svn commit: r366362 - in head/www/squid33: . files

John Marino marino at FreeBSD.org
Wed Aug 27 21:55:31 UTC 2014 

Author: marino
Date: Wed Aug 27 21:55:29 2014
New Revision: 366362
URL: http://svnweb.freebsd.org/changeset/ports/366362
QAT: https://qat.redports.org/buildarchive/r366362/

Log:
  www/squid33: Upgrade version 3.3.11 => 3.3.13
  
  Refactored the makefile again, added urls for known bugs in the makefile,
  Removed FS_COSS from options (broken everywhere).  The new versions bring
  in fixes from upstream too.
  
  PR:		192983
  Collaboration:	timp87 and ohauer@

Added:
  head/www/squid33/files/patch-helpers__basic_auth__MSNT__Makefile.in   (contents, props changed)
  head/www/squid33/files/patch-src__Makefile.in   (contents, props changed)
  head/www/squid33/files/patch-tools__Makefile.in   (contents, props changed)
Modified:
  head/www/squid33/Makefile
  head/www/squid33/distinfo
  head/www/squid33/files/patch-configure
  head/www/squid33/pkg-plist

Modified: head/www/squid33/Makefile
==============================================================================
--- head/www/squid33/Makefile	Wed Aug 27 21:52:25 2014	(r366361)
+++ head/www/squid33/Makefile	Wed Aug 27 21:55:29 2014	(r366362)
@@ -3,7 +3,6 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.3.${SQUID_STABLE_VER}
-PORTREVISION=	6
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
@@ -29,9 +28,10 @@ COMMENT=	HTTP Caching Proxy
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-SQUID_STABLE_VER=	11
+SQUID_STABLE_VER=	13
 
 CONFLICTS_INSTALL=	squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
