From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 18 21:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E9081065695 for ; Wed, 18 Nov 2009 21:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5AFEA8FC1C for ; Wed, 18 Nov 2009 21:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAILK1MR000134 for ; Wed, 18 Nov 2009 21:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAILK1OE000133; Wed, 18 Nov 2009 21:20:01 GMT (envelope-from gnats) Resent-Date: Wed, 18 Nov 2009 21:20:01 GMT Resent-Message-Id: <200911182120.nAILK1OE000133@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Morton Jonuschat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E1881065697 for ; Wed, 18 Nov 2009 21:10:44 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 6CECE8FC14 for ; Wed, 18 Nov 2009 21:10:44 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nAILAimR039122 for ; Wed, 18 Nov 2009 21:10:44 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nAILAiBv039105; Wed, 18 Nov 2009 21:10:44 GMT (envelope-from nobody) Message-Id: <200911182110.nAILAiBv039105@www.freebsd.org> Date: Wed, 18 Nov 2009 21:10:44 GMT From: Morton Jonuschat To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/140680: Modify port databases/phpmyadmin to allow building with PHP 5.3.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2009 21:20:01 -0000 >Number: 140680 >Category: ports >Synopsis: Modify port databases/phpmyadmin to allow building with PHP 5.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Nov 18 21:20:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Morton Jonuschat >Release: 8.0-PRERELEASE >Organization: >Environment: FreeBSD localhorst.local 8.0-PRERELEASE FreeBSD 8.0-PRERELEASE #0: Tue Nov 17 07:52:33 CET 2009 root@localhorst.local:/usr/obj/usr/src/sys/HOMESERVER amd64 >Description: This patch allows phpMyAdmin to build with PHP 5.3.0 which permanently includes SPL in the core and this presents a dependency problem. Related to http://www.freebsd.org/cgi/query-pr.cgi?pr=140678 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN /usr/ports-php52/databases/phpmyadmin/Makefile databases/phpmyadmin/Makefile --- /usr/ports-php52/databases/phpmyadmin/Makefile 2009-11-17 01:35:11.062653213 +0100 +++ databases/phpmyadmin/Makefile 2009-11-18 22:04:08.309974589 +0100 @@ -20,7 +20,7 @@ USE_BZIP2= yes NO_BUILD= yes .if !defined(WITHOUT_PHP_DEPENDS) -USE_PHP= ctype mysql session spl filter +USE_PHP= ctype mysql session filter .endif # Unfortunately can't make WITH_SUPHP part of the OPTIONS selection, @@ -108,6 +108,13 @@ .include +.if !defined(WITHOUT_PHP_DEPENDS) +PHP_VERNUM!= ${PHPBASE}/bin/php-config --vernum +. if ${PHP_VERNUM} < 50300 +USE_PHP+= spl +. endif +.endif + _PMA_GID!= ${PW} group show -n ${PMA_GRP} | ${CUT} -d : -f 3 .if empty(_PMA_GID) _PMA_GID= 80 >Release-Note: >Audit-Trail: >Unformatted: