Unbreak build with new php 4.3.2, and Various fixes.

PR:		ports/52804
Reviewed by:	Jens Rehsack <rehsack@liwing.de>
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (maintainer)

6 files changed, 20 insertions, 58 deletions

diff --git a/devel/php-dbg/Makefile b/devel/php-dbg/Makefile
index 8f55ecc..8116ecf 100644
--- a/devel/php-dbg/Makefile
+++ b/devel/php-dbg/Makefile
@@ -16,42 +16,22 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	rehsack@liwing.de
 COMMENT=	Debugger for PHP4
 
-BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
-		autoconf:${PORTSDIR}/devel/autoconf \
-		phpize:${PORTSDIR}/www/mod_php4
-RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
-USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/dbg
-CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler \
-		--with-php-config=${PREFIX}/bin/php-config
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
+USE_PHPIZE=	yes
+CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler
 PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
-
-PHPCONFIG=	${LOCALBASE}/bin/php-config
-.if exists(${PHPCONFIG})
-PHPEXTENSIONS!=	${PHPCONFIG} --extension-dir
-.else
-PHPEXTENSIONS=	${LOCALBASE}/lib/php/extensions
-.endif
-
-post-extract:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/phpize
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" \
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
-	@${SED} "s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" < ${.CURDIR}/pkg-plist | \
-		${SED} "s|${LOCALBASE}/||" >${PLIST}
 
 do-install:
-	@${MKDIR} ${PHPEXTENSIONS}
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/modules/dbg.so \
-		${PHPEXTENSIONS}
+		${PREFIX}/lib/php/${PHP_EXT_DIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/php-dbg/pkg-message b/devel/php-dbg/pkg-message
index 59b308e..355104c 100644
--- a/devel/php-dbg/pkg-message
+++ b/devel/php-dbg/pkg-message
@@ -5,12 +5,12 @@ This product includes DBG PHP Debugger, Copyright(C) 1999, 2000, 2001,
 The php debugger has been installed successful.
 Add a line containing
 
-	extension=%%PREFIX%%/lib/php/extensions/dbg.so
+	extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/dbg.so
 
 to your php.ini to load it.
 If you have the Zend Optimizer installed, add the line
 
-	zend_extension=%%PREFIX%%/lib/php/extensions/dbg.so
+	zend_extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/dbg.so
 
 to your [zend] section in the php.ini file, too.
 Add following section to enable/disable whatever you need from the debugger:
diff --git a/devel/php-dbg/pkg-plist b/devel/php-dbg/pkg-plist
index d4a3f04..b49ec0b 100644
--- a/devel/php-dbg/pkg-plist
+++ b/devel/php-dbg/pkg-plist
@@ -1 +1,2 @@
-%%PHPEXTENSIONS%%/dbg.so
+lib/php/%%PHP_EXT_DIR%%/dbg.so
+@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true
diff --git a/devel/php-dbg2/Makefile b/devel/php-dbg2/Makefile
index 8f55ecc..8116ecf 100644
--- a/devel/php-dbg2/Makefile
+++ b/devel/php-dbg2/Makefile
@@ -16,42 +16,22 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	rehsack@liwing.de
 COMMENT=	Debugger for PHP4
 
-BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
-		autoconf:${PORTSDIR}/devel/autoconf \
-		phpize:${PORTSDIR}/www/mod_php4
-RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
-USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/dbg
-CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler \
-		--with-php-config=${PREFIX}/bin/php-config
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
+USE_PHPIZE=	yes
+CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler
 PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
-
-PHPCONFIG=	${LOCALBASE}/bin/php-config
-.if exists(${PHPCONFIG})
-PHPEXTENSIONS!=	${PHPCONFIG} --extension-dir
-.else
-PHPEXTENSIONS=	${LOCALBASE}/lib/php/extensions
-.endif
-
-post-extract:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/phpize
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" \
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
-	@${SED} "s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" < ${.CURDIR}/pkg-plist | \
-		${SED} "s|${LOCALBASE}/||" >${PLIST}
 
 do-install:
-	@${MKDIR} ${PHPEXTENSIONS}
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/modules/dbg.so \
-		${PHPEXTENSIONS}
+		${PREFIX}/lib/php/${PHP_EXT_DIR}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/php-dbg2/pkg-message b/devel/php-dbg2/pkg-message
index 59b308e..355104c 100644
--- a/devel/php-dbg2/pkg-message
+++ b/devel/php-dbg2/pkg-message
@@ -5,12 +5,12 @@ This product includes DBG PHP Debugger, Copyright(C) 1999, 2000, 2001,
 The php debugger has been installed successful.
 Add a line containing
 
-	extension=%%PREFIX%%/lib/php/extensions/dbg.so
+	extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/dbg.so
 
 to your php.ini to load it.
 If you have the Zend Optimizer installed, add the line
 
-	zend_extension=%%PREFIX%%/lib/php/extensions/dbg.so
+	zend_extension=%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/dbg.so
 
 to your [zend] section in the php.ini file, too.
 Add following section to enable/disable whatever you need from the debugger:
diff --git a/devel/php-dbg2/pkg-plist b/devel/php-dbg2/pkg-plist
index d4a3f04..b49ec0b 100644
--- a/devel/php-dbg2/pkg-plist
+++ b/devel/php-dbg2/pkg-plist
@@ -1 +1,2 @@
-%%PHPEXTENSIONS%%/dbg.so
+lib/php/%%PHP_EXT_DIR%%/dbg.so
+@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true