Fix build on SunOS.

15 files changed, 127 insertions, 15 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index e32535fa738..b655bcc60c8 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2011/09/14 15:49:47 hans Exp $
+# $NetBSD: Makefile,v 1.49 2011/09/14 15:53:35 hans Exp $
 
 # NOTE: Please send a copy of any patches that are not pkgsrc-specific
 # to <pulseaudio-discuss@mail.0pointer.de>
@@ -71,7 +71,7 @@ CONFIGURE_ENV+=		cc_cv_tls___thread=no
 BUILDLINK_TRANSFORM+=	rm:-Wl,--no-undefined
 .endif
 
-PLIST_VARS+=		evdev hal oss
+PLIST_VARS+=		evdev hal oss sun
 PLIST_SUBST+=		PULSEAUDIO_VER=${PULSEAUDIO_VER:Q}
 
 .if ${OPSYS} == "Darwin"
@@ -83,6 +83,12 @@ PLIST.hal=		yes
 PLIST.oss=		yes
 .endif
 
+.if ${OPSYS} == "SunOS"
+PLIST.sun=		yes
+.endif
+
+CFLAGS.SunOS+=		-std=c99
+
 PKG_GROUPS=             ${PULSE_GROUP}
 PKG_GROUPS+=		${PULSE_GROUP_REALTIME}
 PKG_GROUPS+=		${PULSE_GROUP_ACCESS}
diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST
index 352c01a307d..faee8b7ec1c 100644
--- a/audio/pulseaudio/PLIST
+++ b/audio/pulseaudio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/02/02 11:35:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/09/14 15:53:35 hans Exp $
 bin/esdcompat
 bin/pacat
 bin/pacmd
@@ -160,6 +160,8 @@ lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.a
 lib/pulse-${PULSEAUDIO_VER}/modules/module-sine-source.so
 lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.a
 lib/pulse-${PULSEAUDIO_VER}/modules/module-sine.so
+${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.a
+${PLIST.sun}lib/pulse-${PULSEAUDIO_VER}/modules/module-solaris.so
 lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.a
 lib/pulse-${PULSEAUDIO_VER}/modules/module-stream-restore.so
 lib/pulse-${PULSEAUDIO_VER}/modules/module-suspend-on-idle.a
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index ab1db524fbc..24e77eb3f67 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2011/07/21 15:10:11 joerg Exp $
+$NetBSD: distinfo,v 1.27 2011/09/14 15:53:35 hans Exp $
 
 SHA1 (pulseaudio-0.9.21.tar.gz) = 0309c97f7e0812e243c1bb80a4b74dc26369ac22
 RMD160 (pulseaudio-0.9.21.tar.gz) = 6db0725253228b673a78cbfae4824fadce2198ed
 Size (pulseaudio-0.9.21.tar.gz) = 2056896 bytes
-SHA1 (patch-aa) = b8d6bf8ce8642bc987a7dce5d14df51a2a92d2ae
+SHA1 (patch-aa) = 3d1afdd56929be01013cdd38b970007bbb1d7242
 SHA1 (patch-ab) = 1cf47a55b1c794b315646379ae03d633dc1d348f
 SHA1 (patch-ac) = b42e6ef8ff2851ea78a6eae6cb6241c94d74b2d0
 SHA1 (patch-ad) = 5ae0e5d8b0b7622c35cb2fabba4a33b673cbd442
@@ -20,4 +20,5 @@ SHA1 (patch-dc) = fe5f8e6eec89ec832d9d161fa0a201e64a841a0c
 SHA1 (patch-dd) = bfccd97ecf3be1ae9ac41a642b356743e055550f
 SHA1 (patch-de) = 3b8423a5936b8434de22fdd04ff2057dde09a2b8
 SHA1 (patch-poll_c-build-fix) = f9a2e86275431c53257c596974a6973c8034b1f0
+SHA1 (patch-src_pulsecore_macro.h) = 635629d334529021d0dca2defe9c757c4cd20c5b
 SHA1 (patch-src_pulsecore_svolume_mmx.c) = ad1a1be7c1acf52c41447b2fb7d7dcd4c2da204b
diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa
index d8916be0222..ea68b6c691f 100644
--- a/audio/pulseaudio/patches/patch-aa
+++ b/audio/pulseaudio/patches/patch-aa
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.7 2011/05/21 15:32:59 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2011/09/14 15:53:35 hans Exp $
 
 SNDDSP_GETODELAY isn't defined on NetBSD-4.x.
 ioctl() takes u_long argument on NetBSD.
 On NetBSD, use third parameter in ioctl instead of varargs.
 stat() system call has been versioned, use latest version when dlopen()ing.
 Try more typical device names.
+SOUND_PCM_* is not available on SunOS.
 
 --- src/utils/padsp.c.orig	2009-09-18 20:21:44.000000000 +0000
 +++ src/utils/padsp.c
@@ -83,9 +84,29 @@ Try more typical device names.
          r = dsp_open(flags, &_errno);
      else if (filename && mixer_cloak_enable() && strcmp(filename, "/dev/mixer") == 0)
          r = mixer_open(flags, &_errno);
-@@ -2319,19 +2343,27 @@ fail:
+@@ -2224,6 +2248,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             break;
+         }
  
