Index: head/net/mtr/Makefile
===================================================================
--- head/net/mtr/Makefile	(revision 431515)
+++ head/net/mtr/Makefile	(revision 431516)
@@ -1,50 +1,46 @@
 # Created by: Bill Fumerola <billf@chc-chimes.com>
 # $FreeBSD$
 
 PORTNAME=	mtr
 PORTVERSION=	0.87
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Traceroute and ping in a single network diagnostic tool
 
 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
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lncurses
 USES=		autoreconf ncurses pkgconfig
 
 PLIST_FILES=	man/man8/mtr.8.gz \
 		sbin/mtr
 
 IPV6_CATEGORIES=	ipv6
 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
 
 post-install:
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "${PREFIX}/sbin/mtr is setuid \"root\" "
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Please read about potential security issues"
 	@${ECHO_MSG} "in file ${WRKSRC}/SECURITY (not installed)"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
Index: head/net/mtr-nox11/Makefile
===================================================================
--- head/net/mtr-nox11/Makefile	(revision 431515)
+++ head/net/mtr-nox11/Makefile	(revision 431516)
@@ -1,11 +1,13 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-nox11
 
 MASTERDIR=	${.CURDIR}/../mtr
 
+CONFLICTS_INSTALL=	mtr-[0-9]*
+
 OPTIONS_EXCLUDE=X11
 OPTIONS_FILE_UNSET=	X11
 
 .include "${MASTERDIR}/Makefile"