Fri Mar 18 12:42:14 2011 UTC ()
Fix patching on Mac OSX; fix installing the library; fix some pkglint issues


(adam)
diff -r1.25 -r1.26 pkgsrc/multimedia/libmatroska/Makefile
diff -r1.19 -r1.20 pkgsrc/multimedia/libmatroska/buildlink3.mk
diff -r1.18 -r1.19 pkgsrc/multimedia/libmatroska/distinfo
diff -r1.10 -r1.11 pkgsrc/multimedia/libmatroska/patches/patch-ac
cvs diff -r1.25 -r1.26 pkgsrc/multimedia/libmatroska/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/Makefile 2011/02/23 15:41:48 1.25
+++ pkgsrc/multimedia/libmatroska/Makefile 2011/03/18 12:42:13 1.26
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1# $NetBSD: Makefile,v 1.25 2011/02/23 15:41:48 apb Exp $ 1# $NetBSD: Makefile,v 1.26 2011/03/18 12:42:13 adam Exp $
2# 
3 2
4DISTNAME= libmatroska-1.1.0 3DISTNAME= libmatroska-1.1.0
5CATEGORIES= multimedia devel 4CATEGORIES= multimedia devel
6MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/ 5MASTER_SITES= http://dl.matroska.org/downloads/libmatroska/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= salo@NetBSD.org 8MAINTAINER= salo@NetBSD.org
10HOMEPAGE= http://www.matroska.org/ 9HOMEPAGE= http://www.matroska.org/
11COMMENT= Extensible open standard Audio/Video container format 10COMMENT= Extensible open standard Audio/Video container format
 11LICENSE= gnu-lgpl-v2.1
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14PKG_INSTALLATION_TYPES= overwrite pkgviews 14PKG_INSTALLATION_TYPES= overwrite pkgviews
15 15
16USE_TOOLS+= gmake 16USE_LANGUAGES= c++
17USE_LANGUAGES= c++ 17USE_LIBTOOL= yes
18USE_LIBTOOL= yes 18USE_TOOLS+= gmake
19 19
20NO_CONFIGURE= yes 20NO_CONFIGURE= yes
21MAKEFLAGS+= prefix=${PREFIX:Q} 21MAKEFLAGS+= prefix=${PREFIX}
22MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q} 22MAKE_ENV+= CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
23BUILD_DIRS= make/linux 23BUILD_DIRS= make/linux
24BUILD_TARGET= sharedlib 24BUILD_TARGET= sharedlib
25INSTALL_TARGET= install_headers install_sharedlib 25INSTALL_TARGET= install_headers install_sharedlib
26TEST_TARGET= test 26TEST_TARGET= test
 27
 28# remove CRs: fixes patching on Darwin and stops pkglint from complaining
 29pre-patch:
 30 cd ${WRKSRC}/make/linux && \
 31 ${TR} -d '\r' < Makefile > Makefile.new && \
 32 ${MV} Makefile.new Makefile
