11 files changed, 1 insertions, 803 deletions

diff --git a/MOVED b/MOVED
index d160c2281f1c..2123027cd945 100644
--- a/MOVED
+++ b/MOVED
@@ -4241,3 +4241,4 @@ mail/listmanager||2013-04-30|Has expired: No more upstream, no more public distf
 net-mgmt/nettop||2013-04-30|Has expired: Dead upstream
 devel/ruby-term-ansicolor|devel/rubygem-term-ansicolor|2013-04-30|Moved to Rubygems
 www/mediawiki|www/mediawiki119|2013-05-01|Rename mediawiki to mediawiki119
+www/squid31||2013-05-01|Has expired: No longer actively maintained upstream
diff --git a/www/Makefile b/www/Makefile
index 4c4722dd72a3..f59f12a4e459 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1828,7 +1828,6 @@
     SUBDIR += spreadlogd
     SUBDIR += sqstat
     SUBDIR += squid
-    SUBDIR += squid31
     SUBDIR += squid32
     SUBDIR += squid33
     SUBDIR += squid_radius_auth
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
deleted file mode 100644
index 88ec0c4b8357..000000000000
--- a/www/squid31/Makefile
+++ /dev/null
@@ -1,473 +0,0 @@
-# Created by: Adrian Chadd <adrian@FreeBSD.org>
-# $FreeBSD$
-#
-# Tunables not (yet) configurable via 'make config':
-# SQUID_{U,G}ID
-#   Which user/group Squid should run as (default: squid/squid).
-#   The user and group will be created if they do not already exist using
-#   a uid:gid of 100:100.
-#   NOTE: older versions of Squid defaulted to nobody/nogroup.
-#   If you wish to run Squid as "nobody" (which is not recommended), please
-#   define SQUID_UID=nobody and SQUID_GID=nogroup in your make environment
-#   before you start the update or installation of this port.
-#
-# Note:
-# Starting with Squid 3.1 SQUID_LANGUAGES and SQUID_DEFAULT_LANG are no longer
-# available and will be ignored.
-#
-# SQUID_CONFIGURE_ARGS
-#   Additional configuration options.
-#
-#   To enable them, use e.g
-#   `make SQUID_CONFIGURE_ARGS="--enable-ntml-fail-open" install'
-#
-#   The list below may be incomplete, please see the configure script
-#   in the Squid source distribution for the complete list of additional
-#   options.
-#   Note that you probably do not need to worry about these options in most
-#   cases, they are included in case you want to experiment with them.
-#
-#    --enable-xmalloc-statistics
-#     Show malloc statistics in status page
-#    --enable-cachemgr-hostname=some.hostname
-#     Make cachemgr.cgi default to this host
-#    --disable-unlinkd
-#     Do not use "unlinkd"
-#    --with-aufs-threads=N_THREADS
-#     Tune the number of worker threads for the aufs object
-#    --with-filedescriptors=N
-#     Force Squid to use N filedescriptors.
-#    --enable-ntlm-fail-open
-#     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow Squid to still authenticate the user
-#    --enable-x-accelerator-vary
-#     Enable support for the X-Accelerator-Vary HTTP header. Can be used
-#     to indicate variance within an accelerator setup. Typically used
-#     together with other code that adds custom HTTP headers to the
-#     requests.
-
-PORTNAME=	squid
-PORTVERSION=	3.1.${SQUID_STABLE_VER}
-CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		http://mirrors.ccs.neu.edu/Squid/ \
-		ftp://ftp.fu-berlin.de/unix/www/squid/squid/ \
-		ftp://ftp.nl.uu.net/pub/unix/www/squid/ \
-		ftp://ftp.solnet.ch/mirror/squid/ \
-		ftp://ftp.ntua.gr/pub/www/Squid/squid/ \
-		http://mirror.aarnet.edu.au/pub/squid/squid/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid,} \
-		http://www.squid-cache.org/Versions/v3/3.1/ \
-		http://www3.us.squid-cache.org/Versions/v3/3.1/ \
-		http://www1.at.squid-cache.org/Versions/v3/3.1/ \
-		http://www2.de.squid-cache.org/Versions/v3/3.1/ \
-		http://www.eu.squid-cache.org/Versions/v3/3.1/ \
-		http://www1.ie.squid-cache.org/Versions/v3/3.1/ \
-		http://www1.jp.squid-cache.org/Versions/v3/3.1/ \
-		http://www1.za.squid-cache.org/Versions/v3/3.1/
-MASTER_SITE_SUBDIR=	squid
-DIST_SUBDIR=	squid3.1
-
-PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
-		http://www2.us.squid-cache.org/%SUBDIR%/ \
-		http://www1.at.squid-cache.org/%SUBDIR%/ \
-		http://www2.de.squid-cache.org/%SUBDIR%/ \
-		http://www.eu.squid-cache.org/%SUBDIR%/ \
-		http://www1.ie.squid-cache.org/%SUBDIR%/ \
-		http://www1.jp.squid-cache.org/%SUBDIR%/ \
-		http://www2.tw.squid-cache.org/%SUBDIR%/
-PATCH_SITE_SUBDIR=	Versions/v3/3.1/changesets
-PATCHFILES=
-
-MAINTAINER=	tmseck@FreeBSD.org
-COMMENT=	HTTP Caching Proxy
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LATEST_LINK=	squid31
-
-DEPRECATED=	Squid 3.1 is no longer recommended for new installations. Please use www/squid32 instead
-EXPIRATION_DATE=	2013-03-31
-
-SQUID_STABLE_VER=	23
-
-CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]*
-GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_RC_SUBR=	squid
-
-SQUID_UID?=	squid
-SQUID_GID?=	squid
-
-MAN1=		squidclient.1
-MAN8=		cachemgr.cgi.8 squid.8 squid_radius_auth.8
-docs=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
-PORTDOCS=	${docs:T}
-PORTEXAMPLES=	*
-SUB_FILES+=	pkg-deinstall pkg-install pkg-message
-SUB_LIST+=	SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID}
-
-OPTIONS=	SQUID_KERB_AUTH "Install Kerberos authentication helpers" on \
-		SQUID_LDAP_AUTH "Install LDAP authentication helpers" off \
-		SQUID_NIS_AUTH "Install NIS/YP authentication helpers" on \
-		SQUID_SASL_AUTH "Install SASL authentication helpers" off \
-		SQUID_IPV6 "Enable IPv6 support" on \
-		SQUID_DELAY_POOLS "Enable delay pools" off \
-		SQUID_SNMP "Enable SNMP support" on \
-		SQUID_SSL "Enable SSL support for reverse proxies" off \
-		SQUID_SSL_CRTD "Enable SSL certificate daemon" off \
-		SQUID_PINGER "Install the icmp helper" off \
-		SQUID_DNS_HELPER "Use the old 'dnsserver' helper" off \
-		SQUID_HTCP "Enable HTCP support" on \
-		SQUID_VIA_DB "Enable forward/via database" off \
-		SQUID_CACHE_DIGESTS "Enable cache digests" off \
-		SQUID_WCCP "Enable Web Cache Coordination Prot. v1" on \
-		SQUID_WCCPV2 "Enable Web Cache Coordination Prot. v2" off \
-		SQUID_STRICT_HTTP "Be strictly HTTP compliant" off \
-		SQUID_IDENT "Enable ident (RFC 931) lookups" on \
-		SQUID_REFERER_LOG "Enable Referer-header logging" off \
-		SQUID_USERAGENT_LOG "Enable User-Agent-header logging" off \
-		SQUID_ARP_ACL "Enable ACLs based on ethernet address" off \
-		SQUID_IPFW "Enable transparent proxying with IPFW" off \
-		SQUID_PF "Enable transparent proxying with PF" off \
-		SQUID_IPFILTER "Enable transp. proxying with IPFilter" off \
-		SQUID_FOLLOW_XFF "Follow X-Forwarded-For headers" off \
-		SQUID_ICAP "Enable ICAP client functionality" off \
-		SQUID_ESI "Enable ESI support (experimental)" off \
-		SQUID_AUFS "Enable the aufs storage scheme" on \
-		SQUID_COSS "Enable COSS (currently not available)" off \
-		SQUID_KQUEUE "Use kqueue(2) (experimental)" on \
-		SQUID_LARGEFILE "Support log and cache files >2GB" off \
-		SQUID_STACKTRACES "Create backtraces on fatal errors" off \
-		SQUID_DEBUG "Enable debugging options" off
-
-etc_files=	squid/cachemgr.conf.default \
-		squid/errorpage.css.default \
-		squid/mib.txt \
-		squid/mime.conf.default \
-		squid/msntauth.conf.default \
-		squid/squid.conf.default \
-		squid/squid.conf.documented
-
-icon_files=	anthony-binhex.gif anthony-bomb.gif anthony-box.gif \
-		anthony-box2.gif anthony-c.gif anthony-compressed.gif \
-		anthony-dir.gif anthony-dirup.gif anthony-dvi.gif \
-		anthony-f.gif anthony-image.gif anthony-image2.gif \
-		anthony-layout.gif anthony-link.gif anthony-movie.gif \
-		anthony-pdf.gif anthony-portal.gif anthony-ps.gif \
-		anthony-quill.gif anthony-script.gif anthony-sound.gif \
-		anthony-tar.gif anthony-tex.gif anthony-text.gif \
-		anthony-unknown.gif anthony-xbm.gif anthony-xpm.gif
-
-error_files=	ERR_ACCESS_DENIED ERR_ACL_TIME_QUOTA_EXCEEDED \
-		ERR_AGENT_CONFIGURE ERR_AGENT_WPAD \
-		ERR_CACHE_ACCESS_DENIED \
-		ERR_CACHE_MGR_ACCESS_DENIED ERR_CANNOT_FORWARD \
-		ERR_CONNECT_FAIL ERR_DIR_LISTING ERR_DNS_FAIL \
-		ERR_ESI ERR_FORWARDING_DENIED \
-		ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN \
-		ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED \
-		ERR_FTP_PUT_ERROR ERR_FTP_PUT_MODIFIED ERR_FTP_UNAVAILABLE \
-		ERR_GATEWAY_FAILURE \
-		ERR_ICAP_FAILURE ERR_INVALID_REQ ERR_INVALID_RESP \
-		ERR_INVALID_URL ERR_LIFETIME_EXP ERR_NO_RELAY \
-		ERR_ONLY_IF_CACHED_MISS ERR_PRECONDITION_FAILED \
-		ERR_READ_ERROR ERR_READ_TIMEOUT \
-		ERR_SECURE_CONNECT_FAIL ERR_SHUTTING_DOWN ERR_SOCKET_FAILURE \
-		ERR_TOO_BIG ERR_UNSUP_REQ ERR_UNSUP_HTTPVERSION \
-		ERR_URN_RESOLVE ERR_WRITE_ERROR ERR_ZERO_SIZE_OBJECT \
-		error-details.txt
-
-error_dirs=	af ar az bg ca cs da de el en es et fa fi fr he hu hy id it \
-		ja ko lt lv ms nl oc pl pt pt-br ro ru sk sl sr-cyrl sr-latn \
-		sv \
-		th tr uk uz \
-		vi zh-cn zh-tw \
-		templates
-
-error_dir_links=	ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb \
-			ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye \
-			az-az bg-bg cs-cz da-dk \
-			de-at de-ch de-de de-li de-lu \
-			el-gr \
-			en-au en-bz en-ca en-gb en-ie en-in en-jm en-nz \
-			en-ph en-sg en-tt en-uk en-us en-za en-zw \
-			es-ar es-bo es-cl es-co es-cr es-do es-ec es-es \
-			es-gt es-hn es-mx es-ni es-pa es-pe es-pr es-py \
-			es-sv es-uy es-ve \
-			et-ee \
-			fa-fa fa-ir fi-fi \
-			fr-be fr-ca fr-ch fr-fr fr-lu fr-mc \
-			he-il hu-hu hy-am hy-armn id-id it-ch it-it \
-			ja-jp ko-kp ko-kr lt-lt lv-lv ms-my nl-nl \
-			pl-pl pt-pt ro-md ro-ro ru-ru \
-			sk-sk sl-si sr sr-latn-cs sr-sp sv-fi sv-se \
-			th-th tr-tr uk-ua vi-vn zh-hk zh-mo zh-sg
-
-libexec=	cachemgr.cgi digest_pw_auth diskd ip_user_check \
-		msnt_auth ncsa_auth ntlm_smb_lm_auth pam_auth smb_auth \
-		smb_auth.sh squid_db_auth squid_radius_auth squid_session \
-		squid_unix_group wbinfo_group.pl
-.if !defined(SQUID_CONFIGURE_ARGS) || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
-libexec+=	unlinkd
-.endif
-
-sbin=		squidclient squid
-
-CONFIGURE_ARGS=	--with-default-user=${SQUID_UID} \
-		--bindir=${PREFIX}/sbin  \
-		--sbindir=${PREFIX}/sbin  \
-		--datadir=${ETCDIR} \
-		--libexecdir=${PREFIX}/libexec/squid \
-		--localstatedir=/var/squid \
-		--sysconfdir=${ETCDIR} \
-		--with-logdir=/var/log/squid \
-		--with-pidfile=/var/run/squid/squid.pid \
-		--enable-removal-policies="lru heap" \
-		--disable-linux-netfilter \
-		--disable-linux-tproxy \
-		--disable-epoll \
-		--disable-translation \
-		--disable-ecap \
-		--disable-loadable-modules
-
-.include <bsd.port.pre.mk>
-
-# Authentication methods and modules:
-
-basic_auth=	DB NCSA PAM MSNT SMB squid_radius_auth
-digest_auth=	password
-external_acl=	ip_user session unix_group wbinfo_group
-MAN8+=		ncsa_auth.8 pam_auth.8 squid_db_auth.8 squid_session.8 \
-		squid_unix_group.8
-.if defined(WITH_SQUID_LDAP_AUTH)
-USE_OPENLDAP=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
-basic_auth+=	LDAP
-digest_auth+=	ldap
-external_acl+=	ldap_group
-libexec+=	digest_ldap_auth squid_ldap_auth squid_ldap_group
-.endif
-.if defined(WITH_SQUID_SASL_AUTH)
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-basic_auth+=	SASL
-libexec+=	sasl_auth
-.endif
-# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
-.if defined(WITH_SQUID_NIS_AUTH) && !defined(NO_NIS) && !defined(WITHOUT_NIS)
-basic_auth+=	YP
-libexec+=	yp_auth
-.endif
-CONFIGURE_ARGS+=	--enable-auth="basic digest negotiate ntlm" \
-			--enable-basic-auth-helpers="${basic_auth}" \
-			--enable-digest-auth-helpers="${digest_auth}" \
-			--enable-external-acl-helpers="${external_acl}" \
-			--enable-ntlm-auth-helpers="smb_lm"
-# POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
-.if defined(WITH_SQUID_KERB_AUTH) && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
-CONFIGURE_ARGS+=	--enable-negotiate-auth-helpers="squid_kerb_auth"
-libexec+=	negotiate_kerb_auth negotiate_kerb_auth_test \
-		squid_kerb_auth squid_kerb_auth_test
-.endif
-
-# Storage schemes:
-
-storage_schemes=	ufs diskd
-# TODO: should AIO be optional as well?
-diskio_modules=	AIO Blocking DiskDaemon
-.if defined(WITH_SQUID_AUFS)
-storage_schemes+=	aufs
-diskio_modules+=	DiskThreads
-# Only document switching from libpthread to libthr using libmap.conf
-# where lipthread is the default threading library:
-.if ${OSVERSION} < 700041
-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
-.endif
-# Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
-# e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
-.else
-CONFIGURE_ARGS+=	--without-pthreads
-.endif
-.if defined(WITH_SQUID_COSS)
-# COSS is currently disabled in Squid-3 until fixes from the 2.x series are
-# backported to 3.x.
-#storage_schemes+=	coss
-.endif
-CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"
-CONFIGURE_ARGS+=	--enable-disk-io="${diskio_modules}"
-
-# Other options set via 'make config':
-
-.if defined(WITHOUT_SQUID_IPV6) || defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-.if defined(WITH_SQUID_DELAY_POOLS)
-CONFIGURE_ARGS+=	--enable-delay-pools
-.endif
-.if defined(WITHOUT_SQUID_SNMP)
-CONFIGURE_ARGS+=	--disable-snmp
-.endif
-.if defined(WITH_SQUID_SSL)
-# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only
-# works when it is defined before bsd.port{.pre}.mk is .included.
-# This makes it currently impossible to combine this macro with OPTIONS to
-# conditionally include OpenSSL support.
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-CONFIGURE_ARGS+=	--enable-ssl \
-			--with-openssl="${OPENSSLBASE}"
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-.endif
-.if defined(WITH_SQUID_SSL_CRTD)
-CONFIGURE_ARGS+=	--enable-ssl-crtd
-libexec+=	ssl_crtd
-.endif
-.if defined(WITH_SQUID_PINGER)
-CONFIGURE_ARGS+=	--enable-icmp
-libexec+=	pinger
-.endif
-.if defined(WITH_SQUID_DNS_HELPER)
-CONFIGURE_ARGS+=	--disable-internal-dns
-libexec+=	dnsserver
-.endif
-.if defined(WITHOUT_SQUID_HTCP)
-CONFIGURE_ARGS+=	--disable-htcp
-.endif
-.if defined(WITH_SQUID_VIA_DB)
-CONFIGURE_ARGS+=	--enable-forw-via-db
-.endif
-.if defined(WITH_SQUID_CACHE_DIGESTS)
-CONFIGURE_ARGS+=	--enable-cache-digests
-.endif
-.if defined(WITHOUT_SQUID_WCCP)
-CONFIGURE_ARGS+=	--disable-wccp
-.endif
-.if defined(WITH_SQUID_WCCPV2)
-CONFIGURE_ARGS+=	--enable-wccpv2
-.endif
-.if defined(WITH_SQUID_STRICT_HTTP)
-CONFIGURE_ARGS+=	--disable-http-violations
-.endif
-.if defined(WITHOUT_SQUID_IDENT)
-CONFIGURE_ARGS+=	--disable-ident-lookups
-.endif
-.if defined(WITH_SQUID_REFERER_LOG)
-CONFIGURE_ARGS+=	--enable-referer-log
-.endif
-.if defined(WITH_SQUID_USERAGENT_LOG)
-CONFIGURE_ARGS+=	--enable-useragent-log
-.endif
-.if defined(WITH_SQUID_ARP_ACL)
-CONFIGURE_ARGS+=	--enable-arp-acl
-.endif
-.if defined(WITH_SQUID_IPFW)
-CONFIGURE_ARGS+=	--enable-ipfw-transparent
-.endif
-.if defined(WITH_SQUID_PF)
-CONFIGURE_ARGS+=	--enable-pf-transparent
-.endif
-.if defined(WITH_SQUID_IPFILTER)
-CONFIGURE_ARGS+=	--enable-ipf-transparent
-.endif
-.if defined(WITH_SQUID_FOLLOW_XFF)
-CONFIGURE_ARGS+=	--enable-follow-x-forwarded-for
-.endif
-.if defined(WITH_SQUID_ICAP)
-CONFIGURE_ARGS+=	--enable-icap-client
-.endif
-.if defined(WITH_SQUID_ESI)
-CONFIGURE_ARGS+=	--enable-esi
-LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2 \
-		xml2:${PORTSDIR}/textproc/libxml2
-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
-.if defined(WITHOUT_SQUID_KQUEUE)
-# Squid-3's kqueue support is still marked as experimental, so it is not yet
-# enabled automatically as in Squid-2. We are explicit about disabling it,
-# nonetheless:
-CONFIGURE_ARGS+=	--disable-kqueue
-.else
-CONFIGURE_ARGS+=	--enable-kqueue
-.endif
-.if defined(WITH_SQUID_LARGEFILE)
-CONFIGURE_ARGS+=	--with-large-files
-.endif
-.if defined(WITH_SQUID_STACKTRACES)
-CONFIGURE_ARGS+=	--enable-stacktraces
-CFLAGS+=		-g
-STRIP=
-.endif
-.if defined(WITH_SQUID_DEBUG) || defined(WITH_DEBUG)
-# TODO: are there other useful options that can/should be set to help
-#       the developers in debugging failures?
-CONFIGURE_ARGS+=	--disable-optimizations
-WITH_DEBUG?=		yes
-.endif
-
-# Finally, add additional user specified configuration options:
-CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
-
-PLIST_DIRS=	%%ETCDIR%%/icons libexec/squid
-PLIST_FILES=	${etc_files:S,^,etc/,} ${icon_files:S,^,%%ETCDIR%%/icons/,} \
-		${libexec:S,^,libexec/squid/,} ${sbin:S,^,sbin/,}
-
-PLIST_FILES+=	%%ETCDIR%%/errors/COPYRIGHT %%ETCDIR%%/errors/TRANSLATORS
-.for d in ${error_dirs}
-PLIST_DIRS+=	%%ETCDIR%%/errors/${d}
-PLIST_FILES+=	${error_files:S,^,%%ETCDIR%%/errors/${d}/,}
-.endfor
-PLIST_FILES+=	${error_dir_links:S,^,%%ETCDIR%%/errors/,}
-PLIST_DIRS+=	%%ETCDIR%%/errors
-PLIST_DIRSTRY+=	%%ETCDIR%%
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-	    ${WRKSRC}/src/cf.data.pre
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-	    ${WRKSRC}/helpers/basic_auth/SMB/Makefile.in \
-	    ${WRKSRC}/helpers/basic_auth/SMB/smb_auth.sh
-
-pre-install:
-# Prevent installation of .orig files by deleting them.
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
-
-pre-su-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
-	    ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql ${EXAMPLESDIR}
-.endif
-.if defined(WITH_SQUID_PINGER)
-	${CHMOD} 4510 ${PREFIX}/libexec/squid/pinger; \
-	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${docs} ${DOCSDIR}
-.endif
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-	    ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-	@${ECHO_CMD} "===> post-installation information for ${PKGNAME}:"
-	@${ECHO_CMD} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} ""
-.if defined(WITH_SQUID_COSS)
-	@${ECHO_CMD} "Note: COSS support is currently not available in Squid-3."
-	@${ECHO_CMD} "Please check your squid.conf and comment out any 'cache_dir coss' definitions."
-	@${ECHO_CMD} ""
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
deleted file mode 100644
index ef87bb3d27f1..000000000000
--- a/www/squid31/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (squid3.1/squid-3.1.23.tar.bz2) = ba8041d23ef168dee755ca0d343c28b117011f02abfabbf3a7b623f21ef0e48d
-SIZE (squid3.1/squid-3.1.23.tar.bz2) = 2560454
diff --git a/www/squid31/files/extra-patch-src-cf.data.pre.aufs b/www/squid31/files/extra-patch-src-cf.data.pre.aufs
deleted file mode 100644
index 019fdcac0fc7..000000000000
--- a/www/squid31/files/extra-patch-src-cf.data.pre.aufs
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/cf.data.pre.orig	Wed Nov  1 15:12:02 2006
-+++ src/cf.data.pre	Wed Nov  1 15:12:17 2006
-@@ -1097,6 +1100,17 @@
- 
- 	see argument descriptions under ufs above
- 
-+	Note:
-+	By default, FreeBSD uses the pthread(3) M:N threading library.
-+	You can, however, map the thread library to the 1:1 libthr(3)
-+	implementation by inserting the following lines into
-+	/etc/libmap.conf and see whether this performs better on your
-+	system:
-+
-+	[%%PREFIX%%/sbin/squid]
-+	libpthread.so.1	libthr.so.1
-+	libpthread.so.2	libthr.so.2
-+
- 	The diskd store type:
- 
- 	"diskd" uses the same storage format as "ufs", utilizing a
diff --git a/www/squid31/files/patch-src-cf.data.pre b/www/squid31/files/patch-src-cf.data.pre
deleted file mode 100644
index b2b4e55db81f..000000000000
--- a/www/squid31/files/patch-src-cf.data.pre
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cf.data.pre.orig	Sun Jun 24 13:42:25 2007
-+++ src/cf.data.pre	Sun Jun 24 13:59:32 2007
-@@ -1417,6 +1417,10 @@
- LOC: Config.pidFilename
- DOC_START
- 	A filename to write the process-id to.  To disable, enter "none".
-+
-+	Note: If you change this setting, you need to set squid_pidfile
-+	in /etc/rc.conf to reflect the new value. Please see
-+	%%PREFIX%%/etc/rc.d/squid for details.
- DOC_END
- 
- 
diff --git a/www/squid31/files/pkg-deinstall.in b/www/squid31/files/pkg-deinstall.in
deleted file mode 100644
index f78c66c178bd..000000000000
--- a/www/squid31/files/pkg-deinstall.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-squid_base="/var/squid"
-squid_cachedir="${squid_base}/cache"
-squid_confdir=${PKG_PREFIX}/etc/squid
-squid_logdir="/var/log/squid"
-squid_rundir="/var/run/squid"
-
-case $2 in
-DEINSTALL)
-	cd ${squid_confdir} || exit 1
-	for f in cachemgr.conf errorpage.css mime.conf msntauth.conf squid.conf; do
-		cmp -s -z ${f} ${f}.default && rm ${f}
-	done
-	# try to cleanup directories in /var:
-	for d in ${squid_cachedir} ${squid_base} ${squid_logdir} ${squid_rundir}; do
-		rmdir ${d} 2>/dev/null
-	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 ${squid_base} -o -d ${squid_confdir} -o -d ${squid_logdir} -o -d ${squid_rundir} ] ; 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 "     Squid any longer."
-	fi
-	echo ""
-	;;
-*)
-	exit 64
-	;;
-esac
-exit 0
diff --git a/www/squid31/files/pkg-install.in b/www/squid31/files/pkg-install.in
deleted file mode 100644
index 2ab8d99dc70f..000000000000
--- a/www/squid31/files/pkg-install.in
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/usr/sbin
-pkgname=$1
-squid_base="/var/squid"
-squid_cachedir="${squid_base}/cache"
-squid_confdir="${PKG_PREFIX:-%%PREFIX%%}/etc/squid"
-squid_logdir="/var/log/squid"
-squid_rundir="/var/run/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}
-	# Since we usually start the Squid master process as ${squid_user}
-	# instead of root make sure that ${squid_base} is writable for it.
-	if [ ! -d ${squid_base} ]; then
-		echo "Creating ${squid_base}..."
-		install -d -o root -g ${squid_group} \
-		    -m 0775 ${squid_base}
-	else
-		chgrp ${squid_group} ${squid_base}
-		chmod g+w ${squid_base}
-	fi
-	if [ ! -d ${squid_cachedir} ]; then
-		echo "Creating ${squid_cachedir} ..."
-		install -d -o ${squid_user} -g ${squid_group} \
-		    -m 0750 ${squid_cachedir}
-	fi
-	if [ ! -d ${squid_confdir} ]; then
-		echo "Creating ${squid_confdir}..."
-		install -d -o root -g ${squid_group} \
-		    -m 0755 ${squid_confdir}
-	fi
-	if [ ! -d ${squid_logdir} ]; then
-		echo "Creating ${squid_logdir}..."
-		install -d -o ${squid_user} -g ${squid_group} \
-		    -m 0750 ${squid_logdir}
-	fi
-	if [ ! -d ${squid_rundir} ]; then
-		echo "Creating ${squid_rundir}..."
-		install -d -o ${squid_user} -g ${squid_group} \
-		    -m 0755 ${squid_rundir}
-	fi
-	;;
-POST-INSTALL)
-	for file in cachemgr.conf errorpage.css mime.conf msntauth.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/squid31/files/pkg-message.in b/www/squid31/files/pkg-message.in
deleted file mode 100644
index 82f59cb52d77..000000000000
--- a/www/squid31/files/pkg-message.in
+++ /dev/null
@@ -1,33 +0,0 @@
-     o You can find the configuration files for this package in the
-       directory %%PREFIX%%/etc/squid.
-
-     o The default cache directory is /var/squid/.
-       The default log directory is /var/log/squid/.
-
-       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 but the local host and
-       local networks as defined in RFC 1918 for IPv4 and RFCs 4193 and
-       4291 for IPv6 access to the proxy service.  Edit the "http_access
-       allow/deny" directives in %%PREFIX%%/etc/squid/squid.conf
-       to suit your needs.
-
-     To enable Squid, 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 for further details.
-
-     Note:
-     If you just updated your Squid installation from an earlier version,
-     make sure to check your Squid configuration against the 3.1 default
-     configuration file %%PREFIX%%/etc/squid/squid.conf.default.
-     
-     %%PREFIX%%/etc/squid/squid.conf.documented is a fully annotated
-     configuration file you can consult for further reference.
-
-     Additionally, you should check your configuration by calling
-     'squid -f /path/to/squid.conf -k parse' before starting Squid.
-
diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in
deleted file mode 100644
index 67f2008b0712..000000000000
--- a/www/squid31/files/squid.in
+++ /dev/null
@@ -1,101 +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 activate Squid.
-#
-# Additional variables you can define in one of these files:
-#
-# squid_chdir:	the directory into which the rc system moves into before
-# 		starting Squid. Default: /var/squid
-#
-# squid_conf:	The configuration file that Squid should use.
-#		Default: %%PREFIX%%/etc/squid/squid.conf
-#
-# squid_fib:	The alternative routing table id that Squid should use.
-#		Default: none
-#		See setfib(1) for further details. Note that the setfib(2)
-#		system call is not available in FreeBSD versions prior to 7.1.
-#
-# squid_user:	The user id that should be used to run the Squid master
-#		process. Default: %%SQUID_UID%%.
-#		Note that you probably need to define "squid_user=root" if
-#		you want to run Squid in reverse proxy setups or if you want
-#		Squid to listen on a "privileged" port < 1024.
-#
-# squid_pidfile:
-#		The name (including the full path) of the Squid
-#		master process' PID file.
-#		Default: /var/run/squid/squid.pid.
-#		You only need to change this if you changed the
-#		corresponding entry in your Squid configuration.
-#
-# squid_flags:	Additional commandline arguments for Squid you might want to
-#		use. See squid(8) for further details.
-#
-
-squid_checkrunning() {
-	${command} ${command_args} ${squid_flags} -k check 2>/dev/null
-}
-
-squid_setfib() {
-	if command -v check_namevarlist > /dev/null 2>&1; then
-		check_namevarlist fib && return 0
-	fi
-
-	${SYSCTL} net.fibs >/dev/null 2>&1 || return 0
-
-	squid_fib=${squid_fib:-"NONE"}
-	if [ "x${squid_fib}" != "xNONE" ]; then
-		command="setfib -F ${squid_fib} ${command}"
-	else
-		return 0
-	fi
-}
-
-squid_stop() {
-	echo "Stopping ${name}."
-	${command} ${command_args} ${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} ${command_args} ${squid_flags} -k reconfigure"
-start_precmd="squid_setfib"
-stop_precmd="squid_checkrunning"
-stop_cmd="squid_stop"
-
-load_rc_config ${name}
-
-squid_chdir=${squid_chdir:-"/var/squid"}
-squid_conf=${squid_conf:-"%%PREFIX%%/etc/squid/squid.conf"}
-squid_enable=${squid_enable:-"NO"}
-squid_pidfile=${squid_pidfile:-"/var/run/squid/squid.pid"}
-squid_user=${squid_user:-%%SQUID_UID%%}
-
-pidfile=${squid_pidfile}
-required_dirs=${squid_chdir}
-
-# squid(8) will not start if ${squid_conf} is not present so try
-# to catch that beforehand via ${required_files} rather than make
-# squid(8) crash.
-
-required_files=${squid_conf}
-
-# Now make sure that we invoke squid with "-f ${squid_conf}":
-
-command_args="-f ${squid_conf}"
-
-run_rc_command "$1"
diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr
deleted file mode 100644
index 0cd02912d960..000000000000
--- a/www/squid31/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Squid is a high-performance proxy caching server for web clients,
-supporting FTP, gopher, and HTTP data objects. Unlike traditional
-caching software, Squid handles all requests in a single, non-blocking,
-I/O-driven process.
-
-Squid supports SSL, extensive access controls, and full request logging.
-By using the lightweight Internet Cache Protocol, Squid caches can be
-arranged in a hierarchy or mesh for additional bandwidth savings.
-
-WWW: http://www.squid-cache.org/