aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlofi <lofi@FreeBSD.org>2004-05-22 02:33:06 +0800
committerlofi <lofi@FreeBSD.org>2004-05-22 02:33:06 +0800
commit98d470d004ea1342207adc03be8866cccd026d70 (patch)
tree1db69823d64bc8ba4dcb9c64418a5f74a6debd96
parent6d2c99ede9dd75e68d4fc912634452c973844c81 (diff)
downloadfreebsd-ports-gnome-98d470d004ea1342207adc03be8866cccd026d70.tar.gz
freebsd-ports-gnome-98d470d004ea1342207adc03be8866cccd026d70.tar.zst
freebsd-ports-gnome-98d470d004ea1342207adc03be8866cccd026d70.zip
Adjust CONFLICTS, the latest revision of the xfmail port does no longer
conflict with Qt.
-rw-r--r--x11-toolkits/qt33/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 7a55e576c915..b09f9a27cbb3 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qt
PORTVERSION= 3.3.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
@@ -26,7 +27,8 @@ LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng \
jpeg.9:${PORTSDIR}/graphics/jpeg
CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.*
+ qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
+ xfmail-1.5.5_[1-2]
USE_BZIP2= yes
USE_REINPLACE= yes