ports/130051: [maintainer-update] www/squidguard upgrade to 1.4

[Guido Falsi]

>Number:         130051
>Category:       ports
>Synopsis:       [maintainer-update] www/squidguard upgrade to 1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 30 11:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #12: Sun Nov 23 12:57:35 CET 2008 root at megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON i386

>Description:

Upgrade to 1.4

Support for ldap and MySQL still not enabled. They will require more work.

added file:

files/patch-src_Makefile.in

>How-To-Repeat:

>Fix:

diff -ruN squidguard.old/Makefile squidguard/Makefile
--- squidguard.old/Makefile	2008-12-29 15:38:46.162007898 +0100
+++ squidguard/Makefile	2008-12-29 17:50:09.591986368 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	squidGuard
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/
 
diff -ruN squidguard.old/distinfo squidguard/distinfo
--- squidguard.old/distinfo	2008-12-29 15:38:46.162007898 +0100
+++ squidguard/distinfo	2008-12-29 15:39:21.763454806 +0100
@@ -1,3 +1,3 @@
-MD5 (squidGuard-1.3.tar.gz) = d7c2c2e03a2835e4d1c3bef751ace76f
-SHA256 (squidGuard-1.3.tar.gz) = be3342be74dadbf5c27ce0396db675a989c4f919a19e5c8240ce72c6b3c361a4
-SIZE (squidGuard-1.3.tar.gz) = 1905252
+MD5 (squidGuard-1.4.tar.gz) = eec2b1234cd749a4171152af24aaf967
+SHA256 (squidGuard-1.4.tar.gz) = 6d7975d6946a8653e0ef618e3a34dbaebb21fa7e4968460e86cf09748e881a93
+SIZE (squidGuard-1.4.tar.gz) = 1968465
diff -ruN squidguard.old/files/patch-Makefile.in squidguard/files/patch-Makefile.in
--- squidguard.old/files/patch-Makefile.in	2008-12-29 15:38:46.162007898 +0100
+++ squidguard/files/patch-Makefile.in	2008-12-29 18:15:53.774228267 +0100
@@ -1,9 +1,22 @@
---- Makefile.in.orig	2008-11-30 21:11:59.000000000 +0100
-+++ Makefile.in	2008-11-30 21:12:20.000000000 +0100
-@@ -65,15 +65,6 @@
- 		chown -R $(SQUIDUSER) $(logdir) || exit 1 ; \
- 		echo Assigned $(logdir) to user $(SQUIDUSER) ; \
- 	fi ; 
+--- Makefile.in.orig	2008-05-17 20:36:44.000000000 +0200
++++ Makefile.in	2008-12-29 18:15:29.429334258 +0100
+@@ -47,12 +47,6 @@
+ 
+ install-conf:
+ 	@echo Installing configuration file  ;
+-	@if [ ! -d $(prefix)/squidGuard ]; then \
+-		$(MKINSTALLDIRS) $(prefix)/squidGuard ; \
+-		echo Created directory $(prefix)/squidGuard ; \
+-		chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1  ; \
+-		echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \
+-	fi ; 
+ 	@if [ ! -d $(dbhomedir) ]; then \
+ 		$(MKINSTALLDIRS) $(dbhomedir) ; \
+ 		echo Created directory $(dbhomedir) ; \
+@@ -70,15 +64,6 @@
+ 		mkdir -p `dirname $(configfile)` ; \
+ 		echo No configuration directory found. Created `dirname $(configfile)`. ; \
+ 	fi;
 -	@if test ! -f $(configfile); then \
 -		cp samples/sample.conf $(configfile) || exit 1  ; \
 -		echo Copied sample squidGuard.conf ; \
diff -ruN squidguard.old/files/patch-src_Makefile.in squidguard/files/patch-src_Makefile.in
--- squidguard.old/files/patch-src_Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ squidguard/files/patch-src_Makefile.in	2008-12-29 17:28:29.232780733 +0100
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	2008-12-29 17:27:22.867416937 +0100
++++ src/Makefile.in	2008-12-29 17:27:35.627813844 +0100
+@@ -92,7 +92,7 @@
+ 
+ y.tab.c y.tab.h: sg.y sg.h
+ 	@if [ "$(YACC)" = "yacc" ]; then \
+-	   @if [ ! -x $(YACC) ]; then \
++	   if [ ! -x $(YACC) ]; then \
+ 	      echo " " ; \
+ 	      echo "No yacc/bison found. Copy prepared files for y.tab.h and y.tab.c over. " ; \
+ 	      echo " " ; \
diff -ruN squidguard.old/pkg-plist squidguard/pkg-plist
--- squidguard.old/pkg-plist	2008-12-29 15:38:46.162007898 +0100
+++ squidguard/pkg-plist	2008-12-29 18:12:55.923590214 +0100
@@ -1,25 +1,37 @@
 bin/squidGuard
 etc/squid/squidGuard.conf.sample
- at dirrm squidGuard
 %%PORTDOCS%%%%DOCSDIR%%/LDAPFlow.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/authentication.html
+%%PORTDOCS%%%%DOCSDIR%%/authentication.txt
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/configuration.txt
 %%PORTDOCS%%%%DOCSDIR%%/configure.html
 %%PORTDOCS%%%%DOCSDIR%%/configure.txt
+%%PORTDOCS%%%%DOCSDIR%%/expressionlist.html
+%%PORTDOCS%%%%DOCSDIR%%/expressionlist.txt
 %%PORTDOCS%%%%DOCSDIR%%/extended.html
 %%PORTDOCS%%%%DOCSDIR%%/extended.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
+%%PORTDOCS%%%%DOCSDIR%%/features.html
+%%PORTDOCS%%%%DOCSDIR%%/features.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
 %%PORTDOCS%%%%DOCSDIR%%/install.txt
 %%PORTDOCS%%%%DOCSDIR%%/installation.html
 %%PORTDOCS%%%%DOCSDIR%%/installation.txt
+%%PORTDOCS%%%%DOCSDIR%%/ldap-ad-tips.html
+%%PORTDOCS%%%%DOCSDIR%%/ldap-ad-tips.txt
+%%PORTDOCS%%%%DOCSDIR%%/ldap.html
+%%PORTDOCS%%%%DOCSDIR%%/ldap.txt
+%%PORTDOCS%%%%DOCSDIR%%/runtimeops.html
+%%PORTDOCS%%%%DOCSDIR%%/runtimeops.txt
+%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
+%%PORTDOCS%%%%DOCSDIR%%/troubleshoot.txt
 %%PORTDOCS%%%%DOCSDIR%%/squidGuard.gif
 %%PORTDOCS%%%%DOCSDIR%%/README.blacklists
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-
 %%BLACKLIST%%@cwd %%DATADIR%%
 %%BLACKLIST%%ads/domains
 %%BLACKLIST%%ads/domains.db
>Release-Note:
>Audit-Trail:
>Unformatted: