Unbreak build with new php 4.3.2, and Various fixes.

PR:		ports/52803
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (maintainer)

3 files changed, 11 insertions, 22 deletions

diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile
index b20c5da18f44..70e8590987cf 100644
--- a/www/php-templates/Makefile
+++ b/www/php-templates/Makefile
@@ -19,36 +19,25 @@ DISTFILES+=	php_templates-doc-eng-1.1${EXTRACT_SUFX}
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	A template framework for PHP
 
-BUILD_DEPENDS=	phpize:${PORTSDIR}/www/mod_php4
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
-USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
-
 WRKSRC=		${WRKDIR}/templates
 
-CONFIGURE_ARGS=	--enable-templates=shared \
-		--with-php-config=${PREFIX}/bin/php-config
+USE_PHPIZE=	yes
 
-EXT_DIR=	20020429
-PLIST_SUB=	EXT_DIR=${EXT_DIR}
+CONFIGURE_ARGS=	--enable-templates=shared
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-post-extract:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/phpize
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%EXT_DIR%%|${EXT_DIR}|g" \
+	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/php/${EXT_DIR}
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/modules/templates.so \
-		${PREFIX}/lib/php/${EXT_DIR}
+		${PREFIX}/lib/php/${PHP_EXT_DIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}-doc/* ${DOCSDIR}
@@ -57,4 +46,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/php-templates/pkg-message b/www/php-templates/pkg-message
index d3fafeacfce1..22b6e4c63123 100644
--- a/www/php-templates/pkg-message
+++ b/www/php-templates/pkg-message
@@ -4,6 +4,6 @@ You have installed the php-templates package.
 
 Edit %%LOCALBASE%%/etc/php.ini and add:
 
-extension="%%PREFIX%%/lib/php/%%EXT_DIR%%/templates.so"
+extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/templates.so"
 
 *****************************************************************************
diff --git a/www/php-templates/pkg-plist b/www/php-templates/pkg-plist
index 6c07b73a3ec4..8fedeead348c 100644
--- a/www/php-templates/pkg-plist
+++ b/www/php-templates/pkg-plist
@@ -1,6 +1,6 @@
-lib/php/%%EXT_DIR%%/templates.so
+lib/php/%%PHP_EXT_DIR%%/templates.so
 %%PORTDOCS%%share/doc/php-templates/CHANGELOG
 %%PORTDOCS%%share/doc/php-templates/php_templates-eng.html
 %%PORTDOCS%%share/doc/php-templates/php_templates.css
-@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
+@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
 %%PORTDOCS%%@dirrm share/doc/php-templates