Attachment 116679 Details for Bug 158661 – patch

[patch] patch

patch (text/plain), 3.08 KB, created by Po-Chuan Hsieh on 2011-07-05 10:20:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2011-07-05 10:20:07 UTC

Size: 3.08 KB

patch

obsolete

>Index: Mk/bsd.php.mk
>===================================================================
>RCS file: /home/pcvs/ports/Mk/bsd.php.mk,v
>retrieving revision 1.64
>diff -u -r1.64 bsd.php.mk
>--- Mk/bsd.php.mk	15 Apr 2011 14:52:14 -0000	1.64
>+++ Mk/bsd.php.mk	5 Jul 2011 07:03:04 -0000
>@@ -83,10 +83,6 @@
> .endif	# .if exists(${PHPBASE}/etc/php.conf)
> PHP_EXT_INC?=	""
> 
>-# compatability shim
>-.if defined(BROKEN_WITH_PHP)
>-IGNORE_WITH_PHP=${BROKEN_WITH_PHP}
>-.endif
> .if defined(IGNORE_WITH_PHP)
> .	for VER in ${IGNORE_WITH_PHP}
> .		if ${PHP_VER} == "${VER}"
>Index: devel/php5-pinba/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/php5-pinba/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- devel/php5-pinba/Makefile	7 Jan 2010 23:55:06 -0000	1.1
>+++ devel/php5-pinba/Makefile	5 Jul 2011 07:03:04 -0000
>@@ -23,7 +23,7 @@
> USE_PHP=	yes
> USE_PHPEXT=	yes
> DEFAULT_PHP_VER=5
>-BROKEN_WITH_PHP=4
>+IGNORE_WITH_PHP=4
> PHP_MODNAME=	pinba
> 
> .include <bsd.port.mk>
>Index: lang/php4/Makefile.ext
>===================================================================
>RCS file: /home/pcvs/ports/lang/php4/Makefile.ext,v
>retrieving revision 1.54
>diff -u -r1.54 Makefile.ext
>--- lang/php4/Makefile.ext	4 Dec 2010 07:32:23 -0000	1.54
>+++ lang/php4/Makefile.ext	5 Jul 2011 07:03:04 -0000
>@@ -4,7 +4,7 @@
> USE_PHPEXT=	yes
> PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
> DEFAULT_PHP_VER=4
>-BROKEN_WITH_PHP=5
>+IGNORE_WITH_PHP=52 5
> 
> EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
> WRKSRC=		${WRKDIR}/${EXTSUBDIR}
>Index: lang/php5/Makefile.ext
>===================================================================
>RCS file: /home/pcvs/ports/lang/php5/Makefile.ext,v
>retrieving revision 1.80
>diff -u -r1.80 Makefile.ext
>--- lang/php5/Makefile.ext	26 Apr 2011 12:05:57 -0000	1.80
>+++ lang/php5/Makefile.ext	5 Jul 2011 07:03:04 -0000
>@@ -4,7 +4,7 @@
> USE_PHPEXT=	yes
> PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
> DEFAULT_PHP_VER=5
>-BROKEN_WITH_PHP=4
>+IGNORE_WITH_PHP=4 52
> 
> EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
> WRKSRC=		${WRKDIR}/${EXTSUBDIR}
>Index: lang/php52/Makefile.ext
>===================================================================
>RCS file: /home/pcvs/ports/lang/php52/Makefile.ext,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile.ext
>--- lang/php52/Makefile.ext	4 Dec 2010 07:32:24 -0000	1.6
>+++ lang/php52/Makefile.ext	5 Jul 2011 07:03:04 -0000
>@@ -4,7 +4,7 @@
> USE_PHPEXT=	yes
> PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
> DEFAULT_PHP_VER=52
>-BROKEN_WITH_PHP=4 5
>+IGNORE_WITH_PHP=4 5
> 
> EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
> WRKSRC=		${WRKDIR}/${EXTSUBDIR}
>Index: sysutils/dtc/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/dtc/Makefile,v
>retrieving revision 1.34
>diff -u -r1.34 Makefile
>--- sysutils/dtc/Makefile	26 Sep 2010 22:43:06 -0000	1.34
>+++ sysutils/dtc/Makefile	5 Jul 2011 07:03:04 -0000
>@@ -57,7 +57,7 @@
> 
> .if defined(WITH_PHP5)
> DEFAULT_PHP_VER=5
>-BROKEN_WITH_PHP=4
>+IGNORE_WITH_PHP=4
> RUN_DEPENDS+=	${LOCALBASE}/bin/pear:${PORTSDIR}/devel/pear
> USE_PHP+=	bz2 gd mbstring mcrypt mysql mysqli openssl pcre \
> 		session sockets xml zlib curl

Actions: View | Diff

Attachments on bug 158661: 116679