summaryrefslogtreecommitdiff
path: root/databases/pecl-memcache
diff options
context:
space:
mode:
authorMarcus Alves Grando <mnag@FreeBSD.org>2006-05-06 16:32:14 +0000
committerMarcus Alves Grando <mnag@FreeBSD.org>2006-05-06 16:32:14 +0000
commitf40e498bac47cd8499029670461ab7f79365830f (patch)
treec97147b76d67e15410d8a0cf03774658f15abfdd /databases/pecl-memcache
parentUpdate to 0.8.1. (diff)
- Fix segmentation fault when server are restarted (http://pecl.php.net/bugs/bug.php?id=7331).
- Use USE_DOS2UNIX. - Bump PORTREVISION. PR: 96730 Approved by: maintainer
Notes
Notes: svn path=/head/; revision=161501
Diffstat (limited to 'databases/pecl-memcache')
-rw-r--r--databases/pecl-memcache/Makefile7
-rw-r--r--databases/pecl-memcache/files/patch-memcache.c15
2 files changed, 16 insertions, 6 deletions
diff --git a/databases/pecl-memcache/Makefile b/databases/pecl-memcache/Makefile
index 1551ee50f00f..851e118d7b67 100644
--- a/databases/pecl-memcache/Makefile
+++ b/databases/pecl-memcache/Makefile
@@ -7,6 +7,7 @@
PORTNAME= memcache
PORTVERSION= 2.0.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -20,11 +21,9 @@ USE_PHP= zlib
USE_PHPEXT= yes
PHP_MODNAME= memcache
-CONFIGURE_ARGS= --with-zlib-dir=/usr
+USE_DOS2UNIX= yes
-post-extract:
- @${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|cpp|h|txt|php)" -print0 | \
- ${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
+CONFIGURE_ARGS= --with-zlib-dir=/usr
.if !defined(NOPORTDOCS)
post-install:
diff --git a/databases/pecl-memcache/files/patch-memcache.c b/databases/pecl-memcache/files/patch-memcache.c
index f1e2335623d5..79d193de39c0 100644
--- a/databases/pecl-memcache/files/patch-memcache.c
+++ b/databases/pecl-memcache/files/patch-memcache.c
@@ -1,5 +1,5 @@
---- ./memcache.c.orig Wed Jan 4 23:33:18 2006
-+++ ./memcache.c Wed Jan 4 23:33:25 2006
+--- memcache.c.orig Wed May 3 16:41:31 2006
++++ memcache.c Wed May 3 16:42:05 2006
@@ -120,7 +120,7 @@
/* {{{ macros */
@@ -9,3 +9,14 @@
#if ZEND_DEBUG
+@@ -580,7 +580,9 @@
+ if ((version = mmc_get_version(mmc TSRMLS_CC)) == NULL && !_mmc_open(mmc, error_string, errnum TSRMLS_CC)) {
+ break;
+ }
+- efree(version);
++ if (version) {
++ efree(version);
++ }
+ mmc->status = MMC_STATUS_CONNECTED;
+ }
+ return 1;