aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2014-03-31 12:27:53 +0800
committercy <cy@FreeBSD.org>2014-03-31 12:27:53 +0800
commit07817e6a65d5da563dbc923516f88522e28cec56 (patch)
tree1a1d308a60ce5a290f0538012163bcdbf66065db
parentd395ac65d0b947439e443664defa19664c7d9e5c (diff)
downloadfreebsd-ports-gnome-07817e6a65d5da563dbc923516f88522e28cec56.tar.gz
freebsd-ports-gnome-07817e6a65d5da563dbc923516f88522e28cec56.tar.zst
freebsd-ports-gnome-07817e6a65d5da563dbc923516f88522e28cec56.zip
Register conflicts due to x3270if.
Approved by: araujo
-rw-r--r--net/c3270/Makefile3
-rw-r--r--x11/x3270/Makefile3
2 files changed, 6 insertions, 0 deletions
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index 59949d605680..ad3e0472c76f 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -12,6 +12,9 @@ COMMENT= Full-screen curses-based remote login to IBM mainframes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
+# Conflict due to x3270if
+CONFLICTS x3270-*
+
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index ab11b54ea8c2..a587069656ba 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -10,6 +10,9 @@ EXTRACT_SUFX= ga7-src.tgz
MAINTAINER= ecrist@secure-computing.net
COMMENT= 3270 Terminal emulator
+# Conflict due to x3270if
+CONFLICTS= c3270-*
+
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale