es/${PORTVERSION}%20(stable)/ \
-		SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
-DISTNAME=	privoxy-${PORTVERSION}-stable-src
+MASTER_SITES=	https://www.privoxy.org/sf-download-mirror/Sources/${DISTVERSION}%20(stable)/ \
+		SF/ijbswa/Sources/${DISTVERSION}%20%28stable%29
+DISTNAME=	${PORTNAME}-${DISTVERSION}-stable-src
 
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Web proxy with advanced filtering capabilities
 WWW=		https://www.privoxy.org/
 
+LICENSE=		GPLv2+ GPLv3+
+LICENSE_COMB=		dual
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE.GPLv3
+
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
-USES=		autoreconf cpe gmake shebangfix ssl
-USE_RC_SUBR=	privoxy
+USES=		autoreconf cpe gmake localbase shebangfix ssl
+USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	tools/privoxy-log-parser.pl tools/privoxy-regression-test.pl \
 		tools/uagen.pl tools/url-pattern-translator.pl
@@ -22,26 +27,23 @@ CONFIGURE_ARGS=	--enable-extended-statistics --enable-pcre-host-patterns
 
 MAKEFILE=	GNUmakefile
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 # privoxy-devel is the development release available at the Privoxy website.
 # It's not (yet) part of the FreeBSD ports collection.
-CONFLICTS=	privoxy-devel
+CONFLICTS=	${PORTNAME}-devel
 
 SUB_FILES=	pkg-message
 
-WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-stable
 
-USERS=		privoxy
-GROUPS=		privoxy
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
 OPTIONS_DEFINE=	ACCEPT_FILTER BROKEN_STRPTIME BROTLI COMPRESSION DEBUG \
 		DOCS EDITOR EXTERNAL_FILTERS FORCE HTTPS_INSPECTION \
-		PRIVOXY_TOOLS TOGGLE
+		PRIVOXY_TOOLS TOGGLE ZSTD
 
-OPTIONS_DEFAULT=	ACCEPT_FILTER BROTLI DOCS EDITOR FORCE \
-			HTTPS_INSPECTION TOGGLE PRIVOXY_TOOLS
+OPTIONS_DEFAULT=	ACCEPT_FILTER BROTLI COMPRESSION EDITOR FORCE \
+			HTTPS_INSPECTION PRIVOXY_TOOLS TOGGLE ZSTD
 OPTIONS_SUB=	yes
 
 ACCEPT_FILTER_DESC=	Support for accf_http(9)
@@ -55,65 +57,75 @@ FORCE_DESC=		Support bypassing of blocks
 HTTPS_INSPECTION_DESC=	Support filtering of encrypted content
 PRIVOXY_TOOLS_DESC=	Install Privoxy-Log-Parser, uagen, etc.
 TOGGLE_DESC=		Support for remote toggling
+ZSTD_DESC=		Support decompression of ZStandard-encoded content
 
-ACCEPT_FILTER_CONFIGURE_ON=	--enable-accept-filter
+ACCEPT_FILTER_CONFIGURE_ENABLE=	accept-filter
 
-BROKEN_STRPTIME_CONFIGURE_ON=	--enable-strptime-sanity-checks
+BROKEN_STRPTIME_CONFIGURE_ENABLE=	strptime-sanity-checks
 
-BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
-BROTLI_CONFIGURE_ON=	--with-brotli
+BROTLI_LIB_DEPENDS=		libbrotlidec.so:archivers/brotli
+BROTLI_CONFIGURE_WITH=		brotli
 
-COMPRESSION_CONFIGURE_ON=	--enable-compression
+COMPRESSION_CONFIGURE_ENABLE=	compression
 
-DEBUG_CONFIGURE_ON=	--with-debug
+DEBUG_CONFIGURE_WITH=		debug
 
-EDITOR_CONFIGURE_OFF=	--disable-editor
+EDITOR_CONFIGURE_ENABLE=	editor
 
-EXTERNAL_FILTERS_CONFIGURE_ON=	--enable-external-filters
+EXTERNAL_FILTERS_CONFIGURE_ENABLE=	external-filters
 
-FORCE_CONFIGURE_OFF=	--disable-force
+FORCE_CONFIGURE_ENABLE=		force
 
-HTTPS_INSPECTION_CONFIGURE_ON=	--with-openssl
+HTTPS_INSPECTION_CONFIGURE_WITH=	openssl
 
 PRIVOXY_TOOLS_RUN_DEPENDS=	curl:ftp/curl
