Update to 2.0.32

PR:		36040
Submitted by:	maintainer

1 files changed, 26 insertions, 24 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index d7ecd43..ad1e9ea 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -6,28 +6,26 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.28
-PORTREVISION=	5
+PORTVERSION=	2.0.32
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
+		http://www.freebsd.org/gifs/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
+		http://www2.freebsd.org/gifs/ \
 		http://apache.missouri.edu/dist/httpd/ \
 		http://ftp.epix.net/apache/dist/httpd/ \
 		ftp://ftp.digex.net/pub/packages/network/apache/httpd/ \
 		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/
-DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta
-
-PATCH_SITES=	http://fallin.lv/distfiles/
-PATCHFILES=	${PORTNAME}-${PORTVERSION}_1.diff
+DISTNAME=	httpd-${PORTVERSION}-beta
+DISTFILES=	${DISTNAME}.tar.gz powerlogo.gif
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER?=	perky@fallin.lv
 
 LATEST_LINK=	apache2
 
-WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
-FIND=		find
-
-WITH_MPM?=	prefork # or perchild, threaded
+WRKSRC=		${WRKDIR}/httpd-${PORTVERSION}
+WITH_MPM?=	prefork # or worker, perchild (neither of them is working yet)
 HTTP_PORT?=	80
 
 GNU_CONFIGURE=	yes
@@ -38,10 +36,12 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-suexec-docroot=${PREFIX}/www/data \
 		--with-mpm=${WITH_MPM} \
 		--with-port=${HTTP_PORT} \
-		--includedir=${PREFIX}/include/apache # for apr, apr-util
+		--libdir=${PREFIX}/lib/apache \
+		--includedir=${PREFIX}/include/apache
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
-SHARED_MODULES=	all cgid
+SHARED_MODULES=	all cgid cache file-cache disk-cache proxy proxy-connect \
+		proxy-ftp proxy-http
 
 .if defined(NOPORTDOCS)
 MAKE_ENV+=	NOPORTDOCS=YES
@@ -54,18 +54,13 @@ PLIST_SUB+=	SSLOPT=""
 PLIST_SUB+=	SSLOPT="@comment "
 .endif
 
-.if !defined(WITHOUT_PROXY)
-SHARED_MODULES+= proxy proxy-connect proxy-ftp proxy-http
-PLIST_SUB+=	PROXYOPT=""
-.else
-PLIST_SUB+=	PROXYOPT="@comment "
-.endif
-
-.if !defined(WITHOUT_CACHE)
-SHARED_MODULES+= cache mem-cache file-cache #disk-cache
-PLIST_SUB+=	CACHEOPT=""
+.if ${WITH_MPM} != "prefork"
+CONFIGURE_ARGS+= --enable-threads
+SHARED_MODULES+= mem-cache
+PLIST_SUB+=	THREADONLY=""
+PKGNAMESUFFIX=	-${WITH_MPM}
 .else
-PLIST_SUB+=	CACHEOPT="@comment "
+PLIST_SUB+=	THREADONLY="@comment "
 .endif
 
 CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}"
@@ -78,8 +73,15 @@ pre-extract:
 	@${ECHO_MSG} "You can disable support for SSL by defining WITHOUT_SSL."
 .endif
 
+post-extract:
+	@${CP} ${DISTDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif
+
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.orig" -exec rm -f {} \;
+	@cd ${WRKSRC}/docs/docroot && \
+	 for f in index.html.*; do (\
+	  ${PERL} -pi -e 's,apache_pb,icons/freebsd.gif" ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
+	 ); done
+	@${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
 
 pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL