Attachment #64276 for bug #95628

View | Details | Raw Unified | Return to bug 95628
Collapse All | Expand All




#

PORTNAME=	eaccelerator
DISTVERSION=	0.9.5-beta2
CATEGORIES=	www
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR=	${PORTNAME}

USE_PHPIZE=	yes
USE_PHP_BUILD=	yes

CONFIGURE_ARGS=	--enable-eaccelerator=shared --with-eaccelerator-sessions

USE_BZIP2=	yes
SUB_FILES=	pkg-message

.include <bsd.port.pre.mk>

.if ${PHP_VER} == 5
CONFIGURE_ARGS+=	--without-eaccelerator-encoder
PLIST_SUB+=		ENCODER="@comment "
.else
PLIST_SUB+=		ENCODER=""

post-build:
	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g; s|0777|0755|g" \


do-install:
	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
	${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \
	       ${PREFIX}/lib/php/${PHP_EXT_DIR}
.if ${PHP_VER} == 4
	${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
.endif

post-install:
	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.php ${EXAMPLESDIR}
	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_password.php ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
	@${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>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (eaccelerator-0.9.5-beta1.tar.bz2) = 29f68a5975c1a09dbd72c9e8ddd534a7	1	MD5 (eaccelerator-0.9.5-beta2.tar.bz2) = 2516b680ce372765d24e7b64003f1e64
2	SHA256 (eaccelerator-0.9.5-beta1.tar.bz2) = f55781080ca48ba6d907c8101cf188987844a86d776c95b4f12dff2842d3f9d2	2	SHA256 (eaccelerator-0.9.5-beta2.tar.bz2) = b04234714fa8ff9753ccbcafeb499718af8c064c18a5b245fa2f60e98eeae8a2
3	SIZE (eaccelerator-0.9.5-beta1.tar.bz2) = 109878	3	SIZE (eaccelerator-0.9.5-beta2.tar.bz2) = 113387

Lines 1-7 Link Here

(-)pkg-plist (-2 / +2 lines)
1	%%ENCODER%%bin/encoder	1	%%ENCODER%%bin/encoder
2	lib/php/%%PHP_EXT_DIR%%/eaccelerator.so	2	lib/php/%%PHP_EXT_DIR%%/eaccelerator.so
3	@dirrmtry lib/php/%%PHP_EXT_DIR%%	3	@dirrmtry lib/php/%%PHP_EXT_DIR%%
		4	%%EXAMPLESDIR%%/control.php
		5	%%EXAMPLESDIR%%/dasm.php
4	%%EXAMPLESDIR%%/eaccelerator.ini	6	%%EXAMPLESDIR%%/eaccelerator.ini
5	%%EXAMPLESDIR%%/eaccelerator.php
6	%%EXAMPLESDIR%%/eaccelerator_password.php
7	@dirrm %%EXAMPLESDIR%%	7	@dirrm %%EXAMPLESDIR%%




--- 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

Return to bug 95628

Lines 6-12 Link Here

(-)Makefile (-14 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= eaccelerator	8	PORTNAME= eaccelerator
9	DISTVERSION= 0.9.5-beta1	9	DISTVERSION= 0.9.5-beta2
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 18-24 Link Here
18	USE_PHPIZE= yes	18	USE_PHPIZE= yes
19	USE_PHP_BUILD= yes	19	USE_PHP_BUILD= yes
20		20
21	CONFIGURE_ARGS= --enable-eaccelerator=shared	21	CONFIGURE_ARGS= --enable-eaccelerator=shared --with-eaccelerator-sessions
22		22
23	USE_BZIP2= yes	23	USE_BZIP2= yes
24	SUB_FILES= pkg-message	24	SUB_FILES= pkg-message
Lines 29-38 Link Here
29	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
30		30
31	.if ${PHP_VER} == 5	31	.if ${PHP_VER} == 5
32	CONFIGURE_ARGS+=--without-eaccelerator-encoder	32	CONFIGURE_ARGS+= --without-eaccelerator-encoder
33	PLIST_SUB+= ENCODER="@comment "	33	PLIST_SUB+= ENCODER="@comment "
34	.else	34	.else
35	PLIST_SUB+= ENCODER=""	35	PLIST_SUB+= ENCODER=""
36		36
37	post-build:	37	post-build:
38	@${SED} "s\|%%LOCALBASE%%\|${LOCALBASE}\|g; s\|0777\|0755\|g" \	38	@${SED} "s\|%%LOCALBASE%%\|${LOCALBASE}\|g; s\|0777\|0755\|g" \
Lines 41-61 Link Here
41		41
42	do-install:	42	do-install:
43	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}	43	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
44	@${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \	44	${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \
45	${PREFIX}/lib/php/${PHP_EXT_DIR}	45	${PREFIX}/lib/php/${PHP_EXT_DIR}
46	.if ${PHP_VER} == 4	46	.if ${PHP_VER} == 4
47	@${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin	47	${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
48	.endif	48	.endif
49	@${MKDIR} ${EXAMPLESDIR}	49
50	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${EXAMPLESDIR}	50	post-install:
51	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.php ${EXAMPLESDIR}
52	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_password.php ${EXAMPLESDIR}
53	.if !defined(NOPORTDOCS)	51	.if !defined(NOPORTDOCS)
54	@${MKDIR} ${DOCSDIR}	52	@${MKDIR} ${DOCSDIR}
55	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	53	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
56	.endif	54	.endif
57		55	@${MKDIR} ${EXAMPLESDIR}
58	post-install:	56	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${EXAMPLESDIR}
		57	${INSTALL_DATA} ${WRKSRC}/control.php ${EXAMPLESDIR}
		58	${INSTALL_DATA} ${WRKSRC}/dasm.php ${EXAMPLESDIR}
59	@${CAT} ${PKGMESSAGE}	59	@${CAT} ${PKGMESSAGE}
60		60
61	.include <bsd.port.post.mk>	61	.include <bsd.port.post.mk>

Removed Link Here

(-)files/patch-ea_restore.c (-17 lines)
1	--- ea_restore.c.orig Sun Mar 19 18:42:48 2006
2	+++ ea_restore.c Sun Mar 19 18:45:26 2006
3	@@ -718,12 +718,13 @@
4	void restore_class_parent(char *parent, int len,
5	zend_class_entry * to TSRMLS_DC)
6	{
7	- DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: restoring parent class %s of class %s\n", (char *) parent, to->name));
8	#ifdef ZEND_ENGINE_2
9	zend_class_entry** parent_ptr = NULL;
10	+ DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: restoring parent class %s of class %s\n", (char *) parent, to->name));
11	if (zend_lookup_class(parent, len, &parent_ptr TSRMLS_CC) != SUCCESS)
12	#else
13	char *name_lc = estrndup(parent, len);
14	+ DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: restoring parent class %s of class %s\n", (char *) parent, to->name));
15	zend_str_tolower(name_lc, len);
16	if (zend_hash_find(CG(class_table), (void ) name_lc, len + 1, (void *) &to->parent) != SUCCESS)
17	#endif