+
 USES=		perl5 tar:bzip2 shebangfix
 SHEBANG_FILES=	scripts/*.pl contrib/*.pl src/*.pl tools/*.pl\
 		helpers/external_acl/kerberos_ldap_group/cert_tool
@@ -50,50 +50,96 @@ OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	ARP_ACL AUTH_KERB AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB \
 		AUTH_SQL \
 		CACHE_DIGESTS DEBUG DELAY_POOLS DNS_HELPER ECAP ESI \
-		FOLLOW_XFF FS_AUFS FS_COSS HTCP ICAP ICMP IDENT IPV6 KQUEUE \
+		FOLLOW_XFF FS_AUFS HTCP ICAP ICMP IDENT IPV6 KQUEUE \
 		LARGEFILE SNMP SSL SSL_CRTD STACKTRACES LAX_HTTP \
 		TP_IPF TP_IPFW TP_PF VIA_DB WCCP WCCPV2 DOCS EXAMPLES
 
+# Note: FS_FCOSS was removed from OPTIONS, it is broken and only experimentel
+#OPTIONS_DEFINE+=	FS_COSS
+
 OPTIONS_DEFAULT=AUTH_KERB AUTH_NIS FS_AUFS HTCP IDENT KQUEUE SNMP WCCP WCCPV2
 
+ARP_ACL_CONFIGURE_ENABLE=	eui
+AUTH_LDAP_CFLAGS=		-I${LOCALBASE}/include
+AUTH_LDAP_LDFLAGS=		-L${LOCALBASE}/lib
+AUTH_LDAP_USE=			OPENLDAP=yes
+AUTH_SASL_CFLAGS=		-I${LOCALBASE}/include
+AUTH_SASL_CPPFLAGS=		-I${LOCALBASE}/include
+AUTH_SASL_LDFLAGS=		-L${LOCALBASE}/lib
+AUTH_SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+AUTH_SMB_BUILD_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
+AUTH_SMB_RUN_DEPENDS=		smbclient:${PORTSDIR}/net/samba36
+AUTH_SQL_RUN_DEPENDS=		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+AUTH_SQL_USE=			MYSQL=yes
+CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
+DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
+DNS_HELPER_CONFIGURE_ON=	--disable-internal-dns
+ECAP_CFLAGS=			-I${LOCALBASE}/include
+ECAP_CONFIGURE_ENABLE=		ecap
+ECAP_LDFLAGS=			-L${LOCALBASE}/lib
+ECAP_LIB_DEPENDS=		libecap.so:${PORTSDIR}/www/libecap
+ECAP_USES=			pkgconfig:build
+ESI_CFLAGS=			-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
+ESI_CONFIGURE_ENABLE=		esi
+ESI_LDFLAGS=			-L${LOCALBASE}/lib
+ESI_LIB_DEPENDS=		libexpat.so:${PORTSDIR}/textproc/expat2 \
+				libxml2.so:${PORTSDIR}/textproc/libxml2
+FOLLOW_XFF_CONFIGURE_ENABLE=	follow-x-forwarded-for
+HTCP_CONFIGURE_ENABLE=		htcp
+ICAP_CONFIGURE_ENABLE=		icap-client
+ICMP_CONFIGURE_ENABLE=		icmp
+IDENT_CONFIGURE_ENABLE=		ident-lookups
+IPV6_CONFIGURE_ENABLE=		ipv6
+KQUEUE_CONFIGURE_ENABLE=	kqueue
+LARGEFILE_CONFIGURE_WITH=	large-files
+LAX_HTTP_CONFIGURE_ENABLE=	http-violations
+SNMP_CONFIGURE_ENABLE=		snmp
+SSL_CONFIGURE_ENABLE=		ssl
+SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
+STACKTRACES_CONFIGURE_ENABLE=	stacktraces
+TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
+TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
+TP_PF_CONFIGURE_ENABLE=		pf-transparent
+VIA_DB_CONFIGURE_ENABLE=	forw-via-db
+WCCPV2_CONFIGURE_ENABLE=	wccpv2
+WCCP_CONFIGURE_ENABLE=		wccp
+
 # TODO:
 # add an option for external_acl/session (requires some kind of external
 # Berkeley DB support, unsure which one)
-ARP_ACL_DESC=	Enable ARP/MAC/EUI based authentification
-AUTH_KERB_DESC=	Install Kerberos authentication helpers
-AUTH_LDAP_DESC=	Install LDAP authentication helpers
-AUTH_NIS_DESC=	Install NIS/YP authentication helpers
-AUTH_SASL_DESC=	Install SASL authentication helpers
-AUTH_SMB_DESC=	Install SMB auth. helpers (req. Samba)
-AUTH_SQL_DESC=	Install SQL based auth (uses MySQL)
+ARP_ACL_DESC=		ARP/MAC/EUI based authentification
+AUTH_KERB_DESC=		Install Kerberos authentication helpers
+AUTH_LDAP_DESC=		Install LDAP authentication helpers
+AUTH_NIS_DESC=		Install NIS/YP authentication helpers
+AUTH_SASL_DESC=		Install SASL authentication helpers
+AUTH_SMB_DESC=		Install SMB auth. helpers (req. Samba)
+AUTH_SQL_DESC=		Install SQL based auth (uses MySQL)
 CACHE_DIGESTS_DESC=	Use cache digests
-DEBUG_DESC=	Build with extended debugging support
-DELAY_POOLS_DESC=	Enable delay pools (bandwidth limiting)
+DEBUG_DESC=		Build with extended debugging support
+DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)
 DNS_HELPER_DESC=	Use external dnsserver processes for DNS
-ECAP_DESC=	Enable loadable content adaptation modules
-ESI_DESC=	Enable support for ESI
-FOLLOW_XFF_DESC=	Enable support for the X-Following-For header
-FS_AUFS_DESC=	Enable AUFS (async-io) support
-FS_COSS_DESC=	Enable COSS (not stable yet)
-HTCP_DESC=	Enable HTCP support
-ICAP_DESC=	Enable the ICAP client
-ICMP_DESC=	Enable ICMP pinging and network measurement
-IDENT_DESC=	Enable Ident lookups (RFC 931)
-KQUEUE_DESC=	Enable kqueue(2) support
-LARGEFILE_DESC=	Support large (>2GB) cache and log files
-SNMP_DESC=	Enable SNMP support
-SSL_CRTD_DESC=	Use ssl_crtd to handle SSL cert requests
-SSL_DESC=	Enable SSL gatewaying support
+ECAP_DESC=		Loadable content adaptation modules (broken on FreeBSD 10+)
+ESI_DESC=		ESI support
+FOLLOW_XFF_DESC=	Support for the X-Following-For header
+FS_AUFS_DESC=		AUFS (async-io) support
+FS_COSS_DESC=		COSS (not stable yet)
+HTCP_DESC=		HTCP support
+ICAP_DESC=		the ICAP client
+ICMP_DESC=		ICMP pinging and network measurement
+IDENT_DESC=		Ident lookups (RFC 931)
+KQUEUE_DESC=		Kqueue(2) support
+LARGEFILE_DESC=		Support large (>2GB) cache and log files
+SNMP_DESC=		SNMP support
+SSL_CRTD_DESC=		Use ssl_crtd to handle SSL cert requests
+SSL_DESC=		SSL gatewaying support
 STACKTRACES_DESC=	Enable automatic backtraces on fatal errors
-LAX_HTTP_DESC=	Do not enforce strict HTTP compliance
-TP_IPFW_DESC=	Enable transparent proxying with IPFW
-TP_IPF_DESC=	Enable transparent proxying with IPFilter
-TP_PF_DESC=	Enable transparent proxying with PF
-VIA_DB_DESC=	Enable Forward/Via database
-WCCPV2_DESC=	Enable Web Cache Coordination Protocol v2
-WCCP_DESC=	Enable Web Cache Coordination Protocol
-
-ECAP_USES=		pkgconfig:build
+LAX_HTTP_DESC=		Do not enforce strict HTTP compliance
+TP_IPFW_DESC=		Transparent proxying with IPFW
+TP_IPF_DESC=		Transparent proxying with IPFilter
+TP_PF_DESC=		Transparent proxying with PF
+VIA_DB_DESC=		Forward/Via database
+WCCPV2_DESC=		Web Cache Coordination Protocol v2
+WCCP_DESC=		Web Cache Coordination Protocol
 
 change_files=	ChangeLog\
 		contrib/nextstep/makepkg\
@@ -109,38 +155,13 @@ change_files=	ChangeLog\
 		tools/Makefile.am\
 		tools/Makefile.in
 
-.if !defined(SQUID_CONFIGURE_ARGS)\
- || ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
+.if !defined(SQUID_CONFIGURE_ARGS) \
+	|| ${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
 PLIST_SUB+=	UNLINKD=""
 .else
 PLIST_SUB+=	UNLINKD="@comment "
 .endif
 
-IPV6_CONFIGURE_ENABLE=		ipv6
-DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
-SNMP_CONFIGURE_ENABLE=		snmp
-SSL_CONFIGURE_ENABLE=		ssl
-SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
-ICMP_CONFIGURE_ENABLE=		icmp
-HTCP_CONFIGURE_ENABLE=		htcp
-VIA_DB_CONFIGURE_ENABLE=	forw-via-db
-CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
-WCCP_CONFIGURE_ENABLE=		wccp
-WCCPV2_CONFIGURE_ENABLE=	wccpv2
-LAX_HTTP_CONFIGURE_ENABLE=	http-violations
-IDENT_CONFIGURE_ENABLE=		ident-lookups
-ARP_ACL_CONFIGURE_ENABLE=	eui
-TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
-TP_PF_CONFIGURE_ENABLE=		pf-transparent
-TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
-FOLLOW_XFF_CONFIGURE_ENABLE=	follow-x-forwarded-for
-ECAP_CONFIGURE_ENABLE=		ecap
-ICAP_CONFIGURE_ENABLE=		icap-client
-ESI_CONFIGURE_ENABLE=		esi
-KQUEUE_CONFIGURE_ENABLE=	kqueue
-LARGEFILE_CONFIGURE_ENABLE=	large-files
-STACKTRACES_CONFIGURE_ENABLE=	stacktraces
-
 CONFIGURE_ARGS=	--with-default-user=squid \
 		--bindir=${PREFIX}/sbin  \
 		--sbindir=${PREFIX}/sbin  \
@@ -163,46 +184,40 @@ CONFIGURE_ARGS=	--with-default-user=squi
 .include <bsd.port.options.mk>
 
 .if ${CC:T:Mclang*} || ${CXX:T:Mclang++*} \
- || ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024
+	|| ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000024
 CXXFLAGS+=	-Wno-unused-private-field
 .endif
 
 # Authentication methods and modules:
 
-basic_auth=	DB MSNT MSNT-multi-domain NCSA PAM POP3 RADIUS \
-		fake getpwnam
+basic_auth=	DB MSNT MSNT-multi-domain NCSA PAM POP3 RADIUS fake getpwnam
 digest_auth=	file
 external_acl=	file_userip time_quota unix_group
 ntlm_auth=	fake smb_lm
+
 .if ${PORT_OPTIONS:MAUTH_LDAP}
-USE_OPENLDAP=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 basic_auth+=	LDAP
 external_acl+=	LDAP_group
 .endif
+
 .if ${PORT_OPTIONS:MAUTH_SASL}
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 basic_auth+=	SASL
 .endif
+
 .if ${PORT_OPTIONS:MAUTH_SMB}
-BUILD_DEPENDS+=	smbclient:${PORTSDIR}/net/samba36
-RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba36
 basic_auth+=	SMB
 external_acl+=	wbinfo_group
 .endif
+
 .if ${PORT_OPTIONS:MAUTH_SQL}
-USE_MYSQL=	yes
-RUN_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 external_acl+=	SQL_session
 .endif
+
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
 .if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
 basic_auth+=	NIS
 .endif
+
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
 .if ${PORT_OPTIONS:MAUTH_KERB} && !defined(NO_KERBEROS) && !defined(WITHOUT_KERBEROS)
 negotiate_auth=	kerberos wrapper
@@ -210,9 +225,9 @@ negotiate_auth=	kerberos wrapper
 LIB_DEPENDS+=	libkrb5.so:${PORTSDIR}/security/krb5
 .  endif
 # the kerberos_ldap_group external helper depends on LDAP and SASL:
-.if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
+. if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
 external_acl+=	kerberos_ldap_group
-.endif
+. endif
 .else
 negotiate_auth=	none
 .endif
@@ -224,31 +239,32 @@ CONFIGURE_ARGS+=	--enable-auth-basic="${
 			--enable-auth-ntlm="${ntlm_auth}"
 
 # Storage schemes:
-
 storage_schemes=	diskd rock ufs
-diskio_modules=	AIO Blocking DiskDaemon IpcIo Mmapped
+diskio_modules=		AIO Blocking DiskDaemon IpcIo Mmapped
+
 .if ${PORT_OPTIONS:MFS_AUFS}
 storage_schemes+=	aufs
 diskio_modules+=	DiskThreads
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
 # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
-LDFLAGS+=	-pthread
+LDFLAGS+=		-pthread
 .else
 CONFIGURE_ARGS+=	--without-pthreads
 .endif
+
 .if ${PORT_OPTIONS:MFS_COSS}
+BROKEN=			FS_COSS does not compile
 storage_schemes+=	coss
 .endif
-CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}"\
+
+CONFIGURE_ARGS+=	--enable-storeio="${storage_schemes}" \
 			--enable-disk-io="${diskio_modules}"
 
 # Log daemon helpers:
-
 logdaemon_helpers=	file
 CONFIGURE_ARGS+=	--enable-log-daemon-helpers="${logdaemon_helpers}"
 
 # Rewrite helpers:
-
 rewrite_helpers=	fake
 CONFIGURE_ARGS+=	--enable-url-rewrite-helpers="${rewrite_helpers}"
 
@@ -262,27 +278,26 @@ CONFIGURE_ARGS+=	--enable-url-rewrite-he
 # XXX: is this still true with OptionsNG as of 2012-10?
 .include "${.CURDIR}/../../Mk/bsd.openssl.mk"
 CONFIGURE_ARGS+=	--with-openssl="${OPENSSLBASE}"
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-.endif
-.if ${PORT_OPTIONS:MDNS_HELPER}
-CONFIGURE_ARGS+=	--disable-internal-dns
+CFLAGS+=		-I${OPENSSLINC}
+LDFLAGS+=		-L${OPENSSLLIB}
 .endif
+
 .if ${PORT_OPTIONS:MECAP}
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
+# re-evaluate on FreeBSD 10+ with the next release
+# http://www.squid-cache.org/mail-archive/squid-users/201402/0324.html
+BROKEN=		ECAP and clang are not friendly
+.endif
 LIB_DEPENDS+=	libecap.so:${PORTSDIR}/www/libecap
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
-.if ${PORT_OPTIONS:MESI}
-LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libxml2.so:${PORTSDIR}/textproc/libxml2
-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
+
 .if ${PORT_OPTIONS:MSTACKTRACES}
 CFLAGS+=	-g
 STRIP=
 .endif
+
 .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--disable-optimizations --enable-debug-cbdata
 WITH_DEBUG?=		yes
@@ -294,16 +309,17 @@ CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/src/cf.data.pre
-	@cd ${WRKSRC} && ${REINPLACE_CMD}\
+	@(cd ${WRKSRC} && ${REINPLACE_CMD}\
 		-e 's|\.conf\.default|.conf.sample|'\
 		-e 's|)\.default|).sample|'\
-		${change_files}
-	@cd ${WRKSRC} && ${MV} helpers/basic_auth/MSNT/msntauth.conf.default\
-		helpers/basic_auth/MSNT/msntauth.conf.sample
-	@cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample
+		${change_files})
+	@(cd ${WRKSRC} && ${MV} helpers/basic_auth/MSNT/msntauth.conf.default\
+		helpers/basic_auth/MSNT/msntauth.conf.sample)
+	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)
 	@${REINPLACE_CMD} -e 's,echo |,echo =head1 |,'\
 		${WRKSRC}/helpers/basic_auth/DB/config.test\
 		${WRKSRC}/helpers/external_acl/SQL_session/config.test
+
 .if !${PORT_OPTIONS:MIPV6}
 	@${REINPLACE_CMD} -e's/ ::1//' -e's/ fc00::\/7//'\
 		-e's/ fe80::\/10//' -e's/ 2001:DB8::2//'\
@@ -321,15 +337,11 @@ post-patch:
 		${WRKSRC}/helpers/negotiate_auth/kerberos/config.test
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/helpers/basic_auth/DB/passwd.sql \
 		${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
 	${MKDIR} ${STAGEDIR}/var/squid/logs
 
 .include <bsd.port.mk>

Modified: head/www/squid33/distinfo
==============================================================================
--- head/www/squid33/distinfo	Wed Aug 27 21:52:25 2014	(r366361)
+++ head/www/squid33/distinfo	Wed Aug 27 21:55:29 2014	(r366362)
@@ -1,4 +1,4 @@
-SHA256 (squid3.3/squid-3.3.11.tar.bz2) = 6b314cd706693522f01d5ab1930f3aa7a9b03a913bc0e699def16cca8d15ea54
-SIZE (squid3.3/squid-3.3.11.tar.bz2) = 2989941
+SHA256 (squid3.3/squid-3.3.13.tar.bz2) = 584f85de055c28705492ab07a2d5bb818286f5666899f86e9c5fce046404b050
+SIZE (squid3.3/squid-3.3.13.tar.bz2) = 2991135
 SHA256 (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 6fd9e55812e18463e92c83d1376e65ca54b2857606f59f4aa1b7d2716af2b72c
 SIZE (squid3.3/FreeBSD_silence_nosuid_mk1.patch) = 1295

Modified: head/www/squid33/files/patch-configure
==============================================================================
--- head/www/squid33/files/patch-configure	Wed Aug 27 21:52:25 2014	(r366361)
+++ head/www/squid33/files/patch-configure	Wed Aug 27 21:55:29 2014	(r366362)
@@ -1,5 +1,95 @@
---- configure.orig	2013-11-30 07:56:05.000000000 -0600
-+++ configure	2014-02-12 10:53:47.000000000 -0600
+--- configure.orig	2014-08-27 18:17:55.000000000 +0400
++++ configure	2014-08-27 21:14:17.000000000 +0400
+@@ -11856,7 +11856,7 @@
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -11872,7 +11872,7 @@
+       ;;
+ 
+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
++    freebsd2.*)
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_direct=yes
+       hardcode_minus_L=yes
+@@ -12778,7 +12778,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -12789,7 +12789,7 @@
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -12807,7 +12807,7 @@
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  freebsd2*)
++  freebsd2.*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -14673,7 +14673,7 @@
+         esac
+         ;;
+ 
+-      freebsd[12]*)
++      freebsd[12].*)
+         # C++ shared libraries reported to be fairly broken before
+ 	# switch to ELF
+         ld_shlibs_CXX=no
+@@ -16441,7 +16441,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -16452,7 +16452,7 @@
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -16470,7 +16470,7 @@
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  freebsd2*)
++  freebsd2.*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -18550,7 +18550,7 @@
+    squid_cv_cc_arg_pipe=""
+    ;;
+   clang)
+-   squid_cv_cxx_option_werror="-Werror -Qunused-arguments"
++   squid_cv_cxx_option_werror="-Qunused-arguments"
+    squid_cv_cc_option_werror="$squid_cv_cxx_option_werror"
+    squid_cv_cc_option_wall="-Wall"
+    squid_cv_cc_option_optimize="-O2"
 @@ -22964,7 +22964,7 @@
  
  done

Added: head/www/squid33/files/patch-helpers__basic_auth__MSNT__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/squid33/files/patch-helpers__basic_auth__MSNT__Makefile.in	Wed Aug 27 21:55:29 2014	(r366362)
@@ -0,0 +1,15 @@
+--- ./helpers/basic_auth/MSNT/Makefile.in.orig	2014-08-25 23:23:58.000000000 +0200
++++ ./helpers/basic_auth/MSNT/Makefile.in	2014-08-25 23:25:23.000000000 +0200
+@@ -827,12 +827,6 @@
+ $(OBJS): $(top_srcdir)/include/version.h $(top_builddir)/include/autoconf.h
+ 
+ install-data-local: msntauth.conf.default
+-	@if test -f $(DESTDIR)$(MSNTAUTH_CONF) ; then \
+-		echo "$@ will not overwrite existing $(DESTDIR)$(MSNTAUTH_CONF)" ; \
+-	else \
+-		echo "$(INSTALL_DATA) $(srcdir)/msntauth.conf.default $(DESTDIR)$(MSNTAUTH_CONF)" ; \
+-		$(INSTALL_DATA) $(srcdir)/msntauth.conf.default $(DESTDIR)$(MSNTAUTH_CONF) ; \
+-	fi
+ 
+ uninstall-local:
+ 	@$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(MSNTAUTH_CONF)

Added: head/www/squid33/files/patch-src__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/squid33/files/patch-src__Makefile.in	Wed Aug 27 21:55:29 2014	(r366362)
@@ -0,0 +1,25 @@
+--- ./src/Makefile.in.orig	2014-08-25 23:16:03.000000000 +0200
++++ ./src/Makefile.in	2014-08-25 23:20:55.000000000 +0200
+@@ -7354,20 +7354,8 @@
+ 	$(SUBSTITUTE) < $(srcdir)/squid.8.in > $@
+ 
+ install-data-local: install-sysconfDATA install-dataDATA
+-	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
+-	  echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
+-	else \
+-	  echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
+-	  $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
+-	fi
+-	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+-	  echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
+-	else \
+-	  echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+-	  $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
+-	fi
+-	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \
+-	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \
++	echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).sample"; \
++	$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).sample; \
+ 	echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \
+ 	$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \
+ 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \

Added: head/www/squid33/files/patch-tools__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/squid33/files/patch-tools__Makefile.in	Wed Aug 27 21:55:29 2014	(r366362)
@@ -0,0 +1,17 @@
+--- ./tools/Makefile.in.orig	2014-08-25 23:27:15.000000000 +0200
++++ ./tools/Makefile.in	2014-08-25 23:27:53.000000000 +0200
+@@ -1237,13 +1237,7 @@
+ 	$(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@
+ 
+ install-data-local:
+-	$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).default
+-	@if test -f $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG) ; then \
+-	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)" ; \
+-	else \
+-	        echo "$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)"; \
+-	        $(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG); \
+-	fi
++	$(INSTALL_DATA) $(srcdir)/cachemgr.conf $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG).sample
+ 
+ uninstall-local:
+ 	@$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_CACHEMGR_CONFIG)

Modified: head/www/squid33/pkg-plist
==============================================================================
--- head/www/squid33/pkg-plist	Wed Aug 27 21:52:25 2014	(r366361)
+++ head/www/squid33/pkg-plist	Wed Aug 27 21:55:29 2014	(r366362)
@@ -1,71 +1,5 @@
 @sample %%ETCDIR%%/cachemgr.conf.sample
 @sample %%ETCDIR%%/errorpage.css.sample
- at sample %%ETCDIR%%/mime.conf.sample
- at sample %%ETCDIR%%/msntauth.conf.sample
- at sample %%ETCDIR%%/squid.conf.sample
-%%AUTH_LDAP%%libexec/squid/basic_ldap_auth
-libexec/squid/basic_db_auth
-libexec/squid/basic_fake_auth
-libexec/squid/basic_getpwnam_auth
-libexec/squid/basic_msnt_auth
-libexec/squid/basic_msnt_multi_domain_auth
-libexec/squid/basic_ncsa_auth
-%%AUTH_NIS%%libexec/squid/basic_nis_auth
-libexec/squid/basic_pam_auth
-libexec/squid/basic_pop3_auth
-libexec/squid/basic_radius_auth
-%%AUTH_SASL%%libexec/squid/basic_sasl_auth
-%%AUTH_SMB%%libexec/squid/basic_smb_auth
-%%AUTH_SMB%%libexec/squid/basic_smb_auth.sh
-libexec/squid/cachemgr.cgi
-%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
-libexec/squid/digest_file_auth
-libexec/squid/diskd
-%%DNS_HELPER%%libexec/squid/dnsserver
-libexec/squid/ext_file_userip_acl
-%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
-%%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
-%%AUTH_SQL%%libexec/squid/ext_sql_session_acl
-libexec/squid/ext_time_quota_acl
-libexec/squid/ext_unix_group_acl
-%%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl
-libexec/squid/helper-mux.pl
-libexec/squid/log_file_daemon
-%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth
-%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test
-%%AUTH_KERB%%libexec/squid/negotiate_wrapper_auth
-libexec/squid/ntlm_fake_auth
-libexec/squid/ntlm_smb_lm_auth
-%%ICMP%%@mode	4510
-%%ICMP%%@group	squid
-%%ICMP%%libexec/squid/pinger
-%%ICMP%%@group
-%%ICMP%%@mode
-%%SSL_CRTD%%libexec/squid/ssl_crtd
-%%UNLINKD%%libexec/squid/unlinkd
-libexec/squid/url_fake_rewrite
-libexec/squid/url_fake_rewrite.sh
-man/man1/squidclient.1.gz
-man/man8/basic_db_auth.8.gz
-man/man8/basic_getpwnam_auth.8.gz
-%%AUTH_LDAP%%man/man8/basic_ldap_auth.8.gz
-man/man8/basic_ncsa_auth.8.gz
-man/man8/basic_pam_auth.8.gz
-man/man8/basic_radius_auth.8.gz
-%%AUTH_SASL%%man/man8/basic_sasl_auth.8.gz
-man/man8/cachemgr.cgi.8.gz
-man/man8/digest_file_auth.8.gz
-man/man8/ext_file_userip_acl.8.gz
-%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz
-%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
-man/man8/ext_time_quota_acl.8.gz
-man/man8/ext_unix_group_acl.8.gz
-%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
-%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz
-man/man8/squid.8.gz
-sbin/purge
-sbin/squid
-sbin/squidclient
 %%ETCDIR%%/errors/COPYRIGHT
 %%ETCDIR%%/errors/TRANSLATORS
 %%ETCDIR%%/errors/af/ERR_ACCESS_DENIED
@@ -2113,8 +2047,73 @@ sbin/squidclient
 %%ETCDIR%%/icons/silk/script_gear.png
 %%ETCDIR%%/icons/silk/script_palette.png
 %%ETCDIR%%/mib.txt
+ at sample %%ETCDIR%%/mime.conf.sample
+ at sample %%ETCDIR%%/msntauth.conf.sample
 %%ETCDIR%%/squid.conf.documented
- at dirrm %%ETCDIR%%/errors
+ at sample %%ETCDIR%%/squid.conf.sample
+libexec/squid/basic_db_auth
+libexec/squid/basic_fake_auth
+libexec/squid/basic_getpwnam_auth
+%%AUTH_LDAP%%libexec/squid/basic_ldap_auth
+libexec/squid/basic_msnt_auth
+libexec/squid/basic_msnt_multi_domain_auth
+libexec/squid/basic_ncsa_auth
+%%AUTH_NIS%%libexec/squid/basic_nis_auth
+libexec/squid/basic_pam_auth
+libexec/squid/basic_pop3_auth
+libexec/squid/basic_radius_auth
+%%AUTH_SASL%%libexec/squid/basic_sasl_auth
+%%AUTH_SMB%%libexec/squid/basic_smb_auth
+%%AUTH_SMB%%libexec/squid/basic_smb_auth.sh
+libexec/squid/cachemgr.cgi
+%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/cert_tool
+libexec/squid/digest_file_auth
+libexec/squid/diskd
+%%DNS_HELPER%%libexec/squid/dnsserver
+libexec/squid/ext_file_userip_acl
+%%AUTH_LDAP%%%%AUTH_SASL%%libexec/squid/ext_kerberos_ldap_group_acl
+%%AUTH_LDAP%%libexec/squid/ext_ldap_group_acl
+%%AUTH_SQL%%libexec/squid/ext_sql_session_acl
+libexec/squid/ext_time_quota_acl
+libexec/squid/ext_unix_group_acl
+%%AUTH_SMB%%libexec/squid/ext_wbinfo_group_acl
+libexec/squid/helper-mux.pl
+libexec/squid/log_file_daemon
+%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth
+%%AUTH_KERB%%libexec/squid/negotiate_kerberos_auth_test
+%%AUTH_KERB%%libexec/squid/negotiate_wrapper_auth
+libexec/squid/ntlm_fake_auth
+libexec/squid/ntlm_smb_lm_auth
+%%ICMP%%@mode 4510
+%%ICMP%%@group squid
+%%ICMP%%libexec/squid/pinger
+%%ICMP%%@group
+%%ICMP%%@mode
+%%SSL_CRTD%%libexec/squid/ssl_crtd
+%%UNLINKD%%libexec/squid/unlinkd
+libexec/squid/url_fake_rewrite
+libexec/squid/url_fake_rewrite.sh
+man/man1/squidclient.1.gz
+man/man8/basic_db_auth.8.gz
+man/man8/basic_getpwnam_auth.8.gz
+%%AUTH_LDAP%%man/man8/basic_ldap_auth.8.gz
+man/man8/basic_ncsa_auth.8.gz
+man/man8/basic_pam_auth.8.gz
+man/man8/basic_radius_auth.8.gz
+%%AUTH_SASL%%man/man8/basic_sasl_auth.8.gz
+man/man8/cachemgr.cgi.8.gz
+man/man8/digest_file_auth.8.gz
+man/man8/ext_file_userip_acl.8.gz
+%%AUTH_LDAP%%man/man8/ext_ldap_group_acl.8.gz
+%%AUTH_SQL%%man/man8/ext_sql_session_acl.8.gz
+man/man8/ext_time_quota_acl.8.gz
+man/man8/ext_unix_group_acl.8.gz
+%%AUTH_SMB%%man/man8/ext_wbinfo_group_acl.8.gz
+%%AUTH_KERB%%man/man8/negotiate_kerberos_auth.8.gz
+man/man8/squid.8.gz
+sbin/purge
+sbin/squid
+sbin/squidclient
 @dirrm %%ETCDIR%%/errors/af
 @dirrm %%ETCDIR%%/errors/ar
 @dirrm %%ETCDIR%%/errors/az
@@ -2160,10 +2159,11 @@ sbin/squidclient
 @dirrm %%ETCDIR%%/errors/vi
 @dirrm %%ETCDIR%%/errors/zh-cn
 @dirrm %%ETCDIR%%/errors/zh-tw
- at dirrm %%ETCDIR%%/icons
+ at dirrm %%ETCDIR%%/errors
 @dirrm %%ETCDIR%%/icons/silk
- at dirrm libexec/squid
+ at dirrm %%ETCDIR%%/icons
 @dirrmtry %%ETCDIR%%
+ at dirrm libexec/squid
 @cwd /var
 @dirrmtry log/squid
 @dirrmtry run/squid

More information about the svn-ports-all mailing list