From 90eb879ebeae903ab2cf3322c2ed3b10be86e8e6 Mon Sep 17 00:00:00 2001
From: jolan <jolan@openbsd.org>
Date: Fri, 15 Aug 2003 14:44:05 +0000
Subject: [PATCH] Update to 1.5.

---
 www/ffproxy/Makefile                    |  4 ++--
 www/ffproxy/distinfo                    |  6 +++---
 www/ffproxy/patches/patch-Makefile      | 12 -----------
 www/ffproxy/patches/patch-sample_config | 27 ++++++++++++-------------
 www/ffproxy/pkg/PLIST                   |  5 +++--
 5 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100644 www/ffproxy/patches/patch-Makefile

diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile
index 61473987a5b..b526c097fe1 100644
--- a/www/ffproxy/Makefile
+++ b/www/ffproxy/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2003/08/08 04:27:08 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/15 14:44:05 jolan Exp $
 
 COMMENT=	"filtering HTTP proxy server"
-DISTNAME=	ffproxy-1.4.1
+DISTNAME=	ffproxy-1.5
 CATEGORIES=	www
 MASTER_SITES=	http://faith.eu.org/ffproxy/
 
diff --git a/www/ffproxy/distinfo b/www/ffproxy/distinfo
index 62df121d722..5b83b6dd5f2 100644
--- a/www/ffproxy/distinfo
+++ b/www/ffproxy/distinfo
@@ -1,3 +1,3 @@
-MD5 (ffproxy-1.4.1.tar.gz) = d450fda6dcee92418d24d44faa2f8293
-RMD160 (ffproxy-1.4.1.tar.gz) = 364ed59f1bec7541b46601b990bb2b6d6559f58f
-SHA1 (ffproxy-1.4.1.tar.gz) = 12457a4742c9737ea63a95336475d5fab82ee944
+MD5 (ffproxy-1.5.tar.gz) = 67eff5a964dcf0dceb0676f5e3e6c5f6
+RMD160 (ffproxy-1.5.tar.gz) = 70b45bd045ad4f4eca9b72cc6969cff3c1ca3314
+SHA1 (ffproxy-1.5.tar.gz) = 4722c5ad192a9d0500dbaf21966aff64616be981
diff --git a/www/ffproxy/patches/patch-Makefile b/www/ffproxy/patches/patch-Makefile
deleted file mode 100644
index 6f7218993e2..00000000000
--- a/www/ffproxy/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2003/08/08 04:27:08 jolan Exp $
---- Makefile.orig	2003-08-01 15:24:07.000000000 -0500
-+++ Makefile	2003-08-07 21:12:22.000000000 -0500
-@@ -17,7 +17,7 @@ CC?=cc
- 
- DATADIR?=/var/ffproxy
- SYSCONFDIR?=/etc
--CFLAGS = ${OCFLAGS} -DCFGFILE="\"${SYSCONFDIR}/ffproxy.conf\"" -DDATADIR="\"${DATADIR}\""
-+CFLAGS += ${OCFLAGS} -DCFGFILE="\"${SYSCONFDIR}/ffproxy.conf\"" -DDATADIR="\"${DATADIR}\""
- 
- all: proxy
- 
diff --git a/www/ffproxy/patches/patch-sample_config b/www/ffproxy/patches/patch-sample_config
index 3bad01605c5..6c6b5814cee 100644
--- a/www/ffproxy/patches/patch-sample_config
+++ b/www/ffproxy/patches/patch-sample_config
@@ -1,15 +1,14 @@
-$OpenBSD: patch-sample_config,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
---- sample.config.orig	Sun Jul 20 04:51:38 2003
-+++ sample.config	Thu Jul 24 23:36:14 2003
-@@ -37,9 +37,9 @@ use_syslog yes
- log_all_requests no
- 
- # change uid to id, 0 disables (default)
--uid 0
-+uid 523
- # change gid to id, 0 disables (default)
--gid 0
-+gid 523
- 
- # change root to (only in connection with uid and gid change)
+$OpenBSD: patch-sample_config,v 1.2 2003/08/15 14:44:05 jolan Exp $
+--- sample.config.orig	2003-08-09 07:14:52.000000000 -0500
++++ sample.config	2003-08-15 09:28:34.000000000 -0500
+@@ -57,8 +57,8 @@
+ #
+ # to use, both uid and gid must be set
  # (disabled by default)
+-#uid proxy
+-#gid proxy
++uid _ffproxy
++gid _ffproxy
+ #uid 37
+ #gid 38
+ 
diff --git a/www/ffproxy/pkg/PLIST b/www/ffproxy/pkg/PLIST
index 2d87cd1841a..ad5bb6d7a94 100644
--- a/www/ffproxy/pkg/PLIST
+++ b/www/ffproxy/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/07/25 04:52:45 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/08/15 14:44:05 jolan Exp $
 bin/ffproxy
+man/man5/ffproxy.conf.5
+man/man7/ffproxy.quick.7
 man/man8/ffproxy.8
 share/doc/ffproxy/README
 share/examples/ffproxy/db/access.dyndns
@@ -18,7 +20,6 @@ share/examples/ffproxy/ffproxy.conf
 share/examples/ffproxy/html/connect
 share/examples/ffproxy/html/filtered
 share/examples/ffproxy/html/invalid
-share/examples/ffproxy/html/notcached
 share/examples/ffproxy/html/post
 share/examples/ffproxy/html/resolve
 @dirrm share/examples/ffproxy/html