From 76a2f91fa3949e238a2678a6ba71e9f9c6b99db6 Mon Sep 17 00:00:00 2001
From: ale <ale@FreeBSD.org>
Date: Sun, 28 Mar 2004 22:50:13 +0000
Subject: Fix installation, by using correct directories.

Noticed by:	Attila Nagy <bra@fsn.hu>
---
 devel/ZendOptimizer/Makefile    | 8 +++++---
 devel/ZendOptimizer/pkg-message | 4 ++--
 devel/ZendOptimizer/pkg-plist   | 8 ++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'devel')

diff --git a/devel/ZendOptimizer/Makefile b/devel/ZendOptimizer/Makefile
index 532f35bf4d08..70e8b3965939 100644
--- a/devel/ZendOptimizer/Makefile
+++ b/devel/ZendOptimizer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ZendOptimizer
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}-FreeBSD${VER}-i386
 
@@ -47,11 +48,12 @@ and place it in ${DISTDIR}.\n
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
+	@${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}/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}/ZendOptimizer_TS.so
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/Optimizer_TS/php-4.3.x/ZendOptimizer.so
 	${INSTALL_DATA} ${WRKSRC}/data/ZendExtensionManager.so \
 		${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_DATA} ${WRKSRC}/data/ZendExtensionManager_TS.so \
diff --git a/devel/ZendOptimizer/pkg-message b/devel/ZendOptimizer/pkg-message
index 4831e2ddef86..74a9d8a014b5 100644
--- a/devel/ZendOptimizer/pkg-message
+++ b/devel/ZendOptimizer/pkg-message
@@ -6,8 +6,8 @@ Edit %%LOCALBASE%%/etc/php.ini and add:
 
 [Zend]
 zend_optimizer.optimization_level=15
-zend_extension_manager.optimizer="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so"
-zend_extension_manager.optimizer_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so"
+zend_extension_manager.optimizer="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/Optimizer"
+zend_extension_manager.optimizer_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/Optimizer_TS"
 zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager.so"
 zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager_TS.so"
 
diff --git a/devel/ZendOptimizer/pkg-plist b/devel/ZendOptimizer/pkg-plist
index cffc74fa9b41..7fb4adb9740e 100644
--- a/devel/ZendOptimizer/pkg-plist
+++ b/devel/ZendOptimizer/pkg-plist
@@ -1,8 +1,12 @@
 lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager_TS.so
 lib/php/%%PHP_EXT_DIR%%/ZendExtensionManager.so
-lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so
-lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.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
 %%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
+@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer/php-4.3.x
+@dirrm lib/php/%%PHP_EXT_DIR%%/Optimizer
 @unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit