From owner-svn-ports-all@freebsd.org Sun Dec 29 12:50:29 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5756F1DE91B; Sun, 29 Dec 2019 12:50:29 +0000 (UTC) (envelope-from joneum@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47m0ln1fSsz4VBD; Sun, 29 Dec 2019 12:50:29 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F99519AA8; Sun, 29 Dec 2019 12:50:29 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBTCoTx2097015; Sun, 29 Dec 2019 12:50:29 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBTCoSNY097012; Sun, 29 Dec 2019 12:50:28 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201912291250.xBTCoSNY097012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Sun, 29 Dec 2019 12:50:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521296 - in head/databases: phpmyadmin phpmyadmin5 X-SVN-Group: ports-head X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in head/databases: phpmyadmin phpmyadmin5 X-SVN-Commit-Revision: 521296 X-SVN-Commit-Repository: ports 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.29 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: Sun, 29 Dec 2019 12:50:29 -0000 Author: joneum Date: Sun Dec 29 12:50:28 2019 New Revision: 521296 URL: https://svnweb.freebsd.org/changeset/ports/521296 Log: Add CONFLICTS_INSTALL= Sponsored by: Netzkommune GmbH Modified: head/databases/phpmyadmin/Makefile head/databases/phpmyadmin5/Makefile Modified: head/databases/phpmyadmin/Makefile ============================================================================== --- head/databases/phpmyadmin/Makefile Sun Dec 29 12:47:32 2019 (r521295) +++ head/databases/phpmyadmin/Makefile Sun Dec 29 12:50:28 2019 (r521296) @@ -14,6 +14,8 @@ COMMENT= Set of PHP-scripts to manage MySQL over the w LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +CONFLICTS_INSTALL= phpmyadmin5 + USES= cpe php:web,flavors tar:xz CPE_PRODUCT= ${PORTNAME:tl} Modified: head/databases/phpmyadmin5/Makefile ============================================================================== --- head/databases/phpmyadmin5/Makefile Sun Dec 29 12:47:32 2019 (r521295) +++ head/databases/phpmyadmin5/Makefile Sun Dec 29 12:50:28 2019 (r521296) @@ -13,6 +13,8 @@ COMMENT= Set of PHP-scripts to manage MySQL over the w LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE +CONFLICTS_INSTALL= phpmyadmin + USES= cpe php:web,flavors tar:xz CPE_PRODUCT= ${PORTNAME:tl}