Received: by mail.netbsd.org (Postfix, from userid 605) id 5C40484DAA; Wed, 27 Nov 2019 14:35:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D86D284D88 for ; Wed, 27 Nov 2019 14:35:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id n_NZ60cgDdii for ; Wed, 27 Nov 2019 14:35:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 122D584CEA for ; Wed, 27 Nov 2019 14:35:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0F69FFA97; Wed, 27 Nov 2019 14:35:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1574865317237860" MIME-Version: 1.0 Date: Wed, 27 Nov 2019 14:35:17 +0000 From: "Hauke Fath" Subject: CVS commit: pkgsrc/editors To: pkgsrc-changes@NetBSD.org Reply-To: hauke@netbsd.org X-Mailer: log_accum Message-Id: <20191127143517.0F69FFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1574865317237860 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: hauke Date: Wed Nov 27 14:35:16 UTC 2019 Modified Files: pkgsrc/editors/xemacs: Makefile distinfo pkgsrc/editors/xemacs-current: Makefile distinfo pkgsrc/editors/xemacs-current/patches: patch-configure pkgsrc/editors/xemacs-nox11: Makefile pkgsrc/editors/xemacs/patches: patch-configure Log Message: For Solarish, select _XOPEN_SOURCE version depending on __STDC_VERSION__, see To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 pkgsrc/editors/xemacs/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/editors/xemacs/distinfo cvs rdiff -u -r1.100 -r1.101 pkgsrc/editors/xemacs-current/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/editors/xemacs-current/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/editors/xemacs-current/patches/patch-configure cvs rdiff -u -r1.33 -r1.34 pkgsrc/editors/xemacs-nox11/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/xemacs/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1574865317237860 Content-Disposition: inline Content-Length: 7757 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/xemacs/Makefile diff -u pkgsrc/editors/xemacs/Makefile:1.127 pkgsrc/editors/xemacs/Makefile:1.128 --- pkgsrc/editors/xemacs/Makefile:1.127 Fri Oct 11 14:42:48 2019 +++ pkgsrc/editors/xemacs/Makefile Wed Nov 27 14:35:16 2019 @@ -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 Index: pkgsrc/editors/xemacs/distinfo diff -u pkgsrc/editors/xemacs/distinfo:1.30 pkgsrc/editors/xemacs/distinfo:1.31 --- pkgsrc/editors/xemacs/distinfo:1.30 Fri Oct 11 14:42:48 2019 +++ pkgsrc/editors/xemacs/distinfo Wed Nov 27 14:35:16 2019 @@ -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 Index: pkgsrc/editors/xemacs-current/Makefile diff -u pkgsrc/editors/xemacs-current/Makefile:1.100 pkgsrc/editors/xemacs-current/Makefile:1.101 --- pkgsrc/editors/xemacs-current/Makefile:1.100 Tue Oct 8 12:40:55 2019 +++ pkgsrc/editors/xemacs-current/Makefile Wed Nov 27 14:35:16 2019 @@ -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 Index: pkgsrc/editors/xemacs-current/distinfo diff -u pkgsrc/editors/xemacs-current/distinfo:1.34 pkgsrc/editors/xemacs-current/distinfo:1.35 --- pkgsrc/editors/xemacs-current/distinfo:1.34 Wed Dec 19 13:41:45 2018 +++ pkgsrc/editors/xemacs-current/distinfo Wed Nov 27 14:35:16 2019 @@ -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 Index: pkgsrc/editors/xemacs-current/patches/patch-configure diff -u pkgsrc/editors/xemacs-current/patches/patch-configure:1.1 pkgsrc/editors/xemacs-current/patches/patch-configure:1.2 --- pkgsrc/editors/xemacs-current/patches/patch-configure:1.1 Wed Nov 15 14:50:50 2017 +++ pkgsrc/editors/xemacs-current/patches/patch-configure Wed Nov 27 14:35:16 2019 @@ -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 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 Index: pkgsrc/editors/xemacs-nox11/Makefile diff -u pkgsrc/editors/xemacs-nox11/Makefile:1.33 pkgsrc/editors/xemacs-nox11/Makefile:1.34 --- pkgsrc/editors/xemacs-nox11/Makefile:1.33 Fri Oct 11 14:42:48 2019 +++ pkgsrc/editors/xemacs-nox11/Makefile Wed Nov 27 14:35:16 2019 @@ -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 Index: pkgsrc/editors/xemacs/patches/patch-configure diff -u pkgsrc/editors/xemacs/patches/patch-configure:1.3 pkgsrc/editors/xemacs/patches/patch-configure:1.4 --- pkgsrc/editors/xemacs/patches/patch-configure:1.3 Thu Dec 20 15:26:31 2018 +++ pkgsrc/editors/xemacs/patches/patch-configure Wed Nov 27 14:35:16 2019 @@ -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 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 + --- 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 th 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 + } + --_----------=_1574865317237860--