libtoolize and build shared libraries,

this will make it usable in dynamically loaded plugins,
bump PKGREVISION

5 files changed, 48 insertions, 21 deletions

diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 451192dbc64..52b167f119e 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/07/01 20:23:19 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2007/11/14 18:27:48 drochner Exp $
 #
 
-DISTNAME=	libmatroska-0.8.0
-PKGREVISION=	1
+DISTNAME=	libmatroska-0.8.1
 CATEGORIES=	multimedia devel
 MASTER_SITES=	http://dl.matroska.org/downloads/libmatroska/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,15 +15,18 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
+USE_LIBTOOL=	yes
 
 NO_CONFIGURE=	yes
 MAKEFLAGS+=	prefix=${PREFIX:Q}
 MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
 BUILD_DIRS=	make/linux
-BUILD_TARGET=	staticlib
-INSTALL_TARGET=	install_headers install_staticlib
+BUILD_TARGET=	sharedlib
+INSTALL_TARGET=	install_headers install_sharedlib
 TEST_TARGET=	test
 
+# needed for libtoolization
+BUILDLINK_API_DEPENDS.libebml+=	libebml>=0.7.7nb1
 .include "../../devel/libebml/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libmatroska/PLIST b/multimedia/libmatroska/PLIST
index c748aa00aa8..8eb8107e6a3 100644
--- a/multimedia/libmatroska/PLIST
+++ b/multimedia/libmatroska/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/18 00:57:21 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/11/14 18:27:48 drochner Exp $
 include/matroska/FileKax.h
 include/matroska/KaxAttached.h
 include/matroska/KaxAttachments.h
@@ -27,6 +27,6 @@ include/matroska/KaxTypes.h
 include/matroska/KaxVersion.h
 include/matroska/c/libmatroska.h
 include/matroska/c/libmatroska_t.h
-lib/libmatroska.a
+lib/libmatroska.la
 @dirrm include/matroska/c
 @dirrm include/matroska
diff --git a/multimedia/libmatroska/buildlink3.mk b/multimedia/libmatroska/buildlink3.mk
index 0df84b8775d..265945676ce 100644
--- a/multimedia/libmatroska/buildlink3.mk
+++ b/multimedia/libmatroska/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2007/11/14 18:27:48 drochner Exp $
 #
 # This Makefile fragment is included by packages that use libmatroska.
 #
 
-BUILDLINK_DEPMETHOD.libmatroska?=	build
-
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMATROSKA_BUILDLINK3_MK:=	${LIBMATROSKA_BUILDLINK3_MK}+
 
diff --git a/multimedia/libmatroska/distinfo b/multimedia/libmatroska/distinfo
index 21b1690bd17..18bff84bef7 100644
--- a/multimedia/libmatroska/distinfo
+++ b/multimedia/libmatroska/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2007/07/01 20:23:19 heinz Exp $
+$NetBSD: distinfo,v 1.16 2007/11/14 18:27:48 drochner Exp $
 
-SHA1 (libmatroska-0.8.0.tar.bz2) = 7725d874dbf37ec7c41115804f091fa1554c6338
-RMD160 (libmatroska-0.8.0.tar.bz2) = e2fb6dcad7157373a271273a1a3ffc4428da9744
-Size (libmatroska-0.8.0.tar.bz2) = 90653 bytes
-SHA1 (patch-ac) = cd865ba47b6e1edf5988db2ff12ad9cd2f0dbc1c
+SHA1 (libmatroska-0.8.1.tar.bz2) = 8317c3a2a19f27a05c5dd289c3496c21a1d12456
+RMD160 (libmatroska-0.8.1.tar.bz2) = 195ca5fcf48653fea56e42ce4074d16447c680ac
+Size (libmatroska-0.8.1.tar.bz2) = 91381 bytes
+SHA1 (patch-ac) = 1fb682d09cb14bf1cfea1b396a3055bbf708383b
diff --git a/multimedia/libmatroska/patches/patch-ac b/multimedia/libmatroska/patches/patch-ac
index 1e8811f5bf1..2c7352c1512 100644
--- a/multimedia/libmatroska/patches/patch-ac
+++ b/multimedia/libmatroska/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2007/07/01 20:23:19 heinz Exp $
+$NetBSD: patch-ac,v 1.8 2007/11/14 18:27:48 drochner Exp $
 
---- make/linux/Makefile.orig	2005-04-19 09:00:00.000000000 +0200
+--- make/linux/Makefile.orig	2006-06-02 16:32:52.000000000 +0200
 +++ make/linux/Makefile
 @@ -16,15 +16,15 @@ prefix=/boot/home/config
  else
@@ -24,7 +24,35 @@ $NetBSD: patch-ac,v 1.7 2007/07/01 20:23:19 heinz Exp $
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
-@@ -155,23 +155,23 @@ install: install_staticlib install_share
+@@ -56,7 +56,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+ 
+ # Names
+ LIBRARY=libmatroska.a
+-LIBRARY_SO=libmatroska.so
++LIBRARY_SO=libmatroska.la
+ LIBRARY_SO_VER=libmatroska.so.0
+ 
+ # source-files
+@@ -95,16 +95,14 @@ lib:
+ 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ %.lo: %$(EXTENSION)
+-	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++	$(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+ 
+ $(LIBRARY): $(objects)
+ 	$(AR) $@ $(objects)
+ 	$(RANLIB) $@
+ 
+ $(LIBRARY_SO): $(objects_so)
+-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+-	rm -f $(LIBRARY_SO)
+-	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++	$(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0
+ 
+ clean:	cleantest
+ 	rm -f $(objects) $(objects_so)
+@@ -156,23 +154,22 @@ install: install_staticlib install_share
  endif
  
  install_headers:
@@ -50,10 +78,9 @@ $NetBSD: patch-ac,v 1.7 2007/07/01 20:23:19 heinz Exp $
  install_sharedlib: $(LIBRARY_SO)
 -	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 -	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--	ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+-	ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
 +	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
-+	ln -s $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
++	$(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
  
  ifneq ($(wildcard .depend),)
  include .depend