www/privoxy: Update to 4.2.0

[Stepan Ipatov (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Stepan Ipatov <st.ipatov%gmail.com@localhost>
Pushed By:	st.ipatov
Date:		Wed Aug 12 14:36:04 2026 +0000
Changeset:	c225437dfe2bccf1560b8ad70423c6a6ca62bfc5

Modified Files:
	privoxy/Makefile
	privoxy/distinfo
Added Files:
	privoxy/patches/patch-tools_uagen.pl

Log Message:
www/privoxy: Update to 4.2.0

Fix hardcoded paths and update templates installation

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c225437dfe2bccf1560b8ad70423c6a6ca62bfc5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 privoxy/Makefile                     | 37 ++++++++++++++++++++++++++++++------
 privoxy/distinfo                     |  1 +
 privoxy/patches/patch-tools_uagen.pl | 26 +++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 6 deletions(-)

diffs:
diff --git a/privoxy/Makefile b/privoxy/Makefile
index 70860feec7..92206506cc 100644
--- a/privoxy/Makefile
+++ b/privoxy/Makefile
@@ -20,10 +20,10 @@ PRIVOXY_EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 PRIVOXY_DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 PRIVOXY_LOGDIR=		${VARBASE}/log/privoxy
 
-USE_TOOLS+=		gmake mktemp autoconf autoheader perl
+USE_TOOLS+=		gmake mktemp autoconf autoheader perl:run
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	config man/privoxy.8 man/uagen.1
+SUBST_FILES.paths=	config man/privoxy.8 man/uagen.1 tools/uagen.pl
 SUBST_VARS.paths=	PREFIX VARBASE PKG_SYSCONFDIR PRIVOXY_LOGDIR PRIVOXY_DOCDIR
 SUBST_STAGE.paths=	pre-configure
 
@@ -49,7 +49,6 @@ PKG_GROUPS_VARS+=		PRIVOXY_GROUP
 PKG_GROUPS=			${PRIVOXY_GROUP}
 PKG_USERS=			${PRIVOXY_USER}:${PRIVOXY_GROUP}
 PKG_GECOS.${PRIVOXY_USER}=	Privoxy user
-PKG_HOME.${PRIVOXY_USER}=	${PRIVOXY_HOME}
 
 OWN_DIRS_PERMS+=	${PRIVOXY_HOME} ${PRIVOXY_USER} ${PRIVOXY_GROUP} 0770
 
@@ -59,9 +58,35 @@ RCD_SCRIPTS+=		privoxy
 .endif
 
 USER_GROUP=		${PRIVOXY_USER} ${PRIVOXY_GROUP}
-.for i in \
-	config trust default.action user.action user.filter default.filter match-all.action
-CONF_FILES_PERMS+=	${PRIVOXY_EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} ${USER_GROUP} 0640
+
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/templates ${USER_GROUP} 0755
+
+PRIVOXY_CONF_FILES=	config default.action default.filter \
+			match-all.action trust user.action user.filter
+
+PRIVOXY_TEMPLATE_FILES=	blocked cgi-error-404 cgi-error-bad-param \
+			cgi-error-disabled cgi-error-file \
+			cgi-error-file-read-only cgi-error-modified \
+			cgi-error-parse cgi-style.css client-tags \
+			connect-failed connection-timeout default \
+			edit-actions-add-url-form edit-actions-for-url \
+			edit-actions-for-url-filter \
+			edit-actions-for-url-string-action mod-title \
+			edit-actions-list edit-actions-list-button \
+			edit-actions-list-section edit-actions-list-url \
+			edit-actions-remove-url-form edit-actions-url-form \
+			forwarding-failed mod-local-help \
+			mod-support-and-service mod-unstable-warning \
+			no-server-data no-such-domain show-request show-status \
+			show-status-file show-url-info toggle toggle-mini \
+			untrusted url-info-osd.xml wpad.dat
+
+.for f in ${PRIVOXY_CONF_FILES}
+CONF_FILES+=		${PRIVOXY_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+
+.for f in ${PRIVOXY_TEMPLATE_FILES}
+CONF_FILES+=		${PRIVOXY_EGDIR}/templates/${f} ${PKG_SYSCONFDIR}/templates/${f}
 .endfor
 
 OWN_DIRS_PERMS+=	${PRIVOXY_LOGDIR} ${USER_GROUP} 0755
diff --git a/privoxy/distinfo b/privoxy/distinfo
index 15fc47adb7..a22655a208 100644
--- a/privoxy/distinfo
+++ b/privoxy/distinfo
@@ -8,3 +8,4 @@ SHA1 (patch-config) = a111b0d25be9166d64632e8c3b4b5ef61a6f0cb1
 SHA1 (patch-configure.in) = 8e245310c3d13467b7e2958c63ff89424ea1161d
 SHA1 (patch-man_privoxy.8) = 3ec0da5655f9ae94b648b9d04511f4e18079fa89
 SHA1 (patch-man_uagen.1) = da9026d395b659bc0634520c0d0bf9365314a8ed
+SHA1 (patch-tools_uagen.pl) = 0f2c1ba3ff40baba1ea2afac1279b776ae3ff505
diff --git a/privoxy/patches/patch-tools_uagen.pl b/privoxy/patches/patch-tools_uagen.pl
new file mode 100644
index 0000000000..95828f05f6
--- /dev/null
+++ b/privoxy/patches/patch-tools_uagen.pl
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Replace hardcoded paths with paths configured by pkgsrc.
+
+--- tools/uagen.pl.orig	2026-08-12 13:09:18.065429443 +0000
++++ tools/uagen.pl
+@@ -41,8 +41,8 @@ use constant {
+ 
+    UAGEN_VERSION       => 'uagen 1.2.7',
+ 
+-   UAGEN_LOGFILE       => '/var/log/uagen.log',
+-   ACTION_FILE         => '/etc/privoxy/user-agent.action',
++   UAGEN_LOGFILE       => '@VARBASE@/log/uagen.log',
++   ACTION_FILE         => '@PKG_SYSCONFDIR@/user-agent.action',
+    MOZILLA_PREFS_FILE  => '',
+    SILENT              =>  0,
+    NO_LOGGING          =>  0,
+@@ -477,7 +477,7 @@ used by many Mozilla browsers.
+ =head1 OPTIONS
+ 
+ B<--action-file> I<action_file> Privoxy action file to write the
+-generated actions into. Default is /etc/privoxy/user-agent.action.
++generated actions into. Default is @PKG_SYSCONFDIR@/user-agent.action.
+ 
+ B<--action-injection> Don't generate a new action file from scratch,
+ but read an old one and just replace the action values. Useful