27 33
28# needed for libtoolization 
29BUILDLINK_API_DEPENDS.libebml+= libebml>=0.8 
30.include "../../devel/libebml/buildlink3.mk" 34.include "../../devel/libebml/buildlink3.mk"
31 
32.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/multimedia/libmatroska/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/buildlink3.mk 2011/02/14 19:00:45 1.19
+++ pkgsrc/multimedia/libmatroska/buildlink3.mk 2011/03/18 12:42:13 1.20
@@ -1,18 +1,15 @@ @@ -1,18 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.19 2011/02/14 19:00:45 drochner Exp $ 1# $NetBSD: buildlink3.mk,v 1.20 2011/03/18 12:42:13 adam Exp $
2# 
3# This Makefile fragment is included by packages that use libmatroska. 
4# 
5 2
6BUILDLINK_TREE+= libmatroska 3BUILDLINK_TREE+= libmatroska
7 4
8.if !defined(LIBMATROSKA_BUILDLINK3_MK) 5.if !defined(LIBMATROSKA_BUILDLINK3_MK)
9LIBMATROSKA_BUILDLINK3_MK:= 6LIBMATROSKA_BUILDLINK3_MK:=
10 7
11BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=0.8.0 8BUILDLINK_API_DEPENDS.libmatroska+= libmatroska>=0.8.0
12BUILDLINK_ABI_DEPENDS.libmatroska?= libmatroska>=1.1.0 9BUILDLINK_ABI_DEPENDS.libmatroska+= libmatroska>=1.1.0
13BUILDLINK_PKGSRCDIR.libmatroska?= ../../multimedia/libmatroska 10BUILDLINK_PKGSRCDIR.libmatroska?= ../../multimedia/libmatroska
14 11
15.include "../../devel/libebml/buildlink3.mk" 12.include "../../devel/libebml/buildlink3.mk"
16.endif # LIBMATROSKA_BUILDLINK3_MK 13.endif # LIBMATROSKA_BUILDLINK3_MK
17 14
18BUILDLINK_TREE+= -libmatroska 15BUILDLINK_TREE+= -libmatroska
cvs diff -r1.18 -r1.19 pkgsrc/multimedia/libmatroska/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/distinfo 2011/02/14 19:00:45 1.18
+++ pkgsrc/multimedia/libmatroska/distinfo 2011/03/18 12:42:13 1.19
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.18 2011/02/14 19:00:45 drochner Exp $ 1$NetBSD: distinfo,v 1.19 2011/03/18 12:42:13 adam Exp $
2 2
3SHA1 (libmatroska-1.1.0.tar.bz2) = ffc7d0b757854f9eb8c32e51f2fedadc796ef617 3SHA1 (libmatroska-1.1.0.tar.bz2) = ffc7d0b757854f9eb8c32e51f2fedadc796ef617
4RMD160 (libmatroska-1.1.0.tar.bz2) = 8da0bd5bd83e6b158b714b554f35f82c05181e9d 4RMD160 (libmatroska-1.1.0.tar.bz2) = 8da0bd5bd83e6b158b714b554f35f82c05181e9d
5Size (libmatroska-1.1.0.tar.bz2) = 80469 bytes 5Size (libmatroska-1.1.0.tar.bz2) = 80469 bytes
6SHA1 (patch-ac) = 69e511efd34597894a926d830549f09a3a449ad6 6SHA1 (patch-ac) = 8f7dd83d9ff04b29a918f97e65ef64a49310b6b6
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/libmatroska/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/multimedia/libmatroska/patches/Attic/patch-ac 2011/02/14 19:00:45 1.10
+++ pkgsrc/multimedia/libmatroska/patches/Attic/patch-ac 2011/03/18 12:42:14 1.11
@@ -1,87 +1,87 @@ @@ -1,87 +1,87 @@
1$NetBSD: patch-ac,v 1.10 2011/02/14 19:00:45 drochner Exp $ 1$NetBSD: patch-ac,v 1.11 2011/03/18 12:42:14 adam Exp $
2 2
3--- make/linux/Makefile.orig 2011-01-29 11:48:16.000000000 +0000 3--- make/linux/Makefile.orig 2011-01-29 11:48:16.000000000 +0000
4+++ make/linux/Makefile 4+++ make/linux/Makefile
5@@ -16,16 +16,16 @@ prefix=/boot/home/config  5@@ -16,16 +16,16 @@ prefix=/boot/home/config
6 else  6 else
7 prefix=/usr/local  7 prefix=/usr/local
8 endif  8 endif
9-libdir=$(prefix)/lib  9-libdir=$(prefix)/lib
10-includedir=$(prefix)/include/matroska  10-includedir=$(prefix)/include/matroska
11+libdir=$(PREFIX)/lib  11+libdir=$(PREFIX)/lib
12+includedir=$(PREFIX)/include/matroska  12+includedir=$(PREFIX)/include/matroska
13  13
14 # Programs  14 # Programs
15 CROSS =  15 CROSS =
16-CXX = $(CROSS)g++  16-CXX = $(CROSS)g++
17+#CXX = $(CROSS)g++  17+#CXX = $(CROSS)g++
18 LD = $(CXX)  18 LD = $(CXX)
19-AR = $(CROSS)ar  19-AR = $(CROSS)ar
20-RANLIB = $(CROSS)ranlib  20-RANLIB = $(CROSS)ranlib
21-INSTALL = install  21-INSTALL = install
22+#AR = $(CROSS)ar  22+#AR = $(CROSS)ar
23+#RANLIB = $(CROSS)ranlib  23+#RANLIB = $(CROSS)ranlib
24+INSTALL = $(BSD_INSTALL)  24+INSTALL = $(BSD_INSTALL)
25 INSTALL_OPTS = -m 644  25 INSTALL_OPTS = -m 644
26 INSTALL_OPTS_LIB = -m 644  26 INSTALL_OPTS_LIB = -m 644
27 INSTALL_DIR_OPTS = -m 755  27 INSTALL_DIR_OPTS = -m 755
28@@ -53,7 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)  28@@ -53,7 +53,7 @@ MUX_LIBS=-lmatroska -lebml $(LIBICONV)
29  29
30 # Names  30 # Names
31 LIBRARY=libmatroska.a  31 LIBRARY=libmatroska.a
32-LIBRARY_SO=libmatroska.so  32-LIBRARY_SO=libmatroska.so
33+LIBRARY_SO=libmatroska.la  33+LIBRARY_SO=libmatroska.la
34 LIBRARY_SO_VER=libmatroska.so.3  34 LIBRARY_SO_VER=libmatroska.so.3
35  35
36 # source-files  36 # source-files
37@@ -92,16 +92,14 @@ lib:  37@@ -92,16 +92,14 @@ lib:
38 $(CXX) -c $(COMPILEFLAGS) -o $@ $<  38 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
39  39
40 %.lo: %$(EXTENSION)  40 %.lo: %$(EXTENSION)
41- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<  41- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
42+ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<  42+ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
43  43
44 $(LIBRARY): $(objects)  44 $(LIBRARY): $(objects)
45 $(AR) rcvu $@ $(objects)  45 $(AR) rcvu $@ $(objects)
46 $(RANLIB) $@  46 $(RANLIB) $@
47  47
48 $(LIBRARY_SO): $(objects_so)  48 $(LIBRARY_SO): $(objects_so)
49- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml  49- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
50- rm -f $(LIBRARY_SO)  50- rm -f $(LIBRARY_SO)
51- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)  51- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
52+ $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0  52+ $(LIBTOOL) --mode=link $(CXX) -o $(LIBRARY_SO) $(objects_so) -lebml -rpath $(PREFIX)/lib -version-info 0
53  53
54 clean: cleantest  54 clean: cleantest
55 rm -f $(objects) $(objects_so)  55 rm -f $(objects) $(objects_so)
56@@ -153,23 +151,22 @@ install: install_staticlib install_share 56@@ -153,23 +151,22 @@ install: install_staticlib install_share
57 endif  57 endif
58  58
59 install_headers:  59 install_headers:
60- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)  60- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
61+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)  61+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
62 for i in $(INCLUDE_DIR)/*.h; do \  62 for i in $(INCLUDE_DIR)/*.h; do \
63- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \  63- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
64+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \  64+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
65 done  65 done
66- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c  66- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
67+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c  67+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
68 for i in $(INCLUDE_DIR)/c/*.h; do \  68 for i in $(INCLUDE_DIR)/c/*.h; do \
69- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \  69- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
70+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \  70+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
71 done  71 done
72  72
73 install_staticlib: $(LIBRARY)  73 install_staticlib: $(LIBRARY)
74- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)  74- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
75- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)  75- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
76+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)  76+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
77+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)  77+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
78  78
79 install_sharedlib: $(LIBRARY_SO)  79 install_sharedlib: $(LIBRARY_SO)
80- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)  80- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
81- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)  81- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
82- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)  82- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
83+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)  83+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
84+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)  84+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIBRARY_SO) $(DESTDIR)$(libdir)
85  85
86 ifneq ($(wildcard .depend),)  86 ifneq ($(wildcard .depend),)
87 include .depend  87 include .depend