Wed Sep 14 15:45:31 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.35 -r1.36 pkgsrc/audio/bmp/Makefile
diff -r1.12 -r1.13 pkgsrc/audio/bmp/distinfo
diff -r0 -r1.1 pkgsrc/audio/bmp/patches/patch-at
cvs diff -r1.35 -r1.36 pkgsrc/audio/bmp/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/bmp/Makefile 2011/07/21 13:05:46 1.35
+++ pkgsrc/audio/bmp/Makefile 2011/09/14 15:45:30 1.36
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1# $NetBSD: Makefile,v 1.35 2011/07/21 13:05:46 obache Exp $ 1# $NetBSD: Makefile,v 1.36 2011/09/14 15:45:30 hans Exp $
2# 2#
3 3
4BMP_ENABLE_ENCODERS= yes 4BMP_ENABLE_ENCODERS= yes
5PKG_DESTDIR_SUPPORT= user-destdir 5PKG_DESTDIR_SUPPORT= user-destdir
6 6
7.include "Makefile.common" 7.include "Makefile.common"
8PKGREVISION= 12 8PKGREVISION= 12
9 9
10DEPENDS+= unzip-[0-9]*:../../archivers/unzip 10DEPENDS+= unzip-[0-9]*:../../archivers/unzip
11 11
12PLIST_VARS+= cdaudio 12PLIST_VARS+= cdaudio
13.if ${OPSYS} != "Darwin" 13.if ${OPSYS} != "Darwin"
14PLIST.cdaudio= yes 14PLIST.cdaudio= yes
15.endif 15.endif
16PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next } 16PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
17 17
18# XXX Workaround a crash during shutdown that happens when dlclose(3)ing 18# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
19# any open plugin. libstdc++ gets dynamically linked in when the id3lib 19# any open plugin. libstdc++ gets dynamically linked in when the id3lib
20# library is loaded, and is the one causing problems. See PR pkg/26846 20# library is loaded, and is the one causing problems. See PR pkg/26846
21# for more information. 21# for more information.
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
23LDFLAGS.NetBSD+= -lstdc++ -lm 23LDFLAGS.NetBSD+= -lstdc++ -lm
24 24
 25.if ${OPSYS} == "SunOS"
 26MAKE_ENV+= SunOS_LDFLAGS="-shared -mimpure-text"
 27.endif
 28
25.include "../../audio/id3lib/buildlink3.mk" 29.include "../../audio/id3lib/buildlink3.mk"
26.include "../../audio/libvorbis/buildlink3.mk" 30.include "../../audio/libvorbis/buildlink3.mk"
27.include "../../multimedia/libogg/buildlink3.mk" 31.include "../../multimedia/libogg/buildlink3.mk"
28.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
29 33
30.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/audio/bmp/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/bmp/distinfo 2006/07/31 21:43:55 1.12
+++ pkgsrc/audio/bmp/distinfo 2011/09/14 15:45:30 1.13
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.12 2006/07/31 21:43:55 jmmv Exp $ 1$NetBSD: distinfo,v 1.13 2011/09/14 15:45:30 hans Exp $
2 2
3SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77 3SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77
4RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5 4RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5
5Size (bmp-0.9.7-ipv6-simple.diff) = 8660 bytes 5Size (bmp-0.9.7-ipv6-simple.diff) = 8660 bytes
6SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547 6SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547
7RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7 7RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7
8Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes 8Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes
9SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f 9SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f
10SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f 10SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
11SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2 11SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
12SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa 12SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
13SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b 13SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b
14SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67 14SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67
15SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604 15SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604
 16SHA1 (patch-at) = a643d4bc95d84424226f742675abc87c18834af5
File Added: pkgsrc/audio/bmp/patches/Attic/patch-at
$NetBSD: patch-at,v 1.1 2011/09/14 15:45:30 hans Exp $

--- Input/mpg123/Makefile.in.orig	2011-09-13 15:02:57.309943222 +0200
+++ Input/mpg123/Makefile.in	2011-09-13 15:15:51.386590197 +0200
@@ -113,7 +113,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
 	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
 CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
 LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
 	$(CCASFLAGS)