Update to 1.4.1:

New 1.4.1 version:
    - Added new elements/classes DiscardPadding, CodecDelay and
      SeekPreRoll
    - The licensing information has been cleared up/unified.
    - The Makefile now contain options for specifying the destination
      base directory during installation ("DESTDIR") and for
      specifying which library types to build ("link").
    - The libraries are built without the "-ansi" and
      "-fno-gnu-keywords" flags on Linux
    - Code cleanup

3 files changed, 16 insertions, 38 deletions

diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index d6a05a64185..106b598db07 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2013/04/12 13:36:56 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2013/10/04 20:58:44 wiz Exp $
 
-DISTNAME=	libmatroska-1.4.0
+DISTNAME=	libmatroska-1.4.1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index 534f181a373..8e0b9eed5ca 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2013/04/12 13:36:56 drochner Exp $
+$NetBSD: distinfo,v 1.22 2013/10/04 20:58:44 wiz Exp $
 
-SHA1 (libmatroska-1.4.0.tar.bz2) = e2cd74cef7eb6d0223251e755a7af8d283d650e5
-RMD160 (libmatroska-1.4.0.tar.bz2) = b64136b2ffc1913dda3f3418ab4de3241556f3e1
-Size (libmatroska-1.4.0.tar.bz2) = 78705 bytes
-SHA1 (patch-ac) = aa13a5616a09f09942a357cb3f0b82a15ca58f5d
+SHA1 (libmatroska-1.4.1.tar.bz2) = e08c42531b68d21980bf991192378cf8cf79b40f
+RMD160 (libmatroska-1.4.1.tar.bz2) = 5074e5b3005ab6c12261bd0cfa2ce51bd271de78
+Size (libmatroska-1.4.1.tar.bz2) = 78387 bytes
+SHA1 (patch-ac) = 090d21b94deab12fc469fe52314cde7214562625
diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac
index 86ff3cbf68e..78db735d838 100644
--- a/multimedia/libmatroska/patches/patch-ac
+++ b/multimedia/libmatroska/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.13 2013/04/12 13:36:56 drochner Exp $
+$NetBSD: patch-ac,v 1.14 2013/10/04 20:58:44 wiz Exp $
 
---- make/linux/Makefile.orig	2013-03-21 12:11:24.000000000 +0000
+--- make/linux/Makefile.orig	2013-10-04 20:56:20.000000000 +0000
 +++ make/linux/Makefile
 @@ -16,16 +16,16 @@ prefix=/boot/home/config
  else
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.13 2013/04/12 13:36:56 drochner Exp $
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
-@@ -53,7 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+@@ -63,7 +63,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
  
  # Names
  LIBRARY=libmatroska.a
@@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.13 2013/04/12 13:36:56 drochner Exp $
  LIBRARY_SO_VER=libmatroska.so.6
  
  # source-files
-@@ -92,16 +92,14 @@ lib:
+@@ -97,16 +97,14 @@ lib:
  	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  %.lo: %$(EXTENSION)
@@ -53,35 +53,13 @@ $NetBSD: patch-ac,v 1.13 2013/04/12 13:36:56 drochner Exp $
  
  clean:	cleantest
  	rm -f $(objects) $(objects_so)
-@@ -153,23 +151,22 @@ install: install_staticlib install_share
- endif
- 
- install_headers:
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
- 	for i in $(INCLUDE_DIR)/*.h; do \
--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
- 	done
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
- 	for i in $(INCLUDE_DIR)/c/*.h; do \
--		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
-+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
- 	done
- 
- install_staticlib: $(LIBRARY)
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
+@@ -169,8 +167,7 @@ install_staticlib: $(LIBRARY)
  
  install_sharedlib: $(LIBRARY_SO)
--	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
-+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
+ 	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+-	ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
++	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
  
  ifneq ($(wildcard .depend),)
  include .depend