From mad@madpilot.net  Tue Jun 29 09:02:33 2010
Return-Path: <mad@madpilot.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 97F95106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jun 2010 09:02:33 +0000 (UTC)
	(envelope-from mad@madpilot.net)
Received: from megatron.madpilot.net (megatron.madpilot.net [88.149.173.206])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EFA78FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jun 2010 09:02:33 +0000 (UTC)
Received: from megatron.madpilot.net (localhost [127.0.0.1])
	by megatron.madpilot.net (Postfix) with ESMTP id AE6B31F1C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jun 2010 11:02:31 +0200 (CEST)
Received: from megatron.madpilot.net ([127.0.0.1])
	by megatron.madpilot.net (megatron.madpilot.net [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id iSJLYwlJsWsi for <FreeBSD-gnats-submit@freebsd.org>;
	Tue, 29 Jun 2010 11:02:28 +0200 (CEST)
Received: by megatron.madpilot.net (Postfix, from userid 1000)
	id 9B0371F14; Tue, 29 Jun 2010 11:02:28 +0200 (CEST)
Message-Id: <20100629090228.9B0371F14@megatron.madpilot.net>
Date: Tue, 29 Jun 2010 11:02:28 +0200 (CEST)
From: Guido Falsi <mad@madpilot.net>
Reply-To: Guido Falsi <mad@madpilot.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] www/squidguard: fix installation and plist with SAMPLE_BL=off
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 29 09:10:10 UTC 2010
>Closed-Date:    Fri Aug 13 14:11:16 UTC 2010
>Last-Modified:  Fri Aug 13 14:20:03 UTC 2010
>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@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:

From: Guido Falsi <mad@madpilot.net>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/148225: [maintainer-update] www/squidguard: fix
 installation and plist with SAMPLE_BL=off
Date: Tue, 29 Jun 2010 11:20:42 +0200

 BTW the How-To-Reeat part is plainly wrong I notice that just now.
 
 Sorry.
 
 -- 
 Guido Falsi <mad@madpilot.net>
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Aug 13 14:03:41 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148225 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148225: commit references a PR
Date: Fri, 13 Aug 2010 14:11:23 +0000 (UTC)

 pav         2010-08-13 14:11:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/squidguard       Makefile pkg-plist 
   Log:
   - Fix installation and plist for non-default SAMPLE_BL=off option
   
   PR:             ports/148225
   Submitted by:   Guido Falsi <mad@madpilot.net> (maintainer)
   
   Revision  Changes    Path
   1.26      +1 -1      ports/www/squidguard/Makefile
   1.7       +1 -1      ports/www/squidguard/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
