from Brad:

- Maintenance update of XCache, also tested by myself.

from me:
- adjust for /var/www/conf/php5 symlinks
- add re2c as BUILD_DEPENDS, configure picks it up if installed
ok brad@ (maintainer)

www/xcache/Makefile

@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.3 2008/01/04 17:48:38 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2008/03/23 21:36:20 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	fast and stable PHP opcode cache
 
-VERSION=	1.2.1
+VERSION=	1.2.2
 DISTNAME=	xcache-${VERSION}
 CATEGORIES=	www
 MASTER_SITES=	http://xcache.lighttpd.net/pub/Releases/${VERSION}/
 
-HOMEPAGE=	http://trac.lighttpd.net/xcache/
+HOMEPAGE=	http://xcache.lighttpd.net/
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -20,7 +20,8 @@ PERMIT_DISTFILES_FTP=	Yes
 AUTOCONF_VERSION=	2.59
 
 BUILD_DEPENDS+=		${MODGNU_AUTOCONF_DEPENDS} \
-			::www/php5/core
+			::www/php5/core \
+			::devel/re2c
 RUN_DEPENDS+=		::www/php5/core
 
 USE_LIBTOOL=		Yes
@@ -46,11 +47,10 @@ pre-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/xcache
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/xcache
-	${INSTALL_DATA} ${WRKSRC}/xcache.ini ${PREFIX}/xcache
-
 	${INSTALL_DATA_DIR} ${PREFIX}/xcache/admin
+	${INSTALL_DATA_DIR} ${PREFIX}/conf/php5.sample
 	cd ${WRKSRC}/admin && ${INSTALL_DATA} * ${PREFIX}/xcache/admin
+	${INSTALL_DATA} ${WRKSRC}/xcache.ini ${PREFIX}/conf/php5.sample/xcache.ini.dist
 
 .if ${FLAVOR:L:Mcoverager}
 	${INSTALL_DATA_DIR} ${PREFIX}/xcache/coverager

www/xcache/distinfo

@@ -1,5 +1,5 @@
-MD5 (xcache-1.2.1.tar.gz) = 83HKiBBKtCaqd5MCR2kW6w==
-RMD160 (xcache-1.2.1.tar.gz) = ozAfm4MROQ3i+KGoxQIrmw9Go8M=
-SHA1 (xcache-1.2.1.tar.gz) = vhHSgS3nlQn0HeDkYsZsa9xXOgk=
-SHA256 (xcache-1.2.1.tar.gz) = 2v2bFZ0sm5liS7sWZyPbasoKe2x5CNKcDT1WHd5uNaY=
-SIZE (xcache-1.2.1.tar.gz) = 268340
+MD5 (xcache-1.2.2.tar.gz) = IW3FM/Y/c4uCQxntG6LILw==
+RMD160 (xcache-1.2.2.tar.gz) = s9wHECEZx3F64WWd4BaLcIvlspk=
+SHA1 (xcache-1.2.2.tar.gz) = F9/vG7oPYAFzHN5R8wNlPRgTCTQ=
+SHA256 (xcache-1.2.2.tar.gz) = 4Pmnc2x6H6Pv7KjLHtH1JOULOWhTobDfz5I/Sy3rLJY=
+SIZE (xcache-1.2.2.tar.gz) = 269238

www/xcache/patches/patch-xcache_ini

@@ -0,0 +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"
+-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
+-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
+ 

www/xcache/pkg/MESSAGE

@@ -1,12 +1,10 @@
-To finish the install of XCache, you need to enable
-the module by using the following command
+To configure XCache, edit ${PREFIX}/conf/php5.sample/xcache.ini.
+To enable the module, create a symbolic link to that file from
+${PREFIX}/conf/php5/xcache.ini:
 
-    # ${LOCALBASE}/sbin/phpxs -a xcache
+ln -fs ${PREFIX}/conf/php5.sample/xcache.ini \
+        ${PREFIX}/conf/php5/xcache.ini
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
 you should fully stop and then restart the server.
-
-You'll also need to configure XCache using various 
-settings in php.ini.  See ${PREFIX}/xcache/INSTALL
-for details.

www/xcache/pkg/PLIST

@@ -1,8 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/23 18:57:07 robert Exp $
-lib/
-lib/php/
-lib/php/modules/
+@comment $OpenBSD: PLIST,v 1.2 2008/03/23 21:36:20 sthen Exp $
+@comment conf/php5.sample/
+@group bin
+conf/php5.sample/xcache.ini.dist
+@sample conf/php5.sample/xcache.ini
+@comment lib/
+@comment lib/php/
+@comment lib/php/modules/
 lib/php/modules/xcache.so
+@group
 xcache/
 xcache/INSTALL
 xcache/admin/
@@ -25,4 +30,3 @@ xcache/admin/xcache.css
 xcache/admin/xcache.php
 xcache/admin/xcache.tpl.php
 %%coverager%%
-xcache/xcache.ini

www/xcache/pkg/UNMESSAGE

@@ -1,7 +1,8 @@
-To completely deinstall XCache, you need to disable
-the module by using the following command
+You can disable this module by removing the
+${PREFIX}/conf/php5/xcache.ini symbolic link by
+issuing the following command: 
 
-    # ${LOCALBASE}/sbin/phpxs -r xcache
+rm -f ${PREFIX}/conf/php5/xcache.ini
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,