[Maintainer Update] Port: www/php-dyn

	Update from 1.2 to 1.2.1 release.  Use WANT_ variables.
	Work with Apache 2.

PR:		ports/50265
Submitted by:	Alex Dupre <sysadmin@alexdupre.com>

4 files changed, 26 insertions, 13 deletions

diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile
index 40ea24a86808..9abb53cac072 100644
--- a/www/php-dyn/Makefile
+++ b/www/php-dyn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	php-dyn
-PORTVERSION=	1.2
+PORTVERSION=	1.2.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,30 +16,42 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	A PHP Extension to help debugging a PHP script
 
-BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
-		autoconf:${PORTSDIR}/devel/autoconf \
-		phpize:${PORTSDIR}/www/mod_php4
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
+BUILD_DEPENDS=	phpize:${PORTSDIR}/www/mod_php4
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${APACHE_PORT} \
+		${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
 
 USE_LIBTOOL=	yes
+WANT_AUTOMAKE_VER=	15
+WANT_AUTOCONF_VER=	253
+
 CONFIGURE_ARGS=	--enable-php_dyn=shared \
 		--with-php-config=${LOCALBASE}/bin/php-config
 
+EXT_DIR=	20020429
+PLIST_SUB=	EXT_DIR=${EXT_DIR}
+
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_APACHE2) || exists(${LOCALBASE}/include/apache2/apr.h)
+APACHE_PORT?=	${PORTSDIR}/www/apache2
+.else
+APACHE_PORT?=	${PORTSDIR}/www/apache13
+.endif
+
 post-extract:
 	@${ECHO_MSG} "===>    PHPizing for ${PORTNAME}-${PORTVERSION}"
 	@(cd ${WRKSRC}; ${LOCALBASE}/bin/phpize)
 
 post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g" \
+	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%EXT_DIR%%|${EXT_DIR}|g" \
 		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/php/extensions
+	@${MKDIR} ${PREFIX}/lib/php/${EXT_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/modules/php_dyn.so \
-		${PREFIX}/lib/php/extensions
+		${PREFIX}/lib/php/${EXT_DIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README.en ${DOCSDIR}/README
@@ -48,4 +60,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/php-dyn/distinfo b/www/php-dyn/distinfo
index 9c6b278474d2..2fe2d69139a5 100644
--- a/www/php-dyn/distinfo
+++ b/www/php-dyn/distinfo
@@ -1 +1 @@
-MD5 (php_dyn-1.2.tgz) = 75a90c4731ad4b1ee4887dc24a118b67
+MD5 (php_dyn-1.2.1.tgz) = cad66289a4d2fb6aa3165b4e9a0d3c5c
diff --git a/www/php-dyn/files/pkg-message.in b/www/php-dyn/files/pkg-message.in
index ebc7591bf5c5..8adc8ec7f0de 100644
--- a/www/php-dyn/files/pkg-message.in
+++ b/www/php-dyn/files/pkg-message.in
@@ -4,6 +4,6 @@ You have installed the php-dyn package.
 
 Edit %%LOCALBASE%%/etc/php.ini and add:
 
-zend_extension="%%PREFIX%%/lib/php/extensions/php_dyn.so"
+zend_extension="%%PREFIX%%/lib/php/%%EXT_DIR%%/php_dyn.so"
 
 *****************************************************************************
diff --git a/www/php-dyn/pkg-plist b/www/php-dyn/pkg-plist
index 1490bd683d7a..b42d091dbe2d 100644
--- a/www/php-dyn/pkg-plist
+++ b/www/php-dyn/pkg-plist
@@ -1,3 +1,4 @@
-lib/php/extensions/php_dyn.so
+lib/php/%%EXT_DIR%%/php_dyn.so
 %%PORTDOCS%%share/doc/php-dyn/README
+@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
 %%PORTDOCS%%@dirrm share/doc/php-dyn