www/squid incorporated into www/squid3

10 files changed, 6 insertions, 234 deletions

diff --git a/www/squid/MESSAGE b/www/squid/MESSAGE
deleted file mode 100644
index dd8a21c917c..00000000000
--- a/www/squid/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.7 2011/10/14 22:48:28 jklos Exp $
-
-You DO need running nameservice to start and run ${PKGNAME}.
-
-Please note that to use the diskd storage method, you'll likely have to
-change SYSV-IPC parameters in the kernel config file (see
-http://wiki.squid-cache.org/Features/DiskDaemon for details)
-
-And please read some documents at ${PREFIX}/share/doc/squid.
-
-===========================================================================
diff --git a/www/squid/Makefile.common b/www/squid/Makefile.common
deleted file mode 100644
index 26d4401da49..00000000000
--- a/www/squid/Makefile.common
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2013/12/09 10:32:38 sborrill Exp $
-#
-# used by www/squidGuard/Makefile
-# used by www/squid/Makefile.squid
-# used by www/squidview/Makefile
-
-SQUID_DATADIR=	${VARBASE}/squid
-LOGDIR?=	${SQUID_DATADIR}/logs
-
-PKG_SYSCONFSUBDIR?=		squid
-
-SQUID_USER?=			squid
-SQUID_GROUP?=			squid
-
-PKG_GROUPS_VARS+=		SQUID_GROUP
-PKG_USERS_VARS+=		SQUID_USER
-
-PKG_GROUPS=			${SQUID_GROUP}
-PKG_USERS=			${SQUID_USER}:${SQUID_GROUP}
-PKG_GECOS.${SQUID_USER}=	Squid Web-Cache pseudo-user
diff --git a/www/squid/Makefile.squid b/www/squid/Makefile.squid
deleted file mode 100644
index 6329505574a..00000000000
--- a/www/squid/Makefile.squid
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile.squid,v 1.22 2013/02/10 18:18:10 adam Exp $
-#
-# used by www/squid27/Makefile
-# used by www/squid3/Makefile
-
-.include "Makefile.common"
-
-SQUID_MASTER_SITES=	ftp://ftp.squid-cache.org/pub/squid/ \
-			http://ftp.nluug.nl/internet/squid/
-
-DOCDIR=		share/doc/squid
-EGDIR=		share/examples/squid
-BUILD_DEFS+=	LOGDIR VARBASE
-MAKE_ENV+=	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
-MAKE_ENV+=	PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${SQUID_DATADIR:Q}
-CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/squid
-CONFIGURE_ARGS+=	--enable-cachemgr-hostname=localhost
-CONFIGURE_ARGS+=	--enable-delay-pools
-CONFIGURE_ARGS+=	--enable-icmp
-CONFIGURE_ARGS+=	--enable-removal-policies=lru,heap
-CONFIGURE_ARGS+=	--enable-poll
-CONFIGURE_ARGS+=	--enable-storeio=${SQUID_BACKENDS:Q}
-CONFIGURE_ARGS+=	--with-aio
-
-PLIST_SRC=	${WRKDIR}/PLIST
-
-MESSAGE_SRC?=		../squid/MESSAGE
-RCD_SCRIPTS=		squid
-RCD_SCRIPT_SRC.squid?=	../squid/files/squid.sh
-
-CONFS=		cachemgr.conf mime.conf squid.conf msntauth.conf
-.for f in ${CONFS}
-CONF_FILES+=	${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-OWN_DIRS=	${SQUID_DATADIR}
-OWN_DIRS_PERMS+=${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
-		${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
-
-DOCFILES=	ChangeLog RELEASENOTES.html doc/debug-sections.txt
-READMES=	README.FreeBSD README.NetBSD README.OpenBSD README.Solaris
-EGFILES=	src/mime.conf.default src/squid.conf.default \
-		helpers/basic_auth/MSNT/msntauth.conf.default \
-		tools/cachemgr.conf
-
-SUBST_CLASSES+=		confs
-SUBST_STAGE.confs=	pre-configure
-SUBST_FILES.confs=	src/cf.data.pre
-SUBST_SED.confs=	-e "s/@USER@/${SQUID_USER}/"
-SUBST_MESSAGE.confs=	Fixing configuration files.
-
-CHECK_PORTABILITY_SKIP+=	icons/icons.shar
-
-INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man8 sbin \
-			share/squid share/squid/errors share/squid/icons \
-			${DOCDIR} ${EGDIR}
-SPECIAL_PERMS+=		libexec/pinger ${SETUID_ROOT_PERMS}
-
-POST_INSTALL_EXTRA?=
-
-post-install: ${POST_INSTALL_EXTRA}
-	for f in ${EGFILES}; do \
-		${INSTALL_DATA}	${WRKSRC}/$$f \
-			${DESTDIR}${PREFIX}/${EGDIR}/`basename $$f .default`; \
-	done
-	for f in ${DOCFILES}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$f \
-			${DESTDIR}${PREFIX}/${DOCDIR}; \
-	done
-	for f in ${READMES}; do \
-		${INSTALL_DATA} ${PKGDIR}/../squid/files/$$f \
-			${DESTDIR}${PREFIX}/${DOCDIR}; \
-	done
-	${CHMOD} -w ${DESTDIR}${PREFIX}/libexec/pinger
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	${CHMOD} +w ${PLIST_SRC}
-	(${FIND} ${DESTDIR}${PREFIX}/share/squid/errors \! -type d -print; \
-	 ${FIND} ${DESTDIR}${PREFIX}/share/squid/icons \! -type d -print) | \
-	${SED} -e 's#^${DESTDIR}${PREFIX}/##' | ${SORT} >>${PLIST_SRC}
diff --git a/www/squid/files/README.FreeBSD b/www/squid/files/README.FreeBSD
deleted file mode 100644
index 8c2f5d54933..00000000000
--- a/www/squid/files/README.FreeBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$NetBSD: README.FreeBSD,v 1.1 2008/09/12 16:03:05 taca Exp $
-
-The following parameters should work for FreeBSD:
-
-options         SYSVMSG         # System V-like message queues
-options         SYSVSEM         # System V-like semaphores
-options         SYSVSHM         # System V-like memory sharing
-
-options         SHMMAXPGS=8192
-options         MSGMNB=8192
-options         MSGSSZ=64
-options         MSGTQL=2048
diff --git a/www/squid/files/README.NetBSD b/www/squid/files/README.NetBSD
deleted file mode 100644
index b3306c6aa57..00000000000
--- a/www/squid/files/README.NetBSD
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$NetBSD: README.NetBSD,v 1.1 2008/09/12 16:03:05 taca Exp $
-
-The following parameters should work for NetBSD:
-
-options         SYSVMSG         # System V-like message queues
-options         SYSVSEM         # System V-like semaphores
-options         SYSVSHM         # System V-like memory sharing
-
-options         SHMMAXPGS=8192
-options         MSGMNB=16384
-options         MSGSSZ=64
-options         MSGTQL=512
-
-After 4.99.35, you might set these parameter kern.ipc.* variables
-via sysctl(8).
diff --git a/www/squid/files/README.OpenBSD b/www/squid/files/README.OpenBSD
deleted file mode 100644
index e3509da6140..00000000000
--- a/www/squid/files/README.OpenBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$NetBSD: README.OpenBSD,v 1.1 2008/09/12 16:03:05 taca Exp $
-
-The following parameters should work for OpenBSD:
-
-options         SYSVMSG         # System V-like message queues
-options         SYSVSEM         # System V-like semaphores
-options         SYSVSHM         # System V-like memory sharing
-
-options         SHMMAXPGS=8192
-options         MSGMNB=16384
-options         MSGSSZ=64
-options         MSGTQL=1024
diff --git a/www/squid/files/README.Solaris b/www/squid/files/README.Solaris
deleted file mode 100644
index 0cdd43013df..00000000000
--- a/www/squid/files/README.Solaris
+++ /dev/null
@@ -1,8 +0,0 @@
-
-$NetBSD: README.Solaris,v 1.1 2008/09/12 16:03:05 taca Exp $
-
-The following parameters in /etc/system should work for Solaris:
-
-set shmsys:shminfo_shmmax=2097152
-set shmsys:shminfo_shmmni=32
-set shmsys:shminfo_shmseg=16
diff --git a/www/squid/files/squid.sh b/www/squid/files/squid.sh
deleted file mode 100644
index 295bcae6693..00000000000
--- a/www/squid/files/squid.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: squid.sh,v 1.22 2013/08/06 15:44:34 adam Exp $
-#
-# PROVIDE: squid
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-: ${squid_conf:=@PKG_SYSCONFDIR@/squid.conf}
-
-name="squid"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/${name}.pid"
-required_files="${squid_conf} @PKG_SYSCONFDIR@/mime.conf"
-command_args="-Y -f ${squid_conf}"
-
-# Note: 'shutdown' waits 30 seconds, while 'interrupt' stops immediately
-stop_cmd="${command} ${squid_flags} ${command_args} -k interrupt"
-reload_cmd="${command} ${squid_flags} ${command_args} -k reconfigure"
-rotate_cmd="${command} ${squid_flags} ${command_args} -k rotate"
-createdirs_cmd="${command} ${squid_flags} ${command_args} -z"
-extra_commands="createdirs reload rotate"
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
-	case $1 in
-	start)
-		start_cmd="${command} ${squid_flags} ${command_args}"
-		if [ -x ${command} -a -f ${squid_conf} ] ; then
-			${start_cmd}
-		fi
-		;;
-	stop)
-		${stop_cmd}
-		;;
-	createdirs)
-		${createdirs_cmd}
-		;;
-	reload)
-		if [ -r "${pidfile}" ] ; then
-			${reload_cmd}
-		fi
-		;;
-	rotate)
-		if [ -r "${pidfile}" ] ; then
-			${rotate_cmd}
-		fi
-		;;
-	*)
-		@ECHO@ "Usage: $0 {start|stop|reload|rotate|createdirs}" 1>&2
-		exit 64
-		;;
-	esac
-fi
diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile
index f162bd5ad1a..f78ef9b44ce 100644
--- a/www/squidGuard/Makefile
+++ b/www/squidGuard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/07/12 10:45:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2013/12/10 14:51:20 adam Exp $
 
 DISTNAME=	squidGuard-1.4
 PKGREVISION=	8
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.squidguard.org/
 COMMENT=	Ultrafast and free filter, redirector and access controller for Squid
 LICENSE=	gnu-gpl-v2
 
-.include "../../www/squid/Makefile.common"
+.include "../../www/squid3/Makefile.common"
 
 BDB_ACCEPTED=		db4 db5
 USE_TOOLS+=		lex yacc perl
diff --git a/www/squidview/Makefile b/www/squidview/Makefile
index 27e5855018b..da0ac187889 100644
--- a/www/squidview/Makefile
+++ b/www/squidview/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/12/09 10:32:18 sborrill Exp $
-#
+# $NetBSD: Makefile,v 1.2 2013/12/10 14:51:20 adam Exp $
 
 DISTNAME=	squidview-0.80
 CATEGORIES=	www
@@ -10,10 +9,10 @@ HOMEPAGE=	http://www.rillion.net/squidview/
 COMMENT=	Program which monitors and displays squid logs
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=		c c++
+GNU_CONFIGURE=		yes
 
-.include "../../www/squid/Makefile.common"
+.include "../../www/squid3/Makefile.common"
 
 SUBST_CLASSES+=	files
 SUBST_STAGE.files=	post-patch