Fix building with db5; updated to patch-20091019

3 files changed, 16 insertions, 23 deletions

diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index e612bd0ef44..6b5f7e96926 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.21 2010/02/26 10:28:35 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/02 13:11:00 adam Exp $
 
 DISTNAME=	squidGuard-1.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/ \
 		http://www.squidguard.org/Downloads/Patches/1.4/
-DISTFILES=	${DEFAULT_DISTFILES} squidGuard-1.4-patch-20091015.tar.gz
+DISTFILES=	${DEFAULT_DISTFILES} \
+		squidGuard-1.4-patch-20091015.tar.gz \
+		squidGuard-1.4-patch-20091019.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.squidguard.org/
@@ -16,11 +18,11 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BDB_ACCEPTED=		db4
+BDB_ACCEPTED=		db4 db5
 USE_TOOLS+=		lex yacc perl
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-db-inc=${BUILDLINK_PREFIX.db4}/include/db4
-CONFIGURE_ARGS+=	--with-db-lib=${BUILDLINK_PREFIX.db4}/lib/db4
+CONFIGURE_ARGS+=	--with-db-inc=${BDBBASE}/include/${BDB_TYPE}
+CONFIGURE_ARGS+=	--with-db-lib=${BDBBASE}/lib/${BDB_TYPE}
 CONFIGURE_ARGS+=	--with-sg-config=${PKG_SYSCONFDIR}/squidGuard.conf
 CONFIGURE_ARGS+=	--with-sg-logdir=${LOGDIR}
 CONFIGURE_ARGS+=	--with-sg-dbhome=${DBDIR}
@@ -50,8 +52,9 @@ INSTALLATION_DIRS+=	bin ${EGDIR}
 CGIBINDIR?=		${PREFIX}/libexec/cgi-bin/
 
 pre-patch:
-	${CP} ${WRKDIR}/squidGuard-1.4-patch-20091015/sgLog.c \
-		${WRKSRC}/src
+	${CP} ${WRKDIR}/squidGuard-1.4-patch-20091015/sgLog.c ${WRKSRC}/src
+	${CP} ${WRKDIR}/squidGuard-1.4-20091019/sg.h.in ${WRKSRC}/src
+	${CP} ${WRKDIR}/squidGuard-1.4-20091019/sgDiv.c.in ${WRKSRC}/src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/squidGuard ${DESTDIR}${PREFIX}/bin
@@ -64,5 +67,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/samples/squidGuard.cgi \
 		${DESTDIR}${PREFIX}/${EGDIR}
 
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squidGuard/distinfo b/www/squidGuard/distinfo
index dd2b24a5797..2a09ecb40b3 100644
--- a/www/squidGuard/distinfo
+++ b/www/squidGuard/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.7 2009/10/17 01:50:38 taca Exp $
+$NetBSD: distinfo,v 1.8 2010/06/02 13:11:00 adam Exp $
 
 SHA1 (squidGuard-1.4-patch-20091015.tar.gz) = b6ad4c67222463e6bafa002593e947d73929db18
 RMD160 (squidGuard-1.4-patch-20091015.tar.gz) = 08991337d2966d44dbe2a9a131b26fa881e1e807
 Size (squidGuard-1.4-patch-20091015.tar.gz) = 2577 bytes
+SHA1 (squidGuard-1.4-patch-20091019.tar.gz) = 0da4230be909020e5fb560183ca43b4f5594c980
+RMD160 (squidGuard-1.4-patch-20091019.tar.gz) = 62c8e79da9a5ffca4b222b7b498549696b7c9f40
+Size (squidGuard-1.4-patch-20091019.tar.gz) = 9597 bytes
 SHA1 (squidGuard-1.4.tar.gz) = 0508ccb7db5c656b9952eacbcff2c956c01677d3
 RMD160 (squidGuard-1.4.tar.gz) = c44880ddbfd7d1ad63fcda1c6ed777f24feedbba
 Size (squidGuard-1.4.tar.gz) = 1968492 bytes
-SHA1 (patch-aa) = 49297a206953a6d0de58756d32ddec51ea50271d
diff --git a/www/squidGuard/patches/patch-aa b/www/squidGuard/patches/patch-aa
deleted file mode 100644
index e4505baddcd..00000000000
--- a/www/squidGuard/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/08/31 08:55:31 adam Exp $
-
---- configure.orig	2009-01-03 21:05:25.000000000 +0100
-+++ configure
-@@ -4600,7 +4600,7 @@ else
- fi
- 
- 
--LIBS="$LIBS -ldb"
-+LIBS="$LIBS -ldb4"
- if test "$cross_compiling" = yes; then
-   db_ok_version=no
- else