aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorsat <sat@FreeBSD.org>2006-12-03 23:29:07 +0800
committersat <sat@FreeBSD.org>2006-12-03 23:29:07 +0800
commit0b1a280e70f688b9ed1a2550fd250b5951c3b068 (patch)
tree1c231ae1193e849a80224ef11d3637f7d7e5881b /multimedia
parentdad4999668cb3b91aa3188dfd771ebd06b52558d (diff)
downloadfreebsd-ports-gnome-0b1a280e70f688b9ed1a2550fd250b5951c3b068.tar.gz
freebsd-ports-gnome-0b1a280e70f688b9ed1a2550fd250b5951c3b068.tar.zst
freebsd-ports-gnome-0b1a280e70f688b9ed1a2550fd250b5951c3b068.zip
- Update to 1.8.0
Approved by: lioux (timeout)
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/mkvtoolnix/Makefile29
-rw-r--r--multimedia/mkvtoolnix/distinfo6
2 files changed, 19 insertions, 16 deletions
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 455f181ef75c..0baa50dc7c0c 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -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 @@ LIB_DEPENDS= FLAC.7:${PORTSDIR}/audio/flac \
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
@@ -61,21 +65,22 @@ PLIST_FILES+= %%DATADIR%%/${file}
PLIST_FILES+= %%DATADIR%%/images/${file}
.endfor
-.include <bsd.port.pre.mk>
-
.ifndef(WITHOUT_WXGTK)
-USE_WX= 2.6
+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"
@@ -88,12 +93,10 @@ post-patch:
@${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|${WX_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>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index a015f445685f..d07cbdaf7590 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -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