ports/145624: [PATCH] www/pecl-APC: Update to 3.1.3p1

[Jui-Nan Lin]

>Number:         145624
>Category:       ports
>Synopsis:       [PATCH] www/pecl-APC: Update to 3.1.3p1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 11 08:00:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jui-Nan Lin
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD Florence.tamama.org 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #8: Thu Jan  7 11:34:24 CST
>Description:
Since lang/php5 is 5.3 now, so APC should be upgraded to 
3.1 to support PHP 5.3.

NOTE: APC 3.1 no longer supports PHP4.

Port maintainer (mnag at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- pecl-APC-3.1.3.p1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/pecl-APC/Makefile /home/users/jnlin/ports/pecl-APC/Makefile
--- /usr/ports/www/pecl-APC/Makefile	2009-03-25 12:18:42.000000000 +0800
+++ /home/users/jnlin/ports/pecl-APC/Makefile	2010-04-11 02:22:28.946800036 +0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	APC
-DISTVERSION=	3.0.19
+DISTVERSION=	3.1.3p1
 CATEGORIES=	www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -18,6 +18,7 @@
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
+IGNORE_WITH_PHP=	4
 PHP_MODNAME=	apc
 
 SUB_FILES=	pkg-message
@@ -28,8 +29,7 @@
 OPTIONS=	MMAP		"Enable mmap memory support (default: IPC shm)"	off \
 		SEMAPHORES	"Enable sysv IPC semaphores (default: fcntl())"	off \
 		SPINLOCKS	"Enable spinlocks (experimental)"		off \
-		FILEHITS	"Enable per request cache info"			off \
-		PHP4_OPT	"Little optimization to PHP4"			off
+		FILEHITS	"Enable per request cache info"			off
 
 PORTDOCS=	*
 
@@ -51,26 +51,7 @@
 CONFIGURE_ARGS+=	--enable-apc-filehits
 .endif
 
-.if defined(WITH_PHP4_OPT)
-.if ${PHP_VER} == 4
-.if exists(${LOCALBASE}/include/apache/httpd.h)
-CFLAGS+=	-I${LOCALBASE}/include/apache -DAPC_PHP4_STAT
-.elif exists(${LOCALBASE}/include/apache2/httpd.h)
-CFLAGS+=	-I${LOCALBASE}/include/apache2 -DAPC_PHP4_STAT
-.elif exists(${LOCALBASE}/include/apache21/httpd.h)
-CFLAGS+=	-I${LOCALBASE}/include/apache21 -DAPC_PHP4_STAT
-.elif exists(${LOCALBASE}/include/apache22/httpd.h)
-CFLAGS+=	-I${LOCALBASE}/include/apache22 -DAPC_PHP4_STAT
-.endif
-.else
-pre-configure:
-	@${ECHO_CMD}
-	@${ECHO_CMD} "*** WARNING ***"
-	@${ECHO_CMD} "This optimization is only for PHP4. PHP5 or newer does not need it"
-	@${ECHO_CMD} "I will continue instalation..."
-	@${ECHO_CMD}
-.endif
-.endif
+CFLAGS+=	-I${PREFIX}/include
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN --exclude=CVS /usr/ports/www/pecl-APC/distinfo /home/users/jnlin/ports/pecl-APC/distinfo
--- /usr/ports/www/pecl-APC/distinfo	2008-06-10 06:05:04.000000000 +0800
+++ /home/users/jnlin/ports/pecl-APC/distinfo	2010-04-11 02:08:41.615685418 +0800
@@ -1,3 +1,3 @@
-MD5 (PECL/APC-3.0.19.tgz) = 951f43d2873e3572f5d5ae71a9b66f90
-SHA256 (PECL/APC-3.0.19.tgz) = a02677a7884361d64fbf3745c402f2a6ff313e817b0d0a2010acb64cd05247b0
-SIZE (PECL/APC-3.0.19.tgz) = 115735
+MD5 (PECL/APC-3.1.3p1.tgz) = 941cf59c3f8042c1d6961b7afb1002b9
+SHA256 (PECL/APC-3.1.3p1.tgz) = 9e4e3163baf697bf0fba7bc3993f112c375f0ab2b40bba325d7109999ae4d28d
+SIZE (PECL/APC-3.1.3p1.tgz) = 142277
diff -ruN --exclude=CVS /usr/ports/www/pecl-APC/files/patch-apc_sem.c /home/users/jnlin/ports/pecl-APC/files/patch-apc_sem.c
--- /usr/ports/www/pecl-APC/files/patch-apc_sem.c	2008-01-25 11:01:54.000000000 +0800
+++ /home/users/jnlin/ports/pecl-APC/files/patch-apc_sem.c	2010-04-11 02:12:50.861579473 +0800
@@ -1,12 +1,9 @@
-#
-# Fix http://pecl.php.net/bugs/bug.php?id=5280
-#
---- apc_sem.c.orig	2008-01-25 00:32:24.000000000 -0200
-+++ apc_sem.c	2008-01-25 00:35:28.000000000 -0200
-@@ -82,12 +82,16 @@
+--- apc_sem.c.orig	1970-01-01 17:13:08.000000000 +0800
++++ apc_sem.c	2010-04-11 02:12:13.026306211 +0800
+@@ -85,12 +85,16 @@
          }
      }
-     
+ 
 -    if ((semid = semget(key, 1, IPC_CREAT | IPC_EXCL | perms)) >= 0) {
 +    if ((semid = semget(key, 2, IPC_CREAT | IPC_EXCL | perms)) >= 0) {
          /* sempahore created for the first time, initialize now */
@@ -14,14 +11,14 @@
          if (semctl(semid, 0, SETVAL, arg) < 0) {
              apc_eprint("apc_sem_create: semctl(%d,...) failed:", semid);
          }
-+        arg.val = getpid();
-+        if (semctl(semid, 1, SETVAL, arg) < 0) {
-+            apc_eprint("apc_sem_create: semctl(%d,...) failed:", semid);
-+        }
++	arg.val = getpid();
++	if (semctl(semid, 1, SETVAL, arg) < 0) {
++	    apc_eprint("apc_sem_create: semctl(%d,...) failed:", semid);
++	}
      }
      else if (errno == EEXIST) {
          /* sempahore already exists, don't initialize */
-@@ -107,7 +111,10 @@
+@@ -110,7 +114,10 @@
  {
      /* we expect this call to fail often, so we do not check */
      union semun arg;
--- pecl-APC-3.1.3.p1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: