head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2;
locks; strict;
comment	@# @;


1.4
date	2008.01.21.18.36.16;	author rse;	state Exp;
branches;
next	1.3;
commitid	Np69tXrspgfDpjOs;

1.3
date	2005.07.25.09.12.55;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2005.07.25.09.02.09;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2005.07.25.07.59.46;	author rse;	state Exp;
branches;
next	;

1.3.2.1
date	2005.07.25.09.12.55;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.55.08;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.4
log
@upgrading package: privoxy 3.0.6 -> 3.0.8
@
text
@Index: GNUmakefile.in
--- GNUmakefile.in.orig	2007-12-11 22:29:25 +0100
+++ GNUmakefile.in	2008-01-21 18:58:55 +0100
@@@@ -62,9 +62,9 @@@@
 MAN_DIR      = @@mandir@@
 MAN_DEST     = $(MAN_DIR)/man1
 SHARE_DEST   = @@datadir@@
-DOC_DEST     = $(SHARE_DEST)/doc/privoxy
+DOC_DEST     = $(SHARE_DEST)/doc
 VAR_DEST     = @@localstatedir@@
-LOGS_DEST    = $(VAR_DEST)/log/privoxy
+LOGS_DEST    = $(VAR_DEST)/log
 PIDS_DEST    = $(VAR_DEST)/run
 
 # if $prefix = /usr/local then the default CONFDEST change from 
Index: configure.in
--- configure.in.orig	2008-01-20 15:07:09 +0100
+++ configure.in	2008-01-21 18:58:55 +0100
@@@@ -1357,7 +1357,7 @@@@
   echo "using libpcre"
   pcre_dyn=yes
   STATIC_PCRE_ONLY=#
-  LIBS="$LIBS -lpcre -lpcreposix"
+  LIBS="$LIBS -lpcreposix -lpcre"
 else
   echo "using built-in static pcre"
   pcre_dyn=no
@


1.3
log
@fix linking the second time
@
text
@d2 2
a3 2
--- GNUmakefile.in.orig	2004-01-31 02:15:33 +0100
+++ GNUmakefile.in	2005-07-25 11:00:56 +0200
a15 9
@@@@ -246,7 +246,7 @@@@
 CFLAGS = @@CFLAGS@@ @@CPPFLAGS@@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
          @@STATIC_PCRE_ONLY@@ -Ipcre 
 
-LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
+LDFLAGS = @@LDFLAGS@@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
 
 
 #############################################################################
d17 3
a19 3
--- configure.in.orig	2004-01-30 10:26:03 +0100
+++ configure.in	2005-07-25 11:12:00 +0200
@@@@ -1243,7 +1243,7 @@@@
@


1.3.2.1
log
@file privoxy.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:55:08 +0000
@
text
@d1 36
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 36
Index: GNUmakefile.in
--- GNUmakefile.in.orig	2004-01-31 02:15:33 +0100
+++ GNUmakefile.in	2005-07-25 11:00:56 +0200
@@@@ -62,9 +62,9 @@@@
 MAN_DIR      = @@mandir@@
 MAN_DEST     = $(MAN_DIR)/man1
 SHARE_DEST   = @@datadir@@
-DOC_DEST     = $(SHARE_DEST)/doc/privoxy
+DOC_DEST     = $(SHARE_DEST)/doc
 VAR_DEST     = @@localstatedir@@
-LOGS_DEST    = $(VAR_DEST)/log/privoxy
+LOGS_DEST    = $(VAR_DEST)/log
 PIDS_DEST    = $(VAR_DEST)/run
 
 # if $prefix = /usr/local then the default CONFDEST change from 
@@@@ -246,7 +246,7 @@@@
 CFLAGS = @@CFLAGS@@ @@CPPFLAGS@@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
          @@STATIC_PCRE_ONLY@@ -Ipcre 
 
-LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
+LDFLAGS = @@LDFLAGS@@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
 
 
 #############################################################################
Index: configure.in
--- configure.in.orig	2004-01-30 10:26:03 +0100
+++ configure.in	2005-07-25 11:12:00 +0200
@@@@ -1243,7 +1243,7 @@@@
   echo "using libpcre"
   pcre_dyn=yes
   STATIC_PCRE_ONLY=#
-  LIBS="$LIBS -lpcre -lpcreposix"
+  LIBS="$LIBS -lpcreposix -lpcre"
 else
   echo "using built-in static pcre"
   pcre_dyn=no
@


1.2
log
@fix linking
@
text
@d25 12
@


1.1
log
@new package: privoxy 3.0.3 (Privacy Web Proxy)
@
text
@d3 1
a3 1
+++ GNUmakefile.in	2005-07-25 09:17:57 +0200
d16 9
@