Upgrade to 1.3.37.

2 files changed, 26 insertions, 32 deletions

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 8fa21cd41d7a..561fb6f2430b 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -6,23 +6,17 @@
 #
 
 PORTNAME=	apache+ipv6
-PORTVERSION=	1.3.33
-PORTREVISION=	2
+PORTVERSION=	1.3.37
 CATEGORIES=	www ipv6
 MASTER_SITES=   ${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	apache_${PORTVERSION}
 
-#PATCH_SITES=   ${MASTER_SITE_APACHE_HTTPD}
-#PATCH_SITE_SUBDIR=	patches/apply_to_1.3.33/
-#PATCHFILES=
-#PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
-
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	hrs
-PATCHFILES=	apache-1.3.33-v6-20041106.diff.gz
+PATCH_SITES=	http://www.don.to/arc/
+PATCHFILES=	apache-1.3.37-v6-20060728.diff.gz
+PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	sumikawa@FreeBSD.org
-COMMENT=	The extremely popular Apache http server.  Very fast, very clean
+COMMENT=	The extremely popular Apache http server. Very fast, very clean
 
 CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
@@ -30,7 +24,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
-USE_PERL5=      yes
+USE_PERL5=	yes
 USE_RC_SUBR=	yes
 
 .if defined(APACHE_DATADIR)
@@ -52,12 +46,12 @@ DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 .if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
-EXPAT_CONF+=    --disable-rule=EXPAT
+EXPAT_CONF+=	--disable-rule=EXPAT
 .else
 .if !defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes
-LIB_DEPENDS+=   expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
 .endif
-EXPAT_CONF+=    --enable-rule=EXPAT
+EXPAT_CONF+=	--enable-rule=EXPAT
 .endif
 
 .if defined(WITH_APACHE_SUEXEC) && ${WITH_APACHE_SUEXEC} == yes
@@ -69,7 +63,7 @@ APACHE_SUEXEC_UIDMIN?=1000
 APACHE_SUEXEC_GIDMIN?=1000
 APACHE_SUEXEC_CALLER?=www
 
-SUEXEC_CONF= \
+SUEXEC_CONF=	\
 	--enable-suexec \
 	--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
 	--suexec-caller=${APACHE_SUEXEC_CALLER} \
@@ -80,22 +74,22 @@ SUEXEC_CONF= \
 	--suexec-safepath=${DEFAULT_PATH}
 
 .if defined(APACHE_SUEXEC_UMASK)
-SUEXEC_CONF+= \
+SUEXEC_CONF+=	\
 	--suexec-umask=${APACHE_SUEXEC_UMASK}
 .endif
 
-PLIST_SUB+=     SUB_SUEXEC=""
-SUEXEC_MAN=     suexec.8
+PLIST_SUB+=	SUB_SUEXEC=""
+SUEXEC_MAN=	suexec.8
 
-.else   # !SUEXEC
+.else  # !SUEXEC
 
 SUEXEC_CONF=
-PLIST_SUB+=     SUB_SUEXEC="@comment "
+PLIST_SUB+=	SUB_SUEXEC="@comment "
 SUEXEC_MAN=
 
 .endif  # !SUEXEC
 
-HAS_CONFIGURE=  yes
+HAS_CONFIGURE=	yes
 # += for child ports
 CONFIGURE_ARGS+=	\
 		--prefix=${PREFIX} \
@@ -134,20 +128,20 @@ CFLAGS+=-DHARD_SERVER_LIMIT=512
 .if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == yes
 CFLAGS+=-DBUFFERED_LOGS
 # Don't use OPTIM below, it is inserted _before_ CFLAGS
-CFLAGS+=-O6 -fomit-frame-pointer
+CFLAGS+=-O3
 .endif
 
-CONFIGURE_ENV=  OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
+CONFIGURE_ENV=	OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
 
 .if (!defined(WITHOUT_APACHE_EXPAT) || ${WITHOUT_APACHE_EXPAT} != yes) && \
     (!defined(WITH_APACHE_INTERNAL_EXPAT) || ${WITH_APACHE_INTERNAL_EXPAT} != yes)
-CONFIGURE_ENV+= \
+CONFIGURE_ENV+=	\
 		INCLUDES=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 .endif
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
-MAN8=           ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
+MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
 		${SUEXEC_MAN}
 
 post-extract:
diff --git a/www/apache13+ipv6/distinfo b/www/apache13+ipv6/distinfo
index 39a1d84ee710..52a88818423f 100644
--- a/www/apache13+ipv6/distinfo
+++ b/www/apache13+ipv6/distinfo
@@ -1,6 +1,6 @@
-MD5 (apache_1.3.33.tar.gz) = 3dfd2c3778f37a2dfc22b97417a61407
-SHA256 (apache_1.3.33.tar.gz) = c7327891a6dba926e97d701463f9877fa164757189d192aac8d52100bf2a2484
-SIZE (apache_1.3.33.tar.gz) = 2468567
-MD5 (apache-1.3.33-v6-20041106.diff.gz) = a8d940d2624ba563da9dc812c243e4e2
-SHA256 (apache-1.3.33-v6-20041106.diff.gz) = 6a0a90cce4afed872423bf5d9300b2c5900d4dfe32cd8be38dfb1558097ae787
-SIZE (apache-1.3.33-v6-20041106.diff.gz) = 37909
+MD5 (apache_1.3.37.tar.gz) = b278f0969a9ccadeb781316e79e3520f
+SHA256 (apache_1.3.37.tar.gz) = 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
+SIZE (apache_1.3.37.tar.gz) = 2665370
+MD5 (apache-1.3.37-v6-20060728.diff.gz) = fee0642f0faa5c95599cf732dd63b73f
+SHA256 (apache-1.3.37-v6-20060728.diff.gz) = 2522884f6298a8b0df2bfea55a71c24ea57d3344be28e10eb7c09d271cccd7e8
+SIZE (apache-1.3.37-v6-20060728.diff.gz) = 37878