Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile	26 Jul 2006 23:11:41 -0000	1.32
+++ Makefile	18 Nov 2006 21:04:12 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mkvtoolnix
-PORTVERSION=	1.7.0
+PORTVERSION=	1.8.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/old/
@@ -19,14 +19,18 @@
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		lzo2.2:${PORTSDIR}/archivers/lzo2 \
 		matroska.0:${PORTSDIR}/multimedia/libmatroska \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
+		ogg.5:${PORTSDIR}/audio/libogg \
+		pcrecpp.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I/usr/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L/usr/lib -L${LOCALBASE}/lib -lmagic -lz"
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -lmagic -lz
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 
 MAN1=		base64tool.1 mkvextract.1 mkvinfo.1 mkvmerge.1
 PLIST_FILES=	bin/base64tool bin/mkvextract bin/mkvinfo bin/mkvmerge
@@ -63,21 +67,23 @@
 
 WXGTK_CONFIG=	wxgtk2u-2.6-config
 
-.include <bsd.port.pre.mk>
 
 .ifndef(WITHOUT_WXGTK)
-LIB_DEPENDS+=	wx_gtk2u_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26-unicode
-
+USE_WX=		yes
+WX_UNICODE=	yes
+WX_CONF_ARGS=	absolute
 MAN1+=		mmg.1
 PLIST_FILES+=	bin/mmg
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD 4.x"
-CFLAGS+= -DNO_WSTRING
+BROKEN=		Does not compile on FreeBSD 4.x
+CFLAGS+=	-DNO_WSTRING
 .endif
 
-pre-everything::
+pre-configure::
 .ifndef(WITHOUT_WXGTK)
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can disable wxGTK2 support by defining"
@@ -90,12 +96,10 @@
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E -e \
 		's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
-	@${REINPLACE_CMD} -e 's|wx-config|${WXGTK_CONFIG}|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
 		${WRKSRC}/src/common/os.cpp
 
 pre-install:
-	@${MKDIR} ${DATADIR}
+	@${INSTALL} -d ${DATADIR}/
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/mkvtoolnix/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	25 Jul 2006 22:52:33 -0000	1.16
+++ distinfo	18 Nov 2006 21:04:12 -0000
@@ -1,3 +1,3 @@
-MD5 (mkvtoolnix-1.7.0.tar.bz2) = a4d2720ace7509b2af026db00405cfc0
-SHA256 (mkvtoolnix-1.7.0.tar.bz2) = da8e5654bc511e23512fc23bba587ccd70a7096d554d6eee290b7985fe057219
-SIZE (mkvtoolnix-1.7.0.tar.bz2) = 655481
+MD5 (mkvtoolnix-1.8.0.tar.bz2) = 318d5a366463efb6c4d873c4ee67e54b
+SHA256 (mkvtoolnix-1.8.0.tar.bz2) = e96a0fd4af265adceb3903c570e886ea6151dcc31eedfe6b6de613549798c693
+SIZE (mkvtoolnix-1.8.0.tar.bz2) = 665809