3 files changed, 83 insertions, 84 deletions

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 218a4e452bde..1503ee0a4510 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.39
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.apache.org/dist/httpd/ \
 		http://apache.mirrorcentral.com/dist/httpd/ \
@@ -25,7 +25,7 @@ MAINTAINER?=	perky@fallin.lv
 
 LATEST_LINK=	apache2
 
-WITH_MPM?=	prefork
+WITH_MPM?=	prefork # or worker, perchild
 HTTP_PORT?=	80
 
 HAS_CONFIGURE=	yes
@@ -42,33 +42,23 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}"
 SHARED_MODULES= all cgid ext_filter bucketeer
-PREFIX_RELDEST=	${PREFIX:S,${DESTDIR},,}
+PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 RC_SUB=		-e 's,@@PREFIX@@,${PREFIX_RELDEST},g'
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
-PLIST_SUB+=	DESTDIR=${DESTDIR}
 
 .if defined(NOPORTDOCS)
 MAKE_ENV+=	-DNOPORTDOCS
 .endif
 
-.if defined(WITH_BUNDLED_EXPAT)
+.if !defined(WITHOUT_BUNDLED_EXPAT)
 EXPAT_PATHS=	xml/expat-cvs xml/expat $$srcdir/xml/expat
 PLIST_SUB+=	EXPAT=""
 .else
 LIB_DEPENDS=	expat.2:${PORTSDIR}/textproc/expat2
-EXPAT_PATHS=	${LOCALBASE} ${PREFIX} ${LOCALBASE:S,${DESTDIR},,}
+EXPAT_PATHS=	${LOCALBASE} ${PREFIX} ${LOCALBASE:S,^${DESTDIR},,}
 PLIST_SUB+=	EXPAT="@comment "
 .endif
 
-.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
-SHARED_MODULES+= ssl
-PLIST_SUB+=	MODSSL=""
-RC_SUB+=	-e 's,@@SSL@@,ssl,g'
-.else
-PLIST_SUB+=	MODSSL="@comment "
-RC_SUB+=	-e 's,@@SSL@@,,g'
-.endif
-
 .if defined(WITH_SUEXEC)
 SUEXEC_DOCROOT?= ${PREFIX_RELDEST}/www/data
 SUEXEC_USERDIR?= public_html
@@ -85,6 +75,28 @@ PLIST_SUB+=	SUEXEC=""
 PLIST_SUB+=	SUEXEC="@comment "
 .endif
 
+.if ${WITH_MPM} != "prefork"
+PKGNAMESUFFIX=	-${WITH_MPM}
+WITH_THREADS=	yes
+.if !defined(FORCE_THREADING_MPM)
+FORBIDDEN=	"doesn't work with threading MPMs on FreeBSD. If you are\
+		brave enough, make again with FORCE_THREADING_MPM=yes"
+.endif
+.endif
+
+.if defined(WITH_THREADS)
+CONFIGURE_ARGS+= --enable-threads
+.endif
+
+.if !defined(WITHOUT_SSL) && exists(/usr/lib/libcrypto.so)
+SHARED_MODULES+= ssl
+PLIST_SUB+=	MODSSL=""
+RC_SUB+=	-e 's,@@SSL@@,ssl,g'
+.else
+PLIST_SUB+=	MODSSL="@comment "
+RC_SUB+=	-e 's,@@SSL@@,,g'
+.endif
+
 .if !defined(WITHOUT_CACHE) && defined(WITH_THREADS)
 SHARED_MODULES+= cache file-cache disk-cache mem_cache
 PLIST_SUB+=	MODCACHE=""
@@ -106,19 +118,6 @@ PLIST_SUB+=	EXPERIMENTAL=""
 PLIST_SUB+=	EXPERIMENTAL="@comment "
 .endif
 
