Various portability fixes for SunOS.

4 files changed, 51 insertions, 1 deletions

diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index dbc0be521e1..9b258ed8b59 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.3 2013/06/15 12:47:46 khorben Exp $
+$NetBSD: distinfo,v 1.4 2014/03/21 14:38:01 jperkin Exp $
 
 SHA1 (Panel-0.2.18.tar.gz) = 2920631f99b3c9f4d91de1765b2588dfbf0f6645
 RMD160 (Panel-0.2.18.tar.gz) = c8dae6a9cb028814a24b01a5fcf04b6b34f4c6c6
 Size (Panel-0.2.18.tar.gz) = 111036 bytes
+SHA1 (patch-data_pkgconfig.sh) = a4fae097b46becc6d98fb6b42707188d8ed3e048
+SHA1 (patch-src_applets_main.c) = 239eebc72b7d113a72e42633e838c3294003e931
 SHA1 (patch-src_applets_memory.c) = bcc44e38c03fc60e6720e71d815178f7129fa798
 SHA1 (patch-src_applets_swap.c) = 75599dd9b7aed08895c542376d2a6b7883a91f7f
+SHA1 (patch-src_applets_volume.c) = 10a4dfe01b6576a7f39a344ddd669725666d72a7
diff --git a/x11/deforaos-panel/patches/patch-data_pkgconfig.sh b/x11/deforaos-panel/patches/patch-data_pkgconfig.sh
new file mode 100644
index 00000000000..5783593c4cf
--- /dev/null
+++ b/x11/deforaos-panel/patches/patch-data_pkgconfig.sh
@@ -0,0 +1,16 @@
+$NetBSD: patch-data_pkgconfig.sh,v 1.1 2014/03/21 14:38:01 jperkin Exp $
+
+Use correct rpath flag on SunOS.
+
+--- data/pkgconfig.sh.orig	2013-02-04 22:23:50.000000000 +0000
++++ data/pkgconfig.sh
+@@ -114,6 +114,9 @@ while [ $# -gt 0 ]; do
+ 			Darwin)
+ 				RPATH="-Wl,-rpath,\${libdir}"
+ 				;;
++			SunOS)
++				RPATH="-Wl,-R\${libdir}"
++				;;
+ 		esac
+ 	fi
+ 
diff --git a/x11/deforaos-panel/patches/patch-src_applets_main.c b/x11/deforaos-panel/patches/patch-src_applets_main.c
new file mode 100644
index 00000000000..62aeffaacbd
--- /dev/null
+++ b/x11/deforaos-panel/patches/patch-src_applets_main.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_applets_main.c,v 1.1 2014/03/21 14:38:01 jperkin Exp $
+
+Need sys/fcntl.h for O_RDONLY on SunOS.
+
+--- src/applets/main.c.orig	2013-06-01 23:34:31.000000000 +0000
++++ src/applets/main.c
+@@ -23,6 +23,9 @@
+ #include <errno.h>
+ #include <libintl.h>
+ #include <System.h>
++#ifdef __sun
++#include <sys/fcntl.h>
++#endif
+ #include "Panel.h"
+ #include "../../config.h"
+ #define _(string) gettext(string)
diff --git a/x11/deforaos-panel/patches/patch-src_applets_volume.c b/x11/deforaos-panel/patches/patch-src_applets_volume.c
new file mode 100644
index 00000000000..7dc640ec055
--- /dev/null
+++ b/x11/deforaos-panel/patches/patch-src_applets_volume.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_applets_volume.c,v 1.1 2014/03/21 14:38:01 jperkin Exp $
+
+Fix SunOS includes.
+
+--- src/applets/volume.c.orig	2013-02-04 22:23:50.000000000 +0000
++++ src/applets/volume.c
+@@ -19,7 +19,7 @@
+ 
+ 
+ #include <sys/ioctl.h>
+-#if defined(__NetBSD__) || defined(__sun__)
++#if defined(__NetBSD__)
+ # include <sys/audioio.h>
+ #elif defined(__linux__)
+ # include <alsa/asoundlib.h>