Index: branches/2018Q2/databases/phpmyadmin/Makefile
===================================================================
--- branches/2018Q2/databases/phpmyadmin/Makefile	(revision 473118)
+++ branches/2018Q2/databases/phpmyadmin/Makefile	(revision 473119)
@@ -1,86 +1,99 @@
 # Created by: nbm
 # $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
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Set of PHP-scripts to manage MySQL over the web
 
 LICENSE=	GPLv2
 
 USES=		cpe php:web,flavors tar:xz
 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
 
 .include <bsd.port.options.mk>
 
 GROUPS?=	${WWWGRP}
 CFG_FILE=	config.inc.php
 
 PLIST=		${WRKDIR}/plist
 PLIST_SUB+=	PMA_GRP=${GROUPS}
 
 SUB_LIST+=	PKGNAME=${PKGNAME}	        \
 		CFG_FILE=${WWWDIR}/${CFG_FILE}
 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
 .endfor
 
 .endif
 
 .SILENT:
 
 post-patch:
 	cd ${WRKSRC} ; \
 	${CP} ${FILESDIR}/${CFG_FILE}.sample ${WRKSRC}/${CFG_FILE}.sample ; \
 	${FIND} . ! -type d ! -name ${CFG_FILE}.sample ! -name '*.bak' | \
 	    ${SORT} | ${SED} -e "s,^\.,%%WWWDIR%%,"   >${PLIST} ; \
 	${CAT} ${PKGDIR}/pkg-plist-chunk	     >>${PLIST} ; \
 	for emptydir in $$( ${FIND} . -type d -empty -print | \
 		${SED} -e "s,^\.,%%WWWDIR%%," ) ; do \
 	    ${ECHO} "@dir $${emptydir}"		     >>${PLIST} ; \
 	done ; \
 
 do-install:
 	cd ${WRKSRC} ; \
 	for src in $$( ${FIND} . ! -name .cvsignore ! -name '*.bak' ) ; do \
 	    dst=${STAGEDIR}${WWWDIR}$${src#.} ; \
 	    if ${TEST} -d "$$src" ; then \
 		${MKDIR} "$$dst" ; \
 	    else \
 		${INSTALL_DATA} "$$src" "$$dst" ; \
 	    fi \
 	done
+	@${MKDIR} ${STAGEDIR}${WWWDIR}/tmp
 
 .include <bsd.port.mk>
Index: branches/2018Q2/databases/phpmyadmin/distinfo
===================================================================
--- branches/2018Q2/databases/phpmyadmin/distinfo	(revision 473118)
+++ branches/2018Q2/databases/phpmyadmin/distinfo	(revision 473119)
@@ -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
Index: branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk
===================================================================
--- branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk	(revision 473118)
+++ branches/2018Q2/databases/phpmyadmin/pkg-plist-chunk	(revision 473119)
@@ -1 +1,2 @@
 @sample(,%%PMA_GRP%%,640) %%WWWDIR%%/config.inc.php.sample
+@dir(,%%PMA_GRP%%,770) %%WWWDIR%%/tmp
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 473118)
+++ branches/2018Q2	(revision 473119)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r468537,470823,473096