- #ifdef sun
++#ifndef __sun
+         case SOUND_PCM_READ_RATE:
+             debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_PCM_READ_RATE\n");
+ 
+@@ -2247,7 +2272,7 @@ static int dsp_ioctl(fd_info *i, unsigne
+             *(int*) argp = pa_sample_size(&i->sample_spec)*8;
+             pa_threaded_mainloop_unlock(i->mainloop);
+             break;
+-
++#endif
+         case SNDCTL_DSP_GETOPTR: {
+             count_info *info;
+ 
+@@ -2317,21 +2342,29 @@ fail:
+     return ret;
+ }
+ 
+-#ifdef sun
++#ifdef __sun
  int ioctl(int fd, int request, ...) {
 +#elif defined(__NetBSD__)
 +int ioctl(int fd, u_long request, void *_argp) {
diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_macro.h b/audio/pulseaudio/patches/patch-src_pulsecore_macro.h
new file mode 100644
index 00000000000..48accc7e83b
--- /dev/null
+++ b/audio/pulseaudio/patches/patch-src_pulsecore_macro.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_pulsecore_macro.h,v 1.1 2011/09/14 15:53:35 hans Exp $
+
+--- src/pulsecore/macro.h.orig	2009-09-18 22:21:44.000000000 +0200
++++ src/pulsecore/macro.h	2011-09-08 12:44:25.798236549 +0200
+@@ -37,6 +37,10 @@
+ #error "Please include config.h before including this file!"
+ #endif
+ 
++#ifdef __sun
++#define typeof	__typeof__
++#endif
++
+ #ifndef PA_LIKELY
+ #ifdef __GNUC__
+ #define PA_LIKELY(x) (__builtin_expect(!!(x),1))
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index ab3704d4677..c9b288ed265 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/08/14 08:18:07 obache Exp $
+# $NetBSD: Makefile,v 1.14 2011/09/14 15:54:39 hans Exp $
 
 DISTNAME=	DBIx-Class-Schema-Loader-0.07002
 PKGNAME=	p5-${DISTNAME}
@@ -56,7 +56,7 @@ PERL5_PACKLIST=	auto/DBIx/Class/Schema/Loader/.packlist
 PERL5_MODULE_TYPE=	Module::Install::Bundled
 
 pre-configure:
-	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
+	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
 
 BUILDLINK_API_DEPENDS.p5-DBI+=	p5-DBI>=1.560
 BUILDLINK_DEPMETHOD.p5-DBI?=	build
diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index ef50d9d6442..7c04e0381e8 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2011/04/22 13:01:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.13 2011/09/14 15:55:26 hans Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -52,6 +52,7 @@ PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql
+CONFIGURE_ARGS+=	--localedir=${PREFIX}/lib/locale
 CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
 
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 1ab6812bfc3..0205d12b008 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2011/09/11 10:53:31 marino Exp $
+$NetBSD: distinfo,v 1.13 2011/09/14 15:55:26 hans Exp $
 
 SHA1 (postgresql-8.4.8.tar.bz2) = f4936de8b8a31f5579e094c928df9612fffe62b5
 RMD160 (postgresql-8.4.8.tar.bz2) = ad4c81e7f22ed3018ff4f37e1e6ad54ce1a5fd4e
@@ -13,3 +13,4 @@ SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-ao) = 045a25457da09aff30ac93f1c299064c9f6079a8
 SHA1 (patch-ba) = 2cc374fdf4351a4c03ecad30fb99d2aff2cf0bdf
+SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
diff --git a/databases/postgresql84/patches/patch-bb b/databases/postgresql84/patches/patch-bb
new file mode 100644
index 00000000000..4268060695d
--- /dev/null
+++ b/databases/postgresql84/patches/patch-bb
@@ -0,0 +1,10 @@
+$NetBSD: patch-bb,v 1.1 2011/09/14 15:55:26 hans Exp $
+
+--- src/makefiles/Makefile.solaris.orig	2011-04-15 05:17:14.000000000 +0200
++++ src/makefiles/Makefile.solaris	2011-07-28 18:34:45.870978873 +0200
+@@ -22,5 +22,3 @@ ifeq ($(GCC), yes)
+ else
+ 	$(CC) $(CFLAGS) -G -o $@ $<
+ endif
+-
+-sqlmansect = 5sql
diff --git a/devel/cppunit/distinfo b/devel/cppunit/distinfo
index 47e389561e9..a5d8135b0db 100644
--- a/devel/cppunit/distinfo
+++ b/devel/cppunit/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2011/06/28 09:28:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2011/09/14 15:56:15 hans Exp $
 
 SHA1 (cppunit-1.12.1.tar.gz) = f1ab8986af7a1ffa6760f4bacf5622924639bf4a
 RMD160 (cppunit-1.12.1.tar.gz) = c5f38b1d201afcba7913f2b53fb7558add3d21f5
 Size (cppunit-1.12.1.tar.gz) = 762803 bytes
 SHA1 (patch-include_cppunit_Message.h) = aa4442b3c8d144a686d8d43f4c97943ee0d82ba4
+SHA1 (patch-include_cppunit_portability_FloatingPoint.h) = 7e358bc36e201b6fcee801ee04bd68055e69e233
 SHA1 (patch-src_cppunit_Message.cpp) = 4e5d38c70879d30f18bc7135916346a58652d3ce
diff --git a/devel/cppunit/patches/patch-include_cppunit_portability_FloatingPoint.h b/devel/cppunit/patches/patch-include_cppunit_portability_FloatingPoint.h
new file mode 100644
index 00000000000..8055ad9b2f6
--- /dev/null
+++ b/devel/cppunit/patches/patch-include_cppunit_portability_FloatingPoint.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_cppunit_portability_FloatingPoint.h,v 1.1 2011/09/14 15:56:15 hans Exp $
+
+--- include/cppunit/portability/FloatingPoint.h.orig	2007-03-05 04:16:42.000000000 +0100
++++ include/cppunit/portability/FloatingPoint.h	2011-09-13 15:48:01.512720874 +0200
+@@ -4,6 +4,10 @@
+ #include <cppunit/Portability.h>
+ #include <math.h>
+ 
++#ifdef __sun
++#include <ieeefp.h>
++#endif
++
+ CPPUNIT_NS_BEGIN
+ 
+ /// \brief Tests if a floating-point is a NaN.
diff --git a/devel/eina/distinfo b/devel/eina/distinfo
index e610b2ffaaf..5825ae70f0c 100644
--- a/devel/eina/distinfo
+++ b/devel/eina/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/12/16 19:52:58 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/09/14 16:07:07 hans Exp $
 
 SHA1 (eina-0.9.9.063.tar.bz2) = 574a405bec4ea60e5f2c7e28684e5d30ae42bf92
 RMD160 (eina-0.9.9.063.tar.bz2) = ad2a4d04d2080fe4d7e56ab64cb003511f90c80a
 Size (eina-0.9.9.063.tar.bz2) = 430156 bytes
+SHA1 (patch-aa) = 777e06d42caa0cd4113acc203745ff1817b63b2e
diff --git a/devel/eina/patches/patch-aa b/devel/eina/patches/patch-aa
new file mode 100644
index 00000000000..fbe8de7a8d7
--- /dev/null
+++ b/devel/eina/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.3 2011/09/14 16:07:07 hans Exp $
+
+--- src/lib/eina_cpu.c.orig	2009-11-09 17:20:58.000000000 +0100
++++ src/lib/eina_cpu.c	2011-09-13 15:58:16.607177765 +0200
+@@ -24,7 +24,7 @@
+ # ifdef _WIN32
+ #  define WIN32_LEAN_AND_MEAN
+ #  include <windows.h>
+-# elif defined (__SUNPRO_C)
++# elif defined (__sun)
+ #  include <unistd.h>
+ # elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__DragonFly__) || defined (__MacOSX__) || ( defined (__MACH__) && defined (__APPLE__))
+ #  include <unistd.h>
+@@ -133,7 +133,7 @@ EAPI int eina_cpu_count(void)
+    GetSystemInfo(&sysinfo);
+    return sysinfo.dwNumberOfProcessors;
+ 
+-# elif defined (__SUNPRO_C)
++# elif defined (__sun)
+    /*
+     * _SC_NPROCESSORS_ONLN: number of processors that are online, that
+                             is available when sysconf is called. The number
diff --git a/devel/exempi/distinfo b/devel/exempi/distinfo
index e782a48e8ab..27bfbea9fae 100644
--- a/devel/exempi/distinfo
+++ b/devel/exempi/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/11/16 13:50:56 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/09/14 16:08:08 hans Exp $
 
 SHA1 (exempi-2.1.1.tar.gz) = f05a4c1d609c0e3cafdf839c16ec46afae1b160d
 RMD160 (exempi-2.1.1.tar.gz) = e79500f804e162df340e669deea620408e4926b4
 Size (exempi-2.1.1.tar.gz) = 3401564 bytes
 SHA1 (patch-ab) = 363e85076fe7af6bea36953e9ded575a93d340d2
+SHA1 (patch-ac) = 54b58bb0a97c0c80e2a63e7d126ec47cbfcbb195
diff --git a/devel/exempi/patches/patch-ac b/devel/exempi/patches/patch-ac
new file mode 100644
index 00000000000..aeb0f88f4dc
--- /dev/null
+++ b/devel/exempi/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2011/09/14 16:08:08 hans Exp $
+
+--- exempi/xmp.h.orig	2009-02-17 05:10:40.000000000 +0100
++++ exempi/xmp.h	2011-09-13 12:42:25.542693751 +0200
+@@ -40,10 +40,7 @@
+ #define __EXEMPI_XMP_H_
+ 
+ #include <stdlib.h>
+-/* stdbool choke on Sun (bug# 14612) */
+-#if !defined(__sun)
+ #include <stdbool.h>
+-#endif
+ #include <stdint.h>
+ 
+ #include <time.h>