- House keeping (update to current standards: USE_RC_SUBR, USE_LDCONFIG,etc.)

- Remove python dependency unless apr_dbd_mysql is built [1]

Required by:		many [1]

6 files changed, 82 insertions, 20 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index deb79cce3e54..bc8668a90e44 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -22,7 +22,12 @@ MAINTAINER?=	clement@FreeBSD.org
 COMMENT?=	Version 2.2 of Apache web server with ${WITH_MPM:L} MPM.
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+
+# When using apr_mysql_db we _must_ rebuild makefiles
+.if defined(WITH_FULLBUILD) || defined(WITH_MYSQL)
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+SCRIPTS_ENV+=	FULLBUILD=on
+.endif
 
 LATEST_LINK=	apache22
 
@@ -44,11 +49,11 @@ USE_BZIP2=		yes
 USE_ICONV=		yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_PERL5=		yes
-USE_RC_SUBR=		yes
+USE_RC_SUBR=		apache22.sh
 LIBTOOLFILES=		configure
 
 .if !defined(WITH_APR_FROM_PORTS)
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=	yes
 .endif
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
@@ -65,7 +70,6 @@ CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
 		LOCALBASE="${LOCALBASE}"
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAKE_ENV+=	DESTDIR=${DESTDIR} EXPR_COMPAT=yes
 
@@ -169,8 +173,6 @@ post-extract:
 
 post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache22.sh
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
 	@${REINPLACE_CMD} -e "s,%%OSVERSION%%,${OSVERSION}," \
@@ -193,16 +195,7 @@ post-configure:
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-install-startup-script:
-.if !exists(${WRKDIR}/apache22.sh)
-	@${MKDIR} ${WRKDIR}
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache22.sh
-.endif
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache22.sh startup script."
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache22.sh ${PREFIX}/etc/rc.d/apache22.sh
-
-post-install: install-startup-script
+post-install:
 	@${MKDIR} ${PREFIX}/etc/apache22/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache22/Includes
 	@${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${PREFIX}/etc/apache22/Includes
diff --git a/www/apache22/files/apache.sh b/www/apache22/files/apache22.sh.in
index eec4c2a84de0..89f1f881d82d 100644
--- a/www/apache22/files/apache.sh
+++ b/www/apache22/files/apache22.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.14 2006-02-20 20:47:47 dougb Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache22.sh.in,v 1.1 2006-09-24 16:16:40 clement Exp $
 #
 
 # PROVIDE: apache22
diff --git a/www/apache22/files/patch-srclib-apr-buildconf b/www/apache22/files/patch-srclib-apr-buildconf
new file mode 100644
index 000000000000..61d311890e74
--- /dev/null
+++ b/www/apache22/files/patch-srclib-apr-buildconf
@@ -0,0 +1,41 @@
+--- srclib/apr/buildconf.orig	Tue Jun 14 14:11:15 2005
++++ srclib/apr/buildconf	Sun Sep 24 15:17:36 2006
+@@ -23,7 +23,7 @@
+ #
+ build/buildcheck.sh || exit 1
+ 
+-libtoolize=`build/PrintPath glibtoolize libtoolize15 libtoolize14 libtoolize`
++libtoolize="${LIBTOOLIZE}"
+ if [ "x$libtoolize" = "x" ]; then
+     echo "libtoolize not found in path"
+     exit 1
+@@ -52,7 +52,7 @@
+    # Expecting the code above to be very portable, but just in case...
+    if [ -z "$ltfile" -o ! -f "$ltfile" ]; then
+      ltpath=`dirname $libtoolize`
+-     ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
++     ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4}
+    fi
+ fi
+   
+@@ -61,7 +61,7 @@
+     exit 1
+ fi
+ 
+-echo "buildconf: Using libtool.m4 at ${ltfile}."
++echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}."
+ 
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ 
+@@ -87,8 +87,11 @@
+ # Remove autoconf 2.5x's cache directory
+ rm -rf autom4te*.cache
+ 
++
++if [ "x${FULLBUILD}" = "xon" ] ; then
+ echo "Generating 'make' outputs ..."
+ build/gen-build.py make
++fi
+ 
+ # Create RPM Spec file
+ if [ -f `which cut` ]; then
diff --git a/www/apache22/files/patch-srclib-apr-utils-buildconf b/www/apache22/files/patch-srclib-apr-utils-buildconf
new file mode 100644
index 000000000000..a916dba5deb8
--- /dev/null
+++ b/www/apache22/files/patch-srclib-apr-utils-buildconf
@@ -0,0 +1,13 @@
+--- srclib/apr-util/buildconf.orig	Sat Mar 25 20:30:07 2006
++++ srclib/apr-util/buildconf	Sun Sep 24 15:13:18 2006
+@@ -81,8 +81,10 @@
+ #
+ # Generate build-outputs.mk for the build systme
+ #
++if [ "x${FULLBUILD}" = "xon" ] ; then
+ echo "Generating 'make' outputs ..."
+ $apr_src_dir/build/gen-build.py make
++fi
+ 
+ #
+ # If Expat has been bundled, then go and configure the thing
diff --git a/www/apache22/files/patch-srclib:apr:build:buildcheck.sh b/www/apache22/files/patch-srclib:apr:build:buildcheck.sh
index ca7b49943294..a6641eed7acb 100644
--- a/www/apache22/files/patch-srclib:apr:build:buildcheck.sh
+++ b/www/apache22/files/patch-srclib:apr:build:buildcheck.sh
@@ -1,6 +1,22 @@
---- srclib/apr/build/buildcheck.sh.orig	Fri Jan 14 11:16:31 2005
-+++ srclib/apr/build/buildcheck.sh	Wed Feb 23 11:16:25 2005
-@@ -38,7 +38,7 @@
+--- srclib/apr/build/buildcheck.sh.orig	Fri Jun 17 00:53:05 2005
++++ srclib/apr/build/buildcheck.sh	Sun Sep 24 15:18:38 2006
+@@ -2,6 +2,7 @@
+ 
+ echo "buildconf: checking installation..."
+ 
++if [ "x${FULLBUILD}" = "xon" ] ; then
+ # any python
+ python=`build/PrintPath python`
+ if test -z "$python"; then
+@@ -13,6 +14,7 @@
+ py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
+ echo "buildconf: python version $py_version (ok)"
+ fi
++fi
+ 
+ # autoconf 2.50 or newer
+ ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
+@@ -38,7 +40,7 @@
  # output is multiline from 1.5 onwards
  
  # Require libtool 1.4 or newer
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index cdbae0d6c753..ce443e792f03 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -44,7 +44,6 @@
 @unexec if cmp -s %D/etc/apache22/extra/httpd-vhosts.conf %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf; then rm -f %D/etc/apache22/extra/httpd-vhosts.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-vhosts.conf
 @exec [ -f %D/etc/apache22/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/etc/apache22/extra/httpd-vhosts.conf
-etc/rc.d/apache22.sh
 etc/apache22/Includes/no-accf.conf
 include/apache22/ap_compat.h
 include/apache22/ap_config.h