From: Sven Wegener Date: Thu, 25 Nov 2004 21:46:53 +0000 (+0000) Subject: There's no need to override path.h because the configure script has options for it. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20e01b7be3df55dc2357ddfd69b65f6f2285cf44;p=gentoo.git There's no need to override path.h because the configure script has options for it. --- 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 -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 ptlink-opm-1.3.0.ebuild, ptlink-opm-1.3.1.ebuild: diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest index aa83d604a31b..b46ad4f36854 100644 --- a/net-irc/ptlink-opm/Manifest +++ b/net-irc/ptlink-opm/Manifest @@ -1,18 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5ddfd36b5d6df244592af224e6fe6707 ptlink-opm-1.3.1.ebuild 1627 -MD5 247bed47da28373bcd0e6eb4623c7c95 ChangeLog 1336 +MD5 0e5821c45f1f4efd6b6beabd4927c21f ptlink-opm-1.3.1.ebuild 1321 +MD5 924f4b0e0ae768c35b7887c8124a7c9f ChangeLog 1529 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 -MD5 9438dc78ef2f245d861e10741c0e5c35 ptlink-opm-1.3.0.ebuild 1627 -MD5 6ecad87c0247e165f3316b758358aa72 files/digest-ptlink-opm-1.3.0 67 MD5 70ece3a2f3634a46cf1f6c6d07791b5f files/digest-ptlink-opm-1.3.1 67 MD5 1cfbc36b60e8ae51e840e337eae1fe32 files/ptlink-opm.conf.d 283 MD5 5239c77a2d0978ebdefdda450b1f13dd files/ptlink-opm.init.d 546 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBpkLXI1lqEGTUzyQRApGoAJ4wo8xrkLZ4tuadxLAPU2NAQuIzfwCfc84l -ZRzhsM0RSWoIjhO3M1LgFYo= -=qeGx +iD8DBQFBplLWI1lqEGTUzyQRAgSLAKC3uTDlf38NG+Cr6xfUHdXzQQh9FgCdEBUH +lWAGfaVNDyDJgc39e/I5QYg= +=iZ0n -----END PGP SIGNATURE----- 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"