Date: Sat, 25 Jan 2014 16:10:01 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/186077: [MAINTAINER-UPDATE] pkg-plist fix for www/privoxy 3.0.21 Message-ID: <201401251610.s0PGA1wE054472@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/186077; it has been noted by GNATS.
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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401251610.s0PGA1wE054472>