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

[Mathieu Arnold]

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: