From 48b6df056441f9391eb034e278d8859b32173335 Mon Sep 17 00:00:00 2001
From: jakemsr <jakemsr@openbsd.org>
Date: Sat, 12 Mar 2011 21:17:50 +0000
Subject: [PATCH] update to libmatroska-1.1.0

from Brad (MAINTAINER)
---
 multimedia/libmatroska/Makefile                        |  9 ++++-----
 multimedia/libmatroska/distinfo                        | 10 +++++-----
 .../libmatroska/patches/patch-make_linux_Makefile      | 10 +++++-----
 multimedia/libmatroska/pkg/PLIST                       |  3 +--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 46351079c49..71508575e60 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/19 07:23:13 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/03/12 21:17:50 jakemsr Exp $
 
 COMMENT=	extensible open standard audio/video container library
 
-DISTNAME=	libmatroska-1.0.0
-REVISION=	0
+DISTNAME=	libmatroska-1.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=	.tar.bz2
 
-SHARED_LIBS=	matroska	1.0
+SHARED_LIBS=	matroska	2.0
 
 HOMEPAGE=	http://www.matroska.org/
 
@@ -19,7 +18,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-WANTLIB=	ebml m stdc++
+WANTLIB=	ebml>=2 m stdc++
 
 LIB_DEPENDS=	textproc/libebml
 
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index b6af8e3dfac..6dd07d0cf82 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,5 +1,5 @@
-MD5 (libmatroska-1.0.0.tar.bz2) = TvzzlFsXpvAyDPGqoyak3g==
-RMD160 (libmatroska-1.0.0.tar.bz2) = +246d1+mEcv7qz8XijFwy2VE1R4=
-SHA1 (libmatroska-1.0.0.tar.bz2) = H1gheWiggb1VDsBvLWvrgaejrGg=
-SHA256 (libmatroska-1.0.0.tar.bz2) = 3AAFI99QjkV+rWRHstmixUn7/1JXg8E6ltGbvWETe4g=
-SIZE (libmatroska-1.0.0.tar.bz2) = 83282
+MD5 (libmatroska-1.1.0.tar.bz2) = IeXuPiVz8K6Z2xlTSL37mA==
+RMD160 (libmatroska-1.1.0.tar.bz2) = jaC9W9g+axWLcUtVTzX4LAUYHp0=
+SHA1 (libmatroska-1.1.0.tar.bz2) = /8fQt1eFT564wy5R8v7a3Hlu9hc=
+SHA256 (libmatroska-1.1.0.tar.bz2) = RlnUI4VtZ1RtvdHzAzHuUYXLigsn35jsaSdL15jIqbE=
+SIZE (libmatroska-1.1.0.tar.bz2) = 80469
diff --git a/multimedia/libmatroska/patches/patch-make_linux_Makefile b/multimedia/libmatroska/patches/patch-make_linux_Makefile
index 7766bb8ec49..1d4e69e49e8 100644
--- a/multimedia/libmatroska/patches/patch-make_linux_Makefile
+++ b/multimedia/libmatroska/patches/patch-make_linux_Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-make_linux_Makefile,v 1.3 2010/06/18 21:35:18 sthen Exp $
---- make/linux/Makefile.orig	Thu Jun 17 21:05:53 2010
-+++ make/linux/Makefile	Thu Jun 17 21:06:58 2010
+$OpenBSD: patch-make_linux_Makefile,v 1.4 2011/03/12 21:17:50 jakemsr Exp $
+--- make/linux/Makefile.orig	Sun Feb 27 00:50:05 2011
++++ make/linux/Makefile	Sun Feb 27 00:53:28 2011
 @@ -33,8 +33,8 @@ INSTALL_DIR_OPTS = -m 755
  CWD=$(shell pwd)
  
@@ -17,8 +17,8 @@ $OpenBSD: patch-make_linux_Makefile,v 1.3 2010/06/18 21:35:18 sthen Exp $
  # Names
  LIBRARY=libmatroska.a
 -LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.2
-+LIBRARY_SO_VER=libmatroska.so.$(LIBmatroska_VERSION)
+-LIBRARY_SO_VER=libmatroska.so.3
++LIBRARY_SO_VER=libmatroska.so.${LIBmatroska_VERSION}
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
diff --git a/multimedia/libmatroska/pkg/PLIST b/multimedia/libmatroska/pkg/PLIST
index 398dd4119a6..a49fb9dd92e 100644
--- a/multimedia/libmatroska/pkg/PLIST
+++ b/multimedia/libmatroska/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/06/18 23:25:49 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/03/12 21:17:50 jakemsr Exp $
 %%SHARED%%
 include/matroska/
 include/matroska/FileKax.h
@@ -20,7 +20,6 @@ include/matroska/KaxInfoData.h
 include/matroska/KaxSeekHead.h
 include/matroska/KaxSegment.h
 include/matroska/KaxTag.h
-include/matroska/KaxTagMulti.h
 include/matroska/KaxTags.h
 include/matroska/KaxTrackAudio.h
 include/matroska/KaxTrackEntryData.h