From nobody@FreeBSD.org  Fri Jan 24 15:32:39 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 2EC9F563
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 24 Jan 2014 15:32:39 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 017FE18D0
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 24 Jan 2014 15:32:39 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id s0OFWcDv069895
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 24 Jan 2014 15:32:38 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id s0OFWcZJ069888;
	Fri, 24 Jan 2014 15:32:38 GMT
	(envelope-from nobody)
Message-Id: <201401241532.s0OFWcZJ069888@oldred.freebsd.org>
Date: Fri, 24 Jan 2014 15:32:38 GMT
From: Fabian Keil <fk@fabiankeil.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy 3.0.21
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186077
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy 3.0.21
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 24 15:40:00 UTC 2014
>Closed-Date:    Sat Jan 25 16:40:13 UTC 2014
>Last-Modified:  Sat Jan 25 16:50:03 UTC 2014
>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:

From: Alex Kozlov <spam@rm-rf.kiev.ua>
To: Fabian Keil <fk@fabiankeil.de>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186077: [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy
 3.0.21
Date: Sat, 25 Jan 2014 18:01:27 +0200

 --EeQfGwPcQSOJBaQU
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi, Fabian
 
 Can you please review the attached patch?
 Thanks.
 
 
 -- 
 Alex
 
 --EeQfGwPcQSOJBaQU
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 - Use options helpers
 - Unmute install commands
 - Install DOCS files unconditionally
 Index: www/privoxy/Makefile
 @@ -1,5 +1,5 @@
  # Created by: John von Essen
 -# $FreeBSD: www/privoxy/Makefile 339760 2014-01-15 07:21:17Z miwi $
 +# $FreeBSD: head/www/privoxy/Makefile 339760 2014-01-15 07:21:17Z miwi $
  
  PORTNAME=	privoxy
  PORTVERSION=	3.0.21
 @@ -47,46 +47,25 @@
  
  OPTIONS_DEFAULT=	BROKEN_STRPTIME EDITOR DOCS FORCE TOGGLE
  
 -.include <bsd.port.options.mk>
 +OPTIONS_SUB=	yes
  
 -.if ${PORT_OPTIONS:MACCEPT_FILTER}
 -CONFIGURE_ARGS+=	 --enable-accept-filter
 -.endif
 -
 -.if ${PORT_OPTIONS:MCOMPRESSION}
 -CONFIGURE_ARGS+=	 --enable-compression
 -.endif
 -
 -.if ${PORT_OPTIONS:MDEBUG}
 -CONFIGURE_ARGS+=	--with-debug
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MEDITOR}
 -CONFIGURE_ARGS+=	--disable-editor
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MFORCE}
 -CONFIGURE_ARGS+=	--disable-force
 -.endif
 -
 -.if ${PORT_OPTIONS:MBROKEN_STRPTIME}
 -CONFIGURE_ARGS+=	--enable-strptime-sanity-checks
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MTOGGLE}
 -CONFIGURE_ARGS+=	--disable-toggle
 -.endif
 -
 -.if ${PORT_OPTIONS:MPRIVOXY_TOOLS}
 -USES+=		perl5
 -USE_PERL5=	run
 -RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 -PLIST_SUB+=	PRIVOXY_TOOLS=""
 -.else
 -PLIST_SUB+=	PRIVOXY_TOOLS="@comment "
 -.endif
 +ACCEPT_FILTER_CONFIGURE_ON=	--enable-accept-filter
  
 -PLIST_SUB+=	MAN1PREFIX=${MAN1PREFIX}
 +BROKEN_STRPTIME_CONFIGURE_ON=	--enable-strptime-sanity-checks
 +
 +COMPRESSION_CONFIGURE_ON=	--enable-compression
 +
 +DEBUG_CONFIGURE_ON=	--with-debug
 +
 +EDITOR_CONFIGURE_OFF=	--disable-editor
 +
 +FORCE_CONFIGURE_OFF=	--disable-force
 +
 +TOGGLE_CONFIGURE_OFF=	--disable-toggle
 +
 +PRIVOXY_TOOLS_USES=	perl5
 +PRIVOXY_TOOLS_USE=	PERL5=run
 +PRIVOXY_TOOLS_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  
  post-patch:
  	${REINPLACE_CMD} \
 @@ -94,39 +73,33 @@
  		-e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \
  		-e 's,^\(actionsfile user\),#\1,' \
  		-e 's,^\(filterfile user\),#\1,' \
 -	${WRKSRC}/config
 -.if ${PORT_OPTIONS:MDOCS}
 +		${WRKSRC}/config
  	${REINPLACE_CMD} \
  		-e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
 -	${WRKSRC}/config
 -.endif
 +		${WRKSRC}/config
  	${REINPLACE_CMD} \
  		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
  
  pre-configure:
 -	@cd ${WRKSRC}; ${AUTOHEADER}
 +	@(cd ${WRKSRC}; ${AUTOHEADER})
  
  do-install:
  	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/privoxy/templates
 -	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${STAGEDIR}${PREFIX}/sbin
 -	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${PREFIX}/etc/privoxy/templates
 -.if ${PORT_OPTIONS:MPRIVOXY_TOOLS}
 +	${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${STAGEDIR}${PREFIX}/sbin
 +	${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${PREFIX}/etc/privoxy/templates
  .for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl
 -	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin
 +	${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin
  .endfor
 -.endif
  .for defaultfile in default.action default.filter regression-tests.action
 -	@${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${STAGEDIR}${PREFIX}/etc/privoxy
 +	${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${STAGEDIR}${PREFIX}/etc/privoxy
  .endfor
  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
  .for examplefile in config match-all.action trust user.action
 -	@${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
 +	${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
  .endfor
 -	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 -.if ${PORT_OPTIONS:MDOCS}
 +	${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual
 -	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
 -	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual
 -.endif
 +	${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
 +	${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual
  
  .include <bsd.port.mk>
 Index: 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
 
 --EeQfGwPcQSOJBaQU--

From: Fabian Keil <fk@fabiankeil.de>
To: Alex Kozlov <spam@rm-rf.kiev.ua>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186077: [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy
 3.0.21
Date: Sat, 25 Jan 2014 17:24:41 +0100

 --Sig_/YDGR0gankPe=eY4nA938rM/
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 Alex Kozlov <spam@rm-rf.kiev.ua> wrote:
 
 > Can you please review the attached patch?
 
 Looks good to me. Thanks, Alex.
 
 Fabian
 
 --Sig_/YDGR0gankPe=eY4nA938rM/
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (FreeBSD)
 
 iQIcBAEBCAAGBQJS4+VOAAoJEGkYIpGLojcci3AQAJpTf4C0rHeWsBLlnlvFPLG2
 jUCbYPvbx2NXBz5wxiBqgT21hGBjosY8LldUDpg9vgbwAjT/0dCX5QlECUbAjafr
 6uwPYDrPsaO86tWwf9xvkDeG7yowac1nubDs4Qb6d0h+06Jj0fd7lDXLM07xQWDu
 I9PwSZ/HCMfyP14qT894UnTHx9yppuzvKejvYaObvMnvHA83YCuGYsQFhjT6Gz0j
 no3axdnYUOMWuoKxY9A59OVgRJInaa8jrUkgbgUIOaP0oN2wYKn+JSyIgWMKU2ZB
 GEi6Tayq59xtGs5Olr/4BS0SlfIvEbrxD6dLUT1CO0bMBttfYx1Gsxc/Kn6WPDDI
 wZhdNji/pnd1xaPuO6rL78Ut3YRJhr23/b3spQRVvmzCm2AG4HeO7lNVM4DC1gay
 uJIX8PwvnLkYavw+W/omLqsWcKm505ys3t6YKrUVHKjPcZWXvznheWGC+Dq0ZmjC
 BobN8l/sUTsKhmJ83kJQkVFe9CDjeMWQSvFojIjtNTqR1IJoGko40vxNBrXwk4J3
 /1dyGXt2ITyI09SfBPbK2IcZKOMnRPPl48UnL3ZKbXlggj3VxjeKtuu9DuvEyasx
 I002aL8occwGwIaJ6d38s1qfRqVe/l4ASdsxK9IoC68BpFMvbB9NV+l9+BG3vrr5
 SJ/Hrpf1NOzCLx9blQ7g
 =5zV/
 -----END PGP SIGNATURE-----
 
 --Sig_/YDGR0gankPe=eY4nA938rM/--
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Sat Jan 25 16:39:11 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186077 
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Sat Jan 25 16:40:12 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186077: commit references a PR
Date: Sat, 25 Jan 2014 16:39:59 +0000 (UTC)

 Author: ak
 Date: Sat Jan 25 16:39:52 2014
 New Revision: 341050
 URL: http://svnweb.freebsd.org/changeset/ports/341050
 QAT: https://qat.redports.org/buildarchive/r341050/
 
 Log:
   - Fix pkg-plist [1]
   - Use options helpers
   - Unmute install commands
   - Unconditionally install files for DOCS/PRIVOXY_TOOLS options
   
   PR:	ports/186077 [1]
   Submitted by:	Fabian Keil <fk@fabiankeil.de> (maintainer) [1]
 
 Modified:
   head/www/privoxy/Makefile
   head/www/privoxy/pkg-plist
 
 Modified: head/www/privoxy/Makefile
 ==============================================================================
 --- head/www/privoxy/Makefile	Sat Jan 25 16:30:47 2014	(r341049)
 +++ head/www/privoxy/Makefile	Sat Jan 25 16:39:52 2014	(r341050)
 @@ -47,46 +47,25 @@ TOGGLE_DESC=		Support for remote togglin
  
  OPTIONS_DEFAULT=	BROKEN_STRPTIME EDITOR DOCS FORCE TOGGLE
  
 -.include <bsd.port.options.mk>
 +OPTIONS_SUB=	yes
  
 -.if ${PORT_OPTIONS:MACCEPT_FILTER}
 -CONFIGURE_ARGS+=	 --enable-accept-filter
 -.endif
 -
 -.if ${PORT_OPTIONS:MCOMPRESSION}
 -CONFIGURE_ARGS+=	 --enable-compression
 -.endif
 -
 -.if ${PORT_OPTIONS:MDEBUG}
 -CONFIGURE_ARGS+=	--with-debug
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MEDITOR}
 -CONFIGURE_ARGS+=	--disable-editor
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MFORCE}
 -CONFIGURE_ARGS+=	--disable-force
 -.endif
 -
 -.if ${PORT_OPTIONS:MBROKEN_STRPTIME}
 -CONFIGURE_ARGS+=	--enable-strptime-sanity-checks
 -.endif
 -
 -.if ! ${PORT_OPTIONS:MTOGGLE}
 -CONFIGURE_ARGS+=	--disable-toggle
 -.endif
 -
 -.if ${PORT_OPTIONS:MPRIVOXY_TOOLS}
 -USES+=		perl5
 -USE_PERL5=	run
 -RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 -PLIST_SUB+=	PRIVOXY_TOOLS=""
 -.else
 -PLIST_SUB+=	PRIVOXY_TOOLS="@comment "
 -.endif
 +ACCEPT_FILTER_CONFIGURE_ON=	--enable-accept-filter
  
 -PLIST_SUB+=	MAN1PREFIX=${MAN1PREFIX}
 +BROKEN_STRPTIME_CONFIGURE_ON=	--enable-strptime-sanity-checks
 +
 +COMPRESSION_CONFIGURE_ON=	--enable-compression
 +
 +DEBUG_CONFIGURE_ON=	--with-debug
 +
 +EDITOR_CONFIGURE_OFF=	--disable-editor
 +
 +FORCE_CONFIGURE_OFF=	--disable-force
 +
 +TOGGLE_CONFIGURE_OFF=	--disable-toggle
 +
 +PRIVOXY_TOOLS_USES=	perl5
 +PRIVOXY_TOOLS_USE=	PERL5=run
 +PRIVOXY_TOOLS_RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  
  post-patch:
  	${REINPLACE_CMD} \
 @@ -94,39 +73,33 @@ post-patch:
  		-e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \
  		-e 's,^\(actionsfile user\),#\1,' \
  		-e 's,^\(filterfile user\),#\1,' \
 -	${WRKSRC}/config
 -.if ${PORT_OPTIONS:MDOCS}
 +		${WRKSRC}/config
  	${REINPLACE_CMD} \
  		-e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
 -	${WRKSRC}/config
 -.endif
 +		${WRKSRC}/config
  	${REINPLACE_CMD} \
  		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
  
  pre-configure:
 -	@cd ${WRKSRC}; ${AUTOHEADER}
 +	@(cd ${WRKSRC}; ${AUTOHEADER})
  
  do-install:
  	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/privoxy/templates
 -	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${STAGEDIR}${PREFIX}/sbin
 -	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${PREFIX}/etc/privoxy/templates
 -.if ${PORT_OPTIONS:MPRIVOXY_TOOLS}
 +	${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${STAGEDIR}${PREFIX}/sbin
 +	${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${PREFIX}/etc/privoxy/templates
  .for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl
 -	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin
 +	${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin
  .endfor
 -.endif
  .for defaultfile in default.action default.filter regression-tests.action
 -	@${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${STAGEDIR}${PREFIX}/etc/privoxy
 +	${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${STAGEDIR}${PREFIX}/etc/privoxy
  .endfor
  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
  .for examplefile in config match-all.action trust user.action
 -	@${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
 +	${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/
  .endfor
 -	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 -.if ${PORT_OPTIONS:MDOCS}
 +	${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual
 -	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
 -	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual
 -.endif
 +	${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
 +	${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual
  
  .include <bsd.port.mk>
 
 Modified: head/www/privoxy/pkg-plist
 ==============================================================================
 --- head/www/privoxy/pkg-plist	Sat Jan 25 16:30:47 2014	(r341049)
 +++ head/www/privoxy/pkg-plist	Sat Jan 25 16:39:52 2014	(r341050)
 @@ -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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
