From owner-svn-ports-all@freebsd.org Mon Feb 19 07:46:27 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94210F0A871; Mon, 19 Feb 2018 07:46:27 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E5D6859A5; Mon, 19 Feb 2018 07:46:27 +0000 (UTC) (envelope-from lwhsu@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 34C6117B40; Mon, 19 Feb 2018 07:46:27 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1J7kQCF006024; Mon, 19 Feb 2018 07:46:26 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1J7kQ1Z006022; Mon, 19 Feb 2018 07:46:26 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201802190746.w1J7kQ1Z006022@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 19 Feb 2018 07:46:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462283 - in head/devel: py-magic py-python-magic X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/devel: py-magic py-python-magic X-SVN-Commit-Revision: 462283 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.25 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: Mon, 19 Feb 2018 07:46:27 -0000 Author: lwhsu Date: Mon Feb 19 07:46:26 2018 New Revision: 462283 URL: https://svnweb.freebsd.org/changeset/ports/462283 Log: Register CONFLICTS PR: 224593 Submitted by: Shane Approved by: koobs (maintainer, py-python-magic) MFH: 2018Q1 Modified: head/devel/py-magic/Makefile head/devel/py-python-magic/Makefile Modified: head/devel/py-magic/Makefile ============================================================================== --- head/devel/py-magic/Makefile Mon Feb 19 07:42:08 2018 (r462282) +++ head/devel/py-magic/Makefile Mon Feb 19 07:46:26 2018 (r462283) @@ -15,6 +15,9 @@ COMMENT= Python module for determining file type LICENSE= BSD2CLAUSE +# both install module as magic.py +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}python-magic-* + USES= python USE_PYTHON= distutils autoplist Modified: head/devel/py-python-magic/Makefile ============================================================================== --- head/devel/py-python-magic/Makefile Mon Feb 19 07:42:08 2018 (r462282) +++ head/devel/py-python-magic/Makefile Mon Feb 19 07:46:26 2018 (r462283) @@ -12,6 +12,9 @@ COMMENT= File type identification using libmagic LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +# both install module as magic.py +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}magic-* + USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils