ports/72143: [ Maintainer Update ] databases/phpmyadmin to 2.6.0

Tue Sep 28 11:00:46 UTC 2004

>Number:         72143
>Category:       ports
>Synopsis:       [ Maintainer Update ] databases/phpmyadmin to 2.6.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 28 11:00:45 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.10-STABLE FreeBSD 4.10-STABLE #83: Tue Sep 21 12:22:54 BST 2004 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

This PR subsumes the changes in ports/71100 -- please close.

    - Update to phpMyAdmin 2.6.0

      Announcement and release notes my be found at

        http://sourceforge.net/mailarchive/forum.php?thread_id=5655333&forum_id=2139

     "The phpMyAdmin Project is proud to announce the immediate
     availability of phpMyAdmin 2.6.0.
 
     Supporting the new improved MySQL extension of PHP5 (MySQLi),
     phpMyAdmin has made a giant step towards the new PHP version and
     the upcoming MySQL versions.
 
     phpMyAdmin has acquired a new CSS-based theme system. Two themes
     are included, and can be chosen from the main menu. Documentation
     is included (see FAQ 2.7) to create your own themes.
 
     phpMyAdmin is a web administration tool for MySQL databases,
     intended to handle a whole database server as well as a single
     database. Over the years, it has become the most popular GUI for
     MySQL and is downloaded about 6,000 times a day, according to
     SourceForge.net."

    - Add OPTIONS support (From 71100)

     phpMyAdmin is more functional with BZ2, GD, OPENSSL, PDF and ZLIB
     support, but it will work fine without.  This change permits port
     users to install a stripped down version of phpMyAdmin.

    - Add MySQLi support

     Users of PHP5 and MySQL 4.1 may choose to use the new php5-mysqli
     MySQL extension instead of the standard php5-mysql.  Nb. needs to
     be enabled by editing config.inc.php as well as installing the
     extension.

>How-To-Repeat:
	
>Fix:

--- phpmyadmin.diff begins here ---
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile	Sat Jul 24 19:39:51 2004
+++ phpmyadmin/Makefile	Tue Sep 28 09:37:43 2004
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	phpMyAdmin
-PORTVERSION=	2.5.7.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpmyadmin
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.(.)$/-pl\1/}
 
 MAINTAINER=	m.seaman at infracaninophile.co.uk
-COMMENT=	A set of PHP-scripts to administer MySQL over the web
+COMMENT=	A set of PHP-scripts to manage MySQL over the web
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
-USE_PHP=	bz2 gd mysql openssl pcre pdf zlib
+USE_PHP=	mysql pcre
 
-.if defined(WITH_SUPHP)
+# Unfortunately can't make WITH_SUPHP part of the OPTIONS selection,
+# since it has to be processed before just about anything else.
+
+.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
 
 PKGNAMESUFFIX=	-suphp
 RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
@@ -43,6 +44,30 @@
 
 .endif
 
+# Copy the way lang/php{4,5}-extensions deals with its OPTIONS -- avoids
+# problems with include of bsd.port.pre.mk
+
+OPTIONS=	BZ2	"bzip2 library support" on \
+		GD	"GD library support" on \
+		MYSQLI	"Improved MySQL support (PHP5, MySQL 4.1 only)" off \
+		OPENSSL	"OpenSSL support" on \
+		PDF	"PDFlib support (implies GD)" on \
+		ZLIB	"ZLIB support" on
+
+PORT_DBDIR?=	/var/db/ports
+LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
+OPTIONSFILE?=	${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
+
+.for opt in BZ2 GD MYSQLI OPENSSL PDF ZLIB
+.    if !defined(WITHOUT_${opt}) || defined(WITH_${opt})
+USE_PHP+=	${opt:L}
+.    endif
+.endfor
+
 MSG_SKEL=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -56,9 +81,12 @@
 
 .SILENT:
 
+do-build:
+	@${DO_NADA}
+
 pre-everything::
 	${ECHO_MSG} ""
-	${ECHO_MSG} "You may use the following build options:"
+	${ECHO_MSG} "You may use the following additional build option:"
 	${ECHO_MSG} ""
 	${ECHO_MSG} "    WITH_SUPHP=yes   Install appropriately for use with"
 	${ECHO_MSG} "                     the www/suphp port [default: no]"
diff -Nur /usr/ports/databases/phpmyadmin/distinfo phpmyadmin/distinfo
--- /usr/ports/databases/phpmyadmin/distinfo	Fri Jul  2 00:51:09 2004
+++ phpmyadmin/distinfo	Tue Sep 28 09:31:20 2004
@@ -1,2 +1,2 @@
-MD5 (phpMyAdmin-2.5.7-pl1.tar.bz2) = 93b7c7f3dfcfd6df9c2ea26f31a51772
-SIZE (phpMyAdmin-2.5.7-pl1.tar.bz2) = 1123591
+MD5 (phpMyAdmin-2.6.0.tar.bz2) = 7d8dc68a88aca0c5f36c5d8996bb563f
+SIZE (phpMyAdmin-2.6.0.tar.bz2) = 1277016
diff -Nur /usr/ports/databases/phpmyadmin/pkg-descr phpmyadmin/pkg-descr
--- /usr/ports/databases/phpmyadmin/pkg-descr	Fri Jul  4 12:59:29 2003
+++ phpmyadmin/pkg-descr	Tue Sep 28 09:28:21 2004
@@ -1,15 +1,24 @@
-phpMyAdmin is intended to handle the adminstration of MySQL over the web.
 
+phpMyAdmin is intended to handle the administration of MySQL over the
+Web. It can manage a whole MySQL server as well as a single database.
+ 
 Currently it can:
- - create and drop databases
- - create, copy, drop and alter tables
- - delete, edit and add fields
- - execute any SQL-statement, even batch-queries
- - manage keys on fields
- - load text files into tables
- - create and read dumps of tables
- - export and import CSV data
- - administer multiple servers and single databases
- - communicate in more than 38 different languages
+    - create and drop databases
+    - create, copy, drop, rename and alter tables
+    - do table maintenance
+    - delete, edit and add fields
+    - execute any SQL-statement, even batch-queries
+    - manage keys on fields
+    - load text files into tables
+    - create and read dumps of tables
+    - export data to CSV, XML and Latex formats
+    - administer multiple servers
+    - manage MySQL users and privileges
+    - check referential integrity
+    - using Query-by-example (QBE), create complex queries automatically
+      connecting required tables
+    - create PDF graphics of your Database layout
+    - search globally in a database or a subset of it
+    - communicate in 47 different languages
 
 WWW: http://www.phpmyadmin.net/
--- phpmyadmin.diff ends here ---


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

