Changes 1.4:

* Included last fixes for 1.4 final.
* Some cleanup and fine work: added information about "-b" parameter to the
  help output. Added "!" to the list of allowed characters in urls.
* Added a switch to turn on the progress bar.
* Bug fixes.
* Added MySQL support for authentication.

4 files changed, 35 insertions, 114 deletions

diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index 6596ac8f41c..90bb94e351c 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -1,42 +1,34 @@
-# $NetBSD: Makefile,v 1.17 2009/02/16 19:06:51 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.18 2009/08/31 08:55:31 adam Exp $
 
-DISTNAME=	squidGuard-1.3
-PKGREVISION=	2
+DISTNAME=	squidGuard-1.4
 CATEGORIES=	www
-MASTER_SITES=	http://www.squidguard.org/Downloads/Patches/1.3/ \
-		http://www.squidguard.org/Downloads/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		squidGuard-1.3-patch-20080714${EXTRACT_SUFX}
+MASTER_SITES=	http://www.squidguard.org/Downloads/
 
 MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://www.squidguard.org/
 COMMENT=	Ultrafast and free filter, redirector and access controller for Squid
 
+.include "../../www/squid/Makefile.common"
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BDB_ACCEPTED=	db4
-GNU_CONFIGURE=	YES
-USE_TOOLS+=	lex yacc perl
+BDB_ACCEPTED=		db4
+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-sg-config=${PKG_SYSCONFDIR}/squidGuard.conf
+CONFIGURE_ARGS+=	--with-sg-logdir=${LOGDIR}
+CONFIGURE_ARGS+=	--with-sg-dbhome=${DBDIR}
+CONFIGURE_ARGS+=	--with-squiduser=${SQUID_USER}
 
-DEPENDS+=	squid>=1.0:../../www/squid27
+CHECK_PORTABILITY_SKIP=	configure-old
 
-#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}
-CONFIGURE_ARGS+=	--with-db-inc=${BUILDLINK_PREFIX.db4}/include/db4
-CONFIGURE_ARGS+=	--with-db-lib=${BUILDLINK_PREFIX.db4}/lib/db4
-CONFIGURE_ARGS+=	--with-sg-config=${PKG_SYSCONFDIR:Q}/squidGuard.conf
-CONFIGURE_ARGS+=	--with-sg-logdir=${LOGDIR}
-CONFIGURE_ARGS+=	--with-sg-dbhome=${DBDIR}
-CONFIGURE_ARGS+=	--squiduser=${SQUID_USER}
-
 CONF_FILES_PERMS+=	${PREFIX}/${EGDIR}/squidGuard-simple.cgi \
 			${CGIBINDIR}/squidGuard.cgi ${BINOWN} ${BINGRP} 0755
 CONF_FILES_PERMS+=	${PREFIX}/${EGDIR}/squidGuard.conf \
@@ -44,28 +36,25 @@ CONF_FILES_PERMS+=	${PREFIX}/${EGDIR}/squidGuard.conf \
 			${BINOWN} ${SQUID_GROUP} 0640
 MAKE_DIRS+=		${CGIBINDIR}
 OWN_DIRS+=		${DBDIR}
-OWN_DIRS_PERMS+= 	${DBDIR} ${SQUID_USER} ${SQUID_GROUP} 0750
+OWN_DIRS_PERMS+=	${DBDIR} ${SQUID_USER} ${SQUID_GROUP} 0750
 
 BUILD_DEFS+=		VARBASE
