svn commit: r473119 - branches/2018Q2/databases/phpmyadmin

[Matthew Seaman]

Author: matthew
Date: Sat Jun 23 09:19:21 2018
New Revision: 473119
URL: https://svnweb.freebsd.org/changeset/ports/473119

Log:
  MFH: r468537 r470823 r473096
  
  * Review port dependencies based on composer.json files included in
    the source
  
    - Add hash as a required dependency [1]
  
    - Move xml from optional to required
  
    - Add curl, gmp, opcache and sodium as optional dependencies: all of
      these default to off.  sodium only works with php >= 7.2, but
      there is no mechanism for modifying options dependent on flavour
      settings at the moment.
  
    - Move mbstring from required to optional dependency: defaults to on
  
  * Sort lists of options
  
  * Remove references to the redundant 'OPTIONS_MULTI_DB_connect': this
    was a remnant from an earlier version of the port which allowed
    switching between the old 'mysql' and the current 'mysqli' modules.
  
  * Add an empty %%WWWDIR%%/tmp directory to the plist: this is
    referenced in the configuration defaults [2].  Make this writable by
    the www group.
  
  PR:		227803
  Submitted by:	marko.cupac at mimar.rs [1]
  Reported by:	marko.cupac at mimar.rs [2]
  
  Update to 4.8.1
  
  ChangeLog:	https://www.phpmyadmin.net/files/4.8.1/
  
  Security update to 4.8.2
  
  ChangeLog:	https://www.phpmyadmin.net/files/4.8.2/
  
  Security:	17cb6ff3-7670-11e8-8854-6805ca0b3d42
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2018Q2/databases/phpmyadmin/Makefile
  branches/2018Q2/databases/phpmyadmin/distinfo
  branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/databases/phpmyadmin/Makefile
==============================================================================
--- branches/2018Q2/databases/phpmyadmin/Makefile	Sat Jun 23 09:07:19 2018	(r473118)
+++ branches/2018Q2/databases/phpmyadmin/Makefile	Sat Jun 23 09:19:21 2018	(r473119)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.8.0.1
+DISTVERSION=	4.8.2
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -19,21 +19,33 @@ CPE_PRODUCT=	${PORTNAME:tl}
 NO_ARCH=	yes
 NO_BUILD=	yes
 .if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	ctype session filter mbstring json spl mysqli
+
+# Note: composer.json files in the source list pcre as a required
+# extension, but pcre is compiled into PHP as standard on FreeBSD.
+# spl, libsodium are only required in the bundled vendor code. PMA
+# could, in principle, also use the PHP dbase extension, but it's not
+# available for PHP >= 7.0 and of only minority interest.
+
+USE_PHP=	ctype filter hash json mysqli session spl xml
 .endif
 
 # Note: default settings will pull in X11 client support.  If you don't
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-OPTIONS_DEFINE=		BZ2 GD OPENSSL PDF XML ZIP ZLIB
-OPTIONS_DEFAULT=	BZ2 GD OPENSSL XML ZIP ZLIB
+OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL PDF \
+			SODIUM ZIP ZLIB
+OPTIONS_DEFAULT=	BZ2 GD MBSTRING OPENSSL ZIP ZLIB
 
 BZ2_DESC=	PHP bzip2 library support
+CURL_DESC=	PHP curl support
 GD_DESC=	PHP GD library support (requires X11)
+GMP_DESC=	PHP GMP library support
+MBSTRING_DESC=	PHP Multi-byte String support
+OPCACHE_DESC=	PHP Opcache support
 OPENSSL_DESC=	PHP OpenSSL support
 PDF_DESC=	PHP PDFlib support
-XML_DESC=	PHP XML support (Export to OpenDoc)
+SODIUM_DESC=	PHP libsodium support (only available for PHP >= 7.2)
 ZIP_DESC=	PHP Zip compression support
 ZLIB_DESC=	PHP ZLIB support
 
@@ -51,7 +63,7 @@ SUB_FILES+=	pkg-message
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 
-.for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect}
+.for opt in ${OPTIONS_DEFINE}
 .    if ${PORT_OPTIONS:M${opt}}
 USE_PHP+=	${opt:tl}
 .    endif
@@ -82,5 +94,6 @@ do-install:
 		${INSTALL_DATA} "$$src" "$$dst" ; \
 	    fi \
 	done
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/tmp
 
 .include <bsd.port.mk>

Modified: branches/2018Q2/databases/phpmyadmin/distinfo
==============================================================================
--- branches/2018Q2/databases/phpmyadmin/distinfo	Sat Jun 23 09:07:19 2018	(r473118)
+++ branches/2018Q2/databases/phpmyadmin/distinfo	Sat Jun 23 09:19:21 2018	(r473119)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524165110
-SHA256 (phpMyAdmin-4.8.0.1-all-languages.tar.xz) = 36b586d310374a062244adb919d847379aebf4c41ba0e5d11d6ed3186fa052d5
-SIZE (phpMyAdmin-4.8.0.1-all-languages.tar.xz) = 5926908
+TIMESTAMP = 1529708065
+SHA256 (phpMyAdmin-4.8.2-all-languages.tar.xz) = 2b42e75274ab078a0c2ca3aff767f45d1d81849f9f762a2ed0674819f061ba1d
+SIZE (phpMyAdmin-4.8.2-all-languages.tar.xz) = 5914400

Modified: branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk
==============================================================================
--- branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk	Sat Jun 23 09:07:19 2018	(r473118)
+++ branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk	Sat Jun 23 09:19:21 2018	(r473119)
@@ -1 +1,2 @@
 @sample(,%%PMA_GRP%%,640) %%WWWDIR%%/config.inc.php.sample
+ at dir(,%%PMA_GRP%%,770) %%WWWDIR%%/tmp