[Midnightbsd-cvs] mports: www/privoxy: update to 3.0.8.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Mar 23 16:21:19 EDT 2008
Log Message:
-----------
update to 3.0.8. Get off old autoconf
Modified Files:
--------------
mports/www/privoxy:
Makefile (r1.1 -> r1.2)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/www/privoxy/files:
pkg-message.in (r1.1 -> r1.2)
privoxy.in (r1.1 -> r1.2)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/privoxy/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L www/privoxy/pkg-plist -L www/privoxy/pkg-plist -u -r1.1 -r1.2
--- www/privoxy/pkg-plist
+++ www/privoxy/pkg-plist
@@ -1,9 +1,7 @@
sbin/privoxy
-etc/privoxy/config
etc/privoxy/default.action
-etc/privoxy/standard.action
etc/privoxy/default.filter
-etc/privoxy/trust
+etc/privoxy/standard.action
etc/privoxy/templates/blocked
etc/privoxy/templates/cgi-error-404
etc/privoxy/templates/cgi-error-bad-param
@@ -24,6 +22,7 @@
etc/privoxy/templates/edit-actions-list-url
etc/privoxy/templates/edit-actions-remove-url-form
etc/privoxy/templates/edit-actions-url-form
+etc/privoxy/templates/forwarding-failed
etc/privoxy/templates/mod-local-help
etc/privoxy/templates/mod-support-and-service
etc/privoxy/templates/mod-title
@@ -37,21 +36,31 @@
etc/privoxy/templates/toggle
etc/privoxy/templates/toggle-mini
etc/privoxy/templates/untrusted
-%%PORTDOCS%%share/doc/privoxy-manual/actions-file.html
-%%PORTDOCS%%share/doc/privoxy-manual/configuration.html
-%%PORTDOCS%%share/doc/privoxy-manual/filter-file.html
-%%PORTDOCS%%share/doc/privoxy-manual/introduction.html
-%%PORTDOCS%%share/doc/privoxy-manual/startup.html
-%%PORTDOCS%%share/doc/privoxy-manual/appendix.html
-%%PORTDOCS%%share/doc/privoxy-manual/contact.html
-%%PORTDOCS%%share/doc/privoxy-manual/index.html
-%%PORTDOCS%%share/doc/privoxy-manual/quickstart.html
-%%PORTDOCS%%share/doc/privoxy-manual/templates.html
-%%PORTDOCS%%share/doc/privoxy-manual/config.html
-%%PORTDOCS%%share/doc/privoxy-manual/copyright.html
-%%PORTDOCS%%share/doc/privoxy-manual/installation.html
-%%PORTDOCS%%share/doc/privoxy-manual/seealso.html
-%%PORTDOCS%%share/doc/privoxy-manual/upgradersnote.html
-%%PORTDOCS%%@dirrm share/doc/privoxy-manual
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/actions-file.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/appendix.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/config.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/contact.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/files-in-use.jpg
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/filter-file.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/p_doc.css
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy_setup.jpg
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/seealso.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/startup.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/templates.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/upgradersnote.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html
+%%EXAMPLESDIR%%/config
+%%EXAMPLESDIR%%/trust
+%%EXAMPLESDIR%%/user.action
+ at dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/
@dirrm etc/privoxy/templates
@dirrm etc/privoxy
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/privoxy/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L www/privoxy/Makefile -L www/privoxy/Makefile -u -r1.1 -r1.2
--- www/privoxy/Makefile
+++ www/privoxy/Makefile
@@ -2,39 +2,76 @@
# Date created: 21 November 2002
# Whom: John von Essen
#
-# $MidnightBSD$
-# $FreeBSD: ports/www/privoxy/Makefile,v 1.17 2006/10/07 16:47:14 pav Exp $
+# $FreeBSD: ports/www/privoxy/Makefile,v 1.21 2008/01/25 15:44:02 miwi Exp $
#
PORTNAME= privoxy
-PORTVERSION= 3.0.3
-PORTREVISION= 5
+PORTVERSION= 3.0.8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ijbswa
DISTNAME= privoxy-${PORTVERSION}-stable-src
-MAINTAINER= ports at MidnightBSD.org
+MAINTAINER= fk at fabiankeil.de
COMMENT= Privoxy is a web proxy with advanced filtering capabilities
+LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre
+
WRKSRC= ${WRKDIR}/privoxy-${PORTVERSION}-stable
USE_GMAKE= yes
-USE_AUTOTOOLS= autoconf:253
+USE_AUTOTOOLS= autoconf:261
USE_RC_SUBR= privoxy
SUB_FILES= pkg-message
MAKEFILE= GNUmakefile
+# privoxy-devel is the development release available at the Privoxy website.
+# It's not (yet) part of the FreeBSD ports collection.
+CONFLICTS= privoxy-devel-[0-9]*
+
MAN1= privoxy.1
+CONFIGURE_ARGS= --enable-zlib
+CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \
+ CPPFLAGS=-I${LOCALBASE}/include/
+
+OPTIONS= FORCE "Allows to optionally bypass blocks" On \
+ TOGGLE "Support for remote toggling" On \
+ EDITOR "Enable webbased action editor" On \
+ DEBUG "Build with debugging symbols" Off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_FORCE)
+CONFIGURE_ARGS+= --disable-force
+.endif
+
+.if defined(WITHOUT_TOGGLE)
+CONFIGURE_ARGS+= --disable-toggle
+.endif
+
+.if defined(WITHOUT_EDITOR)
+CONFIGURE_ARGS+= --disable-editor
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --with-debug
+.endif
+
post-patch:
${REINPLACE_CMD} \
-e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \
-e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \
-e 's,^\(actionsfile user\),#\1,' \
${WRKSRC}/config
+.if !defined(NOPORTDOCS)
+ ${REINPLACE_CMD} \
+ -e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
+ ${WRKSRC}/config
+
+.endif
pre-configure:
@cd ${WRKSRC}; ${AUTOHEADER}
@@ -47,24 +84,31 @@
@${MKDIR} ${PREFIX}/etc/privoxy/templates
@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates
-.for file in config default.action standard.action default.filter trust
- @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/privoxy
+.for defaultfile in default.action standard.action default.filter
+ @${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${PREFIX}/etc/privoxy
+ @${CHOWN} privoxy:privoxy ${PREFIX}/etc/privoxy/${defaultfile}
+ @${CHMOD} 0640 ${PREFIX}/etc/privoxy/${defaultfile}
+.endfor
+ @${MKDIR} ${EXAMPLESDIR}
+.for examplefile in config trust user.action
+ @${INSTALL_DATA} ${WRKSRC}/${examplefile} ${EXAMPLESDIR}/
+ @${CHOWN} privoxy:privoxy ${EXAMPLESDIR}/${examplefile}
+ @${CHMOD} 0640 ${EXAMPLESDIR}/${examplefile}
.endfor
@${INSTALL_MAN} ${WRKSRC}/privoxy.1 ${MANPREFIX}/man/man1
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/privoxy-manual
- @if [ -d ${WRKSRC}/doc/webserver/user-manual ]; then \
- ${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${PREFIX}/share/doc/privoxy-manual; \
- fi
+ @${MKDIR} ${DOCSDIR}/user-manual
+ @${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${DOCSDIR}/user-manual
+ @${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${DOCSDIR}/user-manual
.endif
post-install:
- ${MKDIR} /var/log/privoxy
- ${CHOWN} privoxy:privoxy /var/log/privoxy
- ${CHMOD} 0750 /var/log/privoxy
- ${MKDIR} /var/run/privoxy
- ${CHOWN} privoxy:privoxy /var/run/privoxy
- ${CHMOD} 0750 /var/run/privoxy
+ @${MKDIR} /var/log/privoxy
+ @${CHOWN} privoxy:privoxy /var/log/privoxy
+ @${CHMOD} 0750 /var/log/privoxy
+ @${MKDIR} /var/run/privoxy
+ @${CHOWN} privoxy:privoxy /var/run/privoxy
+ @${CHMOD} 0750 /var/run/privoxy
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/privoxy/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L www/privoxy/distinfo -L www/privoxy/distinfo -u -r1.1 -r1.2
--- www/privoxy/distinfo
+++ www/privoxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (privoxy-3.0.3-stable-src.tar.gz) = b0710be8af09409bfb03f52523a17010
-SHA256 (privoxy-3.0.3-stable-src.tar.gz) = 4dab0049049c1ae6cfb00faea606d981535d0f0a65aab17e3179cc3d75de9f84
-SIZE (privoxy-3.0.3-stable-src.tar.gz) = 1561072
+MD5 (privoxy-3.0.8-stable-src.tar.gz) = 252c0e085218fb930c4bc7563e9cedd9
+SHA256 (privoxy-3.0.8-stable-src.tar.gz) = ecd51cb2785691f4e90e07d147f5ec89a151b2e578f71afb26bdd90195478499
+SIZE (privoxy-3.0.8-stable-src.tar.gz) = 2007961
Index: privoxy.in
===================================================================
RCS file: /home/cvs/mports/www/privoxy/files/privoxy.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L www/privoxy/files/privoxy.in -L www/privoxy/files/privoxy.in -u -r1.1 -r1.2
--- www/privoxy/files/privoxy.in
+++ www/privoxy/files/privoxy.in
@@ -1,7 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: ports/www/privoxy/files/privoxy.in,v 1.1 2006/10/07 16:47:15 pav Exp $
-#
+# $MidnightBSD$
#
# PROVIDE: privoxy
# REQUIRE: NETWORKING
@@ -34,6 +33,11 @@
: ${privoxy_user="privoxy"}
: ${privoxy_pidfile="/var/run/privoxy/privoxy.pid"}
+start_precmd="if [ ! -e ${privoxy_config} ]; then\
+ echo ${privoxy_config} not found. Copying default configuration.;\
+ cp %%PREFIX%%/share/examples/privoxy/config ${privoxy_config};\
+ chown ${privoxy_user}:${privoxy_user} ${privoxy_config};\
+fi"
command="%%PREFIX%%/sbin/privoxy"
command_args="${privoxy_flags} --pidfile ${privoxy_pidfile} ${privoxy_config}"
Index: pkg-message.in
===================================================================
RCS file: /home/cvs/mports/www/privoxy/files/pkg-message.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L www/privoxy/files/pkg-message.in -L www/privoxy/files/pkg-message.in -u -r1.1 -r1.2
--- www/privoxy/files/pkg-message.in
+++ www/privoxy/files/pkg-message.in
@@ -1,25 +1,26 @@
-***********************************************************
-** Privoxy's default configuration file is: **
-** %%PREFIX%%/etc/privoxy/config **
-** It gets overwritten on (re)install, if you make your **
-** own modifications, you should rename it first. **
-** **
-** To start Privoxy on boot, add: privoxy_enable="YES" **
-** to /etc/rc.conf. If you changed the location of the **
-** configuration file, additionally add: **
-** privoxy_config="%%PREFIX%%/etc/privoxy/your-config" **
-** **
-** To start Privoxy manually, run: **
-** %%PREFIX%%/etc/rc.d/privoxy forcestart **
-** The script understands most of the commands listed **
-** in rc(8), it also contains a list of other rc **
-** variables you can use. **
-** **
-** If you installed Privoxy as package and are using the **
-** default configuration, you have to make sure the **
-** directories /var/log/privoxy and /var/run/privoxy **
-** exist and are owned by privoxy:privoxy. **
-** **
-** For documentation see: **
-** %%PREFIX%%/share/doc/privoxy-manual or 'man privoxy' **
-***********************************************************
+To start Privoxy on boot, add: privoxy_enable="YES"
+to /etc/rc.conf.
+
+To start Privoxy manually, run:
+/usr/local/etc/rc.d/privoxy forcestart
+The script understands most of the commands listed
+in rc(8), it also contains a list of other rc
+variables you can use.
+
+Privoxy's example files were copied to:
+%%EXAMPLESDIR%%
+
+For documentation see:
+%%DOCSDIR%%/user-manual or 'man privoxy'
+
+Note that default.filter, standard.action and
+default.action get overwritten with each Privoxy
+update. Instead of changing them you should use
+your own action and filter files as described in
+Privoxy's manual.
+
+If you installed Privoxy as package and are using the
+default configuration, you have to make sure the
+directories /var/log/privoxy and /var/run/privoxy
+exist and are owned by privoxy:privoxy.
+
More information about the Midnightbsd-cvs
mailing list