From nobody@FreeBSD.org  Wed Nov 18 21:10:44 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E1881065697
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <mjonuschat@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Modify port databases/phpmyadmin to allow building with PHP 5.3.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: m.seaman@infracaninophile.co.uk

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 18 21:20:00 UTC 2009
>Closed-Date:    Thu Apr 15 02:38:15 UTC 2010
>Last-Modified:  Thu Apr 15 02:38:15 UTC 2010
>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 <bsd.port.pre.mk>
 
+.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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Nov 18 21:20:11 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: m.seaman@infracaninophile.co.uk
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/140680: Modify port databases/phpmyadmin to allow building with PHP 5.3.0
Date: Wed, 18 Nov 2009 21:20:09 UT

 Maintainer of databases/phpmyadmin,
 
 Please note that PR ports/140680 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/140680
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Morton Jonuschat <mjonuschat@gmail.com>
To: FreeBSD-gnats-submit@FreeBSD.org,
 freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: ports/140680: Modify port databases/phpmyadmin to allow building with PHP 5.3.0
Date: Wed, 18 Nov 2009 23:08:00 +0100

 --Apple-Mail-11--1045477699
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii;
 	format=flowed;
 	delsp=yes
 
 Please find a revised patch attached to this mail since my previous  
 patch made the port depend on an installed PHP Version. This patch  
 uses a simple file existance check to decide wether to depend on php5- 
 spl or not.
 
 
 --Apple-Mail-11--1045477699
 Content-Disposition: attachment;
 	filename=phpmyadmin-php53-revised.diff.txt
 Content-Type: text/plain;
 	name="phpmyadmin-php53-revised.diff.txt"
 Content-Transfer-Encoding: 7bit
 
 --- FreeBSD/ports/databases/phpmyadmin/Makefile	2009-11-02 11:54:04.000000000 +0100
 +++ PHP-5.3.0/ports/databases/phpmyadmin/Makefile	2009-11-18 23:04:13.102677851 +0100
 @@ -20,7 +20,10 @@
  USE_BZIP2=	yes
  NO_BUILD=	yes
  .if !defined(WITHOUT_PHP_DEPENDS)
 -USE_PHP=	ctype mysql session spl filter
 +USE_PHP=	ctype mysql session filter
 +.	if exists(${PORTSDIR}/devel/php5-spl/Makefile)
 +USE_PHP+=	spl
 +.	endif
  .endif
  
  # Unfortunately can't make WITH_SUPHP part of the OPTIONS selection,
 
 --Apple-Mail-11--1045477699
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii;
 	format=flowed
 
 
 
 Kind regards,
 Morton
 
 
 --Apple-Mail-11--1045477699--

From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: bug-followup@FreeBSD.ORG
Cc:  
Subject: Re: ports/140680: Modify port databases/phpmyadmin to allow building
 with PHP 5.3.0
Date: Thu, 19 Nov 2009 06:41:12 +0000

 This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
 --------------enig591EEEA2E34E2716DD7FC5EF
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: quoted-printable
 
 Edwin Groothuis wrote:
 > Maintainer of databases/phpmyadmin,
 >=20
 > Please note that PR ports/140680 has just been submitted.
 >=20
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >=20
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/140680
 >=20
 
 PHP 5.3 isn't in the ports yet, and it isn't clear exactly how and when
 it will be introduced.  As soon as PHP 5.3 is available, I will be happy
 to update the phpmyadmin port to interoperate with it, but any changes
 now are premature.
 
 	Cheers,
 
 	Matthew
 
 --=20
 Dr Matthew J Seaman MA, D.Phil.                   7 Priory Courtyard
                                                   Flat 3
 PGP: http://www.infracaninophile.co.uk/pgpkey     Ramsgate
                                                   Kent, CT11 9PW
 
 
 --------------enig591EEEA2E34E2716DD7FC5EF
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: OpenPGP digital signature
 Content-Disposition: attachment; filename="signature.asc"
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (FreeBSD)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
 
 iEYEAREIAAYFAksE6I8ACgkQ8Mjk52CukIx4tACeL1FbUjYMs6+ieh+gaQTuFSkR
 J5UAn3M2K5kyDkHk4S/tj6yyWX73usqn
 =HLcw
 -----END PGP SIGNATURE-----
 
 --------------enig591EEEA2E34E2716DD7FC5EF--
State-Changed-From-To: feedback->suspended 
State-Changed-By: linimon 
State-Changed-When: Thu Nov 19 07:49:33 UTC 2009 
State-Changed-Why:  
mark suspended awaiting arrival of php5.3. 

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

From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: bug-followup@FreeBSD.org, mjonuschat@gmail.com
Cc:  
Subject: Re: ports/140680: Modify port databases/phpmyadmin to allow building
 with PHP 5.3.0
Date: Wed, 14 Apr 2010 10:30:32 +0100

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 
 PHP 5.3 is in the tree, and phpMyAdmin is working fine.  I think this PR
 can be closed.
 
 	Cheers,
 
 	Matthew
 
 - -- 
 Dr Matthew J Seaman MA, D.Phil.                   7 Priory Courtyard
                                                   Flat 3
 PGP: http://www.infracaninophile.co.uk/pgpkey     Ramsgate
                                                   Kent, CT11 9PW
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
 iEYEARECAAYFAkvFizgACgkQ8Mjk52CukIy8KQCfZcp8N52Span8HYkDoZk/5fIE
 fIgAn2hU8dslp1BUNsWML2r3WHrNKnmu
 =rwXH
 -----END PGP SIGNATURE-----
State-Changed-From-To: suspended->closed 
State-Changed-By: linimon 
State-Changed-When: Thu Apr 15 02:37:39 UTC 2010 
State-Changed-Why:  
Maintainer believes that this can now be closed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140680 
>Unformatted:
