From: Christian Heim Date: Sun, 22 Apr 2007 16:35:53 +0000 (+0000) Subject: Use die properly; Use newconfd/newinitd for #174266; Properly quote variables; Fix... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5657ad7afbd8aef5929c55840326ae7b81a3496d;p=gentoo.git Use die properly; Use newconfd/newinitd for #174266; Properly quote variables; Fix postinst note. Package-Manager: portage-2.1.2.4 --- diff --git a/net-misc/gofish/ChangeLog b/net-misc/gofish/ChangeLog index 76323b161de5..c16e8b0ae50c 100644 --- a/net-misc/gofish/ChangeLog +++ b/net-misc/gofish/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/gofish # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/ChangeLog,v 1.14 2007/04/08 11:13:17 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/ChangeLog,v 1.15 2007/04/22 16:35:53 phreak Exp $ + + 22 Apr 2007; Christian Heim gofish-1.0.ebuild, + gofish-1.1.ebuild: + Use die properly; Use newconfd/newinitd for #174266; Properly quote + variables; Fix postinst note. 08 Apr 2007; Simon Stelling metadata.xml: reassign to maintainer-needed diff --git a/net-misc/gofish/gofish-1.0.ebuild b/net-misc/gofish/gofish-1.0.ebuild index 2b3049786afe..564c74d85b2f 100644 --- a/net-misc/gofish/gofish-1.0.ebuild +++ b/net-misc/gofish/gofish-1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/gofish-1.0.ebuild,v 1.1 2005/09/03 01:36:16 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/gofish-1.0.ebuild,v 1.2 2007/04/22 16:35:53 phreak Exp $ inherit eutils @@ -12,8 +12,7 @@ SLOT="0" KEYWORDS="~x86 ~ppc ~amd64" IUSE="" -DEPEND="virtual/libc - >=sys-apps/sed-4" +DEPEND="" RDEPEND="" S="${WORKDIR}/${PN}" @@ -24,19 +23,23 @@ pkg_setup() { } src_compile() { - econf --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-http || die "econf failed" - emake || die + econf \ + --localstatedir=/var \ + --disable-http || die "econf failed!" + + emake || die "emake failed!" } src_install () { - sed -i s/';uid = -1'/'uid = 30'/ ${S}/gofish.conf - sed -i s/';gid = -1'/'uid = 30'/ ${S}/gofish.conf - make DESTDIR="${D}" install || die - exeinto /etc/init.d ; newexe ${FILESDIR}/gofish.rc gofish - insinto /etc/conf.d ; newins ${FILESDIR}/gofish.confd gofish + sed -i s/';uid = -1'/'uid = 30'/ "${S}"/gofish.conf + sed -i s/';gid = -1'/'uid = 30'/ "${S}"/gofish.conf + make DESTDIR="${D}" install || die "make install failed!" + newinitd "${FILESDIR}"/gofish.rc gofish + newconfd "${FILESDIR}"/gofish.confd gofish } pkg_postinst() { - einfo "Please edit /etc/${PN}.conf before using." + echo + elog "Please configure /etc/${PN}.conf before attempt to use it!" + echo } diff --git a/net-misc/gofish/gofish-1.1.ebuild b/net-misc/gofish/gofish-1.1.ebuild index bead754304ee..7bdc4829a53f 100644 --- a/net-misc/gofish/gofish-1.1.ebuild +++ b/net-misc/gofish/gofish-1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/gofish-1.1.ebuild,v 1.2 2006/10/15 13:19:43 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gofish/gofish-1.1.ebuild,v 1.3 2007/04/22 16:35:53 phreak Exp $ inherit eutils @@ -12,8 +12,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~x86" IUSE="" -DEPEND="virtual/libc - >=sys-apps/sed-4" +DEPEND="" RDEPEND="" S="${WORKDIR}/${PN}" @@ -24,19 +23,23 @@ pkg_setup() { } src_compile() { - econf --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-http || die "econf failed" - emake || die + econf \ + --localstatedir=/var \ + --disable-http || die "econf failed!" + + emake || die "emake failed!" } src_install () { - sed -i s/';uid = -1'/'uid = 30'/ ${S}/gofish.conf - sed -i s/';gid = -1'/'uid = 30'/ ${S}/gofish.conf - make DESTDIR="${D}" install || die - exeinto /etc/init.d ; newexe ${FILESDIR}/gofish.rc gofish - insinto /etc/conf.d ; newins ${FILESDIR}/gofish.confd gofish + sed -i s/';uid = -1'/'uid = 30'/ "${S}"/gofish.conf + sed -i s/';gid = -1'/'uid = 30'/ "${S}"/gofish.conf + make DESTDIR="${D}" install || die "make install failed!" + newinitd "${FILESDIR}"/gofish.rc gofish + newconfd "${FILESDIR}"/gofish.confd gofish } pkg_postinst() { - einfo "Please edit /etc/${PN}.conf before using." + echo + elog "Please configure /etc/${PN}.conf before attempt to use it!" + echo }