Fix build on SunOS.

14 files changed, 118 insertions, 8 deletions

diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index ff2e9b8e3d4..056a4ba07d6 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2011/08/20 21:37:49 abs Exp $
+# $NetBSD: Makefile,v 1.75 2011/09/14 15:44:23 hans Exp $
 
 DISTNAME=	arts-1.5.10
 PKGREVISION=	4
@@ -8,6 +8,8 @@ COMMENT=	Analog Real-Time Synthesizer
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
+CFLAGS.SunOS+=	-D_XOPEN_SOURCE=500
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=	kdelibs-2*
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 90028a52da1..ed7ac5d3be5 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2009/09/19 21:13:22 tnn Exp $
+$NetBSD: distinfo,v 1.52 2011/09/14 15:44:23 hans Exp $
 
 SHA1 (arts-1.5.10.tar.bz2) = 2e5507f64a4a4a9ad446cc987dff157e38f98274
 RMD160 (arts-1.5.10.tar.bz2) = 8c237ebd06ac82b88cf7394722fb8da459902ee7
@@ -16,3 +16,6 @@ SHA1 (patch-aj) = ad2637ffab24e501d858d4a32b337ffbb940e5b0
 SHA1 (patch-ak) = 7cad5999aaeb8b596e03309abd4c1a3d54cdefa3
 SHA1 (patch-al) = 3352a5c23e475c77d1babbe2bf77be0555e8de78
 SHA1 (patch-am) = 6e0ef065220d2ae93cdae162ae7e77a1f7c5ef54
+SHA1 (patch-an) = 91bf3166be69e0347dcb7f86ff84c4b63a761882
+SHA1 (patch-ao) = 0b860143602d452dbb75a2c6046563cfd253f4ce
+SHA1 (patch-ap) = 6685be9c71d6ee4872efed0b03e9fccd7f0cf290
diff --git a/audio/arts/patches/patch-an b/audio/arts/patches/patch-an
new file mode 100644
index 00000000000..bc216564764
--- /dev/null
+++ b/audio/arts/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2011/09/14 15:44:23 hans Exp $
+
+--- mcop/iomanager.cc.orig	2007-10-08 11:47:08.000000000 +0200
++++ mcop/iomanager.cc	2011-07-26 16:34:43.213902758 +0200
+@@ -32,6 +32,9 @@
+ 
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>		// Needed on some systems.
++#ifdef __sun
++#include <string.h>		// for memset(), used by FD_ZERO
++#endif
+ #endif
+ // WABA: NOTE!
+ // sys/select.h is needed on e.g. AIX to define "fd_set".
diff --git a/audio/arts/patches/patch-ao b/audio/arts/patches/patch-ao
new file mode 100644
index 00000000000..5e7eb402587
--- /dev/null
+++ b/audio/arts/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2011/09/14 15:44:23 hans Exp $
+
+--- soundserver/artsplay.cc.orig	2008-02-13 10:35:22.000000000 +0100
++++ soundserver/artsplay.cc	2011-07-26 16:43:03.112490880 +0200
+@@ -25,6 +25,10 @@
+ #include "soundserver.h"
+ #include "artsversion.h"
+ 
++#ifdef __sun
++#include <limits.h>
++#endif
++
+ #include <sys/param.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/audio/arts/patches/patch-ap b/audio/arts/patches/patch-ap
new file mode 100644
index 00000000000..dafe4ae59b9
--- /dev/null
+++ b/audio/arts/patches/patch-ap
@@ -0,0 +1,12 @@
+$NetBSD: patch-ap,v 1.1 2011/09/14 15:44:23 hans Exp $
+
+--- flow/audioiosun.cc.orig	2007-10-08 11:47:09.000000000 +0200
++++ flow/audioiosun.cc	2011-07-26 16:37:19.626654499 +0200
+@@ -63,6 +63,7 @@
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <iostream>
+ #include <algorithm>
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 2b0f3ff5d82..5b223b7318e 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/07/21 13:05:46 obache Exp $
+# $NetBSD: Makefile,v 1.36 2011/09/14 15:45:30 hans Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
@@ -22,6 +22,10 @@ PRINT_PLIST_AWK+=	/cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
 USE_LANGUAGES=		c c++
 LDFLAGS.NetBSD+=	-lstdc++ -lm
 
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
+.endif
+
 .include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
index f13007a0585..d6abddba250 100644
--- a/audio/bmp/distinfo
+++ b/audio/bmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2006/07/31 21:43:55 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2011/09/14 15:45:30 hans Exp $
 
 SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77
 RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5
@@ -13,3 +13,4 @@ SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
 SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b
 SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67
 SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604
+SHA1 (patch-at) = a643d4bc95d84424226f742675abc87c18834af5
diff --git a/audio/bmp/patches/patch-at b/audio/bmp/patches/patch-at
new file mode 100644
index 00000000000..3b300573106
--- /dev/null
+++ b/audio/bmp/patches/patch-at
@@ -0,0 +1,13 @@
+$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)
diff --git a/audio/libmpg123/Makefile b/audio/libmpg123/Makefile
index 68730eb3fce..c77e736a640 100644
--- a/audio/libmpg123/Makefile
+++ b/audio/libmpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/10/15 01:58:53 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2011/09/14 15:46:01 hans Exp $
 #
 
 .include "../../audio/libmpg123/Makefile.common"
@@ -25,4 +25,9 @@ post-install:
 
 .include "mpg123-options.mk"
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmpg123/distinfo b/audio/libmpg123/distinfo
index a1b552a87bb..f68d634dc36 100644
--- a/audio/libmpg123/distinfo
+++ b/audio/libmpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/07 00:56:15 bjs Exp $
+$NetBSD: distinfo,v 1.2 2011/09/14 15:46:01 hans Exp $
 
 SHA1 (mpg123-1.5.1.tar.bz2) = 4e85388294c5c432bd899bb910694dd259e76679
 RMD160 (mpg123-1.5.1.tar.bz2) = aeaf5ab770eeb66826d81ba3d840492709b2c7a5
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = faf686e1b47bc53ef5155129da2fd0b81632c2f9
 SHA1 (patch-ab) = 7d1d36cf5ea4a3e3d0a43da351ac7e3c97c636bf
 SHA1 (patch-ac) = 751f52278354413e11f857c53e954e2fd56ba06b
 SHA1 (patch-ad) = 2b888b710499308216a90d48036c1d00327033e3
+SHA1 (patch-ae) = e9b9b661b85fa66e2c16fa2f6466ea82f7e945e2
diff --git a/audio/libmpg123/patches/patch-ae b/audio/libmpg123/patches/patch-ae
new file mode 100644
index 00000000000..293e3dffdf1
--- /dev/null
+++ b/audio/libmpg123/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2011/09/14 15:46:02 hans Exp $
+
+--- src/libmpg123/Makefile.in.orig	2008-08-29 08:48:07.000000000 +0200
++++ src/libmpg123/Makefile.in	2011-09-13 15:21:13.667526892 +0200
+@@ -79,7 +79,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 $@
+ SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
+ 	testcpu.c
+ DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index e871b6e1f79..6a6cf7c5ea5 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2010/05/12 13:16:15 martin Exp $
+# $NetBSD: Makefile,v 1.50 2011/09/14 15:46:49 hans Exp $
 
 PKGNAME=	${DISTNAME:C/[^[:alnum:]]*//}
 COMMENT=	MPEG layer 1, 2, and 3 audio player
@@ -36,6 +36,10 @@ CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 .endif
 
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	SunOS_LDFLAGS="-shared -mimpure-text"
+.endif
+
 # MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers
 .include "Makefile.common"
 
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 87dff6fa097..f054e88c084 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2010/10/26 21:06:44 zafer Exp $
+$NetBSD: distinfo,v 1.33 2011/09/14 15:46:49 hans Exp $
 
 SHA1 (mpg123-1.12.5.tar.bz2) = 476cb47a9b6570684b5af536beedf2026522e5f8
 RMD160 (mpg123-1.12.5.tar.bz2) = a59b0f7506b004c6e7d048ebef57090e1eb857af
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 9700187dc38af7d4b7f4f3332d76556d2cb7f418
 SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a
 SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
 SHA1 (patch-ah) = 86754993466714cb2208a9291b72e8e03dde19c7
+SHA1 (patch-ai) = 9ce00cfa1dac387ea7b5df19fa4b1483b598748f
diff --git a/audio/mpg123/patches/patch-ai b/audio/mpg123/patches/patch-ai
new file mode 100644
index 00000000000..69e6c42c600
--- /dev/null
+++ b/audio/mpg123/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.7 2011/09/14 15:46:49 hans Exp $
+
+--- src/libmpg123/Makefile.in.orig	2010-10-04 08:34:18.000000000 +0200
++++ src/libmpg123/Makefile.in	2011-09-13 15:28:48.954583152 +0200
+@@ -79,7 +79,7 @@ am_libmpg123_la_OBJECTS = compat.lo pars
+ libmpg123_la_OBJECTS = $(am_libmpg123_la_OBJECTS)
+ libmpg123_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(libmpg123_la_LDFLAGS) $(LDFLAGS) -o $@
++	$(libmpg123_la_LDFLAGS) $(LDFLAGS) $(SunOS_LDFLAGS) -o $@
+ testcpu_SOURCES = testcpu.c
+ testcpu_OBJECTS = testcpu.$(OBJEXT)
+ testcpu_DEPENDENCIES = getcpuflags.$(OBJEXT)
+@@ -100,7 +100,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++	$(LDFLAGS) $(SunOS_LDFLAGS) -o $@
+ SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \
+ 	testcpu.c
+ DIST_SOURCES = $(libmpg123_la_SOURCES) $(EXTRA_libmpg123_la_SOURCES) \