- Fix slave ports [1]

- Fix plist [2]
- Fix CONFLICTS with devel/apr-svn [3]
- Fix install when index.html is modified
- Bump PORT_REVISION

PR:             ports/118348 [1], ports/118338 [2],ports/117097 [2]
                ports/90088 [3], ports/118349 [3]
Submitted by:   Andrey Beresovsky <and at sfedu dot ru> [1],
                Dimitry Andric <dimitry at andric dot com> [2],
                YAMAMOTO Takao <yamamoto at computec dot co dot jp>
                Melvyn Sopacua <melvyn atmelvyn dot homeunix dot org> [3],
                Dominic Fandrey <lon_kamikaze at gmx dot de> [3]

3 files changed, 19 insertions, 18 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index c2356d4cad1f..09c371e3f38c 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -45,6 +45,13 @@ USE_RC_SUBR=		apache22.sh htcacheclean.sh
 SUB_LIST+=		RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 LIBTOOLFILES=		configure
 
+# for slave ports
+.if !defined(MASTERDIR)
+APACHEDIR=	${.CURDIR}
+.else
+APACHEDIR=	${MASTERDIR}
+.endif
+
 .if !defined(WITHOUT_APACHE_OPTIONS)
 OPTIONS= \
 	APR_FROM_PORTS "Use devel/apr as APR (beware!)" Off \
@@ -54,7 +61,7 @@ OPTIONS= \
 	SQLITE "Enable SQLite support for apr-dbd" Off \
 	IPV6 "Enable IPv6 support" On \
 	PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off
-.include "${.CURDIR}/Makefile.options"
+.include "${APACHEDIR}/Makefile.options"
 .endif
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
@@ -94,14 +101,6 @@ WITH_EXCEPTION_HOOK=	YES
 CONFIGURE_ARGS+=	--enable-exception-hook
 .endif
 
-# for slave ports
-.if !defined(MASTERDIR)
-APACHEDIR=	${.CURDIR}
-.else
-APACHEDIR=	${MASTERDIR}
-.endif
-
-
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 .include <bsd.port.pre.mk>
@@ -123,7 +122,7 @@ CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
 .else
 USE_LDCONFIG=	yes
 PLIST_SUB+=	APR_PORTS=""
-CONFLICTS+=	apr-1.*
+CONFLICTS+=	apr-1.* apr-db4[0-9]-1.*
 CONFIGURE_ENV+=	USE_BUNDLED_APR=YES
 .endif
 
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index d401ae9b84ec..14bf7f150465 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-04-24 13:08:01.000000000 +0200
-+++ Makefile.in	2007-09-20 08:47:23.000000000 +0200
+--- Makefile.in.orig	2007-04-24 11:08:01.000000000 +0000
++++ Makefile.in	2007-12-03 21:15:51.000000000 +0000
 @@ -31,9 +31,11 @@
  install-conf:
  	@echo Installing configuration files
@@ -31,7 +31,7 @@
  	    	fi; \
  	    	fi; \
  	    done ; \
-@@ -117,48 +119,28 @@
+@@ -117,48 +119,29 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -48,8 +48,9 @@
 -		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
 -	    fi; \
 -	fi
++	    $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
 +		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \
-+		( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html)
++		( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true
  
  install-error:
 -	-@if [ -d $(DESTDIR)$(errordir) ]; then \
@@ -89,7 +90,7 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -206,12 +188,14 @@
+@@ -206,12 +189,14 @@
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 3839655128ba..df2682af47b9 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -277,7 +277,8 @@ www/apache22/cgi-bin/printenv
 www/apache22/cgi-bin/test-cgi
 @unexec if cmp -s %D/www/apache22/data/index.html %D/%%EXAMPLESDIR%%/index.html; then rm -f %D/www/apache22/data/index.html; fi
 %%EXAMPLESDIR%%/index.html
-@exec [ -f %D/www/apache22/data/index.html ] || cp %D/%%EXAMPLESDIR%%/www/apache22/data/index.html %D/www/apache22/data/index.html
+@exec [ -d %D/www/apache22/data ] || mkdir -p %D/www/apache22/data
+@exec [ -f %D/www/apache22/data/index.html ] || cp %D/%%EXAMPLESDIR%%/index.html %D/www/apache22/data/index.html
 www/apache22/error/HTTP_BAD_GATEWAY.html.var
 www/apache22/error/HTTP_BAD_REQUEST.html.var
 www/apache22/error/HTTP_FORBIDDEN.html.var
@@ -526,7 +527,7 @@ www/apache22/icons/world2.png
 @dirrm www/apache22/error/include
 @dirrm www/apache22/error
 @dirrmtry www/apache22/data
-@dirrm www/apache22/cgi-bin
+@dirrmtry www/apache22/cgi-bin
 @dirrm %%EXAMPLESDIR%%/extra
 @dirrm %%EXAMPLESDIR%%
 @dirrm share/apache22/build