Received: by mail.netbsd.org (Postfix, from userid 605) id D370984E62; Fri, 30 Mar 2018 18:28:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CAEF584D80 for ; Fri, 30 Mar 2018 18:28:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id wxsLhmCBgTzg for ; Fri, 30 Mar 2018 18:28:33 +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 490F684C86 for ; Fri, 30 Mar 2018 18:28:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E90A1FB40; Fri, 30 Mar 2018 18:28:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1522434512267250" MIME-Version: 1.0 Date: Fri, 30 Mar 2018 18:28:32 +0000 From: "Chuck Cranor" Subject: CVS commit: pkgsrc/editors/emacs25 To: pkgsrc-changes@NetBSD.org Reply-To: chuck@netbsd.org X-Mailer: log_accum Message-Id: <20180330182832.E90A1FB40@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. --_----------=_1522434512267250 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: chuck Date: Fri Mar 30 18:28:32 UTC 2018 Modified Files: pkgsrc/editors/emacs25: options.mk Log Message: add "--without-ns" to x11 configs for OSX on OSX the configure script will select the "nextstep" window system unless you explicitly tell it not to: % bmake configure |& egrep 'PKG_OPTIONS.emacs|What window system should Emacs use' PKG_OPTIONS.emacs = x11 What window system should Emacs use? nextstep % leaving pkgsrc in a bad state where it thinks it built an x11 version, but instead emacs built a nextstep version. add "--without-ns" to the x11 config option for OSX. this should not impact other platforms. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs25/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1522434512267250 Content-Disposition: inline Content-Length: 719 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/emacs25/options.mk diff -u pkgsrc/editors/emacs25/options.mk:1.3 pkgsrc/editors/emacs25/options.mk:1.4 --- pkgsrc/editors/emacs25/options.mk:1.3 Thu Apr 27 13:27:57 2017 +++ pkgsrc/editors/emacs25/options.mk Fri Mar 30 18:28:32 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2017/04/27 13:27:57 ryoon Exp $ +# $NetBSD: options.mk,v 1.4 2018/03/30 18:28:32 chuck Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs PKG_SUPPORTED_OPTIONS= dbus xft2 svg xml gnutls @@ -75,6 +75,7 @@ PKG_OPTIONS+= gtk3 .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x +CONFIGURE_ARGS+= --without-ns CONFIGURE_ARGS+= --with-xpm CONFIGURE_ARGS+= --with-jpeg CONFIGURE_ARGS+= --with-tiff --_----------=_1522434512267250--