7 files changed, 106 insertions, 61 deletions

diff --git a/www/squirm/Makefile b/www/squirm/Makefile
index 97ea0ea5a56c..09bf69f4a2fb 100644
--- a/www/squirm/Makefile
+++ b/www/squirm/Makefile
@@ -6,22 +6,21 @@
 #
 
 PORTNAME=	squirm
-PORTVERSION= 	1.0b
+PORTVERSION= 	1.23
 CATEGORIES=	www
 MASTER_SITES=	http://www.senet.com.au/squirm/ \
 		http://www.elab.co.za/squirm/
-DISTNAME=	squirm-1.0betaB
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid22
+RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid23
 
 NO_PACKAGE=	must set SQUID_UID and SQUID_GID before building
 
 MAKE_ENV+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
-post-patch:
-	@${PERL} -pi -e "s.%PREFIX%.${PREFIX}.g" ${WRKSRC}/paths.h
+PLIST_SUB=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
 
 pre-install:
 .if defined(SQUID_UID) && defined(SQUID_GID)
diff --git a/www/squirm/distinfo b/www/squirm/distinfo
index cef68ef76b48..6b563486d037 100644
--- a/www/squirm/distinfo
+++ b/www/squirm/distinfo
@@ -1 +1 @@
-MD5 (squirm-1.0betaB.tar.gz) = c77e4fbd76dc6a86786071afc861b408
+MD5 (squirm-1.23.tgz) = aedcaab22ca3ae0c8440bd0ef9d6e75e
diff --git a/www/squirm/files/patch-aa b/www/squirm/files/patch-aa
index 1ef709ce8e9a..756e066b3510 100644
--- a/www/squirm/files/patch-aa
+++ b/www/squirm/files/patch-aa
@@ -1,46 +1,59 @@
---- Makefile.real.orig	Wed Mar 11 10:23:51 1998
-+++ Makefile.real	Tue Jun 29 15:21:37 1999
-@@ -1,31 +1,31 @@
- # Makefile for Squirm
- #
+--- Makefile.orig	Fri Mar 31 08:07:54 2000
++++ Makefile	Wed Jun  7 10:57:22 2000
+@@ -5,16 +5,16 @@
  
--OFILES = squirm.o main.o config.o log.o lists.o regex.o
-+OFILES = squirm.o main.o config.o log.o lists.o #regex.o
  
--HFILES = squirm.h paths.h lists.h log.h regex.h
-+HFILES = squirm.h paths.h lists.h log.h #regex.h
+ # The path to install squirm under
+-PREFIX=/usr/local/squirm
++#PREFIX=/usr/local/squirm
+ 
+ # The username that squid runs as (see cache_effective_user in squid.conf)
+-USER=squid    
++USER=$(SQUID_UID)
+ 
+ # The group that squid runs as (see cache_effective_group in squid.conf)
+-GROUP=squid
++GROUP=$(SQUID_GID)
+ 
+ # The group that the root user belongs to
+-ROOT_GROUP = bin
++ROOT_GROUP = wheel
+ 
+ # The regex library (-lgnuregex is common on FreeBSD, none for some Linux'es)
+ EXTRALIBS=-lgnuregex
+@@ -29,26 +29,25 @@
+ OFILES = squirm.o main.o config.o log.o lists.o ip.o util.o
+ HFILES = squirm.h paths.h lists.h log.h ip.h util.h
  
 -CC=gcc
-+PREFIX?=	/usr/local
-+CC?=		cc
- #CC=checkergcc
++CC?=gcc
  
- #EXTRALIBS=-lregex
--#EXTRALIBS=
-+EXTRALIBS=	-lgnuregex
  
+-OPTIMISATION=-O3
++OPTIMISATION=
  BINARIES = squirm
  
--CFLAGS = -O3 -Wall -funroll-loops
-+CFLAGS?=	-O3 -Wall -funroll-loops
- #CFLAGS = -Wall -g
+-CFLAGS = -O3 -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\"
++CFLAGS += -g -Wall -funroll-loops -DPREFIX=\"$(PREFIX)\"
+ #CFLAGS = -Wall -g -DPREFIX=\"$(PREFIX)\"
+ #CFLAGS = -Wall -g -DDEBUG
  
  all:	$(BINARIES)
  
  install:	all
