Add a few fixes from trunk.

svn path=/head/; revision=177783

www/xcache/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	xcache
 DISTVERSION=	1.2-beta3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://210.51.190.228/pub/XCache/Releases/ \
 		http://210.51.190.228/pub/XCache/snapshots/

www/xcache/files/patch-lock.c

@@ -0,0 +1,16 @@
+--- lock.c (revision 62)
++++ lock.c (revision 282)
+@@ -92,5 +92,5 @@
+ 		}
+ 		size = strlen(tmpdir) + sizeof("/.xcache.lock") - 1 + 3 * 10 + 100;
+-		myname = do_alloca(size);
++		myname = malloc(size);
+ 		snprintf(myname, size - 1, "%s%c.xcache.%d.%d.%d.lock", tmpdir, DEFAULT_SLASH, (int) getuid(), i ++, rand());
+ 		pathname = myname;
+@@ -119,5 +119,5 @@
+ 
+ 	if (myname) {
+-		free_alloca(myname);
++		free(myname);
+ 	}
+ 

www/xcache/files/patch-xcache.c

@@ -0,0 +1,41 @@
+--- xcache.c (revision 278)
++++ xcache.c (revision 283)
+@@ -1582,10 +1582,9 @@
+ 	long id = 0;
+ 
++	xcache_admin_auth_check(TSRMLS_C);
++
+ 	if (!xc_initized) {
+-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "XCache is not initized");
+-		RETURN_FALSE;
+-	}
+-
+-	xcache_admin_auth_check(TSRMLS_C);
++		RETURN_NULL();
++	}
+ 
+ 	if (optype == XC_OP_COUNT) {
+@@ -2365,10 +2364,4 @@
+ }
+ 
+-/* dirty check */
+-#if defined(COMPILE_DL_XCACHE) && (defined(ZEND_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__))
+-#	define zend_append_version_info(x) do { } while (0)
+-#else
+-extern void zend_append_version_info(zend_extension *extension);
+-#endif
+ static int xc_zend_extension_startup(zend_extension *extension)
+ {
+@@ -2377,5 +2370,4 @@
+ 			return FAILURE;
+         }
+-        zend_append_version_info(extension);
+     }
+ 	return SUCCESS;
+@@ -2640,5 +2632,5 @@
+ {
+ 	if (xc_zend_extension_gotup) {
+-		return FAILURE;
++		return SUCCESS;
+ 	}
+ 	xc_zend_extension_gotup = 1;