aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-04-11 05:09:18 +0800
committerMathieu Arnold <mat@FreeBSD.org>2015-04-11 05:09:18 +0800
commit8ab9f857e61ae25e51ed639250d381d510b5a168 (patch)
treed16d96d8d1e1e9f7fab6c46c2dc3f2694d5d2f24 /net
parent77354555625c0dddab05a6e074ad2abfd3259f5c (diff)
downloadfreebsd-ports-gnome-8ab9f857e61ae25e51ed639250d381d510b5a168.tar.gz
freebsd-ports-gnome-8ab9f857e61ae25e51ed639250d381d510b5a168.tar.zst
freebsd-ports-gnome-8ab9f857e61ae25e51ed639250d381d510b5a168.zip
Don't let mtr change its name when X11 is not selected.
With hat: portmgr Sponsored by: Absolight
Diffstat (limited to 'net')
-rw-r--r--net/mtr-nox11/Makefile2
-rw-r--r--net/mtr/Makefile8
2 files changed, 6 insertions, 4 deletions
diff --git a/net/mtr-nox11/Makefile b/net/mtr-nox11/Makefile
index 043f023aeb9e..5eba7a7771df 100644
--- a/net/mtr-nox11/Makefile
+++ b/net/mtr-nox11/Makefile
@@ -6,4 +6,6 @@ MASTERDIR= ${.CURDIR}/../mtr
OPTIONS_EXCLUDE=X11
OPTIONS_FILE_UNSET= X11
+PKGNAMESUFFIX= -nox11
+
.include "${MASTERDIR}/Makefile"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 5b6172edf207..dae380545723 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -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: