- Fix plist where apr_dbd is used

- Fix Postgresql build, don't trust pg_config
- Don't overwrite apr_dbd_mysql.c
- Bump PORTREVISION

No cookie for:  clement

3 files changed, 20 insertions, 5 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index b4ed076b415a..51d72f06913b 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	apache
 PORTVERSION=	2.2.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -199,10 +199,6 @@ pre-everything::
 show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
-post-extract:
-	@${INSTALL_DATA} ${FILESDIR}/apr_dbd_mysql.c \
-		${WRKSRC}/srclib/apr-util/dbd/
-
 post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index d205db60b966..1f75820d0fd8 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -120,22 +120,29 @@ CFLAGS+=	-I${LOCALBASE}/include/mysql -DHAVE_MYSQL_H
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
 CONFIGURE_ENV+=	LIBS="${LIBS}"
 WITH_THREADS=	YES
+PLIST_SUB+=	MYSQL=""
 .else
 CONFIGURE_ARGS+= --without-mysql
+PLIST_SUB+=	MYSQL="@comment"
 .endif
 
 .if defined(WITH_PGSQL)
 USE_PGSQL=	YES
 CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}
+CONFIGURE_ENV+=	ac_cv_path_PGSQL_CONFIG=""
+PLIST_SUB+=	PGSQL=""
 .else
 CONFIGURE_ARGS+= --without-pgsql
+PLIST_SUB+=	PGSQL="@comment"
 .endif
 
 .if defined(WITH_SQLITE)
 USE_SQLITE=	YES
 CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE}
+PLIST_SUB+=	SQLITE3=""
 .else
 CONFIGURE_ARGS+= --without-sqlite3
+PLIST_SUB+=	SQLITE3="@comment"
 .endif
 
 .if !defined(WITHOUT_SSL)
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 123996632381..02cd3908ecc6 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -174,6 +174,18 @@ include/apache22/util_xml.h
 %%APR_PORTS%%lib/libaprutil-1.la
 %%APR_PORTS%%lib/libaprutil-1.so
 %%APR_PORTS%%lib/libaprutil-1.so.3
+%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql-1.so
+%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.so
+%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.la
+%%APR_PORTS%%%%MYSQL%%lib/apr-util-1/apr_dbd_mysql.a
+%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql-1.so
+%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.so
+%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.la
+%%APR_PORTS%%%%PGSQL%%lib/apr-util-1/apr_dbd_pgsql.a
+%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3-1.so
+%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.so
+%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.la
+%%APR_PORTS%%%%SQLITE3%%lib/apr-util-1/apr_dbd_sqlite3.a
 libexec/apache22/httpd.exp
 %%MOD_ACTIONS%%libexec/apache22/mod_actions.so
 %%MOD_ALIAS%%libexec/apache22/mod_alias.so