summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2006-03-06 21:27:46 +0000
committerAlin Năstac <mrness@gentoo.org>2006-03-06 21:27:46 +0000
commit10972e5846d788aa4a774f5d1df96588dc670eff (patch)
tree88e0f266c221f21e6e2baef774a1f3de09be41a7 /net-proxy
parentSecond version of the libdir fix for bug #125156 (diff)
downloadhistorical-10972e5846d788aa4a774f5d1df96588dc670eff.tar.gz
historical-10972e5846d788aa4a774f5d1df96588dc670eff.tar.bz2
historical-10972e5846d788aa4a774f5d1df96588dc670eff.zip
sanitize the code
Package-Manager: portage-2.0.54
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/squidguard/Manifest10
-rw-r--r--net-proxy/squidguard/squidguard-1.2.0-r1.ebuild32
2 files changed, 21 insertions, 21 deletions
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index 494e109a0edc..1651befd15df 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -10,11 +10,11 @@ MD5 5838403ff8fe47285fdc4235a53467ba files/squidguard-1.2.0-db4.patch 685
MD5 71814cadfec6eed3d7ee2437fdd1f0ab files/squidguard-1.2.0-db41.patch 794
MD5 d639b977d8cfd92f19913f1d9fa12564 files/squidguard-1.2.0-db42.patch 1348
MD5 35bcd0f162808937c8e8dcfa3ffca0c4 metadata.xml 264
-MD5 4aa82c44fc5305463752806aa5a7e0cb squidguard-1.2.0-r1.ebuild 1933
+MD5 4c9af73656606823b5ac55a2f7f98df1 squidguard-1.2.0-r1.ebuild 1874
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
-iD8DBQFDmt2+V3J2n04EauwRAn0lAKDSdFxef4ybhfQnKETbsfyZQgkPcQCgtSTK
-eWoykyjksZwN4K4IuXb3w8A=
-=6Xjy
+iD8DBQFEDKlfjG8pv1lIUX4RAkXYAKDwNJbxrGs6YiLwGSPUFsubIDM7/gCg03NI
+jWaxDYjDG6jmuJV8AGFBnGA=
+=8pUp
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
index 110dec46149b..ac4756157d5a 100644
--- a/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.2 2005/10/04 21:26:29 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidguard/squidguard-1.2.0-r1.ebuild,v 1.3 2006/03/06 21:27:46 mrness Exp $
inherit eutils
-MY_P=squidGuard-${PV}
DESCRIPTION="Combined filter, redirector and access controller plugin for Squid."
HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://ftp.teledanmark.no/pub/www/proxy/squidGuard/${MY_P}.tar.gz"
+SRC_URI="http://ftp.teledanmark.no/pub/www/proxy/squidGuard/squidGuard-${PV}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ppc ppc64 ~amd64"
+KEYWORDS="~amd64 ppc ppc64 x86"
IUSE=""
RDEPEND="net-proxy/squid
@@ -19,14 +19,14 @@ DEPEND="${RDEPEND}
sys-devel/bison
sys-devel/flex"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/squidGuard-${PV}"
src_unpack() {
unpack ${A} || die "unpack problem"
- cd ${S}
- epatch ${FILESDIR}/${P}-db4.patch || die
- epatch ${FILESDIR}/${P}-db41.patch || die
- epatch ${FILESDIR}/${P}-db42.patch || die
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-db4.patch"
+ epatch "${FILESDIR}/${P}-db41.patch"
+ epatch "${FILESDIR}/${P}-db42.patch"
autoconf || die "autoconf problem"
}
@@ -37,24 +37,24 @@ src_compile() {
--with-sg-logdir=/var/log/squidGuard \
|| die "configure problem"
- mv src/Makefile src/Makefile.orig
- sed <src/Makefile.orig >src/Makefile \
+ sed -i \
-e "s|logdir\t= /var/log/squidGuard|logdir\t= ${D}/var/log/squidGuard|" \
- -e "s|cfgdir\t= /etc/squidGuard|cfgdir\t= ${D}/etc/squidGuard|"
+ -e "s|cfgdir\t= /etc/squidGuard|cfgdir\t= ${D}/etc/squidGuard|" \
+ src/Makefile
emake || die "compile problem"
}
src_install() {
- make prefix=${D}/usr install
+ make prefix="${D}/usr" install
dodir /var/log/squidGuard
fowners squid:squid /var/log/squidGuard
insinto /etc/squidGuard/sample
- doins ${FILESDIR}/squidGuard.conf.*
+ doins "${FILESDIR}"/squidGuard.conf.*
insinto /etc/squidGuard/sample/db
- doins ${FILESDIR}/blockedsites
+ doins "${FILESDIR}"/blockedsites
dodoc ANNOUNCE CHANGELOG README
dohtml doc/*.html