-.if ${WITH_MPM} != "prefork"
-PKGNAMESUFFIX=	-${WITH_MPM}
-WITH_THREADS=	yes
-.if !defined(FORCE_THREADING_MPM)
-FORBIDDEN=	"doesn\'t work with threading MPMs on FreeBSD. If you are \
-		brave enough, make again with -DFORCE_THREADING_MPM"
-.endif
-.endif
-
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+= --enable-threads
-.endif
-
 CONFIGURE_ARGS+= --enable-mods-shared="${SHARED_MODULES}" ${CONFIGURE_TARGET}
 
 MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
@@ -130,7 +129,7 @@ post-extract:
 post-patch:
 	@cd ${WRKSRC}/docs/docroot && \
 	 for f in index.html.*; do (\
-	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif" \
+	  ${REINPLACE_CMD} -e 's,apache_pb,icons/freebsd.gif"\
 		ALT="[Powered by FreeBSD]"><IMG SRC="apache_pb2_ani,g' $$f \
 	 ); done
 	@${REINPLACE_CMD} -e 's,/usr .*/xml/expat,${EXPAT_PATHS},g' \
diff --git a/www/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index 1ce27f5cdf55..78a67b909c46 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/files/patch-Makefile.in
@@ -6,8 +6,8 @@
  	for i in mime.types magic; do \
 -		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
 +		test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
-+		cp -f $$i $$i.default; \
-+		$(INSTALL_DATA) $$i.default $(DESTDIR)$(sysconfdir); \
++		cp -f $$i $$i-dist; \
++		$(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \
  	done; \
  	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
  		cd $$j ; \
@@ -23,15 +23,15 @@
  	@echo Installing HTML documents
 -	@test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)
 -	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir))
-+	@test -d $(DESTDIR)$(htdocsdir).default || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir).default
-+	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir).default)
-+	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir).default $(DESTDIR)$(htdocsdir)
++	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
++	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
++	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
 +.if !defined(NOPORTDOCS)
  	@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
 -	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf
 +.endif
-+	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf
++	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-error:
  	@echo Installing error documents
@@ -42,10 +42,10 @@
 -	@test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)
 -	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)
 -	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf
-+	@test -d $(DESTDIR)$(cgidir).default || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir).default
-+	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir).default
-+	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir).default $(DESTDIR)$(cgidir)
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir).default && find . -name "CVS" -print | xargs rm -rf
++	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
++	@cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
++	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
++	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index f3aa06c8089d..297d23c2551d 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -6,11 +6,11 @@ etc/apache2/highperformance-std.conf
 @unexec if cmp -s %D/etc/apache2/httpd.conf %D/etc/apache2/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi
 etc/apache2/httpd-std.conf
 @exec [ -f %B/httpd.conf ] || cp %B/%f %B/httpd.conf
-@unexec if cmp -s %D/etc/apache2/magic %D/etc/apache2/magic.default; then rm -f %D/etc/apache2/magic; fi
-etc/apache2/magic.default
+@unexec if cmp -s %D/etc/apache2/magic %D/etc/apache2/magic-dist; then rm -f %D/etc/apache2/magic; fi
+etc/apache2/magic-dist
 @exec [ -f %B/magic ] || cp %B/%f %B/magic
-@unexec if cmp -s %D/etc/apache2/mime.types %D/etc/apache2/mime.types.default; then rm -f %D/etc/apache2/mime.types; fi
-etc/apache2/mime.types.default
+@unexec if cmp -s %D/etc/apache2/mime.types %D/etc/apache2/mime.types-dist; then rm -f %D/etc/apache2/mime.types; fi
+etc/apache2/mime.types-dist
 @exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
 @unexec if cmp -s %D/etc/apache2/ssl.conf %D/etc/apache2/ssl-std.conf; then rm -f %D/etc/apache2/ssl.conf; fi
 etc/apache2/ssl-std.conf
@@ -495,46 +495,46 @@ share/apache2/special.mk
 %%PORTDOCS%%share/doc/apache2/vhosts/name-based.html.ja.jis
 @exec mkdir -p %D/www
 @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin.default %D/www/cgi-bin
