- Various package fixes

- Bump PORTREVISION

5 files changed, 17 insertions, 5 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index c1a90522f89c..b5dc19e2b836 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.0.55
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/$/:powerlogo/}
@@ -264,5 +265,8 @@ post-install: install-startup-script
 	@${MKDIR} ${PREFIX}/etc/apache2/Includes
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	@[ -d ${DOCSDIR}/style/lang/ ] && ${TOUCH} ${DOCSDIR}/style/lang/.keepme
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index d9eb5b76a727..ed39993491b9 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.1.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
@@ -230,6 +231,9 @@ install-startup-script:
 post-install: install-startup-script
 	@${MKDIR} ${PREFIX}/etc/apache21/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache21/Includes
-	@@${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	@[ -d ${DOCSDIR}/style/lang/ ] && ${TOUCH} ${DOCSDIR}/style/lang/.keepme
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 437379a11fe5..b38e026988f2 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -1,5 +1,5 @@
 @comment $FreeBSD$
-@exec mkdir -p %D/etc/apache21 2> /dev/null
+@exec mkdir -p %D/etc/apache21/extra 2> /dev/null
 @unexec if cmp -s %D/etc/apache21/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache21/httpd.conf; fi
 %%EXAMPLESDIR%%/httpd.conf
 @exec [ -f %D/etc/apache21/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache21/httpd.conf
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 79672f9e7c8c..f99790606807 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
@@ -229,6 +230,9 @@ install-startup-script:
 post-install: install-startup-script
 	@${MKDIR} ${PREFIX}/etc/apache22/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache22/Includes
-	@@${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	@[ -d ${DOCSDIR}/style/lang/ ] && ${TOUCH} ${DOCSDIR}/style/lang/.keepme
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 88c5947ece52..544dc5965f35 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -1,5 +1,5 @@
 @comment $FreeBSD$
-@exec mkdir -p %D/etc/apache22 2> /dev/null
+@exec mkdir -p %D/etc/apache22/extra 2> /dev/null
 @unexec if cmp -s %D/etc/apache22/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache22/httpd.conf; fi
 %%EXAMPLESDIR%%/httpd.conf
 @exec [ -f %D/etc/apache22/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache22/httpd.conf
@@ -8,7 +8,7 @@
 @exec [ -f %D/etc/apache22/magic ] || cp %D/%%EXAMPLESDIR%%/magic %D/etc/apache22/magic
 @unexec if cmp -s %D/etc/apache22/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/etc/apache22/mime.types; fi
 %%EXAMPLESDIR%%/mime.types
-@exec [ -f %D/etc/apache22/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types- %D/etc/apache22/mime.types
+@exec [ -f %D/etc/apache22/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/etc/apache22/mime.types
 @unexec if cmp -s %D/etc/apache22/extra/httpd-autoindex.conf %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf; then rm -f %D/etc/apache22/extra/httpd-autoindex.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-autoindex.conf
 @exec [ -f %D/etc/apache22/extra/httpd-autoindex.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf %D/etc/apache22/extra/httpd-autoindex.conf