--			install -m 755 -o root -g root -d /usr/local/squirm \
--			/usr/local/squirm/bin
--			install -m 770 -o root -g squid -d /usr/local/squirm/etc
--			install -m 750 -o squid -g squid -d /usr/local/squirm/logs
--			install -m 660 -o root -g squid squirm.local.dist squirm.patterns.dist \
--			/usr/local/squirm/etc
--			install -m 755 -o root -g root --strip squirm /usr/local/squirm/bin
-+	install -c -m 755 -o root -g wheel -d $(PREFIX)/squirm
-+	install -c -m 750 -o root -g $(SQUID_GID) -d $(PREFIX)/etc/squirm
-+	install -c -m 750 -o $(SQUID_UID) -g $(SQUID_GID) -d $(PREFIX)/squirm/logs
-+	install -c -m 640 -o root -g $(SQUID_GID) squirm.local.dist squirm.patterns.dist \
-+		$(PREFIX)/etc/squirm
-+	install -c -m 755 -o root -g wheel --strip squirm $(PREFIX)/bin
- 			
+-			install -m 755 -o root -g $(ROOT_GROUP) -d $(PREFIX) \
+-			$(PREFIX)/bin
+-			install -m 770 -o root -g $(GROUP) -d $(PREFIX)/etc
+-			install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/logs
+-			install -m 660 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \
+-			$(PREFIX)/etc
+-			install -m 755 -o root -g $(ROOT_GROUP) --strip squirm $(PREFIX)/bin
++			install -m 755 -o root -g $(ROOT_GROUP) -d $(PREFIX)/squirm
++			install -m 750 -o root -g $(GROUP) -d $(PREFIX)/etc/squirm
++			install -m 750 -o $(USER) -g $(GROUP) -d $(PREFIX)/squirm/logs
++			install -m 640 -c -o root -g $(GROUP) squirm.conf.dist squirm.patterns.dist \
++			$(PREFIX)/etc/squirm
++			$(BSD_INSTALL_PROGRAM) squirm $(PREFIX)/bin
+ 
  squirm.o:	squirm.c $(HFILES)
- 			$(CC) -c squirm.c 		$(CFLAGS)
+ 			$(CC) -c squirm.c 	$(CFLAGS)
diff --git a/www/squirm/files/patch-ab b/www/squirm/files/patch-ab
index dfd6a6f0942f..28cc6512cf66 100644
--- a/www/squirm/files/patch-ab
+++ b/www/squirm/files/patch-ab
@@ -1,26 +1,24 @@
---- paths.h.orig	Sun Mar  8 21:56:22 1998
-+++ paths.h	Mon Jun  7 22:53:48 1999
-@@ -14,15 +14,15 @@
+--- ../squirm-1.23.orig/paths.h	Fri Mar 31 08:08:43 2000
++++ paths.h	Wed Jun  7 10:26:23 2000
+@@ -17,14 +17,14 @@
  
  /*************  Log File Locations (must be writable by **********/
  /*************  the user given in the squid.conf file   **********/
--#define LOG_MATCH "/usr/local/squirm/logs/squirm.match"
--#define LOG_FAIL  "/usr/local/squirm/logs/squirm.fail"
--#define LOG_ERROR "/usr/local/squirm/logs/squirm.error"
--#define LOG_WHERE "/usr/local/squirm/logs/squirm.where"
--#define LOG_DEBUG "/usr/local/squirm/logs/squirm.debug"
--#define LOG_INFO  "/usr/local/squirm/logs/squirm.info"
-+#define LOG_MATCH "%PREFIX%/squirm/logs/squirm.match"
-+#define LOG_FAIL  "%PREFIX%/squirm/logs/squirm.fail"
-+#define LOG_ERROR "%PREFIX%/squirm/logs/squirm.error"
-+#define LOG_WHERE "%PREFIX%/squirm/logs/squirm.where"
-+#define LOG_DEBUG "%PREFIX%/squirm/logs/squirm.debug"
-+#define LOG_INFO  "%PREFIX%/squirm/logs/squirm.info"
+-#define LOG_MATCH PREFIX"/logs/squirm.match"
+-#define LOG_FAIL  PREFIX"/logs/squirm.fail"
+-#define LOG_ERROR PREFIX"/logs/squirm.error"
+-#define LOG_WHERE PREFIX"/logs/squirm.where"
+-#define LOG_DEBUG PREFIX"/logs/squirm.debug"
+-#define LOG_INFO PREFIX"/logs/squirm.info"
++#define LOG_MATCH PREFIX"/squirm/logs/squirm.match"
++#define LOG_FAIL  PREFIX"/squirm/logs/squirm.fail"
++#define LOG_ERROR PREFIX"/squirm/logs/squirm.error"
++#define LOG_WHERE PREFIX"/squirm/logs/squirm.where"
++#define LOG_DEBUG PREFIX"/squirm/logs/squirm.debug"
++#define LOG_INFO PREFIX"/squirm/logs/squirm.info"
  
  /*************  Configuration file locations  ***********/
--#define LOCAL_ADDRESSES   "/usr/local/squirm/etc/squirm.local"
--#define REDIRECT_PATTERNS "/usr/local/squirm/etc/squirm.patterns"
-+#define LOCAL_ADDRESSES   "%PREFIX%/etc/squirm/squirm.local"
-+#define REDIRECT_PATTERNS "%PREFIX%/etc/squirm/squirm.patterns"
+-#define SQUIRM_CONF PREFIX"/etc/squirm.conf"
++#define SQUIRM_CONF PREFIX"/etc/squirm/squirm.conf"
  
  #endif
diff --git a/www/squirm/files/patch-ac b/www/squirm/files/patch-ac
new file mode 100644
index 000000000000..74c751a12fc1
--- /dev/null
+++ b/www/squirm/files/patch-ac
@@ -0,0 +1,11 @@
+--- ../squirm-1.23.orig/config.c	Fri Mar 31 08:08:04 2000
++++ config.c	Wed Jun  7 10:27:39 2000
+@@ -277,7 +277,7 @@
+ 	    return 0;
+ 	  }
+ 
+-	  fq_pattern_filename = gen_fq_name(pattern_filename, "etc/");
++	  fq_pattern_filename = gen_fq_name(pattern_filename, "etc/squirm/");
+ 	  if (fq_pattern_filename == NULL) {
+ 	    log(LOG_ERROR, "couldn't allocate memory in parse_squirm_conf()\n");
+ 	    dodo_mode = 1;
diff --git a/www/squirm/files/patch-ad b/www/squirm/files/patch-ad
new file mode 100644
index 000000000000..15fecee0f648
--- /dev/null
+++ b/www/squirm/files/patch-ad
@@ -0,0 +1,24 @@
+--- squirm.conf.dist.orig	Wed Jun  7 10:37:09 2000
++++ squirm.conf.dist	Wed Jun  7 10:37:27 2000
+@@ -26,8 +26,8 @@
+ begin
+ network 10.0.0.0/8
+ network 192.168.0.0/24
+-#log logs/match.log
+-#abort-log logs/abort.log
++#log squirm/logs/match.log
++#abort-log squirm/logs/abort.log
+ pattern squirm.patterns get
+ pattern common.patterns all
+ end
+@@ -35,8 +35,8 @@
+ 
+ begin
+ network 127.0.0.0/24
+-log logs/private-match.log
+-abort-log logs/private-abort.log
++log squirm/logs/private-match.log
++abort-log squirm/logs/private-abort.log
+ pattern private.patterns get
+ pattern common.pattterns all
+ end
diff --git a/www/squirm/pkg-plist b/www/squirm/pkg-plist
index 47a3c5d45afe..1194eaf3fef3 100644
--- a/www/squirm/pkg-plist
+++ b/www/squirm/pkg-plist
@@ -1,8 +1,8 @@
 bin/squirm
-etc/squirm/squirm.local.dist
+etc/squirm/squirm.conf.dist
 etc/squirm/squirm.patterns.dist
-@comment @exec install -m 755 -o root -g wheel -d %D/squirm
-@comment @exec install -m 750 -o nobody -g nogroup -d %D/squirm/logs
+@exec install -m 755 -o root -g wheel -d %D/squirm
+@exec install -m 750 -o %%SQUID_UID%% -g %%SQUID_GID%% -d %D/squirm/logs
 @dirrm etc/squirm
 @dirrm squirm/logs
 @dirrm squirm