Date: Wed, 25 Jun 2014 14:00:36 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359243 - branches/2014Q2/databases/phpmyadmin Message-ID: <201406251400.s5PE0aaV036523@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Wed Jun 25 14:00:36 2014 New Revision: 359243 URL: http://svnweb.freebsd.org/changeset/ports/359243 QAT: https://qat.redports.org/buildarchive/r359243/ Log: Fix mismerge by synching with the version in head. Approved by: portmgr (erwin) Modified: branches/2014Q2/databases/phpmyadmin/Makefile Modified: branches/2014Q2/databases/phpmyadmin/Makefile ============================================================================== --- branches/2014Q2/databases/phpmyadmin/Makefile Wed Jun 25 13:51:33 2014 (r359242) +++ branches/2014Q2/databases/phpmyadmin/Makefile Wed Jun 25 14:00:36 2014 (r359243) @@ -4,11 +4,11 @@ PORTNAME= phpMyAdmin DISTVERSION= 4.2.4 CATEGORIES= databases www -MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION} +MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages MAINTAINER= matthew@FreeBSD.org -COMMENT= A set of PHP-scripts to manage MySQL over the web +COMMENT= Set of PHP-scripts to manage MySQL over the web NO_ARCH= yes LICENSE= GPLv2 @@ -17,7 +17,7 @@ USES= shebangfix tar:xz NO_BUILD= yes .if !defined(WITHOUT_PHP_DEPENDS) IGNORE_WITH_PHP=52 -USE_PHP= ctype session filter mbstring json spl +USE_PHP= ctype session filter mbstring json spl mysqli .endif # Note: default settings will pull in X11 client support. If you don't @@ -27,15 +27,10 @@ USE_PHP= ctype session filter mbstring j OPTIONS_DEFINE= APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB OPTIONS_DEFAULT= BZ2 GD MCRYPT OPENSSL XML ZIP ZLIB -OPTIONS_MULTI= DB_connect -OPTIONS_MULTI_DB_connect= MYSQL MYSQLI - APC_DESC= PHP APC (animated progress bar) support BZ2_DESC= PHP bzip2 library support GD_DESC= PHP GD library support (requires X11) MCRYPT_DESC= PHP MCrypt library support -MYSQLI_DESC= PHP Improved MySQL client support -MYSQL_DESC= PHP MySQL support via mysql client OPENSSL_DESC= PHP OpenSSL support PDF_DESC= PHP PDFlib support XML_DESC= PHP XML support (Export to OpenDoc) @@ -52,7 +47,7 @@ CFG_FILE= config.inc.php PLIST= ${WRKDIR}/plist PLIST_SUB+= PMA_GRP=${GROUPS} -SUB_LIST+= PKGNAME=${PKGNAME} \ +SUB_LIST+= PKGNAME=${PKGNAME} \ CFG_FILE=${WWWDIR}/${CFG_FILE} SUB_FILES+= pkg-message @@ -63,7 +58,7 @@ SHEBANG_FILES= libraries/plugins/transfo .for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect} . if ${PORT_OPTIONS:M${opt}} -USE_PHP+= ${opt:L} +USE_PHP+= ${opt:tl} . endif .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406251400.s5PE0aaV036523>