There's no need for a privoxy-user prerequisite package. The build of

privoxy actually doesn't require the userid to exist at all.  Simply whack
the validity checks from configure.in, move PKG_USERS/PKG_GROUPS to the
main privoxy package, and all works fine.

(Similar to the modifications originally needed for Mailman, but in that
case, the numeric user IDs were also embedded in the binaries.  Fortunately,
that is not the case here.)

7 files changed, 69 insertions, 39 deletions

diff --git a/www/Makefile b/www/Makefile
index 5d5373d93dd..03bc6e2aa8a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.344 2004/09/19 04:08:17 markd Exp $
+# $NetBSD: Makefile,v 1.345 2004/09/24 14:08:36 tv Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -207,7 +207,6 @@ SUBDIR+=	php4
 SUBDIR+=	php4-apc
 SUBDIR+=	php4-curl
 SUBDIR+=	privoxy
-SUBDIR+=	privoxy-user
 SUBDIR+=	py-HTMLgen
 SUBDIR+=	py-curl
 SUBDIR+=	py-pcgi
diff --git a/www/privoxy-user/DESCR b/www/privoxy-user/DESCR
deleted file mode 100644
index 6e8f88ecdba..00000000000
--- a/www/privoxy-user/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a pre-req package which ensures the existance of the privoxy user
-which is required for privoxy to build (and therefore must exist pre-build for
-the privoxy package itself).
diff --git a/www/privoxy-user/Makefile b/www/privoxy-user/Makefile
deleted file mode 100644
index 76cfe54f86d..00000000000
--- a/www/privoxy-user/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 22:56:00 grant Exp $
-
-DISTNAME=	privoxy-user-3.0.2
-CATEGORIES=	www
-MASTER_SITES=   # empty
-DISTFILES=      # empty
-
-MAINTAINER=	jmc@NetBSD.org
-HOMEPAGE=	# empty
-COMMENT=	Pre-req package for privoxy to setup user needed for build/use
-
-USE_PKGINSTALL=	yes
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-PRIVOXY_USER?=          privoxy
-PRIVOXY_GROUP?=         privoxy
-
-USE_PKGINSTALL=         YES
-PKG_GROUPS=             ${PRIVOXY_GROUP}
-PKG_USERS=              ${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/privoxy-user/PLIST b/www/privoxy-user/PLIST
deleted file mode 100644
index cd0357a2ce1..00000000000
--- a/www/privoxy-user/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2003/06/23 16:38:41 jmc Exp $
-@comment this plist intentionally left empty
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 3d9e8411e88..d4dbf7e95ee 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/09/22 16:09:57 kim Exp $
+# $NetBSD: Makefile,v 1.10 2004/09/24 14:08:36 tv Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
 PKGNAME=	privoxy-3.0.3
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
@@ -10,8 +11,6 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.privoxy.org/
 COMMENT=	Web proxy with advanced filtering capabilities
 
-DEPENDS+=       privoxy-user>=3.0.2:../../www/privoxy-user
-
 .include "../../mk/bsd.prefs.mk"
 
 PRIVOXY_USER?=		privoxy
@@ -22,6 +21,8 @@ PKG_SYSCONFSUBDIR?=	privoxy
 
 USE_PKGINSTALL=		YES
 RCD_SCRIPTS=		privoxy
+PKG_GROUPS=		${PRIVOXY_GROUP}
+PKG_USERS=		${PRIVOXY_USER}:${PRIVOXY_GROUP}::Privoxy\\ user
 
 EGDIR=			${PREFIX}/share/examples/privoxy
 
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index 87516871664..7b6adb1ba9d 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/09/22 16:09:57 kim Exp $
+$NetBSD: distinfo,v 1.3 2004/09/24 14:08:36 tv Exp $
 
 SHA1 (privoxy-3.0.3-stable-src.tar.gz) = 8aa5ad21a819c0cd5e5f3aadf24e9fb0d813bdaa
 Size (privoxy-3.0.3-stable-src.tar.gz) = 1561072 bytes
 SHA1 (patch-aa) = 2bdc980df283f14ac8694f04b07e6d499d46c5c1
 SHA1 (patch-ab) = 548d11ad83cef96c311cb0453cb149b71577631e
+SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
diff --git a/www/privoxy/patches/patch-ac b/www/privoxy/patches/patch-ac
new file mode 100644
index 00000000000..542fef55535
--- /dev/null
+++ b/www/privoxy/patches/patch-ac
@@ -0,0 +1,62 @@
+$NetBSD: patch-ac,v 1.1 2004/09/24 14:08:36 tv Exp $
+
+--- configure.in.orig	2004-01-30 04:26:03.000000000 -0500
++++ configure.in
+@@ -563,29 +563,12 @@ if test "$EMXOS2" = yes; then
+ 
+ else
+ 
+-  $ID privoxy >/dev/null 2>/dev/null
+-  if test $? -ne 0 ; then
+-   AC_MSG_WARN(There is no user 'privoxy' on this system)
+-  fi
+   AC_MSG_CHECKING([for user])
+   AC_ARG_WITH(user,
+         [  --with-user=privoxy          Set user under which privoxy will run],
+         [
+-                if test "x$withval" != "xyes"; then
+-                  if test $ID = no ; then
+-                    AC_MSG_ERROR(There is no 'id' program on this system)
+-                  else
+                     AC_MSG_RESULT($with_user)
+-                    $ID $with_user 2>/dev/null >/dev/null
+-                    if test $? -eq 0 ; then
+                       USER=$with_user;
+-                    else
+-                      AC_MSG_ERROR(There is no user '$with_user' on this system)
+-                    fi
+-                  fi
+-                  else
+-                   AC_MSG_ERROR(We need a user if you give me this parameter)
+-                fi
+         ],
+         [
+           if test $ID = no ; then
+@@ -602,27 +585,8 @@ else
+   AC_ARG_WITH(group,
+         [  --with-group=privoxy         Set group for privoxy],
+         [ 
+-                if test "x$withval" != "xyes"; then
+-                  if test $BGROUPS = no ; then
+-                    AC_MSG_ERROR(There is no 'groups' program on this system)
+-                  else
+                     AC_MSG_RESULT($with_group)
+-                    $BGROUPS $USER >/dev/null
+-                    if test $? -eq 0 ; then
+-                    # FIXME: this fails if valid group, but not first group
+-                    # listed.
+-                      if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
+-                        AC_MSG_ERROR(The given value '$withval' does not match group entry)
+-                      else
+                         GROUP=$with_group;
+-                      fi
+-                    else
+-                      AC_MSG_ERROR(There is no group entry for user '$USER')
+-                    fi
+-                  fi
+-                else
+-                   AC_MSG_ERROR(We need a group if you give me this parameter)
+-                fi
+         ],
+         [
+           if test $BGROUPS = no ; then