From nobody Fri Mar 25 17:20:16 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 93BF61A3008C; Fri, 25 Mar 2022 17:20:16 +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 4KQ8402cLfz3pCl; Fri, 25 Mar 2022 17:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648228816; 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=2kb1dKAkKnNnE0jAEwINp6iYdMUfTrnqsYSb/nyyEmc=; b=wHVXQQX9FUF7pe2b2TaqKQhe7os7qeQd2OsAJuYTUFr0vBf39/ChZsWwIw6VRJEBnHAyzu Vj5rbhxgQWCJlSOMSJFvNq98nHu+qNumsJN5Og4oX0I60/Nn6T9PLC9cmRblF+2ghwwo5K HGaarZ/AxY8vsNqZ0g3OZBQqQ7/Fnye6QrM+Kh17/vrL3Q+AkovZ0scLc7OY1AnH3oygMt b4dpM3OofoRf8Wp4Tibof7iNC2+n8QM9Avoh1IgJGT3csfsdyLF6sHA2A2F3OhsXwU05L4 P/IYkvP9pn6SWtDpLk8pOdw5L9La2KdhUibtzX/Dsvp9NIWaio+Q+GmzW1trPg== 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 34B4A10D9A; Fri, 25 Mar 2022 17:20:16 +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 22PHKG8i023127; Fri, 25 Mar 2022 17:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PHKGNL023124; Fri, 25 Mar 2022 17:20:16 GMT (envelope-from git) Date: Fri, 25 Mar 2022 17:20:16 GMT Message-Id: <202203251720.22PHKGNL023124@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 3e5d9959b8b2 - main - multimedia/libmediainfo: Remove outdated CONFLICTS_INSTALL 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e5d9959b8b21df5953242061a7fe1c3a34b6fb7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648228816; 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=2kb1dKAkKnNnE0jAEwINp6iYdMUfTrnqsYSb/nyyEmc=; b=I+MfgpMKnBK5eTxOEaK4nuets3JrWPWdUgMuhl+ROOvgcZOIAaJwgb7db1goslq+JV4MFK biMmQEQsngUWl6is+BT7dClOpNm48stkLlF/wdia1518m/TrlIbRvcj5OGkIK4BNhUN1v6 GBivuzLdwV2szaXPs0mPMi7DcAbvL91dpLe1sqoTRfZfWjiWO7bh7337GCGnUuipE9K45z FuY734tVDizgXzloPYpYZTx2ise8D7sqzSg0lGHM7cc3Y6jxdPB42C7lC1vG6v4VNkF+PH iE+fhjJM1YSHP/bS5fPYHwG5NW9G1CZALx3IjB7N9dKTWtnSpGQsDFmsReXCvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648228816; a=rsa-sha256; cv=none; b=k0b4U9/cO3T6zH8g3fC9wauLeFnqBaF+VJA3ovkYtXxeTlEJ2h743Y9o1+0X0A2CypXum1 mrJ79bnSIUWp2qTnH3V4JGAxH2Xo6h/0ogziXg6ALPETMYS/KyHKsHho8NSZkyF1SSRsmp M85rQo8n076+zyNnzf0Dx/DOygtG/bFoW7zHR0xSI8k8mN/wCEl+l/PRel5g35lUTZuPAg yNcjujnPPfp0MX3o6pV1ufjx66FTFpHrw2k+SMWQJ6+Tjf72uuhvxXIw9W4GjM2HVQmpxc XOfJBcsFzIN7OEOc+QBtCX9dvBaI+bHX9e2lhg4C1JfWkvXpZEnzd6i7xMJItw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e5d9959b8b21df5953242061a7fe1c3a34b6fb7 commit 3e5d9959b8b21df5953242061a7fe1c3a34b6fb7 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 17:15:22 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 17:19:23 +0000 multimedia/libmediainfo: Remove outdated CONFLICTS_INSTALL mediainfo has been updated from 0.7.99 to 17.10 over 4 years ago. --- multimedia/libmediainfo/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile index e51500e4abd5..0c2d6c1365fb 100644 --- a/multimedia/libmediainfo/Makefile +++ b/multimedia/libmediainfo/Makefile @@ -16,12 +16,6 @@ LICENSE_FILE= ${WRKSRC}/../../../License.html LIB_DEPENDS= libzen.so:multimedia/libzen -CONFLICTS_INSTALL= mediainfo-0.[0-6]* mediainfo-0.7.[0-5]* - -OPTIONS_DEFINE= CURL MMS TINYXML2 -OPTIONS_DEFAULT=TINYXML2 -TINYXML2_DESC= Use textproc/tinyxml2 instead of bundled one - USES= alias compiler:c++11-lang libtool localbase pathfix pkgconfig tar:xz CFLAGS+= -D_POSIX_PRIORITY_SCHEDULING @@ -33,6 +27,10 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfoLib/Project/GNU/Library +OPTIONS_DEFINE= CURL MMS TINYXML2 +OPTIONS_DEFAULT=TINYXML2 +TINYXML2_DESC= Use textproc/tinyxml2 instead of bundled one + CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} CURL_LIB_DEPENDS= libcurl.so:ftp/curl MMS_CONFIGURE_ON= --with-libmms=${LOCALBASE}