From 6fc42165c800f3b640f1f9c665a3fdd0f4baa1e5 Mon Sep 17 00:00:00 2001
From: merdely <merdely@openbsd.org>
Date: Wed, 21 Jan 2009 13:54:52 +0000
Subject: [PATCH] Update to 3.0.10. Use SUBST_CMD. Fix license marker (thanks
 sthen). Update WANTLIB (thanks sthen).

ok sthen@, ajacoutot@
---
 www/privoxy/Makefile             | 14 ++++++--------
 www/privoxy/distinfo             | 10 +++++-----
 www/privoxy/patches/patch-config |  4 ++--
 www/privoxy/pkg/PLIST            |  5 +++--
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 6a9b64456a3..338e87b9029 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,22 +1,22 @@
-# $OpenBSD: Makefile,v 1.14 2008/11/14 17:35:00 sturm Exp $
+# $OpenBSD: Makefile,v 1.15 2009/01/21 13:54:52 merdely Exp $
 
 COMMENT=	web proxy with advanced filtering capabilities
 
-V=		3.0.8
+V=		3.0.10
 DISTNAME=	privoxy-${V}-stable
-PKGNAME=	privoxy-${V}p0
+PKGNAME=	privoxy-${V}
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.privoxy.org/
 
 MAINTAINER=	Michael Erdely <merdely@openbsd.org>
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c pthread
+WANTLIB=		c pthread z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 EXTRACT_SUFX=	-src.tar.gz
@@ -37,9 +37,7 @@ pre-configure:
 
 # make install is broken
 do-install:
-	@perl -pi \
-		-e 's|%%SYSCONFDIR%%|${SYSCONFDIR}|g;' \
-		${WRKSRC}/config
+	@${SUBST_CMD} ${WRKSRC}/config
 	${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/privoxy.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/privoxy
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index 6e97049dce6..07138812d41 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,5 +1,5 @@
-MD5 (privoxy-3.0.8-stable-src.tar.gz) = JSwOCFIY+5MMS8dWPpzt2Q==
-RMD160 (privoxy-3.0.8-stable-src.tar.gz) = YE3WGiLcdNBtStqks8h+TV2lFJs=
-SHA1 (privoxy-3.0.8-stable-src.tar.gz) = f+K3r95AZu8fFw9fEYUM+dpCikI=
-SHA256 (privoxy-3.0.8-stable-src.tar.gz) = 7NUcsnhWkfTpDgfRR/XsiaFRsuV49xr7Jr3ZAZVHhJk=
-SIZE (privoxy-3.0.8-stable-src.tar.gz) = 2007961
+MD5 (privoxy-3.0.10-stable-src.tar.gz) = ASgQF/KL4scTMSTRdo2jZA==
+RMD160 (privoxy-3.0.10-stable-src.tar.gz) = kcjVa3GlxgZVS/UJgnGX1onY/BA=
+SHA1 (privoxy-3.0.10-stable-src.tar.gz) = DOUajck4/mQS2qf27fFZuY/WbVQ=
+SHA256 (privoxy-3.0.10-stable-src.tar.gz) = PZ+fVkggEt2rOWyvc/TEAXRqTu69bHY7BPYQjkipCU8=
+SIZE (privoxy-3.0.10-stable-src.tar.gz) = 1957465
diff --git a/www/privoxy/patches/patch-config b/www/privoxy/patches/patch-config
index de455aae85b..40d4411247f 100644
--- a/www/privoxy/patches/patch-config
+++ b/www/privoxy/patches/patch-config
@@ -1,4 +1,4 @@
-$OpenBSD: patch-config,v 1.3 2008/04/04 02:21:29 merdely Exp $
+$OpenBSD: patch-config,v 1.4 2009/01/21 13:54:52 merdely Exp $
 --- config.orig	Wed Apr  2 15:30:46 2008
 +++ config	Wed Apr  2 15:31:57 2008
 @@ -163,8 +163,8 @@
@@ -17,7 +17,7 @@ $OpenBSD: patch-config,v 1.3 2008/04/04 02:21:29 merdely Exp $
  #      No trailing "/", please.
  #
 -confdir .
-+confdir %%SYSCONFDIR%%/privoxy
++confdir ${SYSCONFDIR}/privoxy
  #
  #
  #  2.2. templdir
diff --git a/www/privoxy/pkg/PLIST b/www/privoxy/pkg/PLIST
index 2c3a34b4d6e..48b28b5d115 100644
--- a/www/privoxy/pkg/PLIST
+++ b/www/privoxy/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.5 2008/04/04 02:21:29 merdely Exp $
+@comment $OpenBSD: PLIST,v 1.6 2009/01/21 13:54:52 merdely Exp $
 @newgroup _privoxy:516
 @newuser _privoxy:516:_privoxy:daemon:Privoxy Account:/nonexistent:/sbin/nologin
 @man man/man1/privoxy.1
-sbin/privoxy
+@bin sbin/privoxy
 share/doc/privoxy/
 share/doc/privoxy/README
 share/examples/privoxy/
@@ -247,6 +247,7 @@ share/examples/privoxy/templates/untrusted
 @sample ${SYSCONFDIR}/privoxy/templates/untrusted
 @owner
 @group
+share/examples/privoxy/templates/url-info-osd.xml
 share/examples/privoxy/user.action
 @owner _privoxy
 @group _privoxy