Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1598213554257480"
MIME-Version: 1.0
Date: Sun, 23 Aug 2020 20:12:34 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/editors/emacs27
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20200823201234.E6F75FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1598213554257480
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Aug 23 20:12:34 UTC 2020

Modified Files:
	pkgsrc/editors/emacs27: Makefile distinfo options.mk
Added Files:
	pkgsrc/editors/emacs27/patches: patch-lib-src_emacsclient.c

Log Message:
emacs27: add default-on option for JSON support and add workaround for emacsclient socket issue

Both from iquiw on pkgsrc-users.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs27/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs27/distinfo \
    pkgsrc/editors/emacs27/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/emacs27/patches/patch-lib-src_emacsclient.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1598213554257480
Content-Disposition: inline
Content-Length: 3680
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/editors/emacs27/Makefile
diff -u pkgsrc/editors/emacs27/Makefile:1.2 pkgsrc/editors/emacs27/Makefile:1.3
--- pkgsrc/editors/emacs27/Makefile:1.2	Mon Aug 17 20:18:32 2020
+++ pkgsrc/editors/emacs27/Makefile	Sun Aug 23 20:12:34 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2020/08/17 20:18:32 leot Exp $
+# $NetBSD: Makefile,v 1.3 2020/08/23 20:12:34 wiz Exp $
 
 CONFLICTS+=	emacs27-nox11-[0-9]*
 
-PKGREVISION= 1
+PKGREVISION= 	2
 .include "../../editors/emacs27/Makefile.common"
 
 .include "options.mk"

Index: pkgsrc/editors/emacs27/distinfo
diff -u pkgsrc/editors/emacs27/distinfo:1.1 pkgsrc/editors/emacs27/distinfo:1.2
--- pkgsrc/editors/emacs27/distinfo:1.1	Wed Aug 12 14:14:48 2020
+++ pkgsrc/editors/emacs27/distinfo	Sun Aug 23 20:12:34 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2020/08/12 14:14:48 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2020/08/23 20:12:34 wiz Exp $
 
 SHA1 (emacs-27.1.tar.gz) = 47d5c733cc41406e6f78df9784e4eddf92dfe392
 RMD160 (emacs-27.1.tar.gz) = 9ddfd28ab54c4aee168eeecb783d13599e5b5288
 SHA512 (emacs-27.1.tar.gz) = fce6c785e9fd9e53282d8293c0c222b3a8cf433db2c19de98bef9e5c1797ffe17663ce1cf205edea6a7b8ded7842df2def2c859c563f091bd68d03ffa9c39198
 Size (emacs-27.1.tar.gz) = 65782481 bytes
+SHA1 (patch-lib-src_emacsclient.c) = 2299db9359f1628b5379d2fb0a813ff88e0461cc
 SHA1 (patch-src_inotify.c) = 1fdc6566ed57e8418f1ddc85bb03518d7d9d6bb3
Index: pkgsrc/editors/emacs27/options.mk
diff -u pkgsrc/editors/emacs27/options.mk:1.1 pkgsrc/editors/emacs27/options.mk:1.2
--- pkgsrc/editors/emacs27/options.mk:1.1	Wed Aug 12 14:14:48 2020
+++ pkgsrc/editors/emacs27/options.mk	Sun Aug 23 20:12:34 2020
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2020/08/12 14:14:48 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2020/08/23 20:12:34 wiz Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=			PKG_OPTIONS.emacs
-PKG_SUPPORTED_OPTIONS=			dbus gconf gnutls imagemagick svg xaw3d xft2 xml
+PKG_SUPPORTED_OPTIONS=			dbus gconf gnutls imagemagick jansson svg xaw3d xft2 xml
 # xaw3d is only valid with tookit = xaw
 
 PKG_OPTIONS_OPTIONAL_GROUPS+=		window-system
@@ -22,7 +22,7 @@ PKG_OPTIONS_GROUP.toolkit=		gtk gtk2 gtk
 
 # svg is omitted because it is rarely needed and either very
 # heavyweight or unmaintained.
-PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls gtk3 xaw3d xft2 xml x11
+PKG_SUGGESTED_OPTIONS=	dbus gconf gnutls gtk3 jansson xaw3d xft2 xml x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -37,6 +37,15 @@ CONFIGURE_ARGS+=	--without-dbus
 .endif
 
 ###
+### Support JSON
+###
+.if !empty(PKG_OPTIONS:Mjansson)
+.  include "../../textproc/jansson/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-json
+.endif
+
+###
 ### Support XML2
 ###
 .if !empty(PKG_OPTIONS:Mxml)

Added files:

Index: pkgsrc/editors/emacs27/patches/patch-lib-src_emacsclient.c
diff -u /dev/null pkgsrc/editors/emacs27/patches/patch-lib-src_emacsclient.c:1.1
--- /dev/null	Sun Aug 23 20:12:34 2020
+++ pkgsrc/editors/emacs27/patches/patch-lib-src_emacsclient.c	Sun Aug 23 20:12:34 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-lib-src_emacsclient.c,v 1.1 2020/08/23 20:12:34 wiz Exp $
+
+Workaround for:
+On NetBSD, fstat on a socket returns zero instead of the user id.
+Reported upstream as http://debbugs.gnu.org/cgi/bugreport.cgi?bug=43002
+
+--- lib-src/emacsclient.c.orig	2020-07-29 21:40:41.000000000 +0000
++++ lib-src/emacsclient.c
+@@ -1478,6 +1478,11 @@ set_local_socket (char const *server_nam
+       struct stat connect_stat;
+       if (fstat (s, &connect_stat) != 0)
+ 	sock_status = errno;
++#if defined(__NetBSD__)
++      else if (1) {
++        return s;
++      }
++#endif
+       else if (connect_stat.st_uid == uid)
+ 	return s;
+       else


--_----------=_1598213554257480--