[Midnightbsd-cvs] mports: Makefile: Remove conflicts we don't need to worry about.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Remove conflicts we don't need to worry about.

Remove X11R6 from search path

Modified Files:
--------------
    mports/x11-toolkits/qt33:
        Makefile (r1.7 -> r1.8)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/qt33/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lx11-toolkits/qt33/Makefile -Lx11-toolkits/qt33/Makefile -u -r1.7 -r1.8
--- x11-toolkits/qt33/Makefile
+++ x11-toolkits/qt33/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	x11-toolkits ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
@@ -24,10 +24,6 @@
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
-
 USE_BZIP2=	yes
 REINPLACE_ARGS=	-i ""
 USE_XLIB=	yes
@@ -74,10 +70,7 @@
 
 .include <bsd.port.pre.mk>
 
-# The previous Qt port versions installed qmake and qmake's specs under X11BASE
-# The new devel/qmake port installs them under LOCALBASE. We can use
-# either one here, but we prefer the newer:
-.for d in ${X11BASE} ${LOCALBASE} ${PREFIX}
+.for d in ${LOCALBASE} ${PREFIX}
 .	if exists($d/share/qt/mkspecs/freebsd-g++/qplatformdefs.h)
 QTBASE=$d
 PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++