diff options
author | drochner <drochner> | 2010-07-08 18:42:12 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-07-08 18:42:12 +0000 |
commit | 729d9750b8f2c97e8e3c7d56210604f535d791eb (patch) | |
tree | 80c4b5be775ad69a50d4c0c982e784f5ec769872 /devel/libebml | |
parent | 890a2d534bac61a30faa7c58274bd023fed20e5c (diff) | |
download | pkgsrc-729d9750b8f2c97e8e3c7d56210604f535d791eb.tar.gz |
update to 1.0.0
changes:
-API extensions
-bugfixes
Diffstat (limited to 'devel/libebml')
-rw-r--r-- | devel/libebml/Makefile | 4 | ||||
-rw-r--r-- | devel/libebml/distinfo | 10 | ||||
-rw-r--r-- | devel/libebml/patches/patch-aa | 125 |
3 files changed, 70 insertions, 69 deletions
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile index 826753c61f3..75aa447fa44 100644 --- a/devel/libebml/Makefile +++ b/devel/libebml/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2008/04/28 09:48:13 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2010/07/08 18:42:12 drochner Exp $ # -DISTNAME= libebml-0.7.8 +DISTNAME= libebml-1.0.0 CATEGORIES= devel MASTER_SITES= http://dl.matroska.org/downloads/libebml/ EXTRACT_SUFX= .tar.bz2 diff --git a/devel/libebml/distinfo b/devel/libebml/distinfo index ea2921d83a1..3160e124b4d 100644 --- a/devel/libebml/distinfo +++ b/devel/libebml/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.16 2008/04/28 09:48:13 wiz Exp $ +$NetBSD: distinfo,v 1.17 2010/07/08 18:42:13 drochner Exp $ -SHA1 (libebml-0.7.8.tar.bz2) = 2b1b9a8f4bc2a5b6a709f00ec520353dcc0a1d18 -RMD160 (libebml-0.7.8.tar.bz2) = 73e196e03df254536e20aa390acc0c2c79940054 -Size (libebml-0.7.8.tar.bz2) = 58121 bytes -SHA1 (patch-aa) = 8293712ad0d7f6c8bba8546c3bab9373feadbdca +SHA1 (libebml-1.0.0.tar.bz2) = 8b79752ddb6cadab0346b43785432c554dbf220d +RMD160 (libebml-1.0.0.tar.bz2) = 932552ae239007253f0526d8bb0d506776ca14df +Size (libebml-1.0.0.tar.bz2) = 60058 bytes +SHA1 (patch-aa) = 8d33249a2c845b2e1f10d184092b47d739c4621d diff --git a/devel/libebml/patches/patch-aa b/devel/libebml/patches/patch-aa index 28dab826ef7..fab0c0cff72 100644 --- a/devel/libebml/patches/patch-aa +++ b/devel/libebml/patches/patch-aa @@ -1,64 +1,65 @@ -$NetBSD: patch-aa,v 1.10 2008/04/28 09:48:13 wiz Exp $ +$NetBSD: patch-aa,v 1.11 2010/07/08 18:42:14 drochner Exp $ ---- make/linux/Makefile.orig 2006-06-02 16:32:15.000000000 +0200 +--- make/linux/Makefile.orig 2010-06-04 08:44:54.000000000 +0000 +++ make/linux/Makefile -@@ -16,15 +16,15 @@ prefix=/boot/home/config - else - prefix=/usr/local - endif --libdir=$(prefix)/lib --includedir=$(prefix)/include/ebml -+libdir=$(DESTDIR)$(PREFIX)/lib -+includedir=$(DESTDIR)$(PREFIX)/include/ebml - - # Programs --CXX=g++ -+#CXX=g++ - LD=$(CXX) --AR = ar rcvu --RANLIB = ranlib --INSTALL = install -+AR += rcvu -+#RANLIB = ranlib -+INSTALL = $(BSD_INSTALL) - INSTALL_OPTS = -m 644 - INSTALL_OPTS_LIB = -m 644 - INSTALL_DIR_OPTS = -m 755 -@@ -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) -@@ -140,8 +138,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) -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(libdir) - - - ifneq ($(wildcard .depend),) +@@ -16,16 +16,16 @@ prefix=/boot/home/config
+ else
+ prefix=/usr/local
+ endif
+-libdir=$(prefix)/lib
+-includedir=$(prefix)/include/ebml
++libdir=$(DESTDIR)$(PREFIX)/lib
++includedir=$(DESTDIR)$(PREFIX)/include/ebml
+
+ # Programs
+ CROSS =
+-CXX = $(CROSS)g++
++#CXX = $(CROSS)g++
+ LD = $(CXX)
+-AR = $(CROSS)ar
+-RANLIB = $(CROSS)ranlib
+-INSTALL = install
++#AR = $(CROSS)ar
++#RANLIB = $(CROSS)ranlib
++INSTALL = $(BSD_INSTALL)
+ INSTALL_OPTS = -m 644
+ INSTALL_OPTS_LIB = -m 644
+ INSTALL_DIR_OPTS = -m 755
+@@ -48,7 +48,7 @@ LIBS=
+
+ # Names
+ LIBRARY=libebml.a
+-LIBRARY_SO=libebml.so
++LIBRARY_SO=libebml.la
+ LIBRARY_SO_VER=libebml.so.2
+
+ # source-files
+@@ -84,16 +84,14 @@ lib:
+ $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
+ %.lo: %$(EXTENSION)
+- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+
+ $(LIBRARY): $(objects)
+ $(AR) rcvu $@ $(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)
+@@ -137,8 +135,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)
++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(libdir)
+
+
+ ifneq ($(wildcard .depend),)
|