Fix build on SunOS.

6 files changed, 62 insertions, 8 deletions

diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index cde88462a58..7d7728b95bc 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2015/09/05 11:55:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/14 13:14:06 jperkin Exp $
 
 PKGREVISION=	2
 
@@ -33,7 +33,13 @@ PLIST_SRC+=	PLIST.cserve
 PLIST_SRC+=	PLIST.Darwin
 .endif
 
-CPPFLAGS.SunOS+=	-std=gnu99 -D_XOPEN_SOURCE=600
+# Explicitly select cserve, avoids epoll/inotify.
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--enable-evas-cserve
+CONFIGURE_ARGS+=	--disable-evas-cserve2
+.endif
+
+LIBS.SunOS+=	-lsocket
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \
diff --git a/graphics/evas/distinfo b/graphics/evas/distinfo
index 7b7a18626c0..bca0c982269 100644
--- a/graphics/evas/distinfo
+++ b/graphics/evas/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 21:33:56 agc Exp $
+$NetBSD: distinfo,v 1.19 2016/02/14 13:14:06 jperkin Exp $
 
 SHA1 (evas-1.7.7.tar.bz2) = 680e85a60363df84b81298138cc19629f9f139bc
 RMD160 (evas-1.7.7.tar.bz2) = 306b36018c5ab07712553a554e4a2deac13854ed
@@ -6,9 +6,12 @@ SHA512 (evas-1.7.7.tar.bz2) = 9976f9c1f2774335ab24eb3a7aff37bb582f83e96966e98672
 Size (evas-1.7.7.tar.bz2) = 9408256 bytes
 SHA1 (patch-configure) = b7bda6085449a0fdcc51d58371101bb2f8bbc232
 SHA1 (patch-configure.ac) = d9330c131859794beb29414c9afe66a08b6fe55d
+SHA1 (patch-src_bin_evas__cserve2__shm.c) = cbdc53b04b17d7e0d994c3a9bd9ff6525f7608e8
+SHA1 (patch-src_bin_loaders_psd_evas__image__load__psd.c) = 9d30a6fb9de19151c7fe26b3c942475fe3b83799
+SHA1 (patch-src_lib_cserve2_evas__cs2.h) = 6df29afcb553239f9ef2ea91c772ebaa2aada2a9
 SHA1 (patch-src_lib_engines_common_evas__font__load.c) = b6a0cb75692efc95e81b000f48216f6dd0f1ea27
 SHA1 (patch-src_lib_engines_common_evas__op__blend_op__blend__color__neon.c) = 44254a9b9f3baa0bf54e2732f225cf9247db84cf
 SHA1 (patch-src_lib_engines_common_evas__op__blend_op__blend__pixel__neon.c) = 29b4d5953aba050cab07a87c05f04951e4959599
 SHA1 (patch-src_lib_engines_common_evas__op__copy_op__copy__color__neon.c) = 25d27e9dbc486544cce1f3fded721679421b5e0d
 SHA1 (patch-src_modules_loaders_gif_evas__image__load__gif.c) = 5a61a54fc67f64ba71aed37aba5a094e8d47294a
-SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 386f375a68eb4d49b05cc69c041641d11c306082
+SHA1 (patch-src_modules_loaders_psd_evas__image__load__psd.c) = 454c008696f0045726fc227d8f3e60aec187bc2b
diff --git a/graphics/evas/patches/patch-src_bin_evas__cserve2__shm.c b/graphics/evas/patches/patch-src_bin_evas__cserve2__shm.c
new file mode 100644
index 00000000000..0e56bb26544
--- /dev/null
+++ b/graphics/evas/patches/patch-src_bin_evas__cserve2__shm.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_bin_evas__cserve2__shm.c,v 1.1 2016/02/14 13:14:06 jperkin Exp $
+
+Use portable PATH_MAX.
+
+--- src/bin/evas_cserve2_shm.c.orig	2012-11-23 16:35:06.000000000 +0000
++++ src/bin/evas_cserve2_shm.c
+@@ -56,7 +56,7 @@ cserve2_shm_request(size_t size)
+ {
+    Shm_Mapping *map;
+    Shm_Handle *shm;
+-   char shmname[NAME_MAX];
++   char shmname[PATH_MAX];
+    size_t map_size;
+    int fd;
+ 
diff --git a/graphics/evas/patches/patch-src_bin_loaders_psd_evas__image__load__psd.c b/graphics/evas/patches/patch-src_bin_loaders_psd_evas__image__load__psd.c
new file mode 100644
index 00000000000..afbfbfc94ab
--- /dev/null
+++ b/graphics/evas/patches/patch-src_bin_loaders_psd_evas__image__load__psd.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_bin_loaders_psd_evas__image__load__psd.c,v 1.1 2016/02/14 13:14:06 jperkin Exp $
+
+Don't redefine _XOPEN_SOURCE on SunOS.
+
+--- src/bin/loaders/psd/evas_image_load_psd.c.orig	2012-11-23 16:35:06.000000000 +0000
++++ src/bin/loaders/psd/evas_image_load_psd.c
+@@ -1,4 +1,6 @@
++#ifndef __sun
+ #define _XOPEN_SOURCE
++#endif
+ 
+ #ifdef HAVE_CONFIG_H
+ # include <config.h>
diff --git a/graphics/evas/patches/patch-src_lib_cserve2_evas__cs2.h b/graphics/evas/patches/patch-src_lib_cserve2_evas__cs2.h
new file mode 100644
index 00000000000..7dc9fda6c24
--- /dev/null
+++ b/graphics/evas/patches/patch-src_lib_cserve2_evas__cs2.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_lib_cserve2_evas__cs2.h,v 1.1 2016/02/14 13:14:06 jperkin Exp $
+
+Support systems which don't define MSG_NOSIGNAL.
+
+--- src/lib/cserve2/evas_cs2.h.orig	2012-11-23 16:35:06.000000000 +0000
++++ src/lib/cserve2/evas_cs2.h
+@@ -3,6 +3,10 @@
+ 
+ #include <Eina.h>
+ 
++#ifndef MSG_NOSIGNAL
++#define MSG_NOSIGNAL	0
++#endif
++
+ #ifdef EVAS_CSERVE2
+ 
+ typedef enum {
diff --git a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c
index 0cb0390560d..5a1e0423557 100644
--- a/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c
+++ b/graphics/evas/patches/patch-src_modules_loaders_psd_evas__image__load__psd.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.3 2013/06/16 18:56:05 sno Exp $
+$NetBSD: patch-src_modules_loaders_psd_evas__image__load__psd.c,v 1.4 2016/02/14 13:14:06 jperkin Exp $
 
 jperkin knows o.O (but didn't use pkglint)
 
---- src/modules/loaders/psd/evas_image_load_psd.c.orig	2011-08-11 07:46:01.000000000 +0200
-+++ src/modules/loaders/psd/evas_image_load_psd.c	2011-12-27 15:15:11.097276116 +0100
+--- src/modules/loaders/psd/evas_image_load_psd.c.orig	2012-11-23 16:35:06.000000000 +0000
++++ src/modules/loaders/psd/evas_image_load_psd.c
 @@ -1,4 +1,6 @@
-+#ifndef _XOPEN_SOURCE
++#if !defined(_XOPEN_SOURCE) && !defined(__sun)
  #define _XOPEN_SOURCE
 +#endif