Update devel/php-memcache to 2.2.5.

Removed options.mk support, because there is no OpenSSL support in this
module's configure, and it makes no sense to conflict on PKG_OPTIONS.php=fastcgi when this module can be used
with www/ap-php
only (and not FastCGI-enabled lang/php5).

Changelog:

2.2.5
- Improved performance of consistent hash strategy
- Fixed PECL request #13758 (Failed to extract 'connection' variable
  from object)

2.2.4
- Added memcached stats script from Harun Yayli
  (http://livebookmark.net/memcachephp)
- Fixed server weight not being used in the session handler
- Fixed PECL bug #13343 (compilation breaks with CodeWarrior compiler)
- Fixed PECL bug #13546 (Session handler through unix socket)
- Fixed PECL bug #14239 (Memcache::set() modifies value parameter)
- Fixed PECL request #13725 (unnecessary allocations in
  mmc_consistent_add_server)
- Changed behaviour when unserialize/uncompress fail to return false
  instead of failing the server

2.2.3
- Fixed PECL bug #12883 (Breaks UTF-8 in keys)
- Fixed PECL bug #13060 (make problems, due to role="doc" instead
  of role="src")
- Added package version to phpinfo()

2.2.2
- Fixed PECL bug 12494 (Segmentation fault when Exception thrown in
  the callback function)
- Fixed PECL bug #12834 (segfault when getting duplicate array values
  on 64-bit system)
- Changed behaviour of close() to actually remove all servers from
  pool (PECL bug #12555)
- Added configure option for PEAR installer to disable session handler
  support

2.2.1
- Added argument to Memcache::get() that receives the flags for
  retrieved value(s)
- Fixed PECL bug 11369 ("nested" get calls in __wakeup() functions
  breaks)
- Fixed problem with keys being modified in-place and empty keys
  (PECL Bug #11236)
- Fixed incompatibility with standard hash strategy in previous
  versions

2.2.0
- Added support for consistent hash strategy
- New INI directives "memcache.hash_strategy" = {standard, consistent},
  "memcache.hash_function" = {crc32, fnv}
- PHP6 support
- Fixed PECL bug #11221 (Double free when returning cached object with
  __sleep)
- Fixed PECL bug #10607 (Segfault on array key retrieval when array key
  is not IS_STRING)
- Don't failover on "object to large" errors
- Use $phpincludedir for finding php_session.h

2.1.2
- Added missing files to the package.

2.1.1
- Added experimental session storage support. You can use memcached as
  session storage.
- Fixed PECL bug #9486 (empty keys should not be allowed in
  memcache_set/add())
- Fixed PECL bug #9854 (get() changes the datatype of variable of given
  as key)

3 files changed, 6 insertions, 24 deletions

diff --git a/devel/php-memcache/Makefile b/devel/php-memcache/Makefile
index d51f582c6b9..a8c52a3c0a3 100644
--- a/devel/php-memcache/Makefile
+++ b/devel/php-memcache/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:27 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/03/08 12:13:07 fhajny Exp $
 #
 
 MODNAME=		memcache
-PKGREVISION=		1
-PECL_VERSION=		2.1.0
+PECL_VERSION=		2.2.5
 CATEGORIES+=		devel
 COMMENT=		PHP extension for memcached
 
@@ -14,8 +13,6 @@ CONFLICTS=		php-memcache-[0-9]*
 CONFIGURE_ARGS+=	--enable-${MODNAME}
 WRKSRC=			${WRKDIR}/${MODNAME}-${PECL_VERSION}
 
-.include "options.mk"
-
 .include "../../lang/php/ext.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/php-memcache/distinfo b/devel/php-memcache/distinfo
index 6775ed887ee..482635d8abc 100644
--- a/devel/php-memcache/distinfo
+++ b/devel/php-memcache/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/03/11 16:28:38 grant Exp $
+$NetBSD: distinfo,v 1.3 2010/03/08 12:13:07 fhajny Exp $
 
-SHA1 (php-memcache/memcache-2.1.0.tgz) = 173c1c6fa318346994d111ad9eb9d68de1b5ceb2
-RMD160 (php-memcache/memcache-2.1.0.tgz) = 9f20044d9e30d5b973a1a895c5fa7501eb7218ee
-Size (php-memcache/memcache-2.1.0.tgz) = 19567 bytes
+SHA1 (php-memcache/memcache-2.2.5.tgz) = 6bc7d8fc9c9b9a247316e35d0cac3fe9dd37b68c
+RMD160 (php-memcache/memcache-2.2.5.tgz) = 2c055a018f765a9572fa04beecd7797b7f69e796
+Size (php-memcache/memcache-2.2.5.tgz) = 35981 bytes
diff --git a/devel/php-memcache/options.mk b/devel/php-memcache/options.mk
deleted file mode 100644
index 8763b5f2a65..00000000000
--- a/devel/php-memcache/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2007/03/11 16:28:39 grant Exp $
-#
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.php
-PKG_SUPPORTED_OPTIONS+=	ssl
-PKG_SUGGESTED_OPTIONS+= ssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-.else
-CONFIGURE_ARGS+=	--without-openssl
-.endif