Reassign MAINTAINER to kde@FreeBSD.org, a group formed specifically to

maintain and improve QT/KDE on FreeBSD.  This group (at this time)
consists of:  demon, olgeni, kevlo, lauri@kde.org, rwatson, and will.

While I'm here, fail build of kdelibs11 if kdelibs2 is installed.  This
was originally supposed to be committed with the 2.2 update, but...

57 files changed, 68 insertions, 57 deletions

diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index 14b7428adcfb..e9755c01ab24 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 14b7428adcfb..e9755c01ab24 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 884a454155fd..9e528a274e08 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	$(MASTER_SITE_KDE)
 MASTER_SITE_SUBDIR= Attic/old/1.1.2/distribution/tar/generic/source/bz2
 DISTNAME=	kdesupport-1.1.2
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_BZIP2=	yes
 
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 543019787a08..e19b525d33ba 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	converters kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index e0a23e8c2ebf..2b95d63e2c30 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/koffice-${PORTVERSION:S/.rc1/-rc1/}/src
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index e0a23e8c2ebf..2b95d63e2c30 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/koffice-${PORTVERSION:S/.rc1/-rc1/}/src
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index e0a23e8c2ebf..2b95d63e2c30 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/koffice-${PORTVERSION:S/.rc1/-rc1/}/src
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index e0a23e8c2ebf..2b95d63e2c30 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	unstable/koffice-${PORTVERSION:S/.rc1/-rc1/}/src
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.rc1/-rc1/}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
 
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index c6581c9d432a..c84cc0bbf4f9 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index c6581c9d432a..c84cc0bbf4f9 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index c6581c9d432a..c84cc0bbf4f9 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 0c935986db94..4cce68a09c12 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 0c935986db94..4cce68a09c12 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 0c935986db94..4cce68a09c12 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	dvips:${PORTSDIR}/print/teTeX
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 14b7428adcfb..e9755c01ab24 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 14b7428adcfb..e9755c01ab24 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	xanim:${PORTSDIR}/graphics/xanim
 
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 53c24150713a..1942de68df97 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 53c24150713a..1942de68df97 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 53c24150713a..1942de68df97 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net news kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib
 
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 1609c3f9b1a9..9c293d6fff6c 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index 75396f0bd199..9497797c9909 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 MOC?=		${X11BASE}/bin/moc2
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 75396f0bd199..9497797c9909 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 MOC?=		${X11BASE}/bin/moc2
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 75396f0bd199..9497797c9909 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 USE_KDELIBS_VER=2
 MOC?=		${X11BASE}/bin/moc2
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 7c784bc9c2ba..7d554f686669 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -15,7 +15,7 @@ PATCH_SITES=	ftp://ftp.kde.gr.jp/pub/qt/patch/
 PATCHFILES=	qt-1.45-i18n-20000531.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/qt2-static/Makefile b/x11-toolkits/qt2-static/Makefile
index 39d0cc242e76..f6cbf3c3ef30 100644
--- a/x11-toolkits/qt2-static/Makefile
+++ b/x11-toolkits/qt2-static/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	qt
 PKGNAMESUFFIX=	-static
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	kde@FreeBSD.org
 
 WANT_STATIC=	yes
 
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 7d97f553c80c..72744ceb866e 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.4:${PORTSDIR}/graphics/png \
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 7d97f553c80c..72744ceb866e 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.4:${PORTSDIR}/graphics/png \
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 7d97f553c80c..72744ceb866e 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.4:${PORTSDIR}/graphics/png \
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 7d97f553c80c..72744ceb866e 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.4:${PORTSDIR}/graphics/png \
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 7d97f553c80c..72744ceb866e 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
 		ftp://ftp.chg.ru/pub/X11/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.4:${PORTSDIR}/graphics/png \
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index 680092419572..bea6b9018e14 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
 		kdessh:${PORTSDIR}/misc/kdeutils2 \
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 680092419572..bea6b9018e14 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
 		kdessh:${PORTSDIR}/misc/kdeutils2 \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 680092419572..bea6b9018e14 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
 		kdessh:${PORTSDIR}/misc/kdeutils2 \
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 1b92a29fd446..bf1ced0673d6 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -16,7 +16,7 @@ PATCH_SITES=	ftp://ftp.kde.gr.jp/pub/kde/stable/latest/distribution/tar/generic/
 PATCHFILES=	kdebase-ja.19990823.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index c9f4c877c00d..e2ad8d1eaeb3 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 1679e1341079..362ff6c2a5ff 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -17,7 +17,7 @@ PATCH_SITES=	ftp://ftp.kde.gr.jp/pub/kde/stable/latest/distribution/tar/generic/
 PATCHFILES=	kdelibs-ja.19990903.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
@@ -44,4 +44,15 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
 
+pre-fetch:
+.if exists(${LOCALBASE}/include/kwin.h)
+	@${ECHO}
+	@${ECHO} "                      NOTICE"
+	@${ECHO}
+	@${ECHO} "You have KDE2 headers installed!  Installing this port"
+	@${ECHO} "will result in conflicts between KDE2 and KDE1!"
+	@${ECHO}
+	@${FALSE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index c157997db9f5..ab3e424df532 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index c157997db9f5..ab3e424df532 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c157997db9f5..ab3e424df532 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \