summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2004-01-20 18:39:22 +0000
committerMario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>2004-01-20 18:39:22 +0000
commit3b495c65d985daaf56222990321c48d7cb32a9e4 (patch)
tree42543274115f538d59f4d273a57a186f227c65f0 /net
parent- Use new knobs from bsd.sdl.mk (diff)
Improve CONFLICTS management
Notes
Notes: svn path=/head/; revision=98664
Diffstat (limited to 'net')
-rw-r--r--net/mute-net/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mute-net/Makefile b/net/mute-net/Makefile
index c9145e7f8b8c..e66f9e8b4b6d 100644
--- a/net/mute-net/Makefile
+++ b/net/mute-net/Makefile
@@ -150,25 +150,25 @@ CONFLICTS+= mute-net-[0-9]*
.ifndef(WITHOUT_GUI)
# we cannot install if slave gui port is installed
PLIST_SUB+= GUI=""
+
+CONFLICTS+= mute-net-gui-*
.else
# tag package name properly
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-text
PLIST_SUB+= GUI="@comment "
-
-CONFLICTS+= mute-net-text-*
.endif
# text interface
.ifndef(WITHOUT_TEXT)
PLIST_SUB+= TEXT=""
+
+CONFLICTS+= mute-net-text-*
.else
# tag package name properly
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gui
PLIST_SUB+= TEXT="@comment "
-
-CONFLICTS+= mute-net-gui-*
.endif
.include <bsd.port.post.mk>