13 files changed, 0 insertions, 348 deletions
diff --git a/www/lusca-head/files/patch-errors_Makefile.in b/www/lusca-head/files/patch-errors_Makefile.in
deleted file mode 100644
index a9d595be8c4a..000000000000
--- a/www/lusca-head/files/patch-errors_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- errors/Makefile.in.orig	2009-12-06 09:30:18.000000000 +0000
-+++ errors/Makefile.in	2009-12-06 09:30:24.000000000 +0000
-@@ -236,7 +236,7 @@
- uudecode = @uudecode@
- errordir = $(datadir)/errors
- DEFAULT_ERROR_DIR = $(errordir)
--INSTALL_LANGUAGES = templates @ERR_LANGUAGES@
-+INSTALL_LANGUAGES = @ERR_LANGUAGES@
- TEMPLATE_LANGUAGES = English
- LANGUAGES = \
- 		Armenian \
-@@ -468,7 +468,7 @@
- 	fi
- 
- dist-hook:
--	@ for lang in $(LANGUAGES) templates; do \
-+	@ for lang in $(LANGUAGES) ; do \
- 	  if test "$$lang" = .; then :; else \
- 	    test -d $(distdir)/$$lang \
- 	    || mkdir $(distdir)/$$lang \
diff --git a/www/lusca-head/files/patch-helpers-basic_auth-SMB-Makefile.in b/www/lusca-head/files/patch-helpers-basic_auth-SMB-Makefile.in
deleted file mode 100644
index 09a82638fd3c..000000000000
--- a/www/lusca-head/files/patch-helpers-basic_auth-SMB-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- helpers/basic_auth/SMB/Makefile.in.orig	Tue Oct  4 07:29:26 2005
-+++ helpers/basic_auth/SMB/Makefile.in	Tue Oct  4 07:29:49 2005
-@@ -129,7 +129,7 @@
- makesnmplib = @makesnmplib@
- 
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX = /usr/local/samba
-+SAMBAPREFIX = %%LOCALBASE%%
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff --git a/www/lusca-head/files/patch-helpers-basic_auth-SMB-smb_auth.sh b/www/lusca-head/files/patch-helpers-basic_auth-SMB-smb_auth.sh
deleted file mode 100644
index 8f41fa2ff024..000000000000
--- a/www/lusca-head/files/patch-helpers-basic_auth-SMB-smb_auth.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-*** helpers/basic_auth/SMB/smb_auth.sh.orig	Thu Feb 26 20:58:22 2004
---- helpers/basic_auth/SMB/smb_auth.sh	Thu Feb 26 20:59:45 2004
-***************
-*** 17,22 ****
---- 17,24 ----
-  # along with this program; if not, write to the Free Software
-  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  
-+ SAMBAPREFIX=${SAMBAPREFIX:-%%LOCALBASE%%}
-+ 
-  read DOMAINNAME
-  read PASSTHROUGH
-  read NMBADDR
diff --git a/www/lusca-head/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in b/www/lusca-head/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in
deleted file mode 100644
index ca72c3f2fdd0..000000000000
--- a/www/lusca-head/files/patch-helpers-negotiate_auth-squid_kerb_auth-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- helpers/negotiate_auth/squid_kerb_auth/Makefile.in.orig	Mon Jul 16 20:40:58 2007
-+++ helpers/negotiate_auth/squid_kerb_auth/Makefile.in	Mon Jul 16 20:44:52 2007
-@@ -264,12 +264,12 @@
- #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS)
- 
- # HEIMDAL
--#KERBINC = -DHEIMDAL -I/usr/include/heimdal
--#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken
-+KERBINC = -DHEIMDAL -I/usr/include
-+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -lcrypt -lcrypto
- 
- # MIT
--KERBINC = 
--KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
-+#KERBINC = 
-+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err
- all: all-am
- 
- .SUFFIXES:
diff --git a/www/lusca-head/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c b/www/lusca-head/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c
deleted file mode 100644
index 14f2ac56e21a..000000000000
--- a/www/lusca-head/files/patch-helpers-negotiate_auth-squid_kerb_auth-squid_kerb_auth.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c.orig	Mon Jul 16 21:10:10 2007
-+++ helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c	Mon Jul 16 21:10:35 2007
-@@ -31,6 +31,7 @@
- #include <unistd.h>
- #include <time.h>
- #include <sys/time.h>
-+#include <sys/param.h>
- 
- #include "base64.h"
- #ifndef HAVE_SPNEGO
diff --git a/www/lusca-head/files/patch-include-squid_types.h b/www/lusca-head/files/patch-include-squid_types.h
deleted file mode 100644
index ec93f2dd3c39..000000000000
--- a/www/lusca-head/files/patch-include-squid_types.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/squid_types.h.orig Mon Jul  7 00:45:26 2003
-+++ include/squid_types.h      Mon Jul  7 00:48:39 2003
-@@ -66,8 +66,5 @@
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
--#if HAVE_SYS_BITYPES_H
--#include <sys/bitypes.h>
--#endif
-
- #endif /* SQUID_TYPES_H */
diff --git a/www/lusca-head/files/patch-libiapp-iapp_ssl.h b/www/lusca-head/files/patch-libiapp-iapp_ssl.h
deleted file mode 100644
index b3c910dae24d..000000000000
--- a/www/lusca-head/files/patch-libiapp-iapp_ssl.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- libiapp/iapp_ssl.h  (revision 12992)
-+++ libiapp/iapp_ssl.h  (working copy)
-@@ -3,6 +3,9 @@
- 
- #include "../include/config.h"
- 
-+/* Don't include these if we are -not- building with SSL support */
-+
-+#if USE_SSL
- #if HAVE_OPENSSL_SSL_H
- #include <openssl/ssl.h>
- #endif
-@@ -12,5 +15,6 @@
- #if HAVE_OPENSSL_ENGINE_H
- #include <openssl/engine.h>
- #endif
-+#endif /* USE_SSL */
- 
- #endif
diff --git a/www/lusca-head/files/patch-src-cf.data.pre b/www/lusca-head/files/patch-src-cf.data.pre
deleted file mode 100644
index 72f515e4f8e8..000000000000
--- a/www/lusca-head/files/patch-src-cf.data.pre
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/cf.data.pre.orig	2009-07-27 04:46:32.000000000 +0000
-+++ src/cf.data.pre	2009-12-06 10:15:24.000000000 +0000
-@@ -3975,12 +3979,12 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: %%SQUID_UID%%
- LOC: Config.effectiveUser
- DOC_START
- 	If you start Squid as root, it will change its effective/real
- 	UID/GID to the user specified below.  The default is to change
--	to UID to nobody.  If you define cache_effective_user, but not
-+	to UID to %%SQUID_UID%%.  If you define cache_effective_user, but not
- 	cache_effective_group, Squid sets the GID to the effective
- 	user's default group ID (taken from the password file) and
- 	supplementary group list from the from groups membership of
diff --git a/www/lusca-head/files/patch-tools-Makefile.in b/www/lusca-head/files/patch-tools-Makefile.in
deleted file mode 100644
index 3daee0c17c82..000000000000
--- a/www/lusca-head/files/patch-tools-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.in.orig	Sun May 14 18:30:04 2006
-+++ tools/Makefile.in	Sun May 14 18:31:02 2006
-@@ -297,7 +297,7 @@
- EXTRA_DIST = \
- 	cachemgr.conf
- 
--DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
-+DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf.default
- 
- # Don't automatically uninstall config files
- #	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
diff --git a/www/lusca-head/files/pkg-deinstall.in b/www/lusca-head/files/pkg-deinstall.in
deleted file mode 100644
index 29da2a08a5dd..000000000000
--- a/www/lusca-head/files/pkg-deinstall.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-DEINSTALL)
-	cd ${PKG_PREFIX}/etc/squid || exit 1
-	for f in cachemgr.conf mime.conf msntauth.conf squid.conf; do
-		cmp -s -z ${f} ${f}.default && rm ${f}
-	done
-	;;
-POST-DEINSTALL)
-	echo "===> post-deinstallation information for $1:"
-	echo ""
-	echo "     Note:"
-	echo "     Squid related user accounts and groups were not removed."
-	echo ""
-	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
-	echo "     created by a default installation of this package, run"
-	echo ""
-	echo "     pw userdel -n %%SQUID_UID%% -u 100"
-	if  [ -d ${PKG_PREFIX}/squid -o -d ${PKG_PREFIX}/etc/squid ] ; then
-		echo ""
-		echo "     In order to ease updates the cache and log directories"
-		echo "     and all configuration files modified by you were preserved."
-		echo ""
-		echo "     Please remove them manually if you do not want to use"
-	       	echo "     Lusca any longer."
-	fi
-	echo ""
-	;;
-*)
-	exit 64
-	;;
-esac
-exit 0
diff --git a/www/lusca-head/files/pkg-install.in b/www/lusca-head/files/pkg-install.in
deleted file mode 100644
index 8e87a6c545c8..000000000000
--- a/www/lusca-head/files/pkg-install.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-pkgname=$1
-squid_base="${PKG_PREFIX:-%%PREFIX%%}/squid"
-squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
-if [ -x /usr/sbin/nologin ]; then
-	nologin=/usr/sbin/nologin
-else
-	nologin=/sbin/nologin
-fi
-squid_user="%%SQUID_UID%%"
-squid_group="%%SQUID_GID%%"
-squid_gid=100
-squid_uid=100
-case $2 in
-PRE-INSTALL)
-	echo "===> Pre-installation configuration for ${pkgname}"
-	if ! pw groupshow ${squid_group} -q >/dev/null ; then
-		echo "There is no group '${squid_group}' on this system, so I will try to create it (using group id ${squid_gid}):"
-		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
-			echo "Failed to create group \"${squid_group}\"!" >&2
-			echo "Please create it manually." >&2
-			exit 1
-		else
-			echo "Group '${squid_group}' created successfully:"
-		fi
-	else
-		echo "I will use the existing group '${squid_group}':"
-	fi
-	pw groupshow ${squid_group}
-
-	if ! pw usershow ${squid_user} -q >/dev/null ; then
-		echo "There is no account '${squid_user}' on this system, so I will try to create it (using user id ${squid_uid}):"
-		if ! pw useradd -q -n ${squid_user} \
-		    -u ${squid_uid} -g ${squid_group} \
-	  	    -c "Squid caching-proxy pseudo user" \
-		    -d "${squid_base}" -s "${nologin}" \
-		    -h - ; then
-			echo "Failed to create user '${squid_user}'!" >&2
-			echo "Please create it manually." >&2
-			exit 1
-		else
-			echo "User '${squid_user}' created successfully:"
-		fi
-	else
-		echo "I will use the existing user '${squid_user}':"
-	fi
-	pw usershow ${squid_user}
-	for dir in cache logs; do
-	if [ ! -d ${squid_base}/${dir} ]; then
-		echo "Creating ${squid_base}/${dir}..."
-		install -d -o ${squid_user} -g ${squid_group} \
-		    -m 0750 ${squid_base}/${dir}
-	fi
-	done
-	if [ ! -d ${squid_confdir} ]; then
-		echo "Creating ${squid_confdir}..."
-		install -d -o root -g ${squid_group} \
-		    -m 0750 ${squid_confdir}
-	fi
-	;;
-POST-INSTALL)
-	for file in cachemgr.conf mime.conf squid.conf; do
-		if [ ! -f ${squid_confdir}/${file} \
-		    -a -f ${squid_confdir}/${file}.default ]; then
-			echo "Creating ${file} from default..."
-			install -c -o root -g ${squid_group} -m 0640 \
-		    	    ${squid_confdir}/${file}.default \
-			    ${squid_confdir}/${file}
-		fi
-	done
-	;;
-*)
-	exit 64
-	;;
-esac
-exit 0
diff --git a/www/lusca-head/files/pkg-message.in b/www/lusca-head/files/pkg-message.in
deleted file mode 100644
index cec16e1ba238..000000000000
--- a/www/lusca-head/files/pkg-message.in
+++ /dev/null
@@ -1,37 +0,0 @@
-
-     o This port looks a lot like Squid. Yes, thats because its based
-       on Squid-2.HEAD. The binaries and paths are the same as Squid -
-       this is intended to make migrating from Squid-2.X to Lusca
-       (sans ICAP) as effortless as possible.
-
-     o You can find the configuration files for this package in the
-       directory %%PREFIX%%/etc/squid.
-
-     o A cache directory has been created in %%PREFIX%%/squid/cache.
-       Log files will be written to %%PREFIX%%/squid/logs.
-
-       Note:
-       You must initialize new cache directories before you can start
-       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
-       If your cache directories are already initialized (e.g. after an
-       upgrade of squid) you do not need to initialize them again.
-
-     o The default configuration will deny everyone access to the
-       proxy service. Edit the "http_access" directives in
-       %%PREFIX%%/etc/squid/squid.conf to suit your needs.
-
-     Please note that the Lusca start script is an rc.d style script.
-     This means that Lusca will not start automatically at boot
-     time unless it is explicitly enabled.
-
-     To enable Lusca, set squid_enable=yes in either
-     /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
-     Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
-
-     Note:
-     If you just updated your Lusca installation from Squid 2.5 or earlier,
-     make sure to check your Lusca configuration against the default
-     configuration file %%PREFIX%%/etc/squid/squid.conf.default.
-
-     Additionally, you should check your configuration by calling
-     'squid -f /path/to/squid.conf -k parse' before starting Lusca.
diff --git a/www/lusca-head/files/squid.in b/www/lusca-head/files/squid.in
deleted file mode 100644
index 8a2313116a94..000000000000
--- a/www/lusca-head/files/squid.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: squid
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Note:
-# Set "squid_enable=yes" in either /etc/rc.conf, /etc/rc.conf.local or
-# /etc/rc.conf.d/squid to make this script actually do something. There
-# you can also set squid_chdir, squid_pidfile, squid_user, and squid_flags.
-#
-# Please see squid(8), rc.conf(5) and rc(8) for further details.
-#
-
-squid_checkrunning() {
-	${command} ${squid_flags} -k check 2>/dev/null
-}
-
-squid_stop() {
-	echo "Stopping ${name}."
-	${command} ${squid_flags} -k shutdown
-	run_rc_command poll
-}
-
-. /etc/rc.subr
-
-name=squid
-rcvar=squid_enable
-
-command=%%PREFIX%%/sbin/squid
-extra_commands=reload
-reload_cmd="${command} ${squid_flags} -k reconfigure"
-stop_precmd="squid_checkrunning"
-stop_cmd="squid_stop"
-
-load_rc_config ${name}
-
-squid_chdir=${squid_chdir:-"%%PREFIX%%/squid/logs"}
-squid_enable=${squid_enable:-"NO"}
-squid_flags=${squid_flags-"-D"}
-squid_pidfile=${squid_pidfile:-"%%PREFIX%%/squid/logs/squid.pid"}
-squid_user=${squid_user:-%%SQUID_UID%%}
-default_config=%%PREFIX%%/etc/squid/squid.conf
-
-pidfile=${squid_pidfile}
-required_dirs=${squid_chdir}
-
-# squid(8) will not start if ${default_config} is not present so try
-# to catch that beforehand via ${required_files} rather than make
-# squid(8) crash.
-# If you remove the default configuration file make sure to add
-# '-f /path/to/your/squid.conf' to squid_flags
-
-if [ -z "${squid_flags}" ]; then
-	required_files=${default_config}
-fi
-
-run_rc_command "$1"