From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 17 12:10:13 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F12B16A420 for ; Mon, 17 Oct 2005 12:10:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B640E43D58 for ; Mon, 17 Oct 2005 12:10:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9HCACEj040898 for ; Mon, 17 Oct 2005 12:10:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9HCACig040897; Mon, 17 Oct 2005 12:10:12 GMT (envelope-from gnats) Resent-Date: Mon, 17 Oct 2005 12:10:12 GMT Resent-Message-Id: <200510171210.j9HCACig040897@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Larsson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49A0716A41F for ; 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 ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/87570: [MAINTAINER-UPDATE] www/squidguard: Respect non-standard LOCALBASE/X11BASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Larsson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Oct 2005 12:10:13 -0000 >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: