vte3: Various fixes, now builds on SunOS.

5 files changed, 53 insertions, 17 deletions

diff --git a/x11/vte3/Makefile b/x11/vte3/Makefile
index 6d87374501a..1d110ef7cd4 100644
--- a/x11/vte3/Makefile
+++ b/x11/vte3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/05/14 12:09:22 youri Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/15 09:50:49 jperkin Exp $
 #
 
 DISTNAME=	vte-0.50.3
@@ -18,11 +18,17 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config bash
 USE_LANGUAGES=		c c++
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--disable-Bsymbolic
+.else
 CONFIGURE_ARGS+=	--enable-Bsymbolic=auto
+.endif
 CONFIGURE_ARGS+=	--disable-introspection
 CONFIGURE_ARGS+=	--disable-vala
 
-
+.include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/x11/vte3/distinfo b/x11/vte3/distinfo
index 5cfda854f77..3f736d2d6db 100644
--- a/x11/vte3/distinfo
+++ b/x11/vte3/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2018/05/14 12:09:22 youri Exp $
+$NetBSD: distinfo,v 1.4 2018/05/15 09:50:49 jperkin Exp $
 
 SHA1 (vte-0.50.3.tar.xz) = 4578c34a3ce7722b7b05d6e46ca6d9146ddb8d50
 RMD160 (vte-0.50.3.tar.xz) = c538601e5ca48a3ce8a583f1683024610f675b75
 SHA512 (vte-0.50.3.tar.xz) = 1c1f0dac7cc33798e76fd6ccc89c1403447c84084e7e7053cb0d9da454ea72889cf2fcd5a9136091c3eced4a56ce69bd4bbcfc5e4a223faec12e0af99da6e196
 Size (vte-0.50.3.tar.xz) = 1010076 bytes
-SHA1 (patch-src_pty.cc) = 075106560922d6bb387904ce5451b27a5e13bad2
+SHA1 (patch-configure) = 9a570f27c0ec4e4680d517a8c2498b37728d52ae
+SHA1 (patch-src_pty.cc) = cc2e0be62a90ffefcb21f8b07cb25f281b30df1e
+SHA1 (patch-src_vte.cc) = b07315fef8593e6b51427ac039b9b4724e9fd18b
diff --git a/x11/vte3/patches/patch-configure b/x11/vte3/patches/patch-configure
index 33efb4a4d99..473431b5bc5 100644
--- a/x11/vte3/patches/patch-configure
+++ b/x11/vte3/patches/patch-configure
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure,v 1.1 2018/02/02 09:48:17 jperkin Exp $
+$NetBSD: patch-configure,v 1.2 2018/05/15 09:50:49 jperkin Exp $
 
 Leave pkgsrc to handle security features.
 
---- configure.orig	2015-10-12 14:36:52.000000000 +0000
+--- configure.orig	2018-04-09 21:44:54.000000000 +0000
 +++ configure
-@@ -13550,8 +13550,6 @@ _ACEOF
-   -fno-common \
-   -fdiagnostics-show-option \
-   -fno-strict-aliasing \
--  -fstack-protector \
--  -fstack-protector-strong \
-   -Wno-deprecated-declarations \
- ; do
+@@ -19290,7 +19290,7 @@ _ACEOF
  
+ 
+ 
+-  for flag in    -pipe   -Wall   -Wcast-align   -Wendif-labels   -Werror=declaration-after-statement   "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security"   -Werror=implicit-function-declaration   -Werror=init-self   -Werror=missing-include-dirs   -Werror=missing-prototypes   -Werror=pointer-arith   -Wextra   -Wfloat-equal   -Wlogical-op   -Wmisleading-indentation   -Wmissing-declarations   -Wmissing-include-dirs   -Wmissing-format-attribute   -Wmissing-noreturn   -Wno-missing-field-initializers   -Wno-switch-enum   -Wno-unused-parameter   -Wno-packed   -Wshadow   -Wsign-compare   -Wstrict-aliasing=2   -Wundef   -Wuninitialized   -Wunsafe-loop-optimizations   -Wwrite-strings   -fno-common   -fdiagnostics-show-option   -fno-strict-aliasing   -fstack-protector   -fstack-protector-strong   -fno-semantic-interposition   -Wno-deprecated-declarations     -Waggregate-return   -Wimplicit   -Wnested-externs   -Wold-style-definition   -Wstrict-prototypes ; do
++  for flag in    -pipe   -Wall   -Wcast-align   -Wendif-labels   -Werror=declaration-after-statement   "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security"   -Werror=implicit-function-declaration   -Werror=init-self   -Werror=missing-include-dirs   -Werror=missing-prototypes   -Werror=pointer-arith   -Wextra   -Wfloat-equal   -Wlogical-op   -Wmisleading-indentation   -Wmissing-declarations   -Wmissing-include-dirs   -Wmissing-format-attribute   -Wmissing-noreturn   -Wno-missing-field-initializers   -Wno-switch-enum   -Wno-unused-parameter   -Wno-packed   -Wshadow   -Wsign-compare   -Wstrict-aliasing=2   -Wundef   -Wuninitialized   -Wunsafe-loop-optimizations   -Wwrite-strings   -fno-common   -fdiagnostics-show-option   -fno-strict-aliasing   -fno-semantic-interposition   -Wno-deprecated-declarations     -Waggregate-return   -Wimplicit   -Wnested-externs   -Wold-style-definition   -Wstrict-prototypes ; do
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports flag $flag in envvar CFLAGS" >&5
+ $as_echo_n "checking if $CC supports flag $flag in envvar CFLAGS... " >&6; }
diff --git a/x11/vte3/patches/patch-src_pty.cc b/x11/vte3/patches/patch-src_pty.cc
index 33a20bf82c5..dd5cfc82184 100644
--- a/x11/vte3/patches/patch-src_pty.cc
+++ b/x11/vte3/patches/patch-src_pty.cc
@@ -1,16 +1,28 @@
-$NetBSD: patch-src_pty.cc,v 1.1 2018/05/14 13:55:23 youri Exp $
+$NetBSD: patch-src_pty.cc,v 1.2 2018/05/15 09:50:49 jperkin Exp $
 
 NetBSD fix
+Use correct includes on SunOS.
 
 --- src/pty.cc.orig	2018-04-09 21:43:51.000000000 +0000
 +++ src/pty.cc
-@@ -624,7 +624,12 @@ _vte_pty_open_posix(void)
+@@ -60,7 +60,9 @@
+ #ifdef HAVE_PTY_H
+ #include <pty.h>
+ #endif
+-#if defined(__sun) && defined(HAVE_STROPTS_H)
++#if defined(__sun)
++#include <sys/ioccom.h>
++#include <sys/ptyvar.h>
+ #include <stropts.h>
+ #endif
+ #include <glib.h>
+@@ -624,7 +626,12 @@ _vte_pty_open_posix(void)
          fd = posix_openpt(O_RDWR | O_NOCTTY | O_NONBLOCK | O_CLOEXEC);
  #ifndef __linux__
          /* Other kernels may not support CLOEXEC or NONBLOCK above, so try to fall back */
 -        bool need_cloexec = false, need_nonblocking = false;
 +        bool need_cloexec = false;
-+#if __NetBSD__
++#ifdef __NetBSD__
 +	bool need_nonblocking = true;
 +#else
 +	bool need_nonblocking = false;
diff --git a/x11/vte3/patches/patch-src_vte.cc b/x11/vte3/patches/patch-src_vte.cc
new file mode 100644
index 00000000000..3428e9866a0
--- /dev/null
+++ b/x11/vte3/patches/patch-src_vte.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_vte.cc,v 1.1 2018/05/15 09:50:49 jperkin Exp $
+
+Use correct includes on SunOS.
+
+--- src/vte.cc.orig	2018-04-09 21:43:51.000000000 +0000
++++ src/vte.cc
+@@ -25,6 +25,9 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <sys/param.h> /* howmany() */
++#ifdef __sun
++#include <sys/ptyvar.h>
++#endif
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <math.h>