summaryrefslogtreecommitdiff
path: root/devel/libebml
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libebml')
-rw-r--r--devel/libebml/Makefile28
-rw-r--r--devel/libebml/buildlink3.mk9
-rw-r--r--devel/libebml/distinfo4
-rw-r--r--devel/libebml/patches/patch-aa126
4 files changed, 85 insertions, 82 deletions
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile
index 37f28174172..8cf7984efce 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/02/14 18:57:14 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.31 2011/03/18 12:42:24 adam Exp $
DISTNAME= libebml-1.2.0
CATEGORIES= devel
@@ -9,19 +8,26 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/ebml/
COMMENT= Extensible Binary Meta Language support library
+LICENSE= gnu-lgpl-v2.1
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
-USE_LANGUAGES= c++
-USE_LIBTOOL= yes
+USE_LANGUAGES= c++
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
-NO_CONFIGURE= yes
-MAKEFLAGS+= prefix=${PREFIX:Q}
-MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
-BUILD_DIRS= make/linux
-BUILD_TARGET= sharedlib
-INSTALL_TARGET= install_headers install_sharedlib
+NO_CONFIGURE= yes
+MAKEFLAGS+= prefix=${PREFIX}
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
+BUILD_DIRS= make/linux
+BUILD_TARGET= sharedlib
+INSTALL_TARGET= install_headers install_sharedlib
+
+# remove CRs: fixes patching on Darwin and stops pkglint from complaining
+pre-patch:
+ cd ${WRKSRC}/make/linux && \
+ ${TR} -d '\r' < Makefile > Makefile.new && \
+ ${MV} Makefile.new Makefile
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libebml/buildlink3.mk b/devel/libebml/buildlink3.mk
index 9fd78436965..469f1abe417 100644
--- a/devel/libebml/buildlink3.mk
+++ b/devel/libebml/buildlink3.mk
@@ -1,15 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.17 2011/02/14 18:57:14 drochner Exp $
-#
-# This Makefile fragment is included by packages that use libebml.
-#
+# $NetBSD: buildlink3.mk,v 1.18 2011/03/18 12:42:24 adam Exp $
BUILDLINK_TREE+= libebml
.if !defined(LIBEBML_BUILDLINK3_MK)
LIBEBML_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libebml+= libebml>=0.7.7
-BUILDLINK_ABI_DEPENDS.libebml?= libebml>=1.2.0
+BUILDLINK_API_DEPENDS.libebml+= libebml>=0.8
+BUILDLINK_ABI_DEPENDS.libebml+= libebml>=1.2.0
BUILDLINK_PKGSRCDIR.libebml?= ../../devel/libebml
.endif # LIBEBML_BUILDLINK3_MK
diff --git a/devel/libebml/distinfo b/devel/libebml/distinfo
index ca4d94cf4eb..e53521b6524 100644
--- a/devel/libebml/distinfo
+++ b/devel/libebml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2011/02/14 18:57:14 drochner Exp $
+$NetBSD: distinfo,v 1.19 2011/03/18 12:42:24 adam Exp $
SHA1 (libebml-1.2.0.tar.bz2) = 4107fd6496b5aae3f0e7a96cb3008341a5b224bc
RMD160 (libebml-1.2.0.tar.bz2) = 213b7f9e18cf71f250d83d278ebd7e27220cdebc
Size (libebml-1.2.0.tar.bz2) = 60532 bytes
-SHA1 (patch-aa) = f7ff6a5a059eb2f8f2550f2de4c0b6fbf94c8ce7
+SHA1 (patch-aa) = 9467aaadd8fe6366ae9260b3ad0cdf242ac36d05
diff --git a/devel/libebml/patches/patch-aa b/devel/libebml/patches/patch-aa
index cf8704497ef..d6e751a807b 100644
--- a/devel/libebml/patches/patch-aa
+++ b/devel/libebml/patches/patch-aa
@@ -1,65 +1,65 @@
-$NetBSD: patch-aa,v 1.12 2011/02/14 18:57:14 drochner Exp $
+$NetBSD: patch-aa,v 1.13 2011/03/18 12:42:24 adam Exp $
---- make/linux/Makefile.orig 2011-01-29 11:45:50.000000000 +0000
+--- make/linux/Makefile.orig 2011-03-18 12:15:07.000000000 +0000
+++ make/linux/Makefile
-@@ -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.3
-
- # 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),)
+@@ -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.3
+
+ # 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 $(BSD_INSTALL_LIB) $(LIBRARY_SO) $(libdir)
+
+
+ ifneq ($(wildcard .depend),)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 00:50:01 +0000