6 files changed, 40 insertions, 49 deletions

diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile
index 7c4317bb19a8..e80d15d9f974 100644
--- a/www/eaccelerator/Makefile
+++ b/www/eaccelerator/Makefile
@@ -1,44 +1,45 @@
-# New ports collection makefile for:	turck-mmcache
+# New ports collection makefile for:	eaccelerator
 # Date created:			Sat Mar 1 13:55:55 CET 2003
 # Whom:				Alex Dupre <sysadmin@alexdupre.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	turck-mmcache
-PORTVERSION=	2.4.6
+PORTNAME=	eaccelerator
+PORTVERSION=	0.9.2a
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	An opcode cache for PHP with encoder and loader
 
-USE_BZIP2=	yes
-USE_REINPLACE=	yes
 USE_PHP=	yes
 USE_PHPIZE=	yes
 
-CONFIGURE_ARGS=	--enable-mmcache=shared
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
+CONFIGURE_ARGS=	--enable-eaccelerator=shared
+
+SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-post-patch:
-	@${REINPLACE_CMD} 's|ALIGN|MMALIGN|g' ${WRKSRC}/mm.c ${WRKSRC}/mmcache.c
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
 
 post-build:
 	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/encoder.php > ${WRKSRC}/encoder
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
-		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/modules/mmcache.so \
+	@${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \
 	       ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/mmcache.php ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/mmcache_password.php ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.php ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_password.php ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/www/eaccelerator/distinfo b/www/eaccelerator/distinfo
index 855e307a781d..8dd360f7d2ac 100644
--- a/www/eaccelerator/distinfo
+++ b/www/eaccelerator/distinfo
@@ -1,2 +1,2 @@
-MD5 (turck-mmcache-2.4.6.tar.bz2) = 8edaf6cd647e7c521b5360f4e2d4ee6f
-SIZE (turck-mmcache-2.4.6.tar.bz2) = 96103
+MD5 (eaccelerator-0.9.2a.tar.gz) = e9059ebd49f14835534a1d96a97ababd
+SIZE (eaccelerator-0.9.2a.tar.gz) = 115791
diff --git a/www/eaccelerator/files/patch-encoder.php b/www/eaccelerator/files/patch-encoder.php
index 7ff9b0ce984f..41aa6dd0bd08 100644
--- a/www/eaccelerator/files/patch-encoder.php
+++ b/www/eaccelerator/files/patch-encoder.php
@@ -1,12 +1,12 @@
---- encoder.php.orig	Fri Jul 25 10:21:09 2003
-+++ encoder.php	Mon Jul 28 13:04:19 2003
+--- encoder.php.orig	Mon Dec 27 07:35:20 2004
++++ encoder.php	Wed Jan 19 08:14:49 2005
 @@ -1,10 +1,12 @@
 +#!%%LOCALBASE%%/bin/php -f
 +
  <?php
  $web_error = "";
  
- function mmcache_encoder_usage() {
+ function eaccelerator_encoder_usage() {
 -  echo "Usage:\tphp -q encoder.php [options] source_file_name\n";
 -  echo       "\tphp -q encoder.php [options] source_file_name...\n";
 -  echo       "\tphp -q encoder.php [options] source_directory_name...\n\n";
diff --git a/www/eaccelerator/files/pkg-message.in b/www/eaccelerator/files/pkg-message.in
new file mode 100644
index 000000000000..4420ec2ee1a0
--- /dev/null
+++ b/www/eaccelerator/files/pkg-message.in
@@ -0,0 +1,16 @@
+*****************************************************************************
+
+You have installed the eaccelerator package.
+
+Edit %%LOCALBASE%%/etc/php.ini and add:
+
+[eaccelerator]
+extension="eaccelerator.so"
+
+Then create the cache directory:
+
+  mkdir /tmp/eaccelerator
+  chown www /tmp/eaccelerator
+  chmod 0700 /tmp/eaccelerator
+
+*****************************************************************************
diff --git a/www/eaccelerator/pkg-message b/www/eaccelerator/pkg-message
deleted file mode 100644
index bd70cdb74a32..000000000000
--- a/www/eaccelerator/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-*****************************************************************************
-
-You have installed the turck-mmcache package.
-
-Edit %%LOCALBASE%%/etc/php.ini and add:
-
-[mmcache]
-zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/mmcache.so"
-mmcache.shm_size="16"
-mmcache.cache_dir="/tmp"
-mmcache.enable="1"
-mmcache.optimizer="1"
-mmcache.check_mtime="1"
-mmcache.debug="0"
-mmcache.filter=""
-mmcache.shm_max="0"
-mmcache.shm_ttl="0"
-mmcache.shm_prune_period="0"
-mmcache.shm_only="0"
-mmcache.compress="1"
-mmcache.keys="shm_and_disk"
-mmcache.sessions="shm_and_disk"
-mmcache.content="shm_and_disk"
-
-*****************************************************************************
diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist
index 02366f6de8bd..661dca538810 100644
--- a/www/eaccelerator/pkg-plist
+++ b/www/eaccelerator/pkg-plist
@@ -1,8 +1,7 @@
 bin/encoder
-lib/php/%%PHP_EXT_DIR%%/mmcache.so
-%%PORTDOCS%%%%DOCSDIR%%/README
+lib/php/%%PHP_EXT_DIR%%/eaccelerator.so
 @unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
-%%EXAMPLESDIR%%/mmcache.php
-%%EXAMPLESDIR%%/mmcache_password.php
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/eaccelerator.ini
+%%EXAMPLESDIR%%/eaccelerator.php
+%%EXAMPLESDIR%%/eaccelerator_password.php
 @dirrm %%EXAMPLESDIR%%