From 192e7b5540a09ba585c66ce7870a8ecee40c55fc Mon Sep 17 00:00:00 2001
From: riggs <riggs@FreeBSD.org>
Date: Mon, 5 Jan 2015 13:18:10 +0000
Subject: - Update to upstream version 1.4.2 - Uses GNU_CONFIGURE and pkgconfig
 now -> simplify port Makefile

---
 multimedia/libmatroska/Makefile                    | 29 +++++-----------------
 multimedia/libmatroska/distinfo                    |  4 +--
 .../libmatroska/files/patch-make_linux_Makefile    | 11 --------
 multimedia/libmatroska/pkg-plist                   |  4 +--
 4 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 multimedia/libmatroska/files/patch-make_linux_Makefile

diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index dfd77ba..644c6ea 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libmatroska
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.2
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/ \
 		http://www.bunkus.org/videotools/mkvtoolnix/sources/
@@ -15,30 +14,14 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libebml.so:${PORTSDIR}/textproc/libebml
 
-USES=	gmake dos2unix tar:bzip2
-DOS2UNIX_FILES=	make/linux/Makefile
-BUILD_WRKSRC=	${WRKSRC}/make/linux
-INSTALL_WRKSRC=	${WRKSRC}/make/linux
+USES=		gmake libtool pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-# Installs dir with proper permissions
-INSTALL_DATA_DIR=	${INSTALL} -d -m 755
-
-MAKE_ARGS=	INSTALL_DIR_OPTS="${INSTALL} -d -m 755" \
-		INSTALL_OPTS="${INSTALL_DATA}" \
-		INSTALL_OPTS_LIB="${INSTALL_LIB}" \
-		INSTALL="" \
-		prefix=${PREFIX} \
-		CXX="${CXX}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LIBEBML_INCLUDE_DIR="${LOCALBASE}/include" \
-		LIBEBML_LIB_DIR="${LOCALBASE}/lib"
+INSTALL_TARGET=	install-strip
 
 post-patch:
-# XXX - revise at every port update
-# the tests are botched. do not run them
-	@${REINPLACE_CMD} -E \
-		-e 's|^(all:.*)test|\1|' \
-		${WRKSRC}/make/linux/Makefile
+	${REINPLACE_CMD} -e 's|$${libdir}/pkgconfig|@prefix@/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index 4e42021..9bbbc1a 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmatroska-1.4.1.tar.bz2) = 086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7
-SIZE (libmatroska-1.4.1.tar.bz2) = 78387
+SHA256 (libmatroska-1.4.2.tar.bz2) = bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f
+SIZE (libmatroska-1.4.2.tar.bz2) = 611057
diff --git a/multimedia/libmatroska/files/patch-make_linux_Makefile b/multimedia/libmatroska/files/patch-make_linux_Makefile
deleted file mode 100644
index 4ca4d2d..0000000
--- a/multimedia/libmatroska/files/patch-make_linux_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- 
diff --git a/multimedia/libmatroska/pkg-plist b/multimedia/libmatroska/pkg-plist
index 50f7c23..2d13441 100644
--- a/multimedia/libmatroska/pkg-plist
+++ b/multimedia/libmatroska/pkg-plist
@@ -30,5 +30,5 @@ include/matroska/c/libmatroska_t.h
 lib/libmatroska.a
 lib/libmatroska.so
 lib/libmatroska.so.6
-@dirrm include/matroska/c
-@dirrm include/matroska
+lib/libmatroska.so.6.0.0
+libdata/pkgconfig/libmatroska.pc
-- 
cgit v1.1