From owner-svn-ports-all@freebsd.org  Mon Jul 27 04:13:30 2015
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C81D9AC206;
 Mon, 27 Jul 2015 04:13:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3D86C976;
 Mon, 27 Jul 2015 04:13:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6R4DUTt045386;
 Mon, 27 Jul 2015 04:13:30 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6R4DUVL045385;
 Mon, 27 Jul 2015 04:13:30 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201507270413.t6R4DUVL045385@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 27 Jul 2015 04:13:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r392955 - head/Mk/Uses
X-SVN-Group: ports-head
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.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jul 2015 04:13:30 -0000

Author: hrs
Date: Mon Jul 27 04:13:29 2015
New Revision: 392955
URL: https://svnweb.freebsd.org/changeset/ports/392955

Log:
  Fix the case when X11 option is defined and not specified in the parent port.
  
  PR:	201864

Modified:
  head/Mk/Uses/ghostscript.mk

Modified: head/Mk/Uses/ghostscript.mk
==============================================================================
--- head/Mk/Uses/ghostscript.mk	Mon Jul 27 02:52:57 2015	(r392954)
+++ head/Mk/Uses/ghostscript.mk	Mon Jul 27 04:13:29 2015	(r392955)
@@ -87,7 +87,9 @@ IGNORE?=	Invalid ghostscript argument or
 # dependencies
 _GS_PORT=	ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}
 
-.if ${_GS_ARGS:Mnox11}
+.if ${_GS_ARGS:Mnox11} || \
+    (defined(OPTIONS_DEFINE) && defined(PORT_OPTIONS) && \
+     ${OPTIONS_DEFINE:MX11} && !${PORT_OPTIONS:MX11})
 DEPENDS_ARGS+=	print_${_GS_PORT}_UNSET_FORCE+=X11
 .endif