- Update to 0.9.5-beta2 (PHP 5.1 compatible)

- Show ${INSTALL_*} command

PR:		95628
Approved by:	ale

4 files changed, 19 insertions, 36 deletions

diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile
index 14c50fc9538a..ee703fbb9ba2 100644
--- a/www/eaccelerator/Makefile
+++ b/www/eaccelerator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eaccelerator
-DISTVERSION=	0.9.5-beta1
+DISTVERSION=	0.9.5-beta2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ USE_PHP=	session
 USE_PHPIZE=	yes
 USE_PHP_BUILD=	yes
 
-CONFIGURE_ARGS=	--enable-eaccelerator=shared
+CONFIGURE_ARGS=	--enable-eaccelerator=shared --with-eaccelerator-sessions
 
 USE_BZIP2=	yes
 SUB_FILES=	pkg-message
@@ -29,10 +29,10 @@ PORTDOCS=	*
 .include <bsd.port.pre.mk>
 
 .if ${PHP_VER} == 5
-CONFIGURE_ARGS+=--without-eaccelerator-encoder
-PLIST_SUB+=	ENCODER="@comment "
+CONFIGURE_ARGS+=	--without-eaccelerator-encoder
+PLIST_SUB+=		ENCODER="@comment "
 .else
-PLIST_SUB+=	ENCODER=""
+PLIST_SUB+=		ENCODER=""
 
 post-build:
 	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g; s|0777|0755|g" \
@@ -41,21 +41,21 @@ post-build:
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \
+	${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \
 	       ${PREFIX}/lib/php/${PHP_EXT_DIR}
 .if ${PHP_VER} == 4
-	@${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
 .endif
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.php ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_password.php ${EXAMPLESDIR}
+
+post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-
-post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/control.php ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/dasm.php ${EXAMPLESDIR}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/eaccelerator/distinfo b/www/eaccelerator/distinfo
index e38330904e54..b25552045b60 100644
--- a/www/eaccelerator/distinfo
+++ b/www/eaccelerator/distinfo
@@ -1,3 +1,3 @@
-MD5 (eaccelerator-0.9.5-beta1.tar.bz2) = 29f68a5975c1a09dbd72c9e8ddd534a7
-SHA256 (eaccelerator-0.9.5-beta1.tar.bz2) = f55781080ca48ba6d907c8101cf188987844a86d776c95b4f12dff2842d3f9d2
-SIZE (eaccelerator-0.9.5-beta1.tar.bz2) = 109878
+MD5 (eaccelerator-0.9.5-beta2.tar.bz2) = 2516b680ce372765d24e7b64003f1e64
+SHA256 (eaccelerator-0.9.5-beta2.tar.bz2) = b04234714fa8ff9753ccbcafeb499718af8c064c18a5b245fa2f60e98eeae8a2
+SIZE (eaccelerator-0.9.5-beta2.tar.bz2) = 113387
diff --git a/www/eaccelerator/files/patch-ea_restore.c b/www/eaccelerator/files/patch-ea_restore.c
deleted file mode 100644
index 56565fb3b3ec..000000000000
--- a/www/eaccelerator/files/patch-ea_restore.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ea_restore.c.orig	Sun Mar 19 18:42:48 2006
-+++ ea_restore.c	Sun Mar 19 18:45:26 2006
-@@ -718,12 +718,13 @@
- void restore_class_parent(char *parent, int len,
- 						  zend_class_entry * to TSRMLS_DC)
- {
--	DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: restoring parent class %s of class %s\n", (char *) parent, to->name));
- #ifdef ZEND_ENGINE_2
- 	zend_class_entry** parent_ptr = NULL;
-+	DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: restoring parent class %s of class %s\n", (char *) parent, to->name));
- 	if (zend_lookup_class(parent, len, &parent_ptr TSRMLS_CC) != SUCCESS)
- #else
- 	char *name_lc = estrndup(parent, len);
-+	DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: restoring parent class %s of class %s\n", (char *) parent, to->name));
- 	zend_str_tolower(name_lc, len);
- 	if (zend_hash_find(CG(class_table), (void *) name_lc, len + 1, (void **) &to->parent) != SUCCESS)
- #endif
diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist
index a76ab61405a6..f57cec059c96 100644
--- a/www/eaccelerator/pkg-plist
+++ b/www/eaccelerator/pkg-plist
@@ -1,7 +1,7 @@
 %%ENCODER%%bin/encoder
 lib/php/%%PHP_EXT_DIR%%/eaccelerator.so
 @dirrmtry lib/php/%%PHP_EXT_DIR%%
+%%EXAMPLESDIR%%/control.php
+%%EXAMPLESDIR%%/dasm.php
 %%EXAMPLESDIR%%/eaccelerator.ini
-%%EXAMPLESDIR%%/eaccelerator.php
-%%EXAMPLESDIR%%/eaccelerator_password.php
 @dirrm %%EXAMPLESDIR%%