diff options
author | Matthew Seaman <matthew@FreeBSD.org> | 2012-02-15 00:01:21 +0000 |
---|---|---|
committer | Matthew Seaman <matthew@FreeBSD.org> | 2012-02-15 00:01:21 +0000 |
commit | 66565d11af59ecd294ca100b25b46c42d6fa0c2a (patch) | |
tree | 13a55aa205a366a8514fae2ada0ff73d2970af0d /databases | |
parent | USE_MAKE is the default, right? (diff) |
Routine bugfix update to 3.4.10
ChangeLog:
http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/3.4.10/phpMyAdmin-3.4.10-notes.html/view
3.4.10.0 (2012-02-14)
- bug #3460090 [interface] TextareaAutoSelect feature broken
- patch #3375984 [export] PHP Array export might generate invalid php code
- bug #3049209 [import] Import from ODS ignores cell that is the same as cell be
fore
- bug #3463933 [display] SELECT DISTINCT displays wrong total records found
- patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALU
E_ON_ZERO'
- bug #3469254 [edit] Setting data to NULL and drop-downs
- bug #3477063 [edit] Missing set fields and values in generated INSERT query
- bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145)
Other Changes:
* Drop USE_MYSQL=compat and IGNORE_WITH_MYSQL=41 -- phpmyadmin has
not suddenly grown compatibility for older versions of MySQL.
However, USE_MYSQL implies an dependency on mysql-client, but
phpmyadmin can operate just fine with only the php mysqlnd
drivers.
* Add a new WITH_MYSQL Options knob (off by default) -- if you want
to use the mysql-client driver.
* PHP52 doesn't have mysqlnd drivers, so require at least one of
WITH_MYSQL or WITH_MYSQLI to be selected.
Approved by: shaun (mentor)
Notes
Notes:
svn path=/head/; revision=291375
Diffstat (limited to 'databases')
-rw-r--r-- | databases/phpmyadmin/Makefile | 22 | ||||
-rw-r--r-- | databases/phpmyadmin/distinfo | 4 |
2 files changed, 18 insertions, 8 deletions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index c70e46117d92..29161149fa67 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -6,7 +6,7 @@ # PORTNAME= phpMyAdmin -DISTVERSION= 3.4.9 +DISTVERSION= 3.4.10 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages @@ -16,13 +16,11 @@ COMMENT= A set of PHP-scripts to manage MySQL over the web LICENSE= GPLv2 -USE_MYSQL= compat IGNORE_WITH_PHP= 4 -IGNORE_WITH_MYSQL= 41 USE_XZ= yes NO_BUILD= yes .if !defined(WITHOUT_PHP_DEPENDS) -USE_PHP= ctype mysql session filter mbstring json spl +USE_PHP= ctype session filter mbstring json spl .endif # Note: default settings will pull in X11 client support. If you don't @@ -32,7 +30,8 @@ USE_PHP= ctype mysql session filter mbstring json spl OPTIONS= SUPHP "suPHP support" off \ BZ2 "bzip2 library support" on \ GD "GD library support (requires X11)" on \ - MYSQLI "Improved MySQL support" off \ + MYSQL "MySQL support via mysql client" off \ + MYSQLI "Improved MySQL client support" off \ OPENSSL "OpenSSL support" on \ PDF "PDFlib support" on \ ZLIB "ZLIB support" on \ @@ -138,4 +137,15 @@ post-install: .endif ${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> + +.include <bsd.port.pre.mk> + +# phpMyAdmin can use the mysql native drivers which are available by +# default when using the lang/php5 port. If you're using lang/php52 +# then you will need either WITH_MYSQL or WITH_MYSQLI enabled. + +.if ${PHP_VER} == "52" && !defined(WITH_MYSQL) && !defined(WITH_MYSQLI) +BROKEN= ${PKGNAME} needs one of WITH_MYSQL or WITH_MYSQLI in order to work with php-5.2.x +.endif + +.include <bsd.port.post.mk> diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo index 83275d4d9fd6..60602f383b82 100644 --- a/databases/phpmyadmin/distinfo +++ b/databases/phpmyadmin/distinfo @@ -1,2 +1,2 @@ -SHA256 (phpMyAdmin-3.4.9-all-languages.tar.xz) = b7bceab1d9a6a8d2658e9739f848248faa8aefd945c9f5b33522a00b201363ba -SIZE (phpMyAdmin-3.4.9-all-languages.tar.xz) = 3640512 +SHA256 (phpMyAdmin-3.4.10-all-languages.tar.xz) = 391dc3aa38a210bc77050f3432058c973ab7aa2193a086ad2ac717edf5002219 +SIZE (phpMyAdmin-3.4.10-all-languages.tar.xz) = 3693684 |