Date: Mon, 8 Mar 2010 12:10:22 GMT From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/144550: [maintainer] databases/phpmyadmin update to 3.3.0 Message-ID: <201003081210.o28CAMQ2040515@happy-idiot-talk.infracaninophile.co.uk> Resent-Message-ID: <201003081220.o28CK2Yi038671@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144550
>Category: ports
>Synopsis: [maintainer] databases/phpmyadmin update to 3.3.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: Mon Mar 08 12:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 8.0-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 8.0-STABLE FreeBSD 8.0-STABLE #20: Sat Feb 27 16:19:23 GMT 2010 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386
>Description:
This is a routine bugfix/new features update to version 3.3.0
Announce message:
Welcome to phpMyAdmin 3.3.0. The main new features are:
- new import and export modules
- changes tracking
- synchronizing structure and data between servers
- replication support
Details will appear on http://phpmyadmin.net. In a hurry? you can visit
http://sourceforge.net/projects/phpmyadmin to download.
Marc Delisle, for the team
Release Notes:
http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/3.3.0/phpMyAdmin-3.3.0-notes.html/download
This release incorporates some fairly significant chunks of new
functionality, particularly the new Synchronization section.
Unfortunately the automatic setup script hasn't been updated to deal
with Synchronization settings yet, so end users that have set up the
linked-tables infrastructure will need to modify their config.inc.php
by hand in order to take advantage of it.
Other changes in the port:
The mbstring and mcrypt PHP modules are now mandatory.
The presence of one file and one directory each incorporating a space
character in their names causes an inordinate amount of grief to deal
with: for now, punt this into the long grass by renaming the offending
items.
>How-To-Repeat:
>Fix:
--- phpmyadmin.diff begins here ---
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile 2010-01-12 01:15:17.000000000 +0000
+++ phpmyadmin/Makefile 2010-03-08 11:52:27.000000000 +0000
@@ -6,7 +6,7 @@
#
PORTNAME= phpMyAdmin
-DISTVERSION= 3.2.5
+DISTVERSION= 3.3.0
CATEGORIES= databases www
MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages
@@ -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 spl filter mbstring mcrypt
.endif
OPTIONS= SUPHP "suPHP support" off \
@@ -30,8 +30,6 @@
OPENSSL "OpenSSL support" on \
PDF "PDFlib support (implies GD)" on \
ZLIB "ZLIB support" on \
- MCRYPT "MCrypt library support" on \
- MBSTRING "Multi-byte character-set string support" on \
ZIP "Zip compression support" on
.include <bsd.port.options.mk>
@@ -88,9 +86,6 @@
.SILENT:
-do-build:
- @${DO_NADA}
-
pre-everything::
${ECHO_MSG} "This version of phpmyadmin requires PHP 5.2+ and MySQL"
${ECHO_MSG} "5.0+. If you need to use an older version of PHP or"
@@ -101,30 +96,38 @@
# When creating a package, empty directories will not be generated
# from the pkg tarball. Therefore make sure no directories are empty.
+# Aaargh! A curse on all filenames with spaces in.
post-patch:
+ cd ${WRKSRC}/documentation-gsoc ; \
+ ${MV} "Synchronization_User Manual.htm" \
+ Synchronization_User_Manual.htm ; \
+ ${MV} "Synchronization_User Manual_files" \
+ Synchronization_User_Manual_files ; \
cd ${WRKSRC} ; \
+ ${REINPLACE_CMD} -e 's/_User%20Manual/_User_Manual/' \
+ Documentation.html \
+ documentation-gsoc/Synchronization_User_Manual.htm ; \
for emptydir in $$( ${FIND} . -type d -empty -print ) ; do \
${TOUCH} $${emptydir}/.keep-me ; \
- done
- ${CP} ${FILESDIR}/${CFGFILE}.sample ${WRKSRC}/${CFGFILE}.sample
- cd ${WRKSRC} ; \
- ${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \
- ${SED} -e "s,^\.,%%WWWDIR%%," >${PLIST} ; \
+ done ; \
+ ${CP} ${FILESDIR}/${CFGFILE}.sample ${WRKSRC}/${CFGFILE}.sample ; \
+ ${FIND} . ! -type d ! -name ${CFGFILE}.sample ! -name '*.bak' | \
+ ${SORT} | ${SED} -e "s,^\.,%%WWWDIR%%," >${PLIST} ; \
${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \
${FIND} . -type d | ${SORT} -r | ${SED} \
- -e "s,^\.$$,@dirrmtry %%WWWDIR%%," \
- -e "s,^\.,@dirrm %%WWWDIR%%," >>${PLIST}
+ -e "s,^\.$$,@dirrmtry %%WWWDIR%%," \
+ -e "s,^\.,@dirrm %%WWWDIR%%," >>${PLIST}
do-install: install-app install-conf
install-app:
cd ${WRKSRC} ; \
- for src in $$( ${FIND} . ! -name .cvsignore ) ; do \
+ for src in $$( ${FIND} . ! -name .cvsignore ! -name '*.bak' ) ; do \
dst=${WWWDIR}$${src#.} ; \
- if ${TEST} -d $$src ; then \
- ${MKDIR} $$dst ; \
+ if ${TEST} -d "$$src" ; then \
+ ${MKDIR} "$$dst" ; \
else \
- ${INSTALL_DATA} $$src $$dst ; \
+ ${INSTALL_DATA} "$$src" "$$dst" ; \
fi \
done
diff -Nur /usr/ports/databases/phpmyadmin/distinfo phpmyadmin/distinfo
--- /usr/ports/databases/phpmyadmin/distinfo 2010-01-12 01:15:17.000000000 +0000
+++ phpmyadmin/distinfo 2010-03-08 07:32:26.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (phpMyAdmin-3.2.5-all-languages.tar.bz2) = 6083ea867a152f58f5c332d0c9b92ac1
-SHA256 (phpMyAdmin-3.2.5-all-languages.tar.bz2) = 43f48978c9415be20d630032139fa516c10eca4459f695b0a992bab7464e9493
-SIZE (phpMyAdmin-3.2.5-all-languages.tar.bz2) = 2745641
+MD5 (phpMyAdmin-3.3.0-all-languages.tar.bz2) = 53b5d9d189ed1b969d549f0304f5ca08
+SHA256 (phpMyAdmin-3.3.0-all-languages.tar.bz2) = 5b1b69f1b39f85cb365d939afc50b27b0603dadf1730893d5e2daf69d221cda3
+SIZE (phpMyAdmin-3.3.0-all-languages.tar.bz2) = 3607715
diff -Nur /usr/ports/databases/phpmyadmin/files/config.inc.php.sample phpmyadmin/files/config.inc.php.sample
--- /usr/ports/databases/phpmyadmin/files/config.inc.php.sample 2006-05-16 07:43:23.000000000 +0100
+++ phpmyadmin/files/config.inc.php.sample 2010-03-08 11:37:16.000000000 +0000
@@ -5,7 +5,7 @@
* installaton of phpmyadmin.
*
* Copy any settings you want to override from
- * libraries/config.default.php or use scripts/setup.php to generate a
+ * libraries/config.default.php or visit /phpmyadmin/setup/ to generate a
* basic configuration file
*
*/
diff -Nur /usr/ports/databases/phpmyadmin/pkg-descr phpmyadmin/pkg-descr
--- /usr/ports/databases/phpmyadmin/pkg-descr 2009-12-22 11:48:41.000000000 +0000
+++ phpmyadmin/pkg-descr 2010-03-08 11:00:41.000000000 +0000
@@ -1,26 +1,31 @@
- phpMyAdmin handles the administration of MySQL over the Web. It can
- manage a whole MySQL server as well as a single database.
-
- * Intuitive web interface
- * Support for most MySQL features:
- o browse and drop databases, tables, views, fields and indexes
- o create, copy, drop, rename and alter databases, tables, fields
- and indexes
- o maintenance of server, databases and tables, with proposals on
- server configuration
- o execute, edit and bookmark any SQL-statement, even batch-queries
- o manage MySQL users and privileges
- o manage stored procedures and triggers
- * Import data from CSV and SQL
- * Export data to various formats: CSV, SQL, XML, PDF, ISO/IEC 26300 -
- OpenDocument Text and Spreadsheet, Word, Excel, LATEX and others
- * Administering multiple servers
- * Creating PDF graphics of your database layout
- * Creating complex queries using Query-by-example (QBE)
- * Searching globally in a database or a subset of it
- * Transforming stored data into any format using a set of predefined
+ phpMyAdmin handles the administration of MySQL over the Web. It can:
+ * browse and drop databases, tables, views, fields and indexes
+ * create, copy, drop, rename and alter databases, tables, fields
+ and indexes
+ * maintain server, databases and tables, with proposals on server
+ configuration
+ * execute, edit and bookmark any SQL-statement, even batch-queries
+ * load text files into tables
+ * create and read dumps of tables
+ * export data to various formats: CSV, XML, PDF, ISO/IEC 26300 -
+ OpenDocument Text and Spreadsheet, Word, Excel and LATEX formats
+ * import data and MySQL structures from Microsoft Excel and
+ OpenDocument spreadsheets, as well as XML, CSV, and SQL files
+ * administer multiple servers
+ * manage MySQL users and privileges
+ * check referential integrity in MyISAM tables
+ * 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
+ * transform stored data into any format using a set of predefined
functions, like displaying BLOB-data as image or download-link
- * And much more...
+ * track changes on databases, tables and views
+ * support InnoDB tables and foreign keys
+ * support mysqli, the improved MySQL extension
+ * communicate in 57 different languages
+ * synchronize two databases residing on the same as well as remote
+ servers
WWW: http://www.phpmyadmin.net/
--- phpmyadmin.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003081210.o28CAMQ2040515>