Some fixes for SunOS

  - define BSD_COMP for the build,
  - avoid configure issues using non quoted 'which',
  - and NODEV needs to be undefined prior to using the name in an enum as
    it is defined by SunOS system headers unfortunately.

4 files changed, 45 insertions, 4 deletions

diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 8044a773d43..abcf4bf0b03 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2016/08/03 10:23:11 adam Exp $
+# $NetBSD: Makefile,v 1.98 2016/08/15 12:26:54 richard Exp $
 
 DISTNAME=		gnash-0.8.10
 PKGREVISION=		45
@@ -34,6 +34,8 @@ CONF_FILES+=		${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc
 
 .include "options.mk"
 
+CPPFLAGS.SunOS+=	-DBSD_COMP
+
 #ld: .libs/libgnashplugin_la-plugin.o(.text+0x5564): unresolvable relocation
 # against symbol `_ZNKSs5c_strEv'
 BUILDLINK_TRANSFORM+=	rm:-fvisibility-inlines-hidden
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index b2190797579..2c257ca4999 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.27 2015/09/23 12:00:53 joerg Exp $
+$NetBSD: distinfo,v 1.28 2016/08/15 12:26:54 richard Exp $
 
 SHA1 (gnash-0.8.10.tar.bz2) = be3b12a5edcd3b05f2ae73d02f0991aa786e7300
 RMD160 (gnash-0.8.10.tar.bz2) = 0093174ec0a912309772c033b5f1c1ad46ab41dc
 Size (gnash-0.8.10.tar.bz2) = 4238106 bytes
-SHA1 (patch-aa) = 5e3cfa0c21f6bd9ad01ce4c9f68f245316d063a3
+SHA1 (patch-aa) = 243e32949c0c032f678d40c6bbf26b33bb6ccfaf
 SHA1 (patch-ae) = ca44e2559a1ce0a24baf6d5479636f967e011202
 SHA1 (patch-libbase_GnashImageGif.cpp) = cbe8fa60ba51f2f98c801135cbeec18a7424baf4
 SHA1 (patch-libbase_GnashSleep.h) = f713b29feb0153efa24c10df20e0ac8342b88265
@@ -15,6 +15,7 @@ SHA1 (patch-libcore_DragState.h) = d6029d623a7a45e85a8deaca3b4740bd74785aed
 SHA1 (patch-libcore_Makefile.in) = 6b92917f0be3779b7f6e1993ac29960cef50c736
 SHA1 (patch-libcore_movie__root.cpp) = 5ee7321011961427effd7951860cbf5f3c0b0a6f
 SHA1 (patch-libcore_swf_DefineButtonTag.h) = 42e01cca7a5017349a3a0a31f1eb6b2aeb1f33fd
+SHA1 (patch-libdevice_GnashDevice.h) = e1df642675bb1e876f02d7611d2cdc81924d17c6
 SHA1 (patch-libmedia_FLVParser.cpp) = e990c82edceb3c5d481d7de86e720139b4dc60ea
 SHA1 (patch-libmedia_Makefile.in) = 10fde4560a20dcb28599d8c51a4fc7af93109474
 SHA1 (patch-librender_Makefile.in) = 25e38d82e3ecc156ff1f2b855a05437da015f3ce
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index 0400f6110f6..d685ca254bf 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.16 2013/02/26 11:04:25 joerg Exp $
+$NetBSD: patch-aa,v 1.17 2016/08/15 12:26:54 richard Exp $
+
+add quotes when testing with 'which' as, on at least SunOS, it doesn't
+return an empty string when the object isn't found.
 
 --- configure.orig	2012-01-19 19:19:29.000000000 +0000
 +++ configure
@@ -61,3 +64,21 @@ $NetBSD: patch-aa,v 1.16 2013/02/26 11:04:25 joerg Exp $
  
        cygnal_boost_libs="serialization date_time"
  
+@@ -50203,7 +50206,7 @@ yast_war="`cat $yast_war`"
+ yast_rec="`cat $yast_rec`"
+ 
+ # Pipe stderr to /dev/null since Fedora complains when target isn't there.
+-if test x`which apt-get 2>/dev/null` != x; then
++if test x"`which apt-get 2>/dev/null`" != x; then
+   if test x"$deb_err" != x -o x"$deb_war" != x -o x"$deb_rec" != x; then
+     echo "#!/bin/sh" > deb-attempt-install-dependencies.sh
+     echo "packages=\"$deb_err $deb_war $deb_rec\"" >> deb-attempt-install-dependencies.sh
+@@ -50216,7 +50219,7 @@ if test x`which apt-get 2>/dev/null` !=
+   fi
+ fi
+ 
+-if test x`which yum 2>/dev/null` != x; then
++if test x"`which yum 2>/dev/null`" != x; then
+   if test x"$rpm_err" != x -o x"$rpm_war" != x -o x"$deb_rec" != x; then
+     echo "#!/bin/sh" > rpm-attempt-install-dependencies.sh
+     echo "packages=\"$rpm_err $rpm_war  $rpm_rec\"" >> rpm-attempt-install-dependencies.sh
diff --git a/multimedia/gnash/patches/patch-libdevice_GnashDevice.h b/multimedia/gnash/patches/patch-libdevice_GnashDevice.h
new file mode 100644
index 00000000000..e1b66a002a9
--- /dev/null
+++ b/multimedia/gnash/patches/patch-libdevice_GnashDevice.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-libdevice_GnashDevice.h,v 1.1 2016/08/15 12:26:54 richard Exp $
+
+Avoid enum name clash with NODEV, unfortunately defined in sys/types.h
+and sys/params.h on solaris.
+
+--- libdevice/GnashDevice.h.orig	2012-01-19 19:17:48.000000000 +0000
++++ libdevice/GnashDevice.h
+@@ -45,6 +45,9 @@ struct GnashDevice
+     /// The list of supported renders that use devices
+     typedef enum {OPENVG, OPENGL, OPENGLES1, OPENGLES2, XORG, VAAPI} rtype_t;
+     /// The list of supported device types
++#ifdef NODEV
++#undef NODEV
++#endif
+     typedef enum {NODEV, EGL, DIRECTFB, X11, RAWFB} dtype_t;
+     
+     GnashDevice(int argc, char *argv[]);