-INSTALLATION_DIRS+=	bin ${DOCDIR} ${EGDIR}
+INSTALLATION_DIRS+=	bin ${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
-.include "../../www/squid/Makefile.common"
 
 CGIBINDIR?=		${PREFIX}/libexec/cgi-bin/
-PKG_SYSCONFSUBDIR?=	squidguard
-
-post-extract:
-	cd ${WRKDIR}/squidGuard-1.3-patch-20080714/src/; \
-		${MV} sgDb.c sgDiv.c.in ${WRKSRC}/src
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/squidGuard ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/samples/sample.conf \
 		${DESTDIR}${PREFIX}/${EGDIR}/squidGuard.conf
-.for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${DESTDIR}${PREFIX}/${EGDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/samples/squidGuard-simple.cgi \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/squidGuard-simple-de.cgi \
+		${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/squidGuard.cgi \
+		${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/squidGuard/distinfo b/www/squidGuard/distinfo
index 12662444475..9cf5591feb1 100644
--- a/www/squidGuard/distinfo
+++ b/www/squidGuard/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.5 2008/09/15 17:34:48 taca Exp $
+$NetBSD: distinfo,v 1.6 2009/08/31 08:55:31 adam Exp $
 
-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
-SHA1 (patch-aa) = 5e9f5e064e771419c62b0f66bc24fc99016a4620
-SHA1 (patch-ab) = 9fcecd93e3cc52ad1a9e14eb73d0be8fad054200
+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
index e563599a1af..e4505baddcd 100644
--- a/www/squidGuard/patches/patch-aa
+++ b/www/squidGuard/patches/patch-aa
@@ -1,62 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2007/12/20 03:37:01 taca Exp $
+$NetBSD: patch-aa,v 1.4 2009/08/31 08:55:31 adam Exp $
 
---- configure.orig	2007-09-19 21:22:37.000000000 +0900
+--- configure.orig	2009-01-03 21:05:25.000000000 +0100
 +++ configure
-@@ -3793,7 +3793,7 @@ fi
- echo "$as_me:$LINENO: checking suppress runtime logging " >&5
- echo $ECHO_N "checking suppress runtime logging... $ECHO_C" >&6
- 
--if [ "x$nolog" == x"yes" ]; then
-+if [ "x$nolog" = x"yes" ]; then
-   echo $ECHO_N " $ECHO_C" >&6
- else
-   echo $ECHO_N " no" >&6
-@@ -3802,7 +3802,7 @@ fi
- echo "$as_me:$LINENO: result: $nolog" >&5
- echo "${ECHO_T}$nolog" >&6
- 
--if [ "x$nolog" == x"yes" ]; then
-+if [ "x$nolog" = x"yes" ]; then
- NOLOG1="/* nolog option set:"
- NOLOG2="*/"
- fi
-@@ -3822,11 +3822,11 @@ fi  
- echo "$as_me:$LINENO: result: $with_ldap" >&5
- echo "${ECHO_T}$with_ldap" >&6
- 
--if [ "x$with_ldap" == x"no" ]; then
-+if [ "x$with_ldap" = x"no" ]; then
- ldap_yacc=""
+@@ -4600,7 +4600,7 @@ else
  fi
  
--if [ "x$with_ldap" == x"yes" ]; then
-+if [ "x$with_ldap" = x"yes" ]; then
  
- ldap_yacc="                     | LDAPUSERSEARCH WORD { sgSourceLdapUserSearch(\$2); }"
- echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5
-@@ -4052,13 +4052,13 @@ fi
- #
- ################################################################
- 
--echo "$as_me:$LINENO: checking for db_version in -ldb" >&5
--echo $ECHO_N "checking for db_version in -ldb... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for db_version in -ldb4" >&5
-+echo $ECHO_N "checking for db_version in -ldb4... $ECHO_C" >&6
- if test "${ac_cv_lib_db_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-LIBS="$LIBS -ldb"
++LIBS="$LIBS -ldb4"
+ if test "$cross_compiling" = yes; then
+   db_ok_version=no
  else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb4  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4122,7 +4122,7 @@ if test $ac_cv_lib_db_db_version = yes; 
- #define HAVE_LIBDB 1
- _ACEOF
- 
--  LIBS="-ldb $LIBS"
-+  LIBS="-ldb4 $LIBS"
- 
- else
- 
diff --git a/www/squidGuard/patches/patch-ab b/www/squidGuard/patches/patch-ab
deleted file mode 100644
index b48b18fe335..00000000000
--- a/www/squidGuard/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/12/20 03:37:01 taca Exp $
-
-# Don't try to update documents now.
-
---- Makefile.in.orig	2007-07-02 00:37:14.000000000 +0900
-+++ Makefile.in
-@@ -24,7 +24,7 @@ configfile = @sg_config@
- dbhomedir = @sg_dbhome@
- SQUIDUSER = @squiduser@
- 
--SUBDIRS = src doc test samples contrib
-+SUBDIRS = src test samples contrib
- INSTALL_TARGETS = install-conf install-build
- 
- all::