Index: multimedia/libmatroska/Makefile
===================================================================
--- multimedia/libmatroska/Makefile	(revision 317545)
+++ multimedia/libmatroska/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libmatroska
-# Date created:		Mon May 19 08:29:44 UTC 2003
-# Whom:                 Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libmatroska
-PORTVERSION=	1.3.0
+PORTVERSION=	1.4.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -14,11 +10,14 @@
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Extensible Multimedia Container Format
 
-BUILD_DEPENDS=	libebml>=1.2.1:${PORTSDIR}/textproc/libebml
-LIB_DEPENDS=	ebml.3:${PORTSDIR}/textproc/libebml
+LICENSE=	LGPL21
 
+BUILD_DEPENDS=	libebml>=1.3.0:${PORTSDIR}/textproc/libebml
+LIB_DEPENDS=	ebml.4:${PORTSDIR}/textproc/libebml
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_DOS2UNIX=	make/linux/Makefile
 BUILD_WRKSRC=	${WRKSRC}/make/linux
 INSTALL_WRKSRC=	${WRKSRC}/make/linux
 USE_LDCONFIG=	yes
Index: multimedia/libmatroska/distinfo
===================================================================
--- multimedia/libmatroska/distinfo	(revision 317545)
+++ multimedia/libmatroska/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libmatroska-1.3.0.tar.bz2) = 5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69
-SIZE (libmatroska-1.3.0.tar.bz2) = 80542
+SHA256 (libmatroska-1.4.0.tar.bz2) = 1b6d02e75cdbfb6d282dcf2a902a259c3075404885d5e8063e6652a2b3f6c11b
+SIZE (libmatroska-1.4.0.tar.bz2) = 78705
Index: multimedia/libmatroska/files/patch-make_linux_Makefile
===================================================================
--- multimedia/libmatroska/files/patch-make_linux_Makefile	(revision 317545)
+++ multimedia/libmatroska/files/patch-make_linux_Makefile	(working copy)
@@ -1,11 +1,11 @@
 --- make/linux/Makefile.orig	2010-03-23 12:58:04.000000000 -0300
 +++ make/linux/Makefile	2010-05-31 15:03:28.000000000 -0300
 @@ -99,7 +99,7 @@
- 	$(RANLIB) $@
- 
- $(LIBRARY_SO): $(objects_so)
--	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
-+	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -L$(LIBEBML_LIB_DIR) -lebml
- 	rm -f $(LIBRARY_SO)
- 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
- 
+ 	$(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
++	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -L$(LIBEBML_LIB_DIR) -lebml
+ 	rm -f $(LIBRARY_SO)
+ 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ 
Index: multimedia/libmatroska/pkg-plist
===================================================================
--- multimedia/libmatroska/pkg-plist	(revision 317545)
+++ multimedia/libmatroska/pkg-plist	(working copy)
@@ -28,6 +28,6 @@
 include/matroska/c/libmatroska.h
 include/matroska/c/libmatroska_t.h
 lib/libmatroska.so
-lib/libmatroska.so.5
+lib/libmatroska.so.6
 @dirrm include/matroska/c
 @dirrm include/matroska
Index: textproc/libebml/Makefile
===================================================================
--- textproc/libebml/Makefile	(revision 317545)
+++ textproc/libebml/Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libebml
-# Date created:		Mon May 19 08:29:44 UTC 2003
-# Whom:                 Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
+# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libebml
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://dl.matroska.org/downloads/libebml/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/
Index: textproc/libebml/distinfo
===================================================================
--- textproc/libebml/distinfo	(revision 317545)
+++ textproc/libebml/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libebml-1.2.2.tar.bz2) = 476b08c6436a96c024a53e788e7c945ce9b41cd8654165763444aa7e5245b7a5
-SIZE (libebml-1.2.2.tar.bz2) = 60802
+SHA256 (libebml-1.3.0.tar.bz2) = 83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de
+SIZE (libebml-1.3.0.tar.bz2) = 59359
Index: textproc/libebml/pkg-plist
===================================================================
--- textproc/libebml/pkg-plist	(revision 317545)
+++ textproc/libebml/pkg-plist	(working copy)
@@ -26,6 +26,6 @@
 include/ebml/c/libebml_t.h
 lib/libebml.a
 lib/libebml.so
-lib/libebml.so.3
+lib/libebml.so.4
 @dirrm include/ebml/c
 @dirrm include/ebml