From 1da1c3c8519c45f4187617616974837c4c9383b0 Mon Sep 17 00:00:00 2001 From: sthen Date: Tue, 11 Sep 2012 23:41:43 +0000 Subject: [PATCH] update to xcache 2.0.1, from Brad - includes some segv fixes --- www/xcache/Makefile | 15 +++++++-------- www/xcache/distinfo | 7 ++----- www/xcache/patches/patch-xcache_ini | 26 +++++++++++++------------- www/xcache/pkg/PLIST | 5 +++-- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/www/xcache/Makefile b/www/xcache/Makefile index b402a3d2587..b9eb987885f 100644 --- a/www/xcache/Makefile +++ b/www/xcache/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2012/06/18 07:56:13 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2012/09/11 23:41:43 sthen Exp $ SHARED_ONLY= Yes COMMENT= fast and stable PHP opcode cacher -VERSION= 2.0.0 +VERSION= 2.0.1 DISTNAME= xcache-${VERSION} -REVISION= 0 CATEGORIES= www MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${VERSION}/ @@ -56,16 +55,16 @@ post-extract: @ln -sf ${LOCALBASE}/bin/gindent ${WRKDIR}/bin/indent post-install: - ${INSTALL_DATA_DIR} ${WRKINST}/${WEBROOT}/xcache - ${INSTALL_DATA_DIR} ${WRKINST}/${WEBROOT}/xcache/admin + ${INSTALL_DATA_DIR} ${WRKINST}${WEBROOT}/xcache + ${INSTALL_DATA_DIR} ${WRKINST}${WEBROOT}/xcache/admin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php-${MODPHP_VERSION} - cd ${WRKSRC}/admin && ${INSTALL_DATA} * ${WRKINST}/${WEBROOT}/xcache/admin + cd ${WRKSRC}/admin && ${INSTALL_DATA} * ${WRKINST}${WEBROOT}/xcache/admin ${INSTALL_DATA} ${WRKSRC}/xcache.ini \ ${PREFIX}/share/examples/php-${MODPHP_VERSION} .if ${FLAVOR:L:Mcoverager} - ${INSTALL_DATA_DIR} ${WRKINST}/${WEBROOT}/xcache/coverager - cd ${WRKSRC}/coverager && ${INSTALL_DATA} * ${WRKINST}/${WEBROOT}/xcache/coverager + ${INSTALL_DATA_DIR} ${WRKINST}${WEBROOT}/xcache/coverager + cd ${WRKSRC}/coverager && ${INSTALL_DATA} * ${WRKINST}${WEBROOT}/xcache/coverager .endif .include diff --git a/www/xcache/distinfo b/www/xcache/distinfo index dde49f85712..6196d89c7e8 100644 --- a/www/xcache/distinfo +++ b/www/xcache/distinfo @@ -1,5 +1,2 @@ -MD5 (xcache-2.0.0.tar.gz) = DJA8LrcOMcvDWuZv23UL3A== -RMD160 (xcache-2.0.0.tar.gz) = 4r/fAXLe3v/muA5SW92MhJLGH3U= -SHA1 (xcache-2.0.0.tar.gz) = jIEgf4MedWcr/foK4Y0ASgx6ZNs= -SHA256 (xcache-2.0.0.tar.gz) = swynPHXcn4Bz3WWA0Vmzvti8jdXkR8xpOxq8ogK+qrI= -SIZE (xcache-2.0.0.tar.gz) = 130536 +SHA256 (xcache-2.0.1.tar.gz) = mi2S9t8GtTdMgkw35lZapC6yEoRJKWQeUUaisdmQ/nQ= +SIZE (xcache-2.0.1.tar.gz) = 134833 diff --git a/www/xcache/patches/patch-xcache_ini b/www/xcache/patches/patch-xcache_ini index 2a2e4ccb170..cc5513135a1 100644 --- a/www/xcache/patches/patch-xcache_ini +++ b/www/xcache/patches/patch-xcache_ini @@ -1,18 +1,18 @@ -$OpenBSD: patch-xcache_ini,v 1.1 2008/03/23 21:36:20 sthen Exp $ ---- xcache.ini.orig Sun Mar 23 14:04:11 2008 -+++ xcache.ini Sun Mar 23 14:05:14 2008 -@@ -1,11 +1,11 @@ - [xcache-common] - ;; install as zend extension (recommended), normally "$extension_dir/xcache.so" +$OpenBSD: patch-xcache_ini,v 1.2 2012/09/11 23:41:43 sthen Exp $ +--- xcache.ini.orig Tue Jun 26 06:11:30 2012 ++++ xcache.ini Sat Sep 8 14:36:11 2012 +@@ -5,11 +5,11 @@ + + ;; non-windows example + ;; update xxx accordingly -zend_extension = /usr/local/lib/php/extensions/non-debug-non-zts-xxx/xcache.so +;zend_extension = /usr/local/lib/php/extensions/non-debug-non-zts-xxx/xcache.so - ; zend_extension_ts = /usr/local/lib/php/extensions/non-debug-zts-xxx/xcache.so - ;; For windows users, replace xcache.so with php_xcache.dll + ;; windows example: -zend_extension_ts = c:/php/extensions/php_xcache.dll +;zend_extension_ts = c:/php/extensions/php_xcache.dll - ;; or install as extension, make sure your extension_dir setting is correct --; extension = xcache.so -+extension = xcache.so - ;; or win32: - ; extension = php_xcache.dll + ;; for newer PHP, _ts is removed, use the following line instead +-zend_extension = c:/php/extensions/php_xcache.dll ++;zend_extension = c:/php/extensions/php_xcache.dll + [xcache.admin] + xcache.admin.enable_auth = On diff --git a/www/xcache/pkg/PLIST b/www/xcache/pkg/PLIST index 989e70ef674..e53c2a88cd7 100644 --- a/www/xcache/pkg/PLIST +++ b/www/xcache/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2011/07/08 22:52:23 robert Exp $ +@comment $OpenBSD: PLIST,v 1.6 2012/09/11 23:41:43 sthen Exp $ lib/php-${MODPHP_VERSION}/modules/xcache.so share/examples/php-${MODPHP_VERSION}/xcache.ini @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/xcache.ini @@ -9,7 +9,8 @@ xcache/admin/common-en.lang.php xcache/admin/common-zh-simplified-utf-8.lang.php xcache/admin/common-zh-traditional-utf-8.lang.php xcache/admin/common.php -xcache/admin/config.php.example +xcache/admin/config.default.php +xcache/admin/config.example.php xcache/admin/edit.php xcache/admin/edit.tpl.php xcache/admin/footer.tpl.php