svn commit: r431516 - in head/net: mtr mtr-nox11

[Sunpoet Po-Chuan Hsieh]

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