3 files changed, 28 insertions, 22 deletions

diff --git a/devel/ZendOptimizer/Makefile b/devel/ZendOptimizer/Makefile
index 70e8b3965939..fcd23ad50482 100644
--- a/devel/ZendOptimizer/Makefile
+++ b/devel/ZendOptimizer/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	ZendOptimizer
-PORTVERSION=	2.5.1
-PORTREVISION=	1
+PORTVERSION=	2.5.3
 CATEGORIES=	devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-FreeBSD${VER}-i386
+DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd${VER}-i386
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	An optimizer for PHP code
@@ -17,7 +16,6 @@ COMMENT=	An optimizer for PHP code
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 USE_PHP=	yes
-BROKEN_WITH_PHP=5
 
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 
@@ -26,14 +24,14 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 .include <bsd.port.pre.mk>
 
 # Check for FreeBSD version
+.if ${OSVERSION} < 400000
+IGNORE=		"This port is for FreeBSD 4 or above"
+.else
 .if ${OSVERSION} < 500000
 VER=		4.0
 .else
 VER=		5.1
 .endif
-.if ${OSVERSION} < 400000
-IGNORE=		"This port is for FreeBSD 4 or above"
-.else
 # Check for ZendOptimizer sources
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
 ECHO_MSG=/usr/bin/printf
@@ -47,20 +45,28 @@ and place it in ${DISTDIR}.\n
 .endif
 .endif
 
+.if ${PHP_VER} == 4
+ZEND_PATH=	4.3.x
+.else
+ZEND_PATH=	5.0.0
+.endif
+
+PLIST_SUB+=	ZEND_PATH=${ZEND_PATH}
+
 do-install:
-	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer/php-4.3.x
-	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/ZendOptimizer.so \
-		${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer/php-4.3.x/ZendOptimizer.so
-	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer_TS/php-4.3.x
-	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/TS/ZendOptimizer.so \
-		${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer_TS/php-4.3.x/ZendOptimizer.so
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer/php-${ZEND_PATH}
+	${INSTALL_DATA} ${WRKSRC}/data/${ZEND_PATH:S/./_/g}_comp/ZendOptimizer.so \
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer/php-${ZEND_PATH}/ZendOptimizer.so
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer_TS/php-${ZEND_PATH}
+	${INSTALL_DATA} ${WRKSRC}/data/${ZEND_PATH:S/./_/g}_comp/TS/ZendOptimizer.so \
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer_TS/php-${ZEND_PATH}/ZendOptimizer.so
 	${INSTALL_DATA} ${WRKSRC}/data/ZendExtensionManager.so \
 		${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_DATA} ${WRKSRC}/data/ZendExtensionManager_TS.so \
 		${PREFIX}/lib/php/${PHP_EXT_DIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/data/doc/* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/data/doc/ZendOptimizer_* ${DOCSDIR}
 .endif
 
 post-install:
diff --git a/devel/ZendOptimizer/distinfo b/devel/ZendOptimizer/distinfo
index cb984c2fbe57..0246fff34484 100644
--- a/devel/ZendOptimizer/distinfo
+++ b/devel/ZendOptimizer/distinfo
@@ -1,4 +1,4 @@
-MD5 (ZendOptimizer-2.5.1-FreeBSD4.0-i386.tar.gz) = 63dc38b28255982d3ec29c9d61567c90
-SIZE (ZendOptimizer-2.5.1-FreeBSD4.0-i386.tar.gz) = 1975000
-MD5 (ZendOptimizer-2.5.1-FreeBSD5.1-i386.tar.gz) = 735a0a675e252c77890bcc2448bcdba8
-SIZE (ZendOptimizer-2.5.1-FreeBSD5.1-i386.tar.gz) = 1914687
+MD5 (ZendOptimizer-2.5.3-freebsd4.0-i386.tar.gz) = aa907b69f7883f917e83214059b41980
+SIZE (ZendOptimizer-2.5.3-freebsd4.0-i386.tar.gz) = 2515561
+MD5 (ZendOptimizer-2.5.3-freebsd5.1-i386.tar.gz) = 2e5cd6afcdcf73a3e6e076ef9bdfd869
+SIZE (ZendOptimizer-2.5.3-freebsd5.1-i386.tar.gz) = 2339225
diff --git a/devel/ZendOptimizer/pkg-plist b/devel/ZendOptimizer/pkg-plist
index 7fb4adb9740e..ac4330259205 100644
--- a/devel/ZendOptimizer/pkg-plist
+++ b/devel/ZendOptimizer/pkg-plist
@@ -1,12 +1,12 @@
 lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager_TS.so
 lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager.so
-lib/php/%%PHP_EXT_DIR%%/Optimizer/php-4.3.x/ZendOptimizer.so
-lib/php/%%PHP_EXT_DIR%%/Optimizer_TS/php-4.3.x/ZendOptimizer.so
+lib/php/%%PHP_EXT_DIR%%/Optimizer/php-%%ZEND_PATH%%/ZendOptimizer.so
+lib/php/%%PHP_EXT_DIR%%/Optimizer_TS/php-%%ZEND_PATH%%/ZendOptimizer.so
 %%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_TechFAQ.pdf
 %%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_UserGuide.pdf
-@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer_TS/php-4.3.x
+@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer_TS/php-%%ZEND_PATH%%
 @dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer_TS
-@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer/php-4.3.x
+@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer/php-%%ZEND_PATH%%
 @dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer
 @unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%