From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 10 21:09:19 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C25A7B5F;
 Fri, 10 Apr 2015 21:09:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 AD8A26EE;
 Fri, 10 Apr 2015 21:09:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3AL9Jct036573;
 Fri, 10 Apr 2015 21:09:19 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3AL9JWo036567;
 Fri, 10 Apr 2015 21:09:19 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201504102109.t3AL9JWo036567@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 10 Apr 2015 21:09:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r383764 - in head/net: mtr mtr-nox11
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.18-1
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: Fri, 10 Apr 2015 21:09:19 -0000

Author: mat
Date: Fri Apr 10 21:09:18 2015
New Revision: 383764
URL: https://svnweb.freebsd.org/changeset/ports/383764

Log:
  Don't let mtr change its name when X11 is not selected.
  
  With hat:	portmgr
  Sponsored by:	Absolight

Modified:
  head/net/mtr-nox11/Makefile
  head/net/mtr/Makefile

Modified: head/net/mtr-nox11/Makefile
==============================================================================
--- head/net/mtr-nox11/Makefile	Fri Apr 10 20:59:51 2015	(r383763)
+++ head/net/mtr-nox11/Makefile	Fri Apr 10 21:09:18 2015	(r383764)
@@ -6,4 +6,6 @@ MASTERDIR=	${.CURDIR}/../mtr
 OPTIONS_EXCLUDE=X11
 OPTIONS_FILE_UNSET=	X11
 
+PKGNAMESUFFIX=	-nox11
+
 .include "${MASTERDIR}/Makefile"

Modified: head/net/mtr/Makefile
==============================================================================
--- head/net/mtr/Makefile	Fri Apr 10 20:59:51 2015	(r383763)
+++ head/net/mtr/Makefile	Fri Apr 10 21:09:18 2015	(r383764)
@@ -28,10 +28,10 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 X11_CONFIGURE_WITH=	gtk
 X11_USE=		GNOME=gtk20
 
-.include <bsd.port.options.mk>
-
-.if !${PORT_OPTIONS:MX11}
-PKGNAMESUFFIX+=	-nox11
+.if defined(PKGNAMESUFFIX)
+CONFLICTS=	mtr-0*
+.else
+CONFLICTS=	mtr-nox11-0*
 .endif
 
 post-patch: