Attachment #104031 for bug #144146

View | Details | Raw Unified | Return to bug 144146
Collapse All | Expand All




#

PORTNAME=	privoxy
PORTVERSION=	3.0.16
CATEGORIES=	www ipv6
MASTER_SITES=	SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
DISTNAME=	privoxy-${PORTVERSION}-stable-src


CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib \
		CPPFLAGS=-I${LOCALBASE}/include/

OPTIONS=	ACCEPT_FILTER "Enable support for accf_http(9)" Off \
		DEBUG "Build with debugging symbols" Off \
		EDITOR "Allow to enable the webbased action editor" On \
		FORCE "Allows to optionally bypass blocks" On \
		PRIVOXY_TOOLS "Install Privoxy-Log-Parser, uagen etc." Off \
		TOGGLE "Support for remote toggling" On

.include <bsd.port.pre.mk>

.if defined(WITH_ACCEPT_FILTER)
CONFIGURE_ARGS+=	 --enable-accept-filter
.endif

.if defined(WITH_DEBUG)
CONFIGURE_ARGS+=	--with-debug
.endif

.if defined(WITHOUT_EDITOR)
CONFIGURE_ARGS+=	--disable-editor
.endif

.if defined(WITHOUT_FORCE)
CONFIGURE_ARGS+=	--disable-force
.endif

.if defined(WITHOUT_TOGGLE)
CONFIGURE_ARGS+=	--disable-toggle
.endif

.if defined(WITH_PRIVOXY_TOOLS)
USE_PERL5_RUN=	yes
RUN_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
PLIST_SUB+=	PRIVOXY_TOOLS=""
.else
PLIST_SUB+=	PRIVOXY_TOOLS="@comment "
.endif

post-patch:

	${REINPLACE_CMD} \
		-e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
	${WRKSRC}/config

.endif
	${REINPLACE_CMD} \
		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
# Effectivly apply revision 1.208 to fix a regression test.
	${REINPLACE_CMD} \
		-e 's,\(-fast-redirects -hide-refer\),\1r,' ${WRKSRC}/default.action.master

pre-configure:
	@cd ${WRKSRC}; ${AUTOHEADER}

	@${MKDIR} ${PREFIX}/etc/privoxy/templates
	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates
.if defined(WITH_PRIVOXY_TOOLS)
.for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl
	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${PREFIX}/bin
.endfor
.endif
.for defaultfile in default.action default.filter regression-tests.action
	@${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${PREFIX}/etc/privoxy
	@${CHOWN} privoxy:privoxy ${PREFIX}/etc/privoxy/${defaultfile}
	@${CHMOD} 0444 ${PREFIX}/etc/privoxy/${defaultfile}

.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

Lines 1-3 Link Here

(-)www/privoxy/distinfo (-3 / +3 lines)
1	MD5 (privoxy-3.0.12-stable-src.tar.gz) = c973e608d27b248ef567b47664308da1	1	MD5 (privoxy-3.0.16-stable-src.tar.gz) = 64d3ffcdf8307e04a375773bb4eb255e
2	SHA256 (privoxy-3.0.12-stable-src.tar.gz) = c910da7fdd51dc197b7cd6695555c7dd0124b8fc44cb03d1fc645d72438dcf9a	2	SHA256 (privoxy-3.0.16-stable-src.tar.gz) = 7df74e33cf9263cb8153e5746e4ad09bf82d7c43d175511bb79056b8a4fafee6
3	SIZE (privoxy-3.0.12-stable-src.tar.gz) = 1811124	3	SIZE (privoxy-3.0.16-stable-src.tar.gz) = 1656721

Lines 19-27 Link Here

(-)www/privoxy/files/pkg-message.in (-4 / +4 lines)
19	changing them you should use your own action and	19	changing them you should use your own action and
20	filter files as described in Privoxy's manual.	20	filter files as described in Privoxy's manual.
21		21
22	If you installed Privoxy as package and are using the	22	If you installed Privoxy as package and are using
23	default configuration, you have to make sure the	23	the default configuration, you have to make sure
24	directories /var/log/privoxy and /var/run/privoxy	24	the directory /var/run/privoxy exists and is owned
25	exist and are owned by privoxy:privoxy.	25	by privoxy:privoxy.
26		26
27	***********************************************************	27	***********************************************************

Lines 30-35 Link Here

(-)www/privoxy/files/privoxy.in (+7 lines)
30		30
31	: ${privoxy_enable="NO"}	31	: ${privoxy_enable="NO"}
32	: ${privoxy_config="%%PREFIX%%/etc/privoxy/config"}	32	: ${privoxy_config="%%PREFIX%%/etc/privoxy/config"}
		33	: ${privoxy_logdir="/var/log/privoxy"}
33	: ${privoxy_user="privoxy"}	34	: ${privoxy_user="privoxy"}
34	: ${privoxy_pidfile="/var/run/privoxy/privoxy.pid"}	35	: ${privoxy_pidfile="/var/run/privoxy/privoxy.pid"}
35		36
Lines 45-50 Link Here
45	cp %%PREFIX%%/share/examples/privoxy/match-all.action ${actionfile}	46	cp %%PREFIX%%/share/examples/privoxy/match-all.action ${actionfile}
46	chown ${privoxy_user}:${privoxy_user} ${actionfile}	47	chown ${privoxy_user}:${privoxy_user} ${actionfile}
47	fi	48	fi
		49	if [ ! -e ${privoxy_logdir} ]; then
		50	echo ${privoxy_logdir} not found. Creating ...
		51	mkdir ${privoxy_logdir}
		52	chown ${privoxy_user}:${privoxy_user} ${privoxy_logdir}
		53	chmod 0750 ${privoxy_logdir}
		54	fi
48	}	55	}
49		56
50	start_precmd="config_file_check"	57	start_precmd="config_file_check"




%%PRIVOXY_TOOLS%%bin/privoxy-log-parser.pl
%%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl
%%PRIVOXY_TOOLS%%bin/uagen.pl
sbin/privoxy
etc/privoxy/default.action
etc/privoxy/default.filter
etc/privoxy/regression-tests.action
etc/privoxy/templates/blocked
etc/privoxy/templates/cgi-error-404
etc/privoxy/templates/cgi-error-bad-param

etc/privoxy/templates/cgi-error-parse
etc/privoxy/templates/cgi-style.css
etc/privoxy/templates/connect-failed
etc/privoxy/templates/connection-timeout
etc/privoxy/templates/default
etc/privoxy/templates/edit-actions-add-url-form
etc/privoxy/templates/edit-actions-for-url

etc/privoxy/templates/mod-support-and-service
etc/privoxy/templates/mod-title
etc/privoxy/templates/mod-unstable-warning
etc/privoxy/templates/no-server-data
etc/privoxy/templates/no-such-domain
etc/privoxy/templates/show-request
etc/privoxy/templates/show-status

%%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%%/match-all.action

Return to bug 144146

Lines 6-13 Link Here

(-)www/privoxy/Makefile (-16 / +36 lines)
6	#	6	#
7		7
8	PORTNAME= privoxy	8	PORTNAME= privoxy
9	PORTVERSION= 3.0.12	9	PORTVERSION= 3.0.16
10	CATEGORIES= www	10	CATEGORIES= www ipv6
11	MASTER_SITES= SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29	11	MASTER_SITES= SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
12	DISTNAME= privoxy-${PORTVERSION}-stable-src	12	DISTNAME= privoxy-${PORTVERSION}-stable-src
13		13
Lines 35-61 Link Here
35	CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \	35	CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib \
36	CPPFLAGS=-I${LOCALBASE}/include/	36	CPPFLAGS=-I${LOCALBASE}/include/
37		37
38	OPTIONS= FORCE "Allows to optionally bypass blocks" On \	38	OPTIONS= ACCEPT_FILTER "Enable support for accf_http(9)" Off \
39	TOGGLE "Support for remote toggling" On \	39	DEBUG "Build with debugging symbols" Off \
40	EDITOR "Allow to enable the webbased action editor" On \	40	EDITOR "Allow to enable the webbased action editor" On \
41	DEBUG "Build with debugging symbols" Off	41	FORCE "Allows to optionally bypass blocks" On \
		42	PRIVOXY_TOOLS "Install Privoxy-Log-Parser, uagen etc." Off \
		43	TOGGLE "Support for remote toggling" On
