From owner-svn-ports-all@freebsd.org  Thu May 31 15:35:37 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D6E03EF8CC2;
 Thu, 31 May 2018 15:35:37 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7D55B6CC95;
 Thu, 31 May 2018 15:35:37 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E28F1C194;
 Thu, 31 May 2018 15:35:37 +0000 (UTC) (envelope-from jrm@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4VFZbmM055557;
 Thu, 31 May 2018 15:35:37 GMT (envelope-from jrm@FreeBSD.org)
Received: (from jrm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4VFZb6L055556;
 Thu, 31 May 2018 15:35:37 GMT (envelope-from jrm@FreeBSD.org)
Message-Id: <201805311535.w4VFZb6L055556@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org
 using -f
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Thu, 31 May 2018 15:35:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r471214 - head/editors/emacs
X-SVN-Group: ports-head
X-SVN-Commit-Author: jrm
X-SVN-Commit-Paths: head/editors/emacs
X-SVN-Commit-Revision: 471214
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2018 15:35:38 -0000

Author: jrm
Date: Thu May 31 15:35:36 2018
New Revision: 471214
URL: https://svnweb.freebsd.org/changeset/ports/471214

Log:
  editors/emacs: Fix configure issue when no X toolkit knob is on

Modified:
  head/editors/emacs/Makefile   (contents, props changed)

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Thu May 31 15:35:18 2018	(r471213)
+++ head/editors/emacs/Makefile	Thu May 31 15:35:36 2018	(r471214)
@@ -212,6 +212,11 @@ EMACS_VER=		26.1
 USES+=	compiler:openmp
 .endif
 
+.if ${FLAVOR:U} != nox && !${PORT_OPTIONS:MMAGICK} && !${PORT_OPTIONS:MMAGICK} \
+	&& !${PORT_OPTIONS:MMAGICK} && !${PORT_OPTIONS:MMAGICK}
+CONFIGURE_ARGS+=	--with-x-toolkit=no
+.endif
+
 .if ${FLAVOR} == nox
 # With a desktop entry stage-qa will give a warning about requiring
 # desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS,