diff -ruN ZendOptimizer.orig/Makefile ZendOptimizer/Makefile
--- ZendOptimizer.orig/Makefile	Sat Jan 10 00:28:16 2004
+++ ZendOptimizer/Makefile	Sat Jan 10 00:59:51 2004
@@ -13,51 +13,48 @@
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	An optimizer for PHP code
 
-RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
+BROKEN_WITH_PHP=5
 
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 
-EXT_DIR=	20020429
-PLIST_SUB=	EXT_DIR=${EXT_DIR}
-
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 # Check for FreeBSD version
 .if ${OSVERSION} < 400000 || ${OSVERSION} > 499999
-BROKEN=         "This port is for FreeBSD 4 only."
-.endif
-
+BROKEN=		"This port is for FreeBSD 4 only"
+.else
 # Check for ZendOptimizer sources
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
-IGNORE= :\n\
+IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the source distribution\n\
 manually.\n\
 Please access http://www.zend.com/store/getfreefile.php?pid=13&zbid=547\n\
 with a web browser, read the license and click the \"I ACCEPT\" button.\n\
-Download the source file, ${DISTFILES},\n\
+Download the source file, ${DISTNAME}${EXTRACT_SUFX},\n\
 and place it in ${DISTDIR}.\n
 .endif
+.endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/php/${EXT_DIR}
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/ZendOptimizer.so \
-		${PREFIX}/lib/php/${EXT_DIR}/ZendOptimizer.so
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/ZendOptimizer.so
 	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/TS/ZendOptimizer.so \
-		${PREFIX}/lib/php/${EXT_DIR}/ZendOptimizer_TS.so
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/ZendOptimizer_TS.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/data/doc/* ${DOCSDIR}
 .endif
 
 post-install:
-	@${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}
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN ZendOptimizer.orig/pkg-message ZendOptimizer/pkg-message
--- ZendOptimizer.orig/pkg-message	Sat Jan 10 00:28:16 2004
+++ ZendOptimizer/pkg-message	Sat Jan 10 00:32:18 2004
@@ -6,7 +6,7 @@
 
 [Zend]
 zend_optimizer.optimization_level=15
-zend_extension_ts="%%PREFIX%%/lib/php/%%EXT_DIR%%/ZendOptimizer_TS.so"
-zend_extension=""%%PREFIX%%/lib/php/%%EXT_DIR%%/ZendOptimizer.so"
+zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so"
+zend_extension=""%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so"
 
 *****************************************************************************
diff -ruN ZendOptimizer.orig/pkg-plist ZendOptimizer/pkg-plist
--- ZendOptimizer.orig/pkg-plist	Sat Jan 10 00:28:16 2004
+++ ZendOptimizer/pkg-plist	Sat Jan 10 00:37:41 2004
@@ -1,6 +1,6 @@
-lib/php/%%EXT_DIR%%/ZendOptimizer_TS.so
-lib/php/%%EXT_DIR%%/ZendOptimizer.so
-%%PORTDOCS%%share/doc/ZendOptimizer/ZendOptimizer_TechFAQ.pdf
-%%PORTDOCS%%share/doc/ZendOptimizer/ZendOptimizer_UserGuide.pdf
-@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
-%%PORTDOCS%%@dirrm share/doc/ZendOptimizer
+lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so
+lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so
+%%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_TechFAQ.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_UserGuide.pdf
+@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%