ports/148225: [maintainer-update] www/squidguard: fix installation and plist with SAMPLE_BL=off

[Guido Falsi]

>Number:         148225
>Category:       ports
>Synopsis:       [maintainer-update] www/squidguard: fix installation and plist with SAMPLE_BL=off
>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 Jun 29 09:10:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #17: Sat Jun 26 16:21:43 CEST 2010 root at megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64

>Description:

Fix installation and plist when SAMPLE_BL=off on first installation.

In this case the DATADIR was not created and a file was not installed
in DOCSDIR but appeared in the plist.

>How-To-Repeat:

> cd /usr/ports/www/squidguard
> make SAMPLE_BL=off install
> make deinstall

>Fix:

diff -ruN squidguard.old/Makefile squidguard/Makefile
--- squidguard.old/Makefile	2010-06-29 10:47:35.359221719 +0200
+++ squidguard/Makefile	2010-06-29 10:48:47.959232828 +0200
@@ -103,9 +103,9 @@
 	@${CHOWN} -R ${SQUID_UID}:${SQUID_GID} ${SAMPLE_BL_DIR}
 	${CHMOD} -R 550 ${SAMPLE_BL_DIR}
 .endif
+	@${MKDIR} ${DATADIR}
 .if ${INSTALL_BL} == "yes"
 	@${ECHO_MSG} "===>   Installing blacklists"
-	@${MKDIR} ${DATADIR}
 	@${CP} -Rpf ${_DATADIR}/* ${DATADIR}/
 	@${CHOWN} -R ${SQUID_UID}:${SQUID_GID} ${DATADIR}
 	@${CHMOD} -R 550 ${DATADIR}
diff -ruN squidguard.old/pkg-plist squidguard/pkg-plist
--- squidguard.old/pkg-plist	2010-06-29 10:47:35.345221397 +0200
+++ squidguard/pkg-plist	2010-06-29 10:54:19.779568822 +0200
@@ -30,7 +30,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshoot.txt
 %%PORTDOCS%%%%DOCSDIR%%/squidGuard.gif
-%%PORTDOCS%%%%DOCSDIR%%/README.blacklists
+%%BLACKLIST%%%%PORTDOCS%%%%DOCSDIR%%/README.blacklists
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%BLACKLIST%%@cwd %%SAMPLE_BL_DIR%%
 %%BLACKLIST%%ads/domains
>Release-Note:
>Audit-Trail:
>Unformatted: