From sunpoet@sunpoet.net  Tue Jul  5 09:12:37 2011
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 04183106566B;
	Tue,  5 Jul 2011 09:12:37 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
	by mx1.freebsd.org (Postfix) with ESMTP id 95D578FC08;
	Tue,  5 Jul 2011 09:12:36 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 1C8C752B2; Tue,  5 Jul 2011 17:12:11 +0800 (CST)
Message-Id: <20110705091211.1C8C752B2@sunpoet.net>
Date: Tue,  5 Jul 2011 17:12:11 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Reply-To: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ale@FreeBSD.org
Subject: [PATCH] Mk/bsd.php.mk: remove BROKEN_WITH_PHP 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         158661
>Category:       ports
>Synopsis:       [PATCH] Mk/bsd.php.mk: remove BROKEN_WITH_PHP
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 05 09:20:07 UTC 2011
>Closed-Date:    Tue Jul 05 12:00:13 UTC 2011
>Last-Modified:  Tue Jul  5 12:00:22 UTC 2011
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Jun 20 21:52:00 CST 2011 sunpoet@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64


	
>Description:
- Remove BROKEN_WITH_PHP

Maintainer (ale@FreeBSD.org) is cc'd.
	
>How-To-Repeat:
	
>Fix:

--- patch begins here ---
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
--- patch ends here ---
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jul 5 09:20:37 UTC 2011 
Responsible-Changed-Why:  
bsd.php.mk is ale territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158661 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Tue Jul 5 12:00:12 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=158661 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/158661: commit references a PR
Date: Tue,  5 Jul 2011 11:59:59 +0000 (UTC)

 sunpoet     2011-07-05 11:59:46 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.php.mk 
     devel/php5-pinba     Makefile 
     lang/php4            Makefile.ext 
     lang/php5            Makefile.ext 
     lang/php52           Makefile.ext 
     sysutils/dtc         Makefile 
   Log:
   - Remove BROKEN_WITH_PHP
   
   PR:             ports/158661
   Submitted by:   sunpoet (myself)
   Approved by:    ale (maintainer)
   
   Revision  Changes    Path
   1.65      +1 -5      ports/Mk/bsd.php.mk
   1.2       +1 -1      ports/devel/php5-pinba/Makefile
   1.55      +1 -1      ports/lang/php4/Makefile.ext
   1.81      +1 -1      ports/lang/php5/Makefile.ext
   1.7       +1 -1      ports/lang/php52/Makefile.ext
   1.35      +1 -1      ports/sysutils/dtc/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
