diff options
author | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-06-07 02:12:37 +0000 |
---|---|---|
committer | Norikatsu Shigemura <nork@FreeBSD.org> | 2003-06-07 02:12:37 +0000 |
commit | 55e82756c4030f6795ba65a5f961a3adc1130977 (patch) | |
tree | 1922eb4dee78078e5afb0d698732f15ea211c883 /www | |
parent | Update to 2.2.8a-ja-1.0. (diff) |
Update to 2.3.13.
PR: ports/52785
Submitted by: Alex Dupre <sysadmin@alexdupre.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=82416
Diffstat (limited to 'www')
-rw-r--r-- | www/eaccelerator/Makefile | 41 | ||||
-rw-r--r-- | www/eaccelerator/distinfo | 2 | ||||
-rw-r--r-- | www/eaccelerator/files/patch-encoder.php | 13 | ||||
-rw-r--r-- | www/eaccelerator/files/patch-mm.c | 10 | ||||
-rw-r--r-- | www/eaccelerator/pkg-message | 5 | ||||
-rw-r--r-- | www/eaccelerator/pkg-plist | 4 | ||||
-rw-r--r-- | www/turck-mmcache/Makefile | 41 | ||||
-rw-r--r-- | www/turck-mmcache/distinfo | 2 | ||||
-rw-r--r-- | www/turck-mmcache/files/patch-encoder.php | 13 | ||||
-rw-r--r-- | www/turck-mmcache/files/patch-mm.c | 10 | ||||
-rw-r--r-- | www/turck-mmcache/pkg-message | 5 | ||||
-rw-r--r-- | www/turck-mmcache/pkg-plist | 4 |
12 files changed, 62 insertions, 88 deletions
diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile index 975ae6af4806..22af835ca8fa 100644 --- a/www/eaccelerator/Makefile +++ b/www/eaccelerator/Makefile @@ -6,7 +6,7 @@ # PORTNAME= turck-mmcache -PORTVERSION= 2.3.10 +PORTVERSION= 2.3.14 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,49 +14,28 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sysadmin@alexdupre.com COMMENT= An opcode cache for PHP with encoder and loader -EXTRACT_DEPENDS=phpize:${PORTSDIR}/www/mod_php4 -BUILD_DEPENDS= ${LOCALBASE}/include/php/Zend/zend.h:${PORTSDIR}/www/mod_php4 -LIB_DEPENDS= mm.12:${PORTSDIR}/devel/mm -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${APACHE_PORT} \ - ${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4 - -USE_LIBTOOL= yes -WANT_AUTOMAKE_VER= 15 -WANT_AUTOCONF_VER= 253 - -CONFIGURE_ARGS= --enable-mmcache=shared \ - --with-php-config=${LOCALBASE}/bin/php-config \ - --prefix=${PREFIX} +USE_REINPLACE= yes +USE_PHPIZE= yes -EXT_DIR= 20020429 -PLIST_SUB= EXT_DIR=${EXT_DIR} +CONFIGURE_ARGS= --enable-mmcache=shared PKGMESSAGE= ${WRKDIR}/pkg-message -USE_REINPLACE= yes - .include <bsd.port.pre.mk> +.include "${.CURDIR}/../../lang/php4/bsd.php.mk" -.if defined(WITH_APACHE2) || exists(${LOCALBASE}/include/apache2/apr.h) -APACHE_PORT?= ${PORTSDIR}/www/apache2 -.else -APACHE_PORT?= ${PORTSDIR}/www/apache13 -.endif - -post-extract: - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/config.m4 - @${ECHO_MSG} "===> PHPizing for ${DISTNAME}" - @cd ${WRKSRC} && ${LOCALBASE}/bin/phpize +post-patch: + @${REINPLACE_CMD} 's|ALIGN|MMALIGN|g' ${WRKSRC}/mm.c ${WRKSRC}/mmcache.c post-build: @${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/encoder.php > ${WRKSRC}/encoder - @${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%EXT_DIR%%|${EXT_DIR}|g" \ + @${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/${EXT_DIR} + @${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR} @${INSTALL_DATA} ${WRKSRC}/modules/mmcache.so \ - ${PREFIX}/lib/php/${EXT_DIR} + ${PREFIX}/lib/php/${PHP_EXT_DIR} @${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/mmcache.php ${EXAMPLESDIR} diff --git a/www/eaccelerator/distinfo b/www/eaccelerator/distinfo index e1f36be7926b..710786555b60 100644 --- a/www/eaccelerator/distinfo +++ b/www/eaccelerator/distinfo @@ -1 +1 @@ -MD5 (turck-mmcache-2.3.10.tar.gz) = 6dd12cd6c122a821af1aa872b808704e +MD5 (turck-mmcache-2.3.14.tar.gz) = 8dc52cf900d62bc4776604157cf3b992 diff --git a/www/eaccelerator/files/patch-encoder.php b/www/eaccelerator/files/patch-encoder.php index b70e531d78d6..b4e5c05fd0c9 100644 --- a/www/eaccelerator/files/patch-encoder.php +++ b/www/eaccelerator/files/patch-encoder.php @@ -1,6 +1,6 @@ ---- encoder.php.orig Thu May 8 16:58:25 2003 -+++ encoder.php Thu May 8 17:00:00 2003 -@@ -1,25 +1,25 @@ +--- encoder.php.orig Wed May 28 15:12:59 2003 ++++ encoder.php Thu May 29 16:19:28 2003 +@@ -1,10 +1,10 @@ -#! /usr/bin/php -f +#! %%LOCALBASE%%/bin/php -f @@ -15,12 +15,7 @@ echo "Options:\n"; echo "\t-s suffix\n\t\tencode files only with following suffix (default is \"php\")\n"; echo "\t-a\n\t\tencode all files (no by default)\n"; - echo "\t-l\n\t\tfollow symbolic links (no by default)\n"; - echo "\t-r\n\t\tencode directories recursively (no by default)\n"; - echo "\t-c\n\t\tcopy files those shouldn't be encoded (no by default)\n"; -- echo "\t-f\n\t\toverfrite existing files (no by default)\n"; -+ echo "\t-f\n\t\toverwrite existing files (no by default)\n"; - echo "\t-o target\n\t\tIf you encode only one script then 'target' specifyes an output\n"; +@@ -16,10 +16,10 @@ echo "\t\tfile name. If you encode directory or several files at once\n"; echo "\t\tthen 'target' specifyes an output directory name.\n"; echo "\nExamples:\n"; diff --git a/www/eaccelerator/files/patch-mm.c b/www/eaccelerator/files/patch-mm.c new file mode 100644 index 000000000000..f431f570a081 --- /dev/null +++ b/www/eaccelerator/files/patch-mm.c @@ -0,0 +1,10 @@ +--- mm.c.orig Thu May 29 16:32:06 2003 ++++ mm.c Thu May 29 16:32:16 2003 +@@ -11,7 +11,6 @@ + + #include <sys/types.h> + #include <sys/stat.h> +-#include <malloc.h> + #include <errno.h> + #include <string.h> + #include <stdlib.h> diff --git a/www/eaccelerator/pkg-message b/www/eaccelerator/pkg-message index 3bfb80a63d30..0a420d9c5235 100644 --- a/www/eaccelerator/pkg-message +++ b/www/eaccelerator/pkg-message @@ -5,7 +5,7 @@ You have installed the turck-mmcache package. Edit %%LOCALBASE%%/etc/php.ini and add: [mmcache] -zend_extension="%%PREFIX%%/lib/php/%%EXT_DIR%%/mmcache.so" +zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/mmcache.so" mmcache.shm_size="16" mmcache.cache_dir="/tmp" mmcache.enable="1" @@ -13,5 +13,8 @@ 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" ***************************************************************************** diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist index d40ab6cb27bc..20039e334dca 100644 --- a/www/eaccelerator/pkg-plist +++ b/www/eaccelerator/pkg-plist @@ -1,7 +1,7 @@ bin/encoder -lib/php/%%EXT_DIR%%/mmcache.so +lib/php/%%PHP_EXT_DIR%%/mmcache.so %%PORTDOCS%%share/doc/turck-mmcache/README -@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true +@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true share/examples/turck-mmcache/mmcache.php %%PORTDOCS%%@dirrm share/doc/turck-mmcache @dirrm share/examples/turck-mmcache diff --git a/www/turck-mmcache/Makefile b/www/turck-mmcache/Makefile index 975ae6af4806..22af835ca8fa 100644 --- a/www/turck-mmcache/Makefile +++ b/www/turck-mmcache/Makefile @@ -6,7 +6,7 @@ # PORTNAME= turck-mmcache -PORTVERSION= 2.3.10 +PORTVERSION= 2.3.14 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,49 +14,28 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sysadmin@alexdupre.com COMMENT= An opcode cache for PHP with encoder and loader -EXTRACT_DEPENDS=phpize:${PORTSDIR}/www/mod_php4 -BUILD_DEPENDS= ${LOCALBASE}/include/php/Zend/zend.h:${PORTSDIR}/www/mod_php4 -LIB_DEPENDS= mm.12:${PORTSDIR}/devel/mm -RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${APACHE_PORT} \ - ${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4 - -USE_LIBTOOL= yes -WANT_AUTOMAKE_VER= 15 -WANT_AUTOCONF_VER= 253 - -CONFIGURE_ARGS= --enable-mmcache=shared \ - --with-php-config=${LOCALBASE}/bin/php-config \ - --prefix=${PREFIX} +USE_REINPLACE= yes +USE_PHPIZE= yes -EXT_DIR= 20020429 -PLIST_SUB= EXT_DIR=${EXT_DIR} +CONFIGURE_ARGS= --enable-mmcache=shared PKGMESSAGE= ${WRKDIR}/pkg-message -USE_REINPLACE= yes - .include <bsd.port.pre.mk> +.include "${.CURDIR}/../../lang/php4/bsd.php.mk" -.if defined(WITH_APACHE2) || exists(${LOCALBASE}/include/apache2/apr.h) -APACHE_PORT?= ${PORTSDIR}/www/apache2 -.else -APACHE_PORT?= ${PORTSDIR}/www/apache13 -.endif - -post-extract: - @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/config.m4 - @${ECHO_MSG} "===> PHPizing for ${DISTNAME}" - @cd ${WRKSRC} && ${LOCALBASE}/bin/phpize +post-patch: + @${REINPLACE_CMD} 's|ALIGN|MMALIGN|g' ${WRKSRC}/mm.c ${WRKSRC}/mmcache.c post-build: @${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/encoder.php > ${WRKSRC}/encoder - @${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%EXT_DIR%%|${EXT_DIR}|g" \ + @${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/${EXT_DIR} + @${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR} @${INSTALL_DATA} ${WRKSRC}/modules/mmcache.so \ - ${PREFIX}/lib/php/${EXT_DIR} + ${PREFIX}/lib/php/${PHP_EXT_DIR} @${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/mmcache.php ${EXAMPLESDIR} diff --git a/www/turck-mmcache/distinfo b/www/turck-mmcache/distinfo index e1f36be7926b..710786555b60 100644 --- a/www/turck-mmcache/distinfo +++ b/www/turck-mmcache/distinfo @@ -1 +1 @@ -MD5 (turck-mmcache-2.3.10.tar.gz) = 6dd12cd6c122a821af1aa872b808704e +MD5 (turck-mmcache-2.3.14.tar.gz) = 8dc52cf900d62bc4776604157cf3b992 diff --git a/www/turck-mmcache/files/patch-encoder.php b/www/turck-mmcache/files/patch-encoder.php index b70e531d78d6..b4e5c05fd0c9 100644 --- a/www/turck-mmcache/files/patch-encoder.php +++ b/www/turck-mmcache/files/patch-encoder.php @@ -1,6 +1,6 @@ ---- encoder.php.orig Thu May 8 16:58:25 2003 -+++ encoder.php Thu May 8 17:00:00 2003 -@@ -1,25 +1,25 @@ +--- encoder.php.orig Wed May 28 15:12:59 2003 ++++ encoder.php Thu May 29 16:19:28 2003 +@@ -1,10 +1,10 @@ -#! /usr/bin/php -f +#! %%LOCALBASE%%/bin/php -f @@ -15,12 +15,7 @@ echo "Options:\n"; echo "\t-s suffix\n\t\tencode files only with following suffix (default is \"php\")\n"; echo "\t-a\n\t\tencode all files (no by default)\n"; - echo "\t-l\n\t\tfollow symbolic links (no by default)\n"; - echo "\t-r\n\t\tencode directories recursively (no by default)\n"; - echo "\t-c\n\t\tcopy files those shouldn't be encoded (no by default)\n"; -- echo "\t-f\n\t\toverfrite existing files (no by default)\n"; -+ echo "\t-f\n\t\toverwrite existing files (no by default)\n"; - echo "\t-o target\n\t\tIf you encode only one script then 'target' specifyes an output\n"; +@@ -16,10 +16,10 @@ echo "\t\tfile name. If you encode directory or several files at once\n"; echo "\t\tthen 'target' specifyes an output directory name.\n"; echo "\nExamples:\n"; diff --git a/www/turck-mmcache/files/patch-mm.c b/www/turck-mmcache/files/patch-mm.c new file mode 100644 index 000000000000..f431f570a081 --- /dev/null +++ b/www/turck-mmcache/files/patch-mm.c @@ -0,0 +1,10 @@ +--- mm.c.orig Thu May 29 16:32:06 2003 ++++ mm.c Thu May 29 16:32:16 2003 +@@ -11,7 +11,6 @@ + + #include <sys/types.h> + #include <sys/stat.h> +-#include <malloc.h> + #include <errno.h> + #include <string.h> + #include <stdlib.h> diff --git a/www/turck-mmcache/pkg-message b/www/turck-mmcache/pkg-message index 3bfb80a63d30..0a420d9c5235 100644 --- a/www/turck-mmcache/pkg-message +++ b/www/turck-mmcache/pkg-message @@ -5,7 +5,7 @@ You have installed the turck-mmcache package. Edit %%LOCALBASE%%/etc/php.ini and add: [mmcache] -zend_extension="%%PREFIX%%/lib/php/%%EXT_DIR%%/mmcache.so" +zend_extension="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/mmcache.so" mmcache.shm_size="16" mmcache.cache_dir="/tmp" mmcache.enable="1" @@ -13,5 +13,8 @@ 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" ***************************************************************************** diff --git a/www/turck-mmcache/pkg-plist b/www/turck-mmcache/pkg-plist index d40ab6cb27bc..20039e334dca 100644 --- a/www/turck-mmcache/pkg-plist +++ b/www/turck-mmcache/pkg-plist @@ -1,7 +1,7 @@ bin/encoder -lib/php/%%EXT_DIR%%/mmcache.so +lib/php/%%PHP_EXT_DIR%%/mmcache.so %%PORTDOCS%%share/doc/turck-mmcache/README -@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true +@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true share/examples/turck-mmcache/mmcache.php %%PORTDOCS%%@dirrm share/doc/turck-mmcache @dirrm share/examples/turck-mmcache |