git: 3e5d9959b8b2 - main - multimedia/libmediainfo: Remove outdated CONFLICTS_INSTALL
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 25 Mar 2022 17:20:16 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3e5d9959b8b21df5953242061a7fe1c3a34b6fb7
commit 3e5d9959b8b21df5953242061a7fe1c3a34b6fb7
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-03-25 17:15:22 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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}