diff -ruN --exclude=CVS /usr/ports/multimedia/mediainfo/Makefile /home/users/jnlin/ports/mediainfo/Makefile
--- /usr/ports/multimedia/mediainfo/Makefile	2009-08-22 08:28:28.000000000 +0800
+++ /home/users/jnlin/ports/mediainfo/Makefile	2010-03-17 00:22:37.983936743 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/multimedia/mediainfo/distinfo /home/users/jnlin/ports/mediainfo/distinfo
--- /usr/ports/multimedia/mediainfo/distinfo	2008-12-02 05:13:26.000000000 +0800
+++ /home/users/jnlin/ports/mediainfo/distinfo	2010-03-16 20:16:53.315451124 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/multimedia/mediainfo/files/patch-cli_compile /home/users/jnlin/ports/mediainfo/files/patch-cli_compile
--- /usr/ports/multimedia/mediainfo/files/patch-cli_compile	2008-04-30 05:34:37.000000000 +0800
+++ /home/users/jnlin/ports/mediainfo/files/patch-cli_compile	1970-01-01 08:00:00.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/multimedia/mediainfo/files/patch-int128s /home/users/jnlin/ports/mediainfo/files/patch-int128s
--- /usr/ports/multimedia/mediainfo/files/patch-int128s	2008-04-30 05:34:37.000000000 +0800
+++ /home/users/jnlin/ports/mediainfo/files/patch-int128s	1970-01-01 08:00:00.000000000 +0800
@@ -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 -ruN --exclude=CVS /usr/ports/multimedia/mediainfo/files/patch-int128u /home/users/jnlin/ports/mediainfo/files/patch-int128u
--- /usr/ports/multimedia/mediainfo/files/patch-int128u	2008-04-30 05:34:37.000000000 +0800
+++ /home/users/jnlin/ports/mediainfo/files/patch-int128u	1970-01-01 08:00:00.000000000 +0800
@@ -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