From owner-svn-ports-all@FreeBSD.ORG Wed Jun 25 14:00:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 39274760; Wed, 25 Jun 2014 14:00:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0CA5D2B1A; Wed, 25 Jun 2014 14:00:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5PE0abt036524; Wed, 25 Jun 2014 14:00:36 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5PE0aaV036523; Wed, 25 Jun 2014 14:00:36 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201406251400.s5PE0aaV036523@svn.freebsd.org> From: Matthew Seaman Date: Wed, 25 Jun 2014 14:00:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r359243 - branches/2014Q2/databases/phpmyadmin X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jun 2014 14:00:37 -0000 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