Wed May 22 09:39:35 2013 UTC ()
Fix build on SunOS: call the right configure target, and fix libtool.


(fhajny)
diff -r1.20 -r1.21 pkgsrc/net/liblive/Makefile
diff -r1.13 -r1.14 pkgsrc/net/liblive/distinfo
diff -r1.2 -r1.3 pkgsrc/net/liblive/patches/patch-ba
cvs diff -r1.20 -r1.21 pkgsrc/net/liblive/Makefile (expand / switch to unified diff)

--- pkgsrc/net/liblive/Makefile 2012/10/23 17:18:33 1.20
+++ pkgsrc/net/liblive/Makefile 2013/05/22 09:39:35 1.21
@@ -1,37 +1,49 @@ @@ -1,37 +1,49 @@
1# $NetBSD: Makefile,v 1.20 2012/10/23 17:18:33 asau Exp $ 1# $NetBSD: Makefile,v 1.21 2013/05/22 09:39:35 fhajny Exp $
2# 2#
3 3
4DISTNAME= live.2012.02.04 4DISTNAME= live.2012.02.04
5PKGNAME= lib${DISTNAME:S/./-/:S/.//g} 5PKGNAME= lib${DISTNAME:S/./-/:S/.//g}
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://www.live555.com/liveMedia/public/ 7MASTER_SITES= http://www.live555.com/liveMedia/public/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.live555.com/liveMedia/ 10HOMEPAGE= http://www.live555.com/liveMedia/
11COMMENT= Set of C++ libraries for multimedia streaming 11COMMENT= Set of C++ libraries for multimedia streaming
12 12
13WRKSRC= ${WRKDIR}/live 13WRKSRC= ${WRKDIR}/live
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16USE_LIBTOOL= YES 16USE_LIBTOOL= YES
17 17
18INSTALLATION_DIRS= bin lib 18INSTALLATION_DIRS= bin lib
19 19
 20.include "../../mk/bsd.fast.prefs.mk"
 21
 22.if ${OPSYS} == "SunOS"
 23. if ${MACHINE_ARCH} == "x86_64"
 24LIVE_BITNESS= -64bit
 25. else
 26LIVE_BITNESS= -32bit
 27. endif
 28.else
 29LIVE_BITNESS= # empty
 30.endif
 31
20do-configure: 32do-configure:
21 ${CP} ${FILESDIR}/config.netbsd ${WRKSRC} 33 ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}
22 ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.dragonfly 34 ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.dragonfly
23 ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.darwin 35 ${CP} ${FILESDIR}/config.netbsd ${WRKSRC}/config.darwin
24 cd ${WRKSRC} && ${SH} ./genMakefiles ${LOWER_OPSYS} 36 cd ${WRKSRC} && ${SH} ./genMakefiles ${LOWER_OPSYS}${LIVE_BITNESS}
25 37
26do-install: 38do-install:
27.for lib in BasicUsageEnvironment UsageEnvironment groupsock liveMedia 39.for lib in BasicUsageEnvironment UsageEnvironment groupsock liveMedia
28 cd ${WRKSRC}/${lib} && \ 40 cd ${WRKSRC}/${lib} && \
29 ${LIBTOOL} --mode=install ${INSTALL_LIB} lib${lib}.la ${DESTDIR}${PREFIX}/lib 41 ${LIBTOOL} --mode=install ${INSTALL_LIB} lib${lib}.la ${DESTDIR}${PREFIX}/lib
30 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/${lib} 42 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/${lib}
31 cd ${WRKSRC}/${lib}/include && \ 43 cd ${WRKSRC}/${lib}/include && \
32 for i in *.h *.hh ; do \ 44 for i in *.h *.hh ; do \
33 [ ! -f $$i ] || \ 45 [ ! -f $$i ] || \
34 ${INSTALL_DATA} $$i \ 46 ${INSTALL_DATA} $$i \
35 ${DESTDIR}${PREFIX}/include/${lib} ; \ 47 ${DESTDIR}${PREFIX}/include/${lib} ; \
36 done 48 done
37.endfor 49.endfor
cvs diff -r1.13 -r1.14 pkgsrc/net/liblive/distinfo (expand / switch to unified diff)

--- pkgsrc/net/liblive/distinfo 2013/02/22 14:40:07 1.13
+++ pkgsrc/net/liblive/distinfo 2013/05/22 09:39:35 1.14
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.13 2013/02/22 14:40:07 jperkin Exp $ 1$NetBSD: distinfo,v 1.14 2013/05/22 09:39:35 fhajny Exp $
2 2
3SHA1 (live.2012.02.04.tar.gz) = 26e06f8ec296c3494bc118b7ffde4ad7082e8f80 3SHA1 (live.2012.02.04.tar.gz) = 26e06f8ec296c3494bc118b7ffde4ad7082e8f80
4RMD160 (live.2012.02.04.tar.gz) = 0ff1f656d7244b94820a7ee299d7c96003791b00 4RMD160 (live.2012.02.04.tar.gz) = 0ff1f656d7244b94820a7ee299d7c96003791b00
5Size (live.2012.02.04.tar.gz) = 541332 bytes 5Size (live.2012.02.04.tar.gz) = 541332 bytes
6SHA1 (patch-aa) = ecbf7f9a0d9835fbdb8208d296640570b8770e93 6SHA1 (patch-aa) = ecbf7f9a0d9835fbdb8208d296640570b8770e93
7SHA1 (patch-ba) = 0d977525350b4be3a564060a1d5a561c5564a768 7SHA1 (patch-ba) = dc6fa32b1fa2fcfb84d4917f49c966ea5f938568
8SHA1 (patch-ca) = 20d35409d7fe63e0088d3105d5cd54809da13097 8SHA1 (patch-ca) = 20d35409d7fe63e0088d3105d5cd54809da13097
9SHA1 (patch-cb) = ed98aa446cc4c6cf3c861101637e619d32cc9e95 9SHA1 (patch-cb) = ed98aa446cc4c6cf3c861101637e619d32cc9e95
10SHA1 (patch-cc) = 1e968b8742c913f67654d83612bafe4fe01364c0 10SHA1 (patch-cc) = 1e968b8742c913f67654d83612bafe4fe01364c0
11SHA1 (patch-config.solaris-64bit) = a353d599817eca52a35589aea598c993d9b210d0 11SHA1 (patch-config.solaris-64bit) = a353d599817eca52a35589aea598c993d9b210d0
cvs diff -r1.2 -r1.3 pkgsrc/net/liblive/patches/patch-ba (expand / switch to unified diff)

