Date: Sat, 28 Apr 2018 11:24:17 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468537 - head/databases/phpmyadmin Message-ID: <201804281124.w3SBOHNd078392@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Sat Apr 28 11:24:17 2018 New Revision: 468537 URL: https://svnweb.freebsd.org/changeset/ports/468537 Log: * 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@mimar.rs [1] Reported by: marko.cupac@mimar.rs [2] Modified: head/databases/phpmyadmin/Makefile head/databases/phpmyadmin/pkg-plist-chunk Modified: head/databases/phpmyadmin/Makefile ============================================================================== --- head/databases/phpmyadmin/Makefile Sat Apr 28 11:08:33 2018 (r468536) +++ head/databases/phpmyadmin/Makefile Sat Apr 28 11:24:17 2018 (r468537) @@ -3,6 +3,7 @@ PORTNAME= phpMyAdmin DISTVERSION= 4.8.0.1 +PORTREVISION= 1 CATEGORIES= databases www MASTER_SITES= https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages @@ -19,21 +20,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 +64,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 +95,6 @@ do-install: ${INSTALL_DATA} "$$src" "$$dst" ; \ fi \ done + @${MKDIR} ${STAGEDIR}${WWWDIR}/tmp .include <bsd.port.mk> Modified: head/databases/phpmyadmin/pkg-plist-chunk ============================================================================== --- head/databases/phpmyadmin/pkg-plist-chunk Sat Apr 28 11:08:33 2018 (r468536) +++ head/databases/phpmyadmin/pkg-plist-chunk Sat Apr 28 11:24:17 2018 (r468537) @@ -1 +1,2 @@ @sample(,%%PMA_GRP%%,640) %%WWWDIR%%/config.inc.php.sample +@dir(,%%PMA_GRP%%,770) %%WWWDIR%%/tmp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804281124.w3SBOHNd078392>