From dl@tyfon.net  Mon Oct 17 12:02:58 2005
Return-Path: <dl@tyfon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 49A0716A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Oct 2005 12:02:58 +0000 (GMT)
	(envelope-from dl@tyfon.net)
Received: from hq1.tyfon.net (hq1.tyfon.net [217.27.162.35])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CDE7643D49
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Oct 2005 12:02:57 +0000 (GMT)
	(envelope-from dl@tyfon.net)
Received: from localhost (localhost [127.0.0.1])
	by bsd2.int.tyfon.net (Postfix) with ESMTP id 8EBEA26FBE4
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 Oct 2005 14:02:52 +0200 (CEST)
Received: from hq1.tyfon.net ([127.0.0.1])
 by localhost (bsd2.int.tyfon.net [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 90534-05 for <FreeBSD-gnats-submit@freebsd.org>;
 Mon, 17 Oct 2005 14:02:45 +0200 (CEST)
Received: by bsd2.int.tyfon.net (Postfix, from userid 1000)
	id D59E326FBE3; Mon, 17 Oct 2005 14:02:45 +0200 (CEST)
Message-Id: <20051017120245.D59E326FBE3@bsd2.int.tyfon.net>
Date: Mon, 17 Oct 2005 14:02:45 +0200 (CEST)
From: Dan Larsson <ports@tyfon.net>
Reply-To: Dan Larsson <ports@tyfon.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER-UPDATE] www/squidguard: Respect non-standard LOCALBASE/X11BASE
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         87570
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] www/squidguard: Respect non-standard LOCALBASE/X11BASE
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 17 12:10:12 GMT 2005
>Closed-Date:    Mon Oct 17 18:10:32 GMT 2005
>Last-Modified:  Mon Oct 17 18:10:32 GMT 2005
>Originator:     Dan Larsson
>Release:        FreeBSD 6.0-RC1 i386
>Organization:
Tyfon Svenska AB
>Environment:
	
>Description:
	- Fix port not respecting non-standard LOCALBASE/X11BASE
	- Use DOCSDIR
>How-To-Repeat:
	Apply below patch
>Fix:

--- patch-www+squidguard_honor_prefix begins here ---
Index: ports/www/squidguard/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/squidguard/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- ports/www/squidguard/Makefile	31 Jan 2004 23:34:35 -0000	1.12
+++ ports/www/squidguard/Makefile	17 Oct 2005 10:57:17 -0000
@@ -25,7 +25,8 @@
 		--with-db-lib=${LOCALBASE}/lib \
 		--with-sg-config=${PREFIX}/etc/squid/${PORTNAME}.conf \
 		--with-sg-dbhome=${DATADIR} \
-		--with-sg-logdir=${LOGDIR}
+		--with-sg-logdir=${LOGDIR} \
+		--exec-prefix=${PREFIX}
 
 CFGINPUT=	files/sgcfg.in
 
@@ -109,14 +110,14 @@
 
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing ${PORTNAME} documentation"
-	-@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	-@${MKDIR} ${DOCSDIR}
 .for i in ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif ${WRKSRC}/doc/README
-	@${INSTALL_DATA} ${WRKSRC}$i ${PREFIX}/share/doc/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}$i ${DOCSDIR}
 .endfor
 	@if [ -f ${WRKDIR}/README.blacklists ] ; then \
-		${INSTALL_DATA} ${WRKDIR}/README.blacklists ${PREFIX}/share/doc/${PORTNAME} ; \
+		${INSTALL_DATA} ${WRKDIR}/README.blacklists ${DOCSDIR} ; \
 	fi
-	@${ECHO_MSG} "       -> Documentation installed in: ${PREFIX}/share/doc/${PORTNAME}"
+	@${ECHO_MSG} "       -> Documentation installed in: ${DOCSDIR}"
 .endif
 
 .if !exists(${LOGDIR})
--- patch-www+squidguard_honor_prefix ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Mon Oct 17 12:18:12 GMT 2005 
Responsible-Changed-Why:  
Grabbed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87570 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Mon Oct 17 18:10:31 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=87570 
>Unformatted:
