Declare (or resolve) conflicts for KDE and QT.

7 files changed, 27 insertions, 14 deletions

diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 86468da53f60..e97e8b88ae71 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -16,14 +16,14 @@ DIST_SUBDIR=	KDE
 MAINTAINER?=	kde@FreeBSD.org
 COMMENT=	Powerful IDE for developing KDE/Qt-based apps
 
-RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
+RUN_DEPENDS=	extractrc:${PORTSDIR}/devel/kdesdk3 \
+		gmake:${PORTSDIR}/devel/gmake
 .if defined(WITH_OPTIONAL_DEPENDS)
 RUN_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf \
 		automake:${PORTSDIR}/devel/automake \
 		kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
 		ark:${PORTSDIR}/misc/kdeutils3 \
 		glimpse:${PORTSDIR}/textproc/glimpse \
-		kbabel:${PORTSDIR}/devel/kdesdk3 \
 		a2ps:${PORTSDIR}/print/a2ps-letter
 .endif
 
@@ -47,6 +47,7 @@ pre-everything::
 .endif
 
 pre-configure:
+	${REINPLACE_CMD} -e 's@extractrc@@g' ${WRKSRC}/kdevelop/Makefile.in
 	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index e24856ae51ad..7cc9e6b2730a 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -1,4 +1,3 @@
-bin/extractrc
 bin/kdevdlg2ui
 bin/kdevelop
 bin/one2two
diff --git a/devel/qt-designer/Makefile b/devel/qt-designer/Makefile
index 3fe4a9280d6d..0b0a4685791e 100644
--- a/devel/qt-designer/Makefile
+++ b/devel/qt-designer/Makefile
@@ -5,12 +5,24 @@
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../../x11-toolkits/qt23
-COMMENT=	GUI C++ IDE based on QT
-
 PORTNAME=	qt-designer
 CATEGORIES=	devel
 
+MAINTAINER=	kde@freebsd.org
+COMMENT=	GUI C++ IDE based on QT
+
+LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
+
+MASTERDIR=	${.CURDIR}/../../x11-toolkits/qt23
+
+CONFLICTS=	qt-3.*
+
+WRKSRC=		${WRKDIR}/qt-${PORTVERSION}
+PATCH_WRKSRC=	${WRKSRC}
+PKGDIR=		${.CURDIR}
+MAKE_ENV=	QTDIR=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib PREFIX=${PREFIX}
+ALL_TARGET=	sub-tools
+
 post-patch:
 	${PERL} -pi -e "s@-fno-exceptions@-fno-exceptions -I${X11BASE}/include/qt2@g" ${CONFIG}
 
@@ -30,14 +42,6 @@ qt-pre-configure:
 
 .include "${MASTERDIR}/Makefile"
 
-LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
-
-WRKSRC=		${WRKDIR}/qt-${PORTVERSION}
-PATCH_WRKSRC=	${WRKSRC}
-PKGDIR=		${.CURDIR}
-MAKE_ENV=	QTDIR=${PREFIX} LD_LIBRARY_PATH=${PREFIX}/lib PREFIX=${PREFIX}
-ALL_TARGET=	sub-tools
-
 do-install:
 	${MKDIR} ${PREFIX}/share/qt2/designer/templates \
 		${PREFIX}/share/doc/qt2/html/designer/arrows \
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 9b9cbf4afe2f..93220ef4d63d 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -21,6 +21,8 @@ COMMENT=	An X Window System application for receiving electronic mail
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
+CONFLICTS=	qt-3.*
+
 USE_AUTOMAKE_VER=	15
 USE_AUTOCONF=	yes
 USE_BZIP2=	yes
@@ -29,6 +31,7 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+INSTALLS_SHLIB=	yes
 
 # XXX: Disable patching for libtool until we can generate the files
 LIBTOOLFILES=
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 2539e026b67f..38b631ccd899 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -22,6 +22,8 @@ LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
+CONFLICTS=	qt-3.*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_MESA=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index ac99826d63bd..e3265004d74a 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -23,6 +23,8 @@ LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+CONFLICTS=	linguist-0.* qt-2.* qt-designer-2.* xfmail-1.5.*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index ac99826d63bd..e3265004d74a 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -23,6 +23,8 @@ LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+CONFLICTS=	linguist-0.* qt-2.* qt-designer-2.* xfmail-1.5.*
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes