- Update to 0.7.29

PR:		ports/144796
Submitted by:	Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
Approved by:	Samuel J. Greear <sjg@evilcode.net> (maintainer)

5 files changed, 21 insertions, 42 deletions

diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index f488870c6ccb..ca9f7b05e84d 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -6,23 +6,35 @@
 #
 
 PORTNAME=		mediainfo
-PORTVERSION=		0.7.7.8
-DISTVERSIONSUFFIX=	_CLI_GNU_FromSource
+PORTVERSION=		0.7.29
+DISTVERSIONSUFFIX=	_AllInclusive
 CATEGORIES=		multimedia
-MASTER_SITES=		SF/${PORTNAME}/MediaInfo%20-%20Command%20line/${PORTVERSION}
-DISTNAME=		MediaInfo_${PORTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES=		SF/${PORTNAME}/source/${PORTNAME}/${PORTVERSION}
+DISTNAME=		mediainfo_${PORTVERSION}${DISTVERSIONSUFFIX}
+EXTRACT_SUFX=		.7z
 
 MAINTAINER=	freebsd-ports@evilcode.net
 COMMENT=	Supplies technical and tag information about a video or audio file
 
+EXTRACT_DEPENDS=	p7zip>=0:${PORTSDIR}/archivers/p7zip
+
 PLIST_FILES=	bin/mediainfo
 
-USE_BZIP2=	yes
-USE_DOS2UNIX=	int128s.cpp int128u.cpp
+EXTRACT_CMD=	7z
+USE_AUTOTOOLS=	autotools:build
 
 WRKSRC=		${WRKDIR}/MediaInfo${DISTVERSIONSUFFIX}
 
+do-extract:
+	@(${MKDIR} ${WRKSRC} && ${EXTRACT_CMD} x -o${WRKSRC} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES})
+
+pre-build:
+	@(cd ${WRKSRC} && ${CP} ./MediaInfo/Project/GNU/CLI/AddThisToRoot_CLI_compile.sh ./CLI_Compile.sh)
+
 do-build:
+	@(cd ${WRKSRC}/ZenLib/Project/GNU/Library/ && ${SH} ./autogen)
+	@(cd ${WRKSRC}/MediaInfoLib/Project/GNU/Library/ && ${SH} ./autogen)
+	@(cd ${WRKSRC}/MediaInfo/Project/GNU/CLI/ && ${SH} ./autogen)
 	@(cd ${WRKSRC}/ && ${SH} ./CLI_Compile.sh --prefix=${PREFIX})
 
 do-install:
diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo
index 396977818652..585defaecf2a 100644
--- a/multimedia/mediainfo/distinfo
+++ b/multimedia/mediainfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (MediaInfo_0.7.7.8_CLI_GNU_FromSource.tar.bz2) = d19a2c0fedc28d92e6bded8449759c15
-SHA256 (MediaInfo_0.7.7.8_CLI_GNU_FromSource.tar.bz2) = 2f193a5a109937bcec831b527987a67ff24e2adf1b3a2b902778b7f586471729
-SIZE (MediaInfo_0.7.7.8_CLI_GNU_FromSource.tar.bz2) = 1081183
+MD5 (mediainfo_0.7.29_AllInclusive.7z) = b5229aedc207d9b62a93160b99fb05a7
+SHA256 (mediainfo_0.7.29_AllInclusive.7z) = ec85b6a049eaaa78351b80f318061d93d4b836e32b1ea9ad52e5e94a931cd437
+SIZE (mediainfo_0.7.29_AllInclusive.7z) = 9867360
diff --git a/multimedia/mediainfo/files/patch-cli_compile b/multimedia/mediainfo/files/patch-cli_compile
deleted file mode 100644
index 9999083e3484..000000000000
--- a/multimedia/mediainfo/files/patch-cli_compile
+++ /dev/null
@@ -1,8 +0,0 @@
---- CLI_Compile.sh.old	2008-04-28 20:15:04.000000000 -0700
-+++ CLI_Compile.sh	2008-04-28 20:15:16.000000000 -0700
-@@ -102,4 +102,3 @@
- # Going home
- cd $Home
- echo "MediaInfo executable is in MediaInfo/Project/GNU/CLI"
--echo "For installing, cd MediaInfo/Project/GNU/CLI && make install"
-\ No newline at end of file
diff --git a/multimedia/mediainfo/files/patch-int128s b/multimedia/mediainfo/files/patch-int128s
deleted file mode 100644
index 46410c789065..000000000000
--- a/multimedia/mediainfo/files/patch-int128s
+++ /dev/null
@@ -1,13 +0,0 @@
---- ZenLib/Source/ZenLib/int128s.cpp       2008-04-12 10:52:16.000000000 -0700
-+++ ZenLib/Source/ZenLib/int128s.cpp     2008-04-24 23:30:33.000000000 -0700
-@@ -47,6 +47,9 @@
- #if defined (__MONTAVISTA__) || defined (__ARMEL__)
-     #define fmodl fmod
- #endif
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+    #define fmodl fmod
-+#endif
- using namespace std;
-
- namespace ZenLib
-
diff --git a/multimedia/mediainfo/files/patch-int128u b/multimedia/mediainfo/files/patch-int128u
deleted file mode 100644
index ea3df52aa2e8..000000000000
--- a/multimedia/mediainfo/files/patch-int128u
+++ /dev/null
@@ -1,12 +0,0 @@
---- ZenLib/Source/ZenLib/int128u.cpp       2008-04-12 10:52:16.000000000 -0700
-+++ ZenLib/Source/ZenLib/int128u.cpp     2008-04-24 23:31:13.000000000 -0700
-@@ -47,6 +47,9 @@
- #if defined (__MONTAVISTA__) || defined (__ARMEL__)
-     #define fmodl fmod
- #endif
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+    #define fmodl fmod
-+#endif
- using namespace std;
-
- namespace ZenLib