Received: by mail.netbsd.org (Postfix, from userid 605) id D514384E67; Mon, 4 Feb 2019 10:38:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5B2BE84E3E for ; Mon, 4 Feb 2019 10:38:54 +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 nY-reytXyJy3 for ; Mon, 4 Feb 2019 10:38:53 +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 D767B84CD0 for ; Mon, 4 Feb 2019 10:38:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D20CCFB16; Mon, 4 Feb 2019 10:38:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1549276733276130" MIME-Version: 1.0 Date: Mon, 4 Feb 2019 10:38:53 +0000 From: "Matthias Scheler" Subject: CVS commit: pkgsrc/editors/emacs26 To: pkgsrc-changes@NetBSD.org Reply-To: tron@netbsd.org X-Mailer: log_accum Message-Id: <20190204103853.D20CCFB16@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. --_----------=_1549276733276130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tron Date: Mon Feb 4 10:38:53 UTC 2019 Modified Files: pkgsrc/editors/emacs26: options.mk Log Message: editors/emacs26: Fix building with GTK+ 2 toolkit Previously the "gtk" and "gtk2" options weren't checked properly and the package was built using the GTK+ 3 toolkit instead. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs26/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1549276733276130 Content-Disposition: inline Content-Length: 1481 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/emacs26/options.mk diff -u pkgsrc/editors/emacs26/options.mk:1.3 pkgsrc/editors/emacs26/options.mk:1.4 --- pkgsrc/editors/emacs26/options.mk:1.3 Sun Jul 15 15:21:28 2018 +++ pkgsrc/editors/emacs26/options.mk Mon Feb 4 10:38:53 2019 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2018/07/15 15:21:28 mef Exp $ +# $NetBSD: options.mk,v 1.4 2019/02/04 10:38:53 tron Exp $ ### Set options PKG_OPTIONS_VAR= PKG_OPTIONS.emacs @@ -17,8 +17,8 @@ PKG_SUGGESTED_OPTIONS.Darwin= nextstep # gtk in next line implies gtk2, xaw = athena = lucid PKG_OPTIONS_GROUP.toolkit= gtk gtk2 gtk3 motif xaw lucid # gtk2 and gtk has the same effect -# gtk is default in the logic below (even not included in SUGGESTED_= -# gconf, gtk and xft2 will be ignored for nextstep even shown as selected. +# gtk3 is default in the logic below (even not included in SUGGESTED_= +# gconf, gtk* and xft2 will be ignored for nextstep even shown as selected. PKG_SUGGESTED_OPTIONS= dbus gconf gnutls gtk3 svg xaw3d xft2 xml x11 @@ -113,7 +113,9 @@ CONFIGURE_ARGS+= --without-xft --without ### ### Toolkit selection ### -. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && empty(PKG_OPTIONS:Mmotif)) +. if (empty(PKG_OPTIONS:Mxaw) && empty(PKG_OPTIONS:Mlucid) && \ + empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mgtk2) && \ + empty(PKG_OPTIONS:Mmotif)) # defaults to gtk3 USE_TOOLS+= pkg-config .include "../../x11/gtk3/buildlink3.mk" --_----------=_1549276733276130--