--- pkgsrc/net/liblive/patches/patch-ba 2012/02/21 12:38:58 1.2
+++ pkgsrc/net/liblive/patches/patch-ba 2013/05/22 09:39:35 1.3
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1$NetBSD: patch-ba,v 1.2 2012/02/21 12:38:58 drochner Exp $ 1$NetBSD: patch-ba,v 1.3 2013/05/22 09:39:35 fhajny Exp $
2 2
3--- config.solaris-32bit.orig 2008-07-25 02:40:05.000000000 +0200 3--- config.solaris-32bit.orig 2008-07-25 02:40:05.000000000 +0200
4+++ config.solaris-32bit 4+++ config.solaris-32bit
5@@ -1,17 +1,20 @@ 5@@ -1,17 +1,20 @@
6-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t 6-COMPILE_OPTS = $(INCLUDES) -I. -O -DSOLARIS -DSOCKLEN_T=socklen_t
7+.SUFFIXES: .la .lo .cpp 7+.SUFFIXES: .la .lo .cpp
8+COMPILE_OPTS = ${INCLUDES} -I. ${CPPFLAGS} -O -DSOLARIS -DSOCKLEN_T=socklen_t 8+COMPILE_OPTS = ${INCLUDES} -I. ${CPPFLAGS} -O -DSOLARIS -DSOCKLEN_T=socklen_t -DXLOCALE_NOT_USED=1
9 C = c 9 C = c
10-C_COMPILER = cc 10-C_COMPILER = cc
11-C_FLAGS = $(COMPILE_OPTS) 11-C_FLAGS = $(COMPILE_OPTS)
12+C_COMPILER = ${LIBTOOL} --mode=compile ${CC} 12+C_COMPILER = ${LIBTOOL} --tag=CC --mode=compile ${CC}
13+C_FLAGS = ${COMPILE_OPTS} 13+C_FLAGS = ${COMPILE_OPTS}
14 CPP = cpp 14 CPP = cpp
15-CPLUSPLUS_COMPILER = c++ 15-CPLUSPLUS_COMPILER = c++
16-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall 16-CPLUSPLUS_FLAGS = $(COMPILE_OPTS) -Wall
17-OBJ = o 17-OBJ = o
18-LINK = c++ -o 18-LINK = c++ -o
19-LINK_OPTS = -L. 19-LINK_OPTS = -L.
20-CONSOLE_LINK_OPTS = $(LINK_OPTS) 20-CONSOLE_LINK_OPTS = $(LINK_OPTS)
21-LIBRARY_LINK = ld -o 21-LIBRARY_LINK = ld -o
22-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -dn 22-LIBRARY_LINK_OPTS = $(LINK_OPTS) -r -dn
23-LIB_SUFFIX = a 23-LIB_SUFFIX = a
24+CPLUSPLUS_COMPILER = ${LIBTOOL} --mode=compile c++ 24+CPLUSPLUS_COMPILER = ${LIBTOOL} --tag=CXX --mode=compile c++
25+CPLUSPLUS_FLAGS = ${COMPILE_OPTS} -Wall 25+CPLUSPLUS_FLAGS = ${COMPILE_OPTS} -Wall
26+OBJ = lo 26+OBJ = lo
27+LINK = ${LIBTOOL} --mode=link c++ -o 27+LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -o
28+LINK+= # this is needed to add a space! 28+LINK+= # this is needed to add a space!
29+LINK_OPTS = -Wl,-R${PREFIX}/lib -lm 29+LINK_OPTS = -Wl,-R${PREFIX}/lib -lm
30+CONSOLE_LINK_OPTS = ${LINK_OPTS} 30+CONSOLE_LINK_OPTS = ${LINK_OPTS}
31+LIBRARY_LINK = ${LIBTOOL} --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o 31+LIBRARY_LINK = ${LIBTOOL} --tag=CXX --mode=link c++ -rpath ${PREFIX}/lib -version-info 0:0 -o
32+LIBRARY_LINK+= # this is needed to add a space! 32+LIBRARY_LINK+= # this is needed to add a space!
33+LIBRARY_LINK_OPTS = ${LINK_OPTS} -r -dn 33+LIBRARY_LINK_OPTS = ${LINK_OPTS} -r -dn
34+LIB_SUFFIX = la 34+LIB_SUFFIX = la
35 LIBS_FOR_CONSOLE_APPLICATION = -lsocket -lnsl 35 LIBS_FOR_CONSOLE_APPLICATION = -lsocket -lnsl
36 LIBS_FOR_GUI_APPLICATION = $(LIBS_FOR_CONSOLE_APPLICATION) 36 LIBS_FOR_GUI_APPLICATION = $(LIBS_FOR_CONSOLE_APPLICATION)
37 EXE = 37 EXE =