From owner-svn-ports-all@freebsd.org  Sun Jan 15 04:17:14 2017
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 78711CB0C44;
 Sun, 15 Jan 2017 04:17:14 +0000 (UTC)
 (envelope-from sunpoet@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 mx1.freebsd.org (Postfix) with ESMTPS id 47CA0109E;
 Sun, 15 Jan 2017 04:17:14 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0F4HDAD042938;
 Sun, 15 Jan 2017 04:17:13 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0F4HDgb042936;
 Sun, 15 Jan 2017 04:17:13 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201701150417.v0F4HDgb042936@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 15 Jan 2017 04:17:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431516 - 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.23
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: Sun, 15 Jan 2017 04:17:14 -0000

Author: sunpoet
Date: Sun Jan 15 04:17:13 2017
New Revision: 431516
URL: https://svnweb.freebsd.org/changeset/ports/431516

Log:
  Move CONFLICTS_INSTALL to slave port

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

Modified: head/net/mtr-nox11/Makefile
==============================================================================
--- head/net/mtr-nox11/Makefile	Sun Jan 15 04:17:08 2017	(r431515)
+++ head/net/mtr-nox11/Makefile	Sun Jan 15 04:17:13 2017	(r431516)
@@ -5,6 +5,8 @@ PKGNAMESUFFIX=	-nox11
 
 MASTERDIR=	${.CURDIR}/../mtr
 
+CONFLICTS_INSTALL=	mtr-[0-9]*
+
 OPTIONS_EXCLUDE=X11
 OPTIONS_FILE_UNSET=	X11
 

Modified: head/net/mtr/Makefile
==============================================================================
--- head/net/mtr/Makefile	Sun Jan 15 04:17:08 2017	(r431515)
+++ head/net/mtr/Makefile	Sun Jan 15 04:17:13 2017	(r431516)
@@ -13,6 +13,8 @@ COMMENT=	Traceroute and ping in a single
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS_INSTALL?=	mtr-nox11-[0-9]*
+
 OPTIONS_DEFINE=	IPV6 X11
 OPTIONS_DEFAULT=X11
 X11_DESC=	Build X11-enabled mtr
@@ -29,12 +31,6 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 X11_CONFIGURE_WITH=	gtk
 X11_USE=		GNOME=gtk20
 
-.if defined(PKGNAMESUFFIX)
-CONFLICTS_INSTALL=	mtr-0*
-.else
-CONFLICTS_INSTALL=	mtr-nox11-0*
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|getopt.*$$(OBJEXT)||g; s|getopt.*[ch]||g; /getopt.*Po/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|"getopt\.h"|<getopt.h>|g' ${WRKSRC}/mtr.c