* Use squidGuard-1.3-patch-20080714.

* Prepair for DESTDIR support.
* Reflect squid package's change.

Bump PKGREVISION.

3 files changed, 28 insertions, 25 deletions

diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index 48ace2462f2..271b759d2a3 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2008/09/07 11:24:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/09/15 17:34:48 taca Exp $
 #
 
 DISTNAME=	squidGuard-1.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	http://www.squidguard.org/Downloads/ \
-		http://www.squidguard.org/Downloads/Patches/1.3/
+MASTER_SITES=	http://www.squidguard.org/Downloads/Patches/1.3/ \
+		http://www.squidguard.org/Downloads/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		squidGuard-1.3-patch-20071117${EXTRACT_SUFX}
+		squidGuard-1.3-patch-20080714${EXTRACT_SUFX}
 
 MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.squidguard.org/
@@ -17,12 +17,14 @@ BDB_ACCEPTED=	db4
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	lex yacc perl
 
-DEPENDS+=	squid>=1.0:../../www/squid
+DEPENDS+=	squid>=1.0:../../www/squid27
 
-#DOCDIR=	${PREFIX}/share/doc/squidGuard
-EXAMPLESDIR=	${PREFIX}/share/examples/squidGuard
+#DOCDIR= 	share/doc/squidGuard
+EGDIR=		share/examples/squidGuard
 DBDIR=		${VARBASE}/squidGuard
 
+PLIST_SUBST+=	EGDIR=${EGDIR}
+
 EXAMPLES=	squidGuard-simple.cgi squidGuard-simple-de.cgi squidGuard.cgi
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -33,9 +35,9 @@ CONFIGURE_ARGS+=	--with-sg-logdir=${LOGDIR}
 CONFIGURE_ARGS+=	--with-sg-dbhome=${DBDIR}
 CONFIGURE_ARGS+=	--squiduser=${SQUID_USER}
 
-CONF_FILES_PERMS+=	${EXAMPLESDIR}/squidGuard-simple.cgi \
+CONF_FILES_PERMS+=	${PREFIX}/${EGDIR}/squidGuard-simple.cgi \
 			${CGIBINDIR}/squidGuard.cgi ${BINOWN} ${BINGRP} 0755
-CONF_FILES_PERMS+=	${EXAMPLESDIR}/squidGuard.conf \
+CONF_FILES_PERMS+=	${PREFIX}/${EGDIR}/squidGuard.conf \
 			${PKG_SYSCONFDIR}/squidGuard.conf \
 			${BINOWN} ${SQUID_GROUP} 0640
 MAKE_DIRS+=		${CGIBINDIR}
@@ -43,7 +45,7 @@ OWN_DIRS+=		${DBDIR}
 OWN_DIRS_PERMS+= 	${DBDIR} ${SQUID_USER} ${SQUID_GROUP} 0750
 
 BUILD_DEFS+=		VARBASE
-INSTALLATION_DIRS+=	bin ${DOCDIR} ${EXAMPLESDIR}
+INSTALLATION_DIRS+=	bin ${DOCDIR} ${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../www/squid/Makefile.common"
@@ -52,14 +54,15 @@ CGIBINDIR?=		${PREFIX}/libexec/cgi-bin/
 PKG_SYSCONFSUBDIR?=	squidguard
 
 post-extract:
-	${MV} ${WRKDIR}/squidGuard-1.3-patch-20071117/sgDb.c ${WRKSRC}/src
+	cd ${WRKDIR}/squidGuard-1.3-patch-20080714/src/; \
+		${MV} sgDb.c sgDiv.c.in ${WRKSRC}/src
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/squidGuard ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/squidGuard ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/samples/sample.conf \
-		${EXAMPLESDIR}/squidGuard.conf
+		${DESTDIR}${PREFIX}/${EGDIR}/squidGuard.conf
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${DESTDIR}${PREFIX}/${EGDIR}
 .endfor
 
 .include "../../mk/bdb.buildlink3.mk"
diff --git a/www/squidGuard/PLIST b/www/squidGuard/PLIST
index 62c7aef4563..c9f03c40643 100644
--- a/www/squidGuard/PLIST
+++ b/www/squidGuard/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2007/12/20 03:37:00 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/09/15 17:34:48 taca Exp $
 bin/squidGuard
-share/examples/squidGuard/squidGuard.conf
-share/examples/squidGuard/squidGuard-simple-de.cgi
-share/examples/squidGuard/squidGuard-simple.cgi
-share/examples/squidGuard/squidGuard.cgi
-@dirrm share/examples/squidGuard
+${EGDIR}/squidGuard.conf
+${EGDIR}/squidGuard-simple-de.cgi
+${EGDIR}/squidGuard-simple.cgi
+${EGDIR}/squidGuard.cgi
+@dirrm ${EGDIR}
diff --git a/www/squidGuard/distinfo b/www/squidGuard/distinfo
index 025e92649b4..12662444475 100644
--- a/www/squidGuard/distinfo
+++ b/www/squidGuard/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2007/12/20 03:37:00 taca Exp $
+$NetBSD: distinfo,v 1.5 2008/09/15 17:34:48 taca Exp $
 
-SHA1 (squidGuard-1.3-patch-20071117.tar.gz) = 8b8566fc3d6ddc375eae000ead6a1fb0de221606
-RMD160 (squidGuard-1.3-patch-20071117.tar.gz) = 916706c3bea0b000552168d8af93e57607e13389
-Size (squidGuard-1.3-patch-20071117.tar.gz) = 4966 bytes
+SHA1 (squidGuard-1.3-patch-20080714.tar.gz) = 4345b0da96ca3470e55a4fe4df66217acbcf63cc
+RMD160 (squidGuard-1.3-patch-20080714.tar.gz) = 493a6a868f34d0b066c943f1969cf1e39debe6e2
+Size (squidGuard-1.3-patch-20080714.tar.gz) = 10502 bytes
 SHA1 (squidGuard-1.3.tar.gz) = 4a1e359679f328cff5970e92e93cc94236ead6c7
 RMD160 (squidGuard-1.3.tar.gz) = 4a6a9b5cf36d9e1d0994b3ec410f741a7b7955d3
 Size (squidGuard-1.3.tar.gz) = 1905252 bytes