Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Jan 2014 15:32:38 GMT
From:      Fabian Keil <fk@fabiankeil.de>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/186077: [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy 3.0.21
Message-ID:  <201401241532.s0OFWcZJ069888@oldred.freebsd.org>
Resent-Message-ID: <201401241540.s0OFe0ho094771@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         186077
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy 3.0.21
>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:   Fri Jan 24 15:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Fabian Keil
>Release:        HEAD
>Organization:
>Environment:
FreeBSD r500.local 11.0-CURRENT FreeBSD 11.0-CURRENT #628 r261034+f0d0906(fk): Wed Jan 22 21:23:18 CET 2014     fk@r500.local:/usr/obj/usr/src/sys/ZOEY  amd64

>Description:
The attached patch is supposed to fix a pkg-plist issue the FreeBSD package build servers complained about. Example:
http://beefy3.isc.freebsd.org/bulk/91amd64-default/2014-01-23_15h56m33s/logs/privoxy-3.0.21_1.log

It was tested with Redports (but so was the previous patch which introduced the problem):
https://redports.org/buildarchive/20140124112149-05678/
>How-To-Repeat:
See the FreeBSD package build server log.
>Fix:
Apply the patch (I hope).

Patch attached with submission follows:

>From 2c04e13ca85e6cb6d2c4192ad91c64cd57e8d082 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 24 Jan 2014 12:12:00 +0100
Subject: [PATCH] Fix packaging failure reported by the package build servers

---
 www/privoxy/Makefile  | 4 +---
 www/privoxy/pkg-plist | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git www/privoxy/Makefile www/privoxy/Makefile
index 919d4d1..7b36446 100644
--- www/privoxy/Makefile
+++ www/privoxy/Makefile
@@ -86,8 +86,6 @@ PLIST_SUB+=	PRIVOXY_TOOLS=""
 PLIST_SUB+=	PRIVOXY_TOOLS="@comment "
 .endif
 
-PLIST_SUB+=	MAN1PREFIX=${MAN1PREFIX}
-
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \
@@ -122,7 +120,7 @@ do-install:
 .for examplefile in config match-all.action trust user.action
 	@${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
-	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${STAGEDIR}${PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual
 	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
diff --git www/privoxy/pkg-plist www/privoxy/pkg-plist
index 4933cd7..924f352 100644
--- www/privoxy/pkg-plist
+++ www/privoxy/pkg-plist
@@ -2,7 +2,7 @@
 %%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl
 %%PRIVOXY_TOOLS%%bin/uagen.pl
 sbin/privoxy
-%%MAN1PREFIX%%/man/man1/privoxy.1.gz
+man/man1/privoxy.1.gz
 etc/privoxy/default.action
 etc/privoxy/default.filter
 etc/privoxy/regression-tests.action
-- 
1.8.5.2



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401241532.s0OFWcZJ069888>