-PRIVOXY_TOOLS_USES=	perl5
-PRIVOXY_TOOLS_USE=	PERL5=run
+PRIVOXY_TOOLS_USES=		perl5
+PRIVOXY_TOOLS_USE=		PERL5=run
+PRIVOXY_TOOLS_VARS=		LICENSE+=ISCL LICENSE_COMB=multi
+
+TOGGLE_CONFIGURE_ENABLE=	toggle
 
-TOGGLE_CONFIGURE_OFF=	--disable-toggle
+ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
+ZSTD_CONFIGURE_WITH=		zstd
 
 post-patch:
 	${REINPLACE_CMD} \
-		-e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \
-		-e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \
+		-e 's,^\(confdir\) \.,\1 ${ETCDIR},' \
+		-e 's,^\(logdir\) \.,\1 /var/log/${PORTNAME},' \
 		-e 's,^\(actionsfile user\),#\1,' \
 		-e 's,^\(filterfile user\),#\1,' \
 		-e 's,^#\(listen-backlog -1\),\1,' \
 		${WRKSRC}/config
-	${REINPLACE_CMD} \
-		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
 
 post-patch-DOCS-on:
 	${REINPLACE_CMD} \
 		-e 's,^#\(user-manual\) https://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
 		${WRKSRC}/config
 
+post-patch-PRIVOXY_TOOLS-on:
+	${REINPLACE_CMD} \
+		-e 's,/etc/privoxy,${ETCDIR},' ${WRKSRC}/tools/uagen.pl
+
 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
-.for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl url-pattern-translator.pl
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin
-.endfor
-.for defaultfile in default.action default.filter regression-tests.action
-	${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}/
-.endfor
-	${INSTALL_MAN}  ${WRKSRC}/privoxy.8 ${STAGEDIR}${PREFIX}/share/man/man8
-	@${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
+	${MKDIR} ${STAGEDIR}${ETCDIR}/templates \
+		 ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${ETCDIR}/templates
+	${INSTALL_DATA} ${default.action default.filter \
+		regression-tests.action:L:S|^|${WRKSRC}/|} \
+		${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${config match-all.action trust user.action:L:S|^|${WRKSRC}/|} \
+		${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual
+	${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css \
+		${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual
+
+do-install-PRIVOXY_TOOLS-on:
+	${INSTALL_SCRIPT} ${privoxy-log-parser.pl privoxy-regression-test.pl \
+		uagen.pl url-pattern-translator.pl:L:S|^|${WRKSRC}/tools/|} \
+		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index 613546457cdd..944e3f9c4659 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737205948
-SHA256 (privoxy-4.0.0-stable-src.tar.gz) = c08e2ba0049307017bf9d8a63dd2a0dfb96aa0cdeb34ae007776e63eba62a26f
-SIZE (privoxy-4.0.0-stable-src.tar.gz) = 1746840
+TIMESTAMP = 1767595083
+SHA256 (privoxy-4.1.0-stable-src.tar.gz) = 23e4686e5848c74cb680c09c2811f0357739ecfe641f9c4072ee42399092c97b
+SIZE (privoxy-4.1.0-stable-src.tar.gz) = 1755625
diff --git a/www/privoxy/files/pkg-message.in b/www/privoxy/files/pkg-message.in
index 6280a2c661ba..07e3bd00a0e5 100644
--- a/www/privoxy/files/pkg-message.in
+++ b/www/privoxy/files/pkg-message.in
@@ -5,7 +5,7 @@
   to /etc/rc.conf.
 
   To start Privoxy manually, run:
-  service privoxy forcestart
+  service privoxy onestart
 
   The rc script understands most of the commands listed
   in rc(8), it also contains a list of other rc variables
diff --git a/www/privoxy/pkg-plist b/www/privoxy/pkg-plist
index f819a04b47ec..92b09dfb08d9 100644
--- a/www/privoxy/pkg-plist
+++ b/www/privoxy/pkg-plist
@@ -2,8 +2,6 @@
 %%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl
 %%PRIVOXY_TOOLS%%bin/uagen.pl
 %%PRIVOXY_TOOLS%%bin/url-pattern-translator.pl
-sbin/privoxy
-share/man/man8/privoxy.8.gz
 etc/privoxy/default.action
 etc/privoxy/default.filter
 etc/privoxy/regression-tests.action
@@ -46,6 +44,7 @@ etc/privoxy/templates/toggle-mini
 etc/privoxy/templates/untrusted
 etc/privoxy/templates/url-info-osd.xml
 etc/privoxy/templates/wpad.dat
+sbin/privoxy
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/actions-file.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/appendix.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/config.html
@@ -70,3 +69,4 @@ etc/privoxy/templates/wpad.dat
 %%EXAMPLESDIR%%/match-all.action
 %%EXAMPLESDIR%%/trust
 %%EXAMPLESDIR%%/user.action
+share/man/man8/privoxy.8.gz