For Solarish, select _XOPEN_SOURCE version depending on __STDC_VERSION__,

see <https://gist.github.com/jperkin/b08f9108daf8d0ac695067d71f882a9d>

7 files changed, 53 insertions, 18 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 33d937a0c74..f53e2c42733 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2019/10/08 12:40:55 hauke Exp $
+# $NetBSD: Makefile,v 1.101 2019/11/27 14:35:16 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	*BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo
index bf423a90237..3c6fa3bf7ea 100644
--- a/editors/xemacs-current/distinfo
+++ b/editors/xemacs-current/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2018/12/19 13:41:45 hauke Exp $
+$NetBSD: distinfo,v 1.35 2019/11/27 14:35:16 hauke Exp $
 
 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
 SHA512 (xemacs-21.5.34.tar.gz) = b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 Size (xemacs-21.5.34.tar.gz) = 15816932 bytes
 SHA1 (patch-Makefile.in.in) = e1e18f8555195a53fee44cbbb33a6d1a49fd368b
-SHA1 (patch-configure) = 0f576275a42b883f4502fbe5156aa2d84f17f6a8
+SHA1 (patch-configure) = cb8929d412da85ad92336b6e12cf28000a715ad0
 SHA1 (patch-lib-src_Makefile.in.in) = 6e9c2b9e4cd9e63fbdc88ff4792e74a57ed925ae
 SHA1 (patch-lib-src_fakemail.c) = e62f75055b80f207696cfd77cd7b55fd46e8249b
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
diff --git a/editors/xemacs-current/patches/patch-configure b/editors/xemacs-current/patches/patch-configure
index 78e32a1779d..377b0cbf61e 100644
--- a/editors/xemacs-current/patches/patch-configure
+++ b/editors/xemacs-current/patches/patch-configure
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure,v 1.1 2017/11/15 14:50:50 hauke Exp $
+$NetBSD: patch-configure,v 1.2 2019/11/27 14:35:16 hauke Exp $
+
+For Solarish, select _XOPEN_SOURCE version depending on __STDC_VERSION__,
+see <https://gist.github.com/jperkin/b08f9108daf8d0ac695067d71f882a9d>
 
 Add POSIX syntax for passing ld(1) options through the compiler 
 front end
@@ -9,7 +12,21 @@ Was patch-ab
 
 --- configure.orig	2013-08-21 17:45:50.000000000 +0000
 +++ configure
-@@ -10107,7 +10107,7 @@ $as_echo_n "checking for runtime librari
+@@ -9196,8 +9196,11 @@ case "$opsys" in
+       if test "$os_release" -ge 505; then
+      $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
+ 
+-     $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+-
++     $as_echo "#if __STDC_VERSION__ - 0 < 199901L" >>confdefs.h
++     $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
++     $as_echo "#else" >>confdefs.h
++     $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
++     $as_echo "#endif" >>confdefs.h
+    fi ;;
+   linux)
+     $as_echo "#define _POSIX_C_SOURCE 199506L" >>confdefs.h
+@@ -10107,7 +10110,7 @@ $as_echo_n "checking for runtime librari
      linux* | irix*) dash_r="-rpath " ;;
      *)
        dash_r=""
@@ -18,7 +35,7 @@ Was patch-ab
          xe_check_libs="${try_dash_r}/no/such/file-or-directory"
  
  if test "$GCC" = "yes"; then
-@@ -21819,7 +21819,7 @@ fi
+@@ -21819,7 +21822,7 @@ fi
  if test "$have_vdb_mach" = yes ; then
    echo "  Using mach exception mechanism as vdb fault handler."
  fi
diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile
index bf46cae1c3a..8d21b2b931d 100644
--- a/editors/xemacs-nox11/Makefile
+++ b/editors/xemacs-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2019/10/11 14:42:48 hauke Exp $
+# $NetBSD: Makefile,v 1.34 2019/11/27 14:35:16 hauke Exp $
 
 PKGNAME=	${DISTNAME:S/-/-nox11-/}
-PKGREVISION=	10
+PKGREVISION=	12
 COMMENT=	XEmacs text editor version 21 (no x11 support)
 
 # Version information in ../../editors/xemacs/Makefile.common
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 3ba286d95de..3b2ad9d03eb 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.127 2019/10/11 14:42:48 hauke Exp $
+# $NetBSD: Makefile,v 1.128 2019/11/27 14:35:16 hauke Exp $
 
 PKGNAME=	${DISTNAME}
-PKGREVISION=	9
+PKGREVISION=	10
 COMMENT=	XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11
diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo
index 9b193f6f7c8..6c647565d4b 100644
--- a/editors/xemacs/distinfo
+++ b/editors/xemacs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.30 2019/10/11 14:42:48 hauke Exp $
+$NetBSD: distinfo,v 1.31 2019/11/27 14:35:16 hauke Exp $
 
 SHA1 (xemacs/xemacs-21.4.24.tar.gz) = e9ff7693adbef333b78f51b4dfdddd296bad0fcc
 RMD160 (xemacs/xemacs-21.4.24.tar.gz) = 0e01971c0dd47d9dd401d02e508edf241208969b
 SHA512 (xemacs/xemacs-21.4.24.tar.gz) = b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 Size (xemacs/xemacs-21.4.24.tar.gz) = 8543879 bytes
 SHA1 (patch-Makefile.in.in) = a65cf383a343bb582f6950a28c4e7219e3dd22e7
-SHA1 (patch-configure) = 10ae7a19ada6321996d9f57b8129ee91c326ac72
+SHA1 (patch-configure) = 1f2e71ddd1e061111d48cc11d42b892189d208b8
 SHA1 (patch-lib-src_Makefile.in.in) = 5e11bf2904145804f521fed0ef956da94e5f21bd
 SHA1 (patch-lisp_gui.el) = 686bc5a7c4bf6e3c4f010dba22aee109d94f6cb3
 SHA1 (patch-lwlib_Makefile.in.in) = 97fcf6de4299dfd5ba7a9827ee88bc037df0491e
diff --git a/editors/xemacs/patches/patch-configure b/editors/xemacs/patches/patch-configure
index fa6be478fd0..bd019958200 100644
--- a/editors/xemacs/patches/patch-configure
+++ b/editors/xemacs/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2018/12/20 15:26:31 hauke Exp $
+$NetBSD: patch-configure,v 1.4 2019/11/27 14:35:16 hauke Exp $
 
 On progressive Linuxen (Arch here), CPPFLAGS pre-filled with
 -D_FORTIFY_SOURCE=2 -Werror will make configure tests fail on
@@ -7,9 +7,12 @@ pre-processor warnings. Make sure we set CPP to something that works.
 This patch should go upstream into configure.in, but it is really the
 autoconf AC_PROG_CPP macro definition that needs to be amended.
 
+For Solarish, select _XOPEN_SOURCE version depending on __STDC_VERSION__,
+see <https://gist.github.com/jperkin/b08f9108daf8d0ac695067d71f882a9d>
+
 --- configure.orig	2015-03-25 11:25:33.000000000 +0000
 +++ configure
-@@ -2362,10 +2362,31 @@ else
+@@ -2362,6 +2362,25 @@ else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -35,9 +38,24 @@ autoconf AC_PROG_CPP macro definition that needs to be amended.
    CPP=/lib/cpp
  fi
  rm -f conftest*
- fi
-+rm -f conftest*
-+fi
+@@ -2369,6 +2388,8 @@ fi
  rm -f conftest*
  fi
  rm -f conftest*
++fi
++rm -f conftest*
+   ac_cv_prog_CPP="$CPP"
+   CPP="$ac_cv_prog_CPP"
+ else
+@@ -2457,7 +2478,11 @@ EOF
+     Defining _XOPEN_SOURCE = 500
+ EOF
+ cat >> confdefs.h <<\EOF
++#if __STDC_VERSION__ - 0 < 199901L
+ #define _XOPEN_SOURCE 500
++#else
++#define _XOPEN_SOURCE 600
++#endif
+ EOF
+ }
+