Hi,

here I avoid changing the --user option's value.
this way pkill will be happy in rc.subr

+ result of update-patches on old patches

Samir.


Index: www/privoxy/Makefile
===================================================================
RCS file: /cvs/ports/www/privoxy/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- www/privoxy/Makefile        25 Mar 2011 07:01:14 -0000      1.23
+++ www/privoxy/Makefile        25 Apr 2011 19:38:47 -0000
@@ -7,7 +7,7 @@
 PKGNAME=       privoxy-${V}
 CATEGORIES=    www
 
-REVISION=      0
+REVISION=      1
 
 HOMEPAGE=      http://www.privoxy.org/
 
Index: www/privoxy/patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/privoxy/patches/patch-GNUmakefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-GNUmakefile_in
--- www/privoxy/patches/patch-GNUmakefile_in    26 Mar 2009 18:58:03 -0000      
1.5
+++ www/privoxy/patches/patch-GNUmakefile_in    25 Apr 2011 19:38:47 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-GNUmakefile_in,v 1.5 2009/03/26 18:58:03 merdely Exp $
---- GNUmakefile.in.orig        Fri Jul 18 13:50:47 2008
-+++ GNUmakefile.in     Thu Mar 26 14:23:35 2009
-@@ -225,7 +225,7 @@ PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LIB@
+--- GNUmakefile.in.orig        Sat Feb 20 13:53:30 2010
++++ GNUmakefile.in     Mon Apr 25 20:28:04 2011
+@@ -223,7 +223,7 @@ PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LIB@
  SRCS         = $(C_SRC)  $(W32_SRC)  $(PCRS_SRC)  $(PCRE_SRC)  $(REGEX_SRC)
  OBJS         = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
  HDRS         = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
Index: www/privoxy/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/www/privoxy/patches/patch-configure_in,v
retrieving revision 1.4
diff -u -r1.4 patch-configure_in
--- www/privoxy/patches/patch-configure_in      26 Mar 2009 18:58:03 -0000      
1.4
+++ www/privoxy/patches/patch-configure_in      25 Apr 2011 19:38:47 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_in,v 1.4 2009/03/26 18:58:03 merdely Exp $
---- configure.in.orig  Wed Aug 13 12:53:50 2008
-+++ configure.in       Thu Mar 26 14:29:02 2009
-@@ -842,24 +842,6 @@ fi
+--- configure.in.orig  Sat Oct 30 17:57:50 2010
++++ configure.in       Mon Apr 25 20:28:10 2011
+@@ -331,24 +331,6 @@ fi
  AC_SUBST(WDUMP)
  AC_SUBST(DB2HTML)
  
@@ -26,7 +26,7 @@
  dnl Set doc status flag for conditional content inclusions
  DOC_STATUS=p-not-stable
  if  test $CODE_STATUS = stable; then
-@@ -1399,7 +1381,7 @@ if test $have_pcre = "yes"; then
+@@ -942,7 +924,7 @@ if test $have_pcre = "yes"; then
    echo "using libpcre"
    pcre_dyn=yes
    STATIC_PCRE_ONLY=#
Index: www/privoxy/patches/patch-jcc_c
===================================================================
RCS file: www/privoxy/patches/patch-jcc_c
diff -N www/privoxy/patches/patch-jcc_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ www/privoxy/patches/patch-jcc_c     25 Apr 2011 19:38:47 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- jcc.c.orig Sat Nov  6 12:48:32 2010
++++ jcc.c      Mon Apr 25 20:14:13 2011
+@@ -2845,7 +2845,6 @@ int main(int argc, char **argv)
+ #ifdef unix
+    struct passwd *pw = NULL;
+    struct group *grp = NULL;
+-   char *p;
+    int do_chroot = 0;
+    char *pre_chroot_nslookup_to_load_resolver = NULL;
+ #endif
+@@ -2932,6 +2931,7 @@ int main(int argc, char **argv)
+       {
+          if (++argc_pos == argc) usage(argv[argc_pos]);
+ 
++         char *p = NULL;
+          if ((NULL != (p = strchr(argv[argc_pos], '.'))) && *(p + 1) != '0')
+          {
+             *p++ = '\0';
+@@ -2946,7 +2946,7 @@ int main(int argc, char **argv)
+             log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]);
+          }
+ 
+-         if (p != NULL) *--p = '\0';
++         if (p != NULL) *--p = '.';
+       }
+ 
+       else if (strcmp(argv[argc_pos], "--pre-chroot-nslookup" ) == 0)

Reply via email to