diff options
author | jdolecek <jdolecek@pkgsrc.org> | 2004-11-02 20:08:15 +0000 |
---|---|---|
committer | jdolecek <jdolecek@pkgsrc.org> | 2004-11-02 20:08:15 +0000 |
commit | dcded4cc03a167c6304b2e3a81b8bdea0e8f82e1 (patch) | |
tree | 6f0b0f1495f6331771911c27b7977149fbaf31ae /www/php4-apc | |
parent | aee6c7e1e07b80dcc1c5d9e4cb54c12377d6ef48 (diff) | |
download | pkgsrc-dcded4cc03a167c6304b2e3a81b8bdea0e8f82e1.tar.gz |
Update to APC 2.0.4. It has been completely rewritten, and is now hosted
and pecl.php.net.
Also change package to use the new shared PHP4/PHP5 framework, tho
this module is PHP 4.x-only.
Diffstat (limited to 'www/php4-apc')
-rw-r--r-- | www/php4-apc/Makefile | 23 | ||||
-rw-r--r-- | www/php4-apc/PLIST.extras | 7 | ||||
-rw-r--r-- | www/php4-apc/distinfo | 11 | ||||
-rw-r--r-- | www/php4-apc/patches/patch-aa | 13 | ||||
-rw-r--r-- | www/php4-apc/patches/patch-ab | 14 | ||||
-rw-r--r-- | www/php4-apc/patches/patch-ac | 13 | ||||
-rw-r--r-- | www/php4-apc/patches/patch-ad | 31 | ||||
-rw-r--r-- | www/php4-apc/patches/patch-ae | 24 |
8 files changed, 16 insertions, 120 deletions
diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile index d2acbf53ca9..4defe292e5d 100644 --- a/www/php4-apc/Makefile +++ b/www/php4-apc/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2004/04/24 23:03:25 xtraeme Exp $ +# $NetBSD: Makefile,v 1.13 2004/11/02 20:08:15 jdolecek Exp $ -DISTNAME= apc-1.1.0pl1 -PKGNAME= php-apc-1.1.0.1 -MODNAME= ${DISTNAME:C/-[^-]*$//} -CATEGORIES+= www -MASTER_SITES= http://apc.communityconnect.com/sources/ -EXTRACT_SUFX= .tar.gz +DISTNAME= APC-2.0.4 +PKGNAME= php-${DISTNAME:tl} +MODNAME= ${DISTNAME:C/-[^-]*$//:tl} +CATEGORIES+= sysutils +MASTER_SITES= http://pecl.php.net/get/ +EXTRACT_SUFX= .tgz MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://apc.communityconnect.com/ @@ -17,19 +17,18 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_BUILDLINK3= YES DISTINFO_FILE= ${.CURDIR}/distinfo -.include "../../www/php4/Makefile.module" +PHP_VERSION_REQD= 4 # PHP 4.x only +.include "../../lang/php/ext.mk" CONFIGURE_ARGS+= --enable-${MODNAME} PLIST_SRC+= ${.CURDIR}/PLIST.extras PLIST_SUBST+= PKGBASE="${PKGBASE}" DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -EGDIR= ${PREFIX}/share/examples/${PKGBASE} post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} cd ${WRKSRC}; ${INSTALL_DATA} \ - GORY_DETAILS INSTALL LICENSE README.compiler ${DOCDIR} - cd ${WRKSRC}; ${INSTALL_DATA} extras/apcinfo.php ${EGDIR} + INSTALL LICENSE NOTICE ${DOCDIR} .include "../../mk/bsd.pkg.mk" diff --git a/www/php4-apc/PLIST.extras b/www/php4-apc/PLIST.extras index c6a777ee729..6d961049674 100644 --- a/www/php4-apc/PLIST.extras +++ b/www/php4-apc/PLIST.extras @@ -1,8 +1,5 @@ -@comment $NetBSD: PLIST.extras,v 1.1 2001/11/01 02:25:33 zuntum Exp $ +@comment $NetBSD: PLIST.extras,v 1.2 2004/11/02 20:08:15 jdolecek Exp $ share/doc/${PKGBASE}/INSTALL -share/doc/${PKGBASE}/GORY_DETAILS share/doc/${PKGBASE}/LICENSE -share/doc/${PKGBASE}/README.compiler -share/examples/${PKGBASE}/apcinfo.php -@dirrm share/examples/${PKGBASE} +share/doc/${PKGBASE}/NOTICE @dirrm share/doc/${PKGBASE} diff --git a/www/php4-apc/distinfo b/www/php4-apc/distinfo index 71eae42774b..a656ae4acf6 100644 --- a/www/php4-apc/distinfo +++ b/www/php4-apc/distinfo @@ -1,9 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/12/31 23:54:49 jlam Exp $ +$NetBSD: distinfo,v 1.4 2004/11/02 20:08:15 jdolecek Exp $ -SHA1 (apc-1.1.0pl1.tar.gz) = 7deac1c4c1989ab4cf9e2b9f16b7823d3731b6b4 -Size (apc-1.1.0pl1.tar.gz) = 240886 bytes -SHA1 (patch-aa) = 20cf6cc1568979a1a3d103c40f62463ae2354e3e -SHA1 (patch-ab) = a3794f8bf99e603ea8b0c9849475450c22c78b9e -SHA1 (patch-ac) = 309224a4b0bc7a20a1748708785ee7df1d10ad42 -SHA1 (patch-ad) = 5ecbaeff574a696d5c4106dc2ec419cdceb25d16 -SHA1 (patch-ae) = 4e1e3b89ee359a84a32197099d272e13f8cba38b +SHA1 (APC-2.0.4.tgz) = 228026609ef026988d8830fc6d766b3910c4eac4 +Size (APC-2.0.4.tgz) = 44606 bytes diff --git a/www/php4-apc/patches/patch-aa b/www/php4-apc/patches/patch-aa deleted file mode 100644 index 6dd34000cb6..00000000000 --- a/www/php4-apc/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/29 16:50:16 jlam Exp $ - ---- Makefile.in.orig Thu Jan 11 15:31:49 2001 -+++ Makefile.in -@@ -9,7 +9,7 @@ - - LTLIBRARY_NAME = libapc.la - LTLIBRARY_SOURCES = php_apc.c apc_iface.c apc_cache.c apc_serialize.c apc_rwlock.c apc_smm.c apc_shm.c apc_sem.c apc_lib.c apc_crc32.c apc_fcntl.c apc_cache_mm.c apc_nametable.c apc_util.c --LTLIBRARY_SHARED_NAME = php_apc.la -+LTLIBRARY_SHARED_NAME = apc.la - LTLIBRARY_SHARED_LIBADD = $(APC_SHARED_LIBADD) - - include $(top_srcdir)/build/dynlib.mk diff --git a/www/php4-apc/patches/patch-ab b/www/php4-apc/patches/patch-ab deleted file mode 100644 index a37fc187a61..00000000000 --- a/www/php4-apc/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/10/29 16:50:16 jlam Exp $ - ---- apc_sem.c.orig Fri Jun 15 10:38:34 2001 -+++ apc_sem.c -@@ -17,7 +17,9 @@ - #include "apc_lib.h" - #include "apc_phpdeps.h" - #include <unistd.h> -+#ifdef HAVE_SEMAPHORE_H - #include <semaphore.h> -+#endif - #include <sys/types.h> - #include <sys/ipc.h> - #include <sys/sem.h> diff --git a/www/php4-apc/patches/patch-ac b/www/php4-apc/patches/patch-ac deleted file mode 100644 index bd511b559af..00000000000 --- a/www/php4-apc/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/10/29 16:50:16 jlam Exp $ - ---- config.m4.orig Fri Jun 15 10:38:34 2001 -+++ config.m4 -@@ -27,6 +27,8 @@ - PHP_EXTENSION(apc, $ext_shared) - fi - -+AC_CHECK_HEADERS(semaphore.h) -+ - AC_CACHE_CHECK(for union semun,php_cv_semun, - AC_TRY_COMPILE([ - #include <sys/types.h> diff --git a/www/php4-apc/patches/patch-ad b/www/php4-apc/patches/patch-ad deleted file mode 100644 index 29582fda2ea..00000000000 --- a/www/php4-apc/patches/patch-ad +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/10/29 19:33:50 jlam Exp $ - ---- apc_shm.c.orig Sat Mar 24 17:15:50 2001 -+++ apc_shm.c -@@ -22,12 +22,17 @@ - #include <errno.h> - #include <string.h> - -+#if defined(__NetBSD__) -+#define IPC_PERMS ((S_IRUSR|S_IWUSR) | (S_IRGRP|S_IWGRP) | (S_IROTH|S_IWOTH)) -+#else - #ifndef SHM_R - # define SHM_R 0444 /* read permission */ - #endif - #ifndef SHM_A - # define SHM_A 0222 /* write permission */ - #endif -+#define IPC_PERMS (SHM_R|SHM_A) -+#endif - - /* apc_shm_create: create a shared memory segment of given size */ - int apc_shm_create(const char* pathname, int proj, int size) -@@ -44,7 +49,7 @@ - } - } - -- oflag = IPC_CREAT | SHM_R | SHM_A; -+ oflag = IPC_CREAT | IPC_PERMS; - if ((shmid = shmget(key, size, oflag)) < 0) { - apc_eprint("apc_shmcreate: shmget(%d, %d,%d) failed: %s", key, size, oflag, strerror(errno)); - } diff --git a/www/php4-apc/patches/patch-ae b/www/php4-apc/patches/patch-ae deleted file mode 100644 index 10be2cee6a2..00000000000 --- a/www/php4-apc/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/12/31 23:54:49 jlam Exp $ - ---- php_apc.c.orig Mon Aug 20 14:34:04 2001 -+++ php_apc.c -@@ -61,6 +61,7 @@ - - /* module entry */ - zend_module_entry apc_module_entry = { -+ STANDARD_MODULE_HEADER, - "APC", - apc_functions, - PHP_MINIT(apc), -@@ -68,9 +69,8 @@ - PHP_RINIT(apc), - PHP_RSHUTDOWN(apc), - PHP_MINFO(apc), -- NULL, -- NULL, -- STANDARD_MODULE_PROPERTIES_EX -+ NO_VERSION_YET, -+ STANDARD_MODULE_PROPERTIES - }; - - zend_apc_globals apc_globals; |