ports/52785: [Maintainer Update] Turck MMCache

[Alex Dupre]

>Number:         52785
>Category:       ports
>Synopsis:       [Maintainer Update] Turck MMCache
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 29 08:00:25 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Update to 2.3.13.
Require commit of PR 52674.
Supersede PR 52435.
>How-To-Repeat:
>Fix:

--- mmcache.diff begins here ---
diff -ruN turck-mmcache.orig/Makefile turck-mmcache/Makefile
--- turck-mmcache.orig/Makefile	Thu May 29 16:13:39 2003
+++ turck-mmcache/Makefile	Thu May 29 16:48:10 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turck-mmcache
-PORTVERSION=	2.3.10
+PORTVERSION=	2.3.13
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,39 +14,23 @@
 MAINTAINER=	sysadmin at alexdupre.com
 COMMENT=	An opcode cache for PHP with encoder and loader
 
-EXTRACT_DEPENDS=phpize:${PORTSDIR}/www/mod_php4
-BUILD_DEPENDS=	${LOCALBASE}/include/php/Zend/zend.h:${PORTSDIR}/www/mod_php4
-LIB_DEPENDS=	mm.12:${PORTSDIR}/devel/mm
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${APACHE_PORT} \
-		${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
-USE_LIBTOOL=	yes
-WANT_AUTOMAKE_VER=	15
-WANT_AUTOCONF_VER=	253
-
-CONFIGURE_ARGS=	--enable-mmcache=shared \
-		--with-php-config=${LOCALBASE}/bin/php-config \
-		--prefix=${PREFIX}
+USE_REINPLACE=	yes
+USE_PHPIZE=	yes
+WITH_PHP_MOD=	yes
+
+CONFIGURE_ARGS=	--enable-mmcache=shared
 
 EXT_DIR=	20020429
 PLIST_SUB=	EXT_DIR=${EXT_DIR}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-USE_REINPLACE=	yes
-
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
-.if defined(WITH_APACHE2) || exists(${LOCALBASE}/include/apache2/apr.h)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
-.else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-.endif
-
-post-extract:
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/config.m4
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/phpize
+post-patch:
+	@${REINPLACE_CMD} 's|==|=|g' ${WRKSRC}/config.m4
+	@${REINPLACE_CMD} 's|ALIGN|MMALIGN|g' ${WRKSRC}/mm.c ${WRKSRC}/mmcache.c
 
 post-build:
 	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/encoder.php > ${WRKSRC}/encoder
diff -ruN turck-mmcache.orig/distinfo turck-mmcache/distinfo
--- turck-mmcache.orig/distinfo	Thu May 29 16:13:39 2003
+++ turck-mmcache/distinfo	Thu May 29 16:17:37 2003
@@ -1 +1 @@
-MD5 (turck-mmcache-2.3.10.tar.gz) = 6dd12cd6c122a821af1aa872b808704e
+MD5 (turck-mmcache-2.3.13.tar.gz) = b630e2a0f2baeb37ee3ede3942ba5ce5
diff -ruN turck-mmcache.orig/files/patch-encoder.php turck-mmcache/files/patch-encoder.php
--- turck-mmcache.orig/files/patch-encoder.php	Thu May 29 16:13:39 2003
+++ turck-mmcache/files/patch-encoder.php	Thu May 29 16:19:55 2003
@@ -1,6 +1,6 @@
---- encoder.php.orig	Thu May  8 16:58:25 2003
-+++ encoder.php	Thu May  8 17:00:00 2003
-@@ -1,25 +1,25 @@
+--- encoder.php.orig	Wed May 28 15:12:59 2003
++++ encoder.php	Thu May 29 16:19:28 2003
+@@ -1,10 +1,10 @@
 -#! /usr/bin/php -f
 +#! %%LOCALBASE%%/bin/php -f
  
@@ -15,12 +15,7 @@
    echo "Options:\n";
    echo "\t-s suffix\n\t\tencode files only with following suffix (default is \"php\")\n";
    echo "\t-a\n\t\tencode all files (no by default)\n";
-   echo "\t-l\n\t\tfollow symbolic links (no by default)\n";
-   echo "\t-r\n\t\tencode directories recursively (no by default)\n";
-   echo "\t-c\n\t\tcopy files those shouldn't be encoded (no by default)\n";
--  echo "\t-f\n\t\toverfrite existing files (no by default)\n";
-+  echo "\t-f\n\t\toverwrite existing files (no by default)\n";
-   echo "\t-o target\n\t\tIf you encode only one script then 'target' specifyes an output\n";
+@@ -16,10 +16,10 @@
    echo               "\t\tfile name. If you encode directory or several files at once\n";
    echo               "\t\tthen 'target' specifyes an output directory name.\n";
    echo "\nExamples:\n";
diff -ruN turck-mmcache.orig/files/patch-mm.c turck-mmcache/files/patch-mm.c
--- turck-mmcache.orig/files/patch-mm.c	Thu Jan  1 01:00:00 1970
+++ turck-mmcache/files/patch-mm.c	Thu May 29 16:32:29 2003
@@ -0,0 +1,10 @@
+--- mm.c.orig	Thu May 29 16:32:06 2003
++++ mm.c	Thu May 29 16:32:16 2003
+@@ -11,7 +11,6 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <malloc.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
--- mmcache.diff ends here ---

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