Unbreak build with new php 4.3.2, and Various fixes.

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

3 files changed, 12 insertions, 19 deletions

diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 40f561708de3..65b9619aa2d6 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -16,20 +16,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	A PHP script encryption tool
 
-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
-
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 CRYPTKEY?=	11152, 368, 192, 1281, 62
 
-USE_LIBTOOL=	yes
+USE_PHPIZE=	yes
+
+CONFIGURE_ARGS+=--enable-php_screw=shared
 
-CONFIGURE_ARGS+=--enable-php_screw=shared \
-		--with-php-config=${PREFIX}/bin/php-config
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 pre-everything::
 	@${ECHO} ""
@@ -39,10 +35,6 @@ pre-everything::
 	@${ECHO} "make CRYPTKEY=\"234, 84, 39664, 771, 9853\""
 	@${ECHO} ""
 
-post-extract:
-	@${ECHO_MSG} "===>  PHPizing for ${PORTNAME}-${PORTVERSION}"
-	@(cd ${WRKSRC}; ${LOCALBASE}/bin/phpize)
-
 post-patch:
 	@${ECHO} "short pm9screw_mycryptkey[] = { ${CRYPTKEY} };" > \
 		${WRKSRC}/my_screw.h
@@ -54,15 +46,15 @@ do-build:
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|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/extensions
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	@${INSTALL_DATA} ${WRKSRC}/modules/php_screw.so \
-		${PREFIX}/lib/php/extensions
+		${PREFIX}/lib/php/${PHP_EXT_DIR}
 	@${INSTALL_PROGRAM} ${WRKSRC}/tools/screw ${PREFIX}/bin
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/php-screw/pkg-message b/www/php-screw/pkg-message
index 5c24091dc1cf..a41377fdf0d1 100644
--- a/www/php-screw/pkg-message
+++ b/www/php-screw/pkg-message
@@ -4,6 +4,6 @@ You have installed the php-screw package.
 
 Edit %%LOCALBASE%%/etc/php.ini and add:
 
-zend_extension="%%PREFIX%%/lib/php/extensions/php_screw.so"
+zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/php_screw.so"
 
 *****************************************************************************
diff --git a/www/php-screw/pkg-plist b/www/php-screw/pkg-plist
index f73a5d39f22d..ce6f88ba39f2 100644
--- a/www/php-screw/pkg-plist
+++ b/www/php-screw/pkg-plist
@@ -1,2 +1,3 @@
 bin/screw
-lib/php/extensions/php_screw.so
+lib/php/%%PHP_EXT_DIR%%/php_screw.so
+@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true