ports/87570: [MAINTAINER-UPDATE] www/squidguard: Respect non-standard LOCALBASE/X11BASE

[Dan Larsson]

>Number:         87570
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] www/squidguard: Respect non-standard LOCALBASE/X11BASE
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 17 12:10:12 GMT 2005
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: