libtoolize and build shared libraries,

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

5 files changed, 41 insertions, 14 deletions

diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile
index 220b1921dfc..32f5ebac683 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2007/07/01 20:20:45 heinz Exp $
+# $NetBSD: Makefile,v 1.27 2007/11/14 18:20:05 drochner Exp $
 #
 
 DISTNAME=	libebml-0.7.7
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://dl.matroska.org/downloads/libebml/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,12 +16,13 @@ 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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libebml/PLIST b/devel/libebml/PLIST
index b7c3143b084..c60e79a4a3b 100644
--- a/devel/libebml/PLIST
+++ b/devel/libebml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/04/18 00:51:51 salo Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/11/14 18:20:05 drochner Exp $
 include/ebml/Debug.h
 include/ebml/EbmlBinary.h
 include/ebml/EbmlConfig.h
@@ -25,6 +25,6 @@ include/ebml/IOCallback.h
 include/ebml/MemIOCallback.h
 include/ebml/StdIOCallback.h
 include/ebml/c/libebml_t.h
-lib/libebml.a
+lib/libebml.la
 @dirrm include/ebml/c
 @dirrm include/ebml
diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk
index 63484784640..83f8ea01ef0 100644
--- a/devel/libebml/buildlink3.mk
+++ b/devel/libebml/buildlink3.mk
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/08 03:11:05 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/11/14 18:20:05 drochner Exp $
 #
 # This Makefile fragment is included by packages that use libebml.
 #
 
-BUILDLINK_DEPMETHOD.libebml?=	build
-
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBEBML_BUILDLINK3_MK:=	${LIBEBML_BUILDLINK3_MK}+
 
diff --git a/devel/libebml/distinfo b/devel/libebml/distinfo
index a6f7748a536..f72f98fc922 100644
--- a/devel/libebml/distinfo
+++ b/devel/libebml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2007/07/01 20:20:45 heinz Exp $
+$NetBSD: distinfo,v 1.15 2007/11/14 18:20:05 drochner Exp $
 
 SHA1 (libebml-0.7.7.tar.bz2) = e79f98968c8566c95637616c4419697e0adbecca
 RMD160 (libebml-0.7.7.tar.bz2) = d42ec6606a16cc9b38cff501e14929853136fa0b
 Size (libebml-0.7.7.tar.bz2) = 56527 bytes
-SHA1 (patch-aa) = fb3f3869817ba1a0de98caf35abe22f7ff1b4716
+SHA1 (patch-aa) = ae431e3b2736642d4d0f0292c58cc5f513bcc89a
diff --git a/devel/libebml/patches/patch-aa b/devel/libebml/patches/patch-aa
index db798661279..af2cad7dbbf 100644
--- a/devel/libebml/patches/patch-aa
+++ b/devel/libebml/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2007/07/01 20:20:45 heinz Exp $
+$NetBSD: patch-aa,v 1.9 2007/11/14 18:20:06 drochner Exp $
 
 --- make/linux/Makefile.orig	2006-03-30 21:05:11.000000000 +0200
 +++ make/linux/Makefile
@@ -24,7 +24,35 @@ $NetBSD: patch-aa,v 1.8 2007/07/01 20:20:45 heinz Exp $
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
-@@ -125,23 +125,23 @@ install: install_staticlib install_share
+@@ -51,7 +51,7 @@ LIBS=
+ 
+ # Names
+ LIBRARY=libebml.a
+-LIBRARY_SO=libebml.so
++LIBRARY_SO=libebml.la
+ LIBRARY_SO_VER=libebml.so.0
+ 
+ # source-files
+@@ -87,16 +87,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)
+-	rm -f $(LIBRARY_SO)
+-	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++	$(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -rpath $(PREFIX)/lib -version-info 0
+ 
+ clean:
+ 	rm -f $(objects) $(objects_so)
+@@ -125,23 +123,22 @@ install: install_staticlib install_share
  endif
  
  install_headers:
@@ -52,8 +80,7 @@ $NetBSD: patch-aa,v 1.8 2007/07/01 20:20:45 heinz Exp $
 -	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
 -	ln -s $(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),)