Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Jun 2009 02:23:45 +0800 (CST)
From:      Yi-Jheng Lin <yzlin@cs.nctu.edu.tw>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/135674: [PATCH] some PHP-related knobs should be placed before bsd.ports.pre.mk
Message-ID:  <20090617182345.D23DF48F610@yzlin.org>
Resent-Message-ID: <200906171840.n5HIe2X0030303@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         135674
>Category:       ports
>Synopsis:       [PATCH] some PHP-related knobs should be placed before bsd.ports.pre.mk
>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:   Wed Jun 17 18:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Yi-Jheng Lin
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD yzlin 7.2-STABLE FreeBSD 7.2-STABLE #0: Sun May 24 03:53:58 CST 2009
>Description:

The following ports should be fixed:

databases/adodb5
sysutils/phplogcon
www/cakephp
www/cakephp-devel
www/prado
www/vtiger
www/zend-framework

>How-To-Repeat:
>Fix:

--- phpknobs.patch begins here ---
Index: databases/adodb5/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/adodb5/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- databases/adodb5/Makefile	31 May 2009 20:31:00 -0000	1.6
+++ databases/adodb5/Makefile	17 Jun 2009 05:25:52 -0000
@@ -20,6 +20,8 @@
 LATEST_LINK=	adodb5
 
 USE_PHP=	pcre
+DEFAULT_PHP_VER=5
+IGNORE_WITH_PHP=4
 
 WRKSRC=		${WRKDIR}/${PORTNAME}5
 NO_BUILD=	YES
@@ -33,9 +35,6 @@
 
 .include <bsd.port.pre.mk>
 
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4
-
 .if defined (WITH_TESTS)
 PLIST_SUB+=	TESTS=
 .else
Index: sysutils/phplogcon/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/phplogcon/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sysutils/phplogcon/Makefile	31 Mar 2009 09:40:16 -0000	1.4
+++ sysutils/phplogcon/Makefile	17 Jun 2009 05:25:52 -0000
@@ -17,6 +17,13 @@
 LOGCONDIR?=	www/phplogcon
 PLIST_SUB+=	LOGCONDIR=${LOGCONDIR}
 
+.if !defined(WITHOUT_PHP_DEPENDS)
+USE_PHP=	session pdo gd xml
+WANT_PHP_WEB=	YES
+IGNORE_WITH_PHP=4
+DEFAULT_PHP_VER=5
+.endif
+
 pre-everything::
 	@${ECHO_CMD} "# you can customize the installation directory"
 	@${ECHO_CMD} "# by setting LOGCON in /etc/make.conf"
@@ -33,11 +40,6 @@
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	session pdo gd xml
-WANT_PHP_WEB=	YES
-IGNORE_WITH_PHP=4
-DEFAULT_PHP_VER=5
-
 .if defined(WITH_PHP_MYSQL)
 USE_PHP+=	mysql
 .endif
Index: www/cakephp/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/cakephp/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/cakephp/Makefile	18 Jul 2008 21:05:18 -0000	1.11
+++ www/cakephp/Makefile	17 Jun 2009 05:25:52 -0000
@@ -27,6 +27,8 @@
 NO_BUILD=	yes
 USE_PHP=	pcre session
 WANT_PHP_WEB=	yes
+DEFAULT_PHP_VER=5
+IGNORE_WITH_PHP=4
 
 SUB_FILES=	pkg-message
 
@@ -52,9 +54,6 @@
 CGI_EXT=
 .endif
 
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4
-
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
 .if defined(WITH_PROD)
Index: www/cakephp-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/cakephp-devel/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- www/cakephp-devel/Makefile	21 Apr 2009 20:36:45 -0000	1.16
+++ www/cakephp-devel/Makefile	17 Jun 2009 05:25:52 -0000
@@ -34,6 +34,8 @@
 USE_GETTEXT=	yes
 USE_PHP=	session
 WANT_PHP_WEB=	yes
+DEFAULT_PHP_VER=5
+IGNORE_WITH_PHP=4
 
 CAKE_CONF_FILES=	\
 		app/config/acl.ini.php \
@@ -66,9 +68,6 @@
 CGI_EXT=
 .endif
 
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4
-
 SUB_LIST+=	PHPCGI=${WITH_PHP_CGI}
 
 .if defined(WITH_PROD)
Index: www/prado/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/prado/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/prado/Makefile	27 May 2009 18:51:36 -0000	1.5
+++ www/prado/Makefile	17 Jun 2009 05:25:52 -0000
@@ -30,6 +30,8 @@
 NO_BUILD=	yes
 WANT_PHP_WEB=	yes
 USE_PHP=	session
+DEFAULT_PHP_VER=5
+IGNORE_WITH_PHP=4
 
 SUB_FILES=	pkg-message
 
@@ -44,9 +46,6 @@
 
 .include <bsd.port.pre.mk>
 
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4
-
 WITH_PHP_CGI?=	/cgi-bin/php
 
 .if ${PHP_SAPI:Mcgi} == "cgi" && ${PHP_SAPI:Mmod} == ""
Index: www/vtiger/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/vtiger/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- www/vtiger/Makefile	23 Sep 2007 15:09:59 -0000	1.13
+++ www/vtiger/Makefile	17 Jun 2009 05:25:52 -0000
@@ -19,15 +19,16 @@
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
+USE_PHP=	mysql gd imap session pcre xml
+WANT_PHP_WEB=	YES
+IGNORE_WITH_PHP=	4
+
 WRKSRC=		${WRKDIR}/vtigercrm
 
 OPTIONS=	MYSQLSERVER     "Use MySQL-Server on localhost" OFF
 
 .include <bsd.port.pre.mk>
 
-USE_PHP=	mysql gd imap session pcre xml
-WANT_PHP_WEB=	YES
-IGNORE_WITH_PHP=	4
 IGNORE_WITH_MYSQL=	323 40
 
 CONFLICTS=	vtiger-4.*
Index: www/zend-framework/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/zend-framework/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- www/zend-framework/Makefile	28 May 2009 21:16:30 -0000	1.29
+++ www/zend-framework/Makefile	17 Jun 2009 05:25:52 -0000
@@ -17,6 +17,7 @@
 NO_BUILD=	yes
 USE_PHP=	spl
 WANT_PHP_WEB=	yes
+IGNORE_WITH_PHP=4
 USE_GETTEXT=	yes
 
 SUB_FILES=	pkg-message
@@ -36,8 +37,6 @@
 
 .include <bsd.port.pre.mk>
 
-IGNORE_WITH_PHP=4
-
 # Check for mutually-exclusive options
 .if defined(WITH_EDOJO) && defined(WITH_PDOJO)
 IGNORE=		please select only one type of Dojo installation
--- phpknobs.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090617182345.D23DF48F610>