There's no need to override path.h because the configure script has options for it.

4 files changed, 14 insertions, 81 deletions

diff --git a/net-irc/ptlink-opm/ChangeLog b/net-irc/ptlink-opm/ChangeLog
index d9d39eafc297..6f3c422e1857 100644
--- a/net-irc/ptlink-opm/ChangeLog
+++ b/net-irc/ptlink-opm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/ptlink-opm
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ChangeLog,v 1.9 2004/11/25 20:38:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ChangeLog,v 1.10 2004/11/25 21:46:53 swegener Exp $
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> -ptlink-opm-1.3.0.ebuild,
+  ptlink-opm-1.3.1.ebuild:
+  There's no need to override path.h because the configure script has options
+  for it.
 
   25 Nov 2004; Sven Wegener <swegener@gentoo.org> ptlink-opm-1.3.0.ebuild,
   ptlink-opm-1.3.1.ebuild:
diff --git a/net-irc/ptlink-opm/files/digest-ptlink-opm-1.3.0 b/net-irc/ptlink-opm/files/digest-ptlink-opm-1.3.0
deleted file mode 100644
index ca80d08e7546..000000000000
--- a/net-irc/ptlink-opm/files/digest-ptlink-opm-1.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 559192cff6b8e7dc892a645cd344f143 PTlink.OPM1.3.0.tar.gz 155901
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.0.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.0.ebuild
deleted file mode 100644
index 6109ce1df72c..000000000000
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ptlink-opm-1.3.0.ebuild,v 1.3 2004/11/25 20:38:38 swegener Exp $
-
-inherit eutils
-
-MY_P="PTlink.OPM${PV}"
-
-DESCRIPTION="PTlink Open Proxy Monitor"
-HOMEPAGE="http://www.ptlink.net/"
-SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's:ptopm\.dconf:/etc/ptlink-opm/ptopm.dconf:' \
-		-e 's:ptopm\.log:log/ptopm.log:' \
-		${S}/src/ptopm.c
-}
-
-src_compile() {
-	econf || die "econf failed"
-
-	# Now we're going to override the paths setup by configure
-	echo "#define BINPATH \"/usr/bin\"" > include/path.h
-	echo "#define VARPATH \"/var/lib/ptlink-opm\"" >> include/path.h
-	echo "#define ETCPATH \"/etc\"" >> include/path.h
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	newbin src/ptopm ptlink-opm || die "newbin failed"
-
-	keepdir /var/{lib,log}/ptlink-opm || die "keepdir failed"
-	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log || die "dosym failed"
-
-	insinto /etc/ptlink-opm
-	newins samples/ptopm.dconf.sample ptopm.dconf || die "newins failed"
-	doins samples/scan_rules.dconf || die "doins failed"
-
-	dodoc CHANGES README || die "dodoc failed"
-
-	newinitd ${FILESDIR}/ptlink-opm.init.d ptlink-opm || die "newinitd failed"
-	newconfd ${FILESDIR}/ptlink-opm.conf.d ptlink-opm || die "newconfd failed"
-}
-
-pkg_postinst() {
-	enewuser ptlink-opm
-	chown ptlink-opm ${ROOT}/var/{log,lib}/ptlink-opm
-}
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild
index a757e74e1427..7eb6caa0fec1 100644
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild
+++ b/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild,v 1.2 2004/11/25 20:38:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ptlink-opm/ptlink-opm-1.3.1.ebuild,v 1.3 2004/11/25 21:46:53 swegener Exp $
 
 inherit eutils
 
@@ -19,35 +19,24 @@ DEPEND=">=sys-apps/sed-4"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e 's:ptopm\.dconf:/etc/ptlink-opm/ptopm.dconf:' \
-		-e 's:ptopm\.log:log/ptopm.log:' \
-		${S}/src/ptopm.c
-}
-
 src_compile() {
-	econf || die "econf failed"
-
-	# Now we're going to override the paths setup by configure
-	echo "#define BINPATH \"/usr/bin\"" > include/path.h
-	echo "#define VARPATH \"/var/lib/ptlink-opm\"" >> include/path.h
-	echo "#define ETCPATH \"/etc\"" >> include/path.h
-
+	econf \
+		--sysconfdir=/etc/ptlink-opm \
+		--localstatedir=/var/lib/ptlink-opm \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
 	newbin src/ptopm ptlink-opm || die "newbin failed"
 
-	keepdir /var/{lib,log}/ptlink-opm || die "keepdir failed"
-	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log || die "dosym failed"
-
 	insinto /etc/ptlink-opm
 	newins samples/ptopm.dconf.sample ptopm.dconf || die "newins failed"
 	doins samples/scan_rules.dconf || die "doins failed"
 
+	keepdir /var/{lib,log}/ptlink-opm || die "keepdir failed"
+	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log || die "dosym failed"
+
 	dodoc CHANGES README || die "dodoc failed"
 
 	newinitd ${FILESDIR}/ptlink-opm.init.d ptlink-opm || die "newinitd failed"