-www/cgi-bin.default/printenv
-www/cgi-bin.default/test-cgi
+@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin-dist %D/www/cgi-bin
+www/cgi-bin-dist/printenv
+www/cgi-bin-dist/test-cgi
 @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-@exec [ ! -d %D/www/data ] && ln -fs %D/www/data.default %D/www/data
-www/data.default/apache_pb.gif
-www/data.default/apache_pb.png
-www/data.default/apache_pb2.gif
-www/data.default/apache_pb2.png
-www/data.default/apache_pb2_ani.gif
-www/data.default/index.html.ca
-www/data.default/index.html.cz.iso8859-2
-www/data.default/index.html.de
-www/data.default/index.html.dk
-www/data.default/index.html.ee
-www/data.default/index.html.el
-www/data.default/index.html.en
-www/data.default/index.html.es
-www/data.default/index.html.et
-www/data.default/index.html.fr
-www/data.default/index.html.he.iso8859-8
-www/data.default/index.html.hr.iso8859-2
-www/data.default/index.html.it
-www/data.default/index.html.ja.iso2022-jp
-www/data.default/index.html.ko.euc-kr
-www/data.default/index.html.lb.utf8
-www/data.default/index.html.nl
-www/data.default/index.html.nn
-www/data.default/index.html.no
-www/data.default/index.html.po.iso8859-2
-www/data.default/index.html.pt
-www/data.default/index.html.pt-br
-www/data.default/index.html.ru.cp-1251
-www/data.default/index.html.ru.cp866
-www/data.default/index.html.ru.iso-ru
-www/data.default/index.html.ru.koi8-r
-www/data.default/index.html.ru.utf8
-www/data.default/index.html.se
-www/data.default/index.html.var
-www/data.default/index.html.zh
+@exec [ ! -d %D/www/data ] && ln -fs %D/www/data-dist %D/www/data
+www/data-dist/apache_pb.gif
+www/data-dist/apache_pb.png
+www/data-dist/apache_pb2.gif
+www/data-dist/apache_pb2.png
+www/data-dist/apache_pb2_ani.gif
+www/data-dist/index.html.ca
+www/data-dist/index.html.cz.iso8859-2
+www/data-dist/index.html.de
+www/data-dist/index.html.dk
+www/data-dist/index.html.ee
+www/data-dist/index.html.el
+www/data-dist/index.html.en
+www/data-dist/index.html.es
+www/data-dist/index.html.et
+www/data-dist/index.html.fr
+www/data-dist/index.html.he.iso8859-8
+www/data-dist/index.html.hr.iso8859-2
+www/data-dist/index.html.it
+www/data-dist/index.html.ja.iso2022-jp
+www/data-dist/index.html.ko.euc-kr
+www/data-dist/index.html.lb.utf8
+www/data-dist/index.html.nl
+www/data-dist/index.html.nn
+www/data-dist/index.html.no
+www/data-dist/index.html.po.iso8859-2
+www/data-dist/index.html.pt
+www/data-dist/index.html.pt-br
+www/data-dist/index.html.ru.cp-1251
+www/data-dist/index.html.ru.cp866
+www/data-dist/index.html.ru.iso-ru
+www/data-dist/index.html.ru.koi8-r
+www/data-dist/index.html.ru.utf8
+www/data-dist/index.html.se
+www/data-dist/index.html.var
+www/data-dist/index.html.zh
 www/error/HTTP_BAD_GATEWAY.html.var
 www/error/HTTP_BAD_REQUEST.html.var
 www/error/HTTP_FORBIDDEN.html.var
@@ -784,8 +784,8 @@ www/icons/world2.png
 @dirrm www/icons
 @dirrm www/error/include
 @dirrm www/error
-@dirrm www/data.default
-@dirrm www/cgi-bin.default
+@dirrm www/data-dist
+@dirrm www/cgi-bin-dist
 @dirrm www
 %%PORTDOCS%%@dirrm share/doc/apache2/vhosts
 %%PORTDOCS%%@dirrm share/doc/apache2/style