From nobody Tue Jan 25 12:17:42 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 04DBA196E74A; Tue, 25 Jan 2022 12:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jjm866dYdz3Fm9; Tue, 25 Jan 2022 12:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643113063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6FXRYuFYbMpYnoWooAyJgyoWUUH51nVa7Qd8NBzh85M=; b=VlFYCTop50J+BVoDAHTDedWX4y83a3jeZdzGv8Ik9fNhpD2sq6qc2oqgmzEfoIzwcD5cSu TvEfU83sVdGh3BbDKKugbiqb2AnmHEFO1XPDQaLCPcRi8rcp6+5wMGpLUNvQ1Sm82q7n+E hvzumrycYpv5gl4jVgH/htopeluKFMOAAWFlpu7PWfx7Jmxb+3uNvtMe9nE5fTcBJ808SB Ja9lErnrLC4xLri5iGp1k3C9OKW7pHF/BOYkz9ygAr0vnu+mkRwYZBIbHsSA6+jomDVmZB 6ddUOPlBQ/psaSwdQ1FpXDZf/Whtc+5gXlH8zEYcQFqFZuM+ApGdb6JRzYG+6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B8E571539; Tue, 25 Jan 2022 12:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20PCHgjs099849; Tue, 25 Jan 2022 12:17:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PCHgKi099848; Tue, 25 Jan 2022 12:17:42 GMT (envelope-from git) Date: Tue, 25 Jan 2022 12:17:42 GMT Message-Id: <202201251217.20PCHgKi099848@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 09cc587ea809 - main - www/zend-framework: Remove CONFLICTS List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09cc587ea809299e199466740a4c4a8a70c5a6b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643113062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6FXRYuFYbMpYnoWooAyJgyoWUUH51nVa7Qd8NBzh85M=; b=cxS3d9vHYo1GHOcrTPfb/YzTRNYnEevSKsAzbtBndCDWhtZTrJAgagopGUTXBsMMl4U2EH 0ygkN3MYkpEAIN69GRLCmwAJqq62WW/2QvlP9+ZbsZ8A6fA2uVKslGKZV7XSCiCgxLWZX2 xovzHBQt8rf/HP7t639ycVBwdfZ8IG51M5NTOtkYy2Zp/np6TuYXfbHxco3GUs8Nq1iTkd sDs2Q357WmZpPcaMu2s425Ek323Zxb+Vc/hlPRtytl+jb+mu8mG0U+kaSOTOHo689F6tBF QRMcZ2OZFLeeV5Zb6OSdJ/lng1L85Mr1fC3eSQKN0tByga0dgG/R2AzSMEriyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643113062; a=rsa-sha256; cv=none; b=oEY6DGpkbEzV4AeoARvYWqpLa2g7r0I2Ipi4MFODB2A+XTlUotDC+FWnSSCNBTM0n6QNlw sATD55jBHUyhfb/FRPaMEjvrNxB40ctgAwDXo+8ASKp6FaU6nJEmcmQB62WfeV89n5DWba 5cP/os9KOIA0B0UN1b1Atft0UxEKrNXrwbaGF067qJIawrmWZEYU+5WIMO18Z+mJ1PpBZC g5SdrA9xH5Bm2iJRRkYvhLGwNRxuHyHosbU7KOE2URsljbwOIo9i64FMj/QJLoRC7DGLBN 892urVg1wkyFjAif+7bnmQKY4OGaurdPz9uXx8NOQgwLWvyblXJOI7iOgYAXmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=09cc587ea809299e199466740a4c4a8a70c5a6b6 commit 09cc587ea809299e199466740a4c4a8a70c5a6b6 Author: Muhammad Moinur Rahman AuthorDate: 2022-01-25 12:16:11 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-01-25 12:16:11 +0000 www/zend-framework: Remove CONFLICTS - Conflicting www/zend-framework1 has been removed from tree - OPTIONize port Approved by: portmgr (infrastructure sweep) --- www/zend-framework/Makefile | 77 +++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 56 deletions(-) diff --git a/www/zend-framework/Makefile b/www/zend-framework/Makefile index 04104810343b..c8ca8193043b 100644 --- a/www/zend-framework/Makefile +++ b/www/zend-framework/Makefile @@ -13,77 +13,42 @@ COMMENT= Framework for developing PHP web applications LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -CONFLICTS= ZendFramework-1.* +USES= gettext php:web,flavors tar:tgz +USE_PHP= spl NO_ARCH= yes NO_BUILD= yes -USE_PHP= spl -USES= gettext php:web,flavors tar:tgz - SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS MYSQL MYSQLI DBLIB PGSQL ODBC SQLITE REQPHP OPTPHP MEMCACHE -OPTIONS_DEFAULT=REQPHP +PORTDOCS= CHANGELOG.md CONTRIBUTING.md INSTALL.md README-GIT.md README.md + +OPTIONS_DEFINE= DBLIB DOCS MEMCACHE MYSQL MYSQLI ODBC OPTPHP PGSQL \ + REQPHP SQLITE +OPTIONS_DEFAULT= REQPHP -MYSQL_DESC= Enable MySQL PDO support -MYSQLI_DESC= Enable MySQLi support DBLIB_DESC= Enable DBLIB PDO support -PGSQL_DESC= Enable PostgreSQL PDO support -ODBC_DESC= Enable ODBC PDO support -SQLITE_DESC= Enable SQLite v3 PDO support -REQPHP_DESC= Install required PHP dependencies -OPTPHP_DESC= Install optional PHP dependencies MEMCACHE_DESC= Enable memcache support +MYSQLI_DESC= Enable MySQLi support +OPTPHP_DESC= Install optional PHP dependencies +REQPHP_DESC= Install required PHP dependencies -PORTDOCS= CHANGELOG.md INSTALL.md README-GIT.md CONTRIBUTING.md README.md - -.include - +DBLIB_USE= PHP=pdo_dblib +MEMCACHE_USE= PHP=memcache,memcached +MYSQLI_USE= PHP=mysqli +MYSQL_USE= PHP=pdo_mysql +ODBC_USE= PHP=pdo_odbc +OPTPHP_USE= PHP=bcmath,bitset,json,posix +PGSQL_USE= PHP=pdo_pgsql # Add all of the required and/or optional PHP extension dependencies, # if chosen by the user. -.if ${PORT_OPTIONS:MREQPHP} -USE_PHP+= ctype curl dom gd hash iconv mbstring ldap mcrypt \ - opcache pcre pdo session simplexml soap sqlite3 xml zlib -.endif - -.if ${PORT_OPTIONS:MOPTPHP} -USE_PHP+= bcmath bitset json posix -.endif - -.if ${PORT_OPTIONS:MMEMCACHE} -USE_PHP+= memcache memcached -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= pdo_mysql -.endif - -.if ${PORT_OPTIONS:MMYSQLI} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MDBLIB} -USE_PHP+= pdo_dblib -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pdo_pgsql -.endif - -.if ${PORT_OPTIONS:MODBC} -USE_PHP+= pdo_odbc -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= pdo_sqlite -.endif +REQPHP_USE= PHP=ctype,curl,dom,gd,hash,iconv,ldap,mbstring,mcrypt,opcache,pcre,pdo,session,simplexml,soap,sqlite3,xml,zlib +SQLITE_USE= PHP=pdo_sqlite do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} "library bin resources" ${STAGEDIR}${DATADIR} -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ -.endif -.include +.include