- Update to 1.4

PR:		130051
Submitted by:	Guido Falsi <mad@madpilot.net>

4 files changed, 37 insertions, 13 deletions

diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index dbc8ed3ca329..6de5795b142b 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	squidGuard
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	1.4
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/
 
diff --git a/www/squidguard/distinfo b/www/squidguard/distinfo
index 69c1cfb9dbba..8974cfc5398f 100644
--- a/www/squidguard/distinfo
+++ b/www/squidguard/distinfo
@@ -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) = de834150998c1386c30feae196f16b06
+SHA256 (squidGuard-1.4.tar.gz) = 0711ce60b8e2bbba107b980fed446a88df35e1584b39f079c0cae54a172c5141
+SIZE (squidGuard-1.4.tar.gz) = 1968492
diff --git a/www/squidguard/files/patch-Makefile.in b/www/squidguard/files/patch-Makefile.in
index c7025e7440ac..d8232e0f352b 100644
--- a/www/squidguard/files/patch-Makefile.in
+++ b/www/squidguard/files/patch-Makefile.in
@@ -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 --git a/www/squidguard/pkg-plist b/www/squidguard/pkg-plist
index 9603c16cf13b..f9bd90193d2e 100644
--- a/www/squidguard/pkg-plist
+++ b/www/squidguard/pkg-plist
@@ -1,25 +1,37 @@
 bin/squidGuard
 etc/squid/squidGuard.conf.sample
-@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