42		44
43	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
44		46
45	.if defined(WITHOUT_FORCE)	47	.if defined(WITH_ACCEPT_FILTER)
46	CONFIGURE_ARGS+= --disable-force	48	CONFIGURE_ARGS+= --enable-accept-filter
47	.endif	49	.endif
48		50
49	.if defined(WITHOUT_TOGGLE)	51	.if defined(WITH_DEBUG)
50	CONFIGURE_ARGS+= --disable-toggle	52	CONFIGURE_ARGS+= --with-debug
51	.endif	53	.endif
52		54
53	.if defined(WITHOUT_EDITOR)	55	.if defined(WITHOUT_EDITOR)
54	CONFIGURE_ARGS+= --disable-editor	56	CONFIGURE_ARGS+= --disable-editor
55	.endif	57	.endif
56		58
57	.if defined(WITH_DEBUG)	59	.if defined(WITHOUT_FORCE)
58	CONFIGURE_ARGS+= --with-debug	60	CONFIGURE_ARGS+= --disable-force
		61	.endif
		62
		63	.if defined(WITHOUT_TOGGLE)
		64	CONFIGURE_ARGS+= --disable-toggle
		65	.endif
		66
		67	.if defined(WITH_PRIVOXY_TOOLS)
		68	USE_PERL5_RUN= yes
		69	RUN_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl
		70	PLIST_SUB+= PRIVOXY_TOOLS=""
		71	.else
		72	PLIST_SUB+= PRIVOXY_TOOLS="@comment "
59	.endif	73	.endif
60		74
61	post-patch:	75	post-patch:
Lines 68-75 Link Here
68	${REINPLACE_CMD} \	82	${REINPLACE_CMD} \
69	-e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \	83	-e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
70	${WRKSRC}/config	84	${WRKSRC}/config
71
72	.endif	85	.endif
		86	${REINPLACE_CMD} \
		87	-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
		88	# Effectivly apply revision 1.208 to fix a regression test.
		89	${REINPLACE_CMD} \
		90	-e 's,\(-fast-redirects -hide-refer\),\1r,' ${WRKSRC}/default.action.master
73		91
74	pre-configure:	92	pre-configure:
75	@cd ${WRKSRC}; ${AUTOHEADER}	93	@cd ${WRKSRC}; ${AUTOHEADER}
Lines 82-88 Link Here
82	@${MKDIR} ${PREFIX}/etc/privoxy/templates	100	@${MKDIR} ${PREFIX}/etc/privoxy/templates
83	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin	101	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
84	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates	102	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates
85	.for defaultfile in default.action default.filter	103	.if defined(WITH_PRIVOXY_TOOLS)
		104	.for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl
		105	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${PREFIX}/bin
		106	.endfor
		107	.endif
		108	.for defaultfile in default.action default.filter regression-tests.action
86	@${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${PREFIX}/etc/privoxy	109	@${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${PREFIX}/etc/privoxy
87	@${CHOWN} privoxy:privoxy ${PREFIX}/etc/privoxy/${defaultfile}	110	@${CHOWN} privoxy:privoxy ${PREFIX}/etc/privoxy/${defaultfile}
88	@${CHMOD} 0444 ${PREFIX}/etc/privoxy/${defaultfile}	111	@${CHMOD} 0444 ${PREFIX}/etc/privoxy/${defaultfile}
Lines 101-109 Link Here
101	.endif	124	.endif
102		125
103	post-install:	126	post-install:
104	@${MKDIR} /var/log/privoxy
105	@${CHOWN} privoxy:privoxy /var/log/privoxy
106	@${CHMOD} 0750 /var/log/privoxy
107	@${MKDIR} /var/run/privoxy	127	@${MKDIR} /var/run/privoxy
108	@${CHOWN} privoxy:privoxy /var/run/privoxy	128	@${CHOWN} privoxy:privoxy /var/run/privoxy
109	@${CHMOD} 0750 /var/run/privoxy	129	@${CHMOD} 0750 /var/run/privoxy

Lines 1-6 Link Here

(-)www/privoxy/pkg-plist (-1 / +6 lines)
		1	%%PRIVOXY_TOOLS%%bin/privoxy-log-parser.pl
		2	%%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl
		3	%%PRIVOXY_TOOLS%%bin/uagen.pl
1	sbin/privoxy	4	sbin/privoxy
2	etc/privoxy/default.action	5	etc/privoxy/default.action
3	etc/privoxy/default.filter	6	etc/privoxy/default.filter
		7	etc/privoxy/regression-tests.action
4	etc/privoxy/templates/blocked	8	etc/privoxy/templates/blocked
5	etc/privoxy/templates/cgi-error-404	9	etc/privoxy/templates/cgi-error-404
6	etc/privoxy/templates/cgi-error-bad-param	10	etc/privoxy/templates/cgi-error-bad-param
Lines 11-16 Link Here
11	etc/privoxy/templates/cgi-error-parse	15	etc/privoxy/templates/cgi-error-parse
12	etc/privoxy/templates/cgi-style.css	16	etc/privoxy/templates/cgi-style.css
13	etc/privoxy/templates/connect-failed	17	etc/privoxy/templates/connect-failed
		18	etc/privoxy/templates/connection-timeout
14	etc/privoxy/templates/default	19	etc/privoxy/templates/default
15	etc/privoxy/templates/edit-actions-add-url-form	20	etc/privoxy/templates/edit-actions-add-url-form
16	etc/privoxy/templates/edit-actions-for-url	21	etc/privoxy/templates/edit-actions-for-url
Lines 26-31 Link Here
26	etc/privoxy/templates/mod-support-and-service	31	etc/privoxy/templates/mod-support-and-service
27	etc/privoxy/templates/mod-title	32	etc/privoxy/templates/mod-title
28	etc/privoxy/templates/mod-unstable-warning	33	etc/privoxy/templates/mod-unstable-warning
		34	etc/privoxy/templates/no-server-data
29	etc/privoxy/templates/no-such-domain	35	etc/privoxy/templates/no-such-domain
30	etc/privoxy/templates/show-request	36	etc/privoxy/templates/show-request
31	etc/privoxy/templates/show-status	37	etc/privoxy/templates/show-status
Lines 54-60 Link Here
54	%%PORTDOCS%%%%DOCSDIR%%/user-manual/seealso.html	60	%%PORTDOCS%%%%DOCSDIR%%/user-manual/seealso.html
55	%%PORTDOCS%%%%DOCSDIR%%/user-manual/startup.html	61	%%PORTDOCS%%%%DOCSDIR%%/user-manual/startup.html
56	%%PORTDOCS%%%%DOCSDIR%%/user-manual/templates.html	62	%%PORTDOCS%%%%DOCSDIR%%/user-manual/templates.html
57	%%PORTDOCS%%%%DOCSDIR%%/user-manual/upgradersnote.html
58	%%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html	63	%%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html
59	%%EXAMPLESDIR%%/config	64	%%EXAMPLESDIR%%/config
60	%%EXAMPLESDIR%%/match-all.action	65	%%EXAMPLESDIR%%/match-all.action