Overhaul QT/KDE support:

- bsd.port.mk update to use bsd.kde.mk for USE_{QT,KDE}* - Cleanup corresponding ports for bsd.kde.mk update. - Fix bsd.kde.mk: use correct kdelibs dependency, put qt at the bottom, introduce QT_NONSTANDARD variable for nonstandard configure setup. - Update KDE2 to 2.1.1. Two patches included in x11/kdelibs2 to fix the proxy authentication that was broken for 2.1.1. Remove old patches. - Potentially fix kdelibs build for alpha. - Fix qt-designer 2.3.0 build. - Ruby stuff left alone since it looks like black magic to me. Should still work w/ compat shims for older USE_QT[,2] style. Some others were also left alone for the same reason. Reviewed by: portmgr, ports (bsd.kde.mk+bsd.port.mk) Submitted by: David Faure <faure@kde.org> (proxy auth patches) Alex Zepeda <garbanzo@kde.org> (old patches removal)
author: Will Andrews <will@FreeBSD.org> 2001-04-03 08:14:43 +0000
committer: Will Andrews <will@FreeBSD.org> 2001-04-03 08:14:43 +0000
commit: dbba8af6447e625aae93ec45e619acbecb4ab189 (patch)
tree: d696a8c2d3e835a743132aa1f6a5cc0557d1c435 /x11
parent: Update to the actual release version of 9.1.1. If you're using (diff)
33 files changed, 195 insertions, 196 deletions
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index f16a8b59aa38..7796e350a8b0 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -14,15 +14,14 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
-		kjumpingcube:${PORTSDIR}/games/kdegames2 \
+RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
 		kdessh:${PORTSDIR}/misc/kdeutils2 \
 		kword:${PORTSDIR}/editors/koffice \
 		kppp:${PORTSDIR}/net/kdenetwork2 \
 		kview:${PORTSDIR}/graphics/kdegraphics2 \
 		kmidi:${PORTSDIR}/audio/kdemultimedia2
 
+USE_KDEBASE_VER=2
 NO_BUILD=	yes
 
 do-install:	# empty
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index f16a8b59aa38..7796e350a8b0 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -14,15 +14,14 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
-		kjumpingcube:${PORTSDIR}/games/kdegames2 \
+RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
 		kdessh:${PORTSDIR}/misc/kdeutils2 \
 		kword:${PORTSDIR}/editors/koffice \
 		kppp:${PORTSDIR}/net/kdenetwork2 \
 		kview:${PORTSDIR}/graphics/kdegraphics2 \
 		kmidi:${PORTSDIR}/audio/kdemultimedia2
 
+USE_KDEBASE_VER=2
 NO_BUILD=	yes
 
 do-install:	# empty
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index f16a8b59aa38..7796e350a8b0 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -14,15 +14,14 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
-RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
-		kjumpingcube:${PORTSDIR}/games/kdegames2 \
+RUN_DEPENDS=	kjumpingcube:${PORTSDIR}/games/kdegames2 \
 		kdessh:${PORTSDIR}/misc/kdeutils2 \
 		kword:${PORTSDIR}/editors/koffice \
 		kppp:${PORTSDIR}/net/kdenetwork2 \
 		kview:${PORTSDIR}/graphics/kdegraphics2 \
 		kmidi:${PORTSDIR}/audio/kdemultimedia2
 
+USE_KDEBASE_VER=2
 NO_BUILD=	yes
 
 do-install:	# empty
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 56031f46e8d9..1b92a29fd446 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -26,7 +26,7 @@ NO_LATEST_LINK=	yes
 USE_XLIB=	yes
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_QT=		yes
+USE_QT_VER=	1
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qt-includes=${QTDIR}/include/X11/qt \
@@ -40,12 +40,6 @@ CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
-.if defined(PREFIX)
-QTDIR?=		${PREFIX}
-.else
-QTDIR?=		${X11BASE}
-.endif
-
 pre-patch:
 	@${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps
 
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 7c8cd7cade08..0145e4410a7f 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -6,36 +6,27 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
-		intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_QT2=	yes
+USE_KDELIBS_VER=2
 SOMAJOR=	4
 SOMINOR=	0
-MOC?=		${X11BASE}/bin/moc2
 USE_XPM=	yes
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \
 		--with-qt-dir=${X11BASE} \
-		--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib \
 		--without-ldap \
 		--disable-closure
-CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 243923f1a5d7..51619042121d 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (kdebase-2.1.tar.bz2) = 54264460bca895cc3e315bb49c297f8f
+MD5 (kdebase-2.1.1.tar.bz2) = 3bb3204fe90f1af9e828c1b518ecc577
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 05f068b6a855..1679e1341079 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -29,7 +29,7 @@ MAKE_ENV+=	SOMAJOR="${LIBVER}" SOMINOR="0"
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_QT=		yes
+USE_QT_VER=	1
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=
@@ -40,12 +40,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		QTDIR=${QTDIR}
 
-.if defined(PREFIX)
-QTDIR?=		${PREFIX}
-.else
-QTDIR?=		${X11BASE}
-.endif
-
 # generate KDE style mtree
 MTREE_CMD=	${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree
 MTREE_ARGS=	-U -d -e -p
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 170ff7b40d45..405bf219d7b1 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -18,21 +18,17 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
 USE_OPENSSL=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_QT_VER=	2
 SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+.if ${MACHINE_ARCH} == "alpha"
+CFLAGS=		-O0 ${KDE_CFLAGS}
+.endif
+
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
@@ -52,6 +48,7 @@ pre-fetch:
 .endif
 
 pre-configure:
+	${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure
 	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
 		"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
 		 s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 992af6f45bd7..be16692f3af0 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050
+MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
diff --git a/x11/kdelibs2/files/patch-artsdsp.c b/x11/kdelibs2/files/patch-artsdsp.c
deleted file mode 100644
index 380c17a588e5..000000000000
--- a/x11/kdelibs2/files/patch-artsdsp.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- arts/artsc/artsdsp.c	Sat Oct 28 18:12:12 2000
-+++ arts/artsc/artsdsp.c.new	Sat Oct 28 18:14:56 2000
-@@ -27,6 +27,9 @@
- #endif
- 
- #ifdef HAVE_SYS_SOUNDCARD_H
-+#ifndef SNDCTL_DSP_CHANNELS
-+#define SNDCTL_DSP_CHANNELS SOUND_PCM_WRITE_CHANNELS
-+#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
diff --git a/x11/kdelibs2/files/patch-http.cc b/x11/kdelibs2/files/patch-http.cc
new file mode 100644
index 000000000000..a06a1d7810fb
--- /dev/null
+++ b/x11/kdelibs2/files/patch-http.cc
@@ -0,0 +1,100 @@
+--- kio/http/http.cc	2001/03/16 05:55:57	1.319.2.7
++++ kio/http/http.cc	2001/03/30 22:52:10	1.319.2.10
+@@ -48,6 +48,7 @@
+ 
+ #include <kapp.h>
+ #include <klocale.h>
++#include <kcharsets.h>
+ #include <kprotocolmanager.h>
+ #include <kdatastream.h>
+ #include <ksock.h>
+@@ -804,6 +805,8 @@ bool HTTPProtocol::http_open()
+ 
+   // Let's also clear out some things, so bogus values aren't used.
+   // m_HTTPrev = HTTP_Unknown;
++  m_iWWWAuthCount = 0;
++  m_iProxyAuthCount = 0;
+   m_sContentMD5 = QString::null;
+   m_strMimeType = QString::null;
+   m_qContentEncodings.clear();
+@@ -1184,7 +1187,6 @@ bool HTTPProtocol::readHeader()
+ 
+   // read in 4096 bytes at a time (HTTP cookies can be quite large.)
+   int len = 0;
+-  int proxyAuthCount = 1;
+   char buffer[4097];
+   bool cont = false;
+   bool cacheValidated = false; // Revalidation was successfull
+@@ -1495,9 +1497,6 @@ bool HTTPProtocol::readHeader()
+ 
+     // check for proxy-based authentication
+     else if (strncasecmp(buffer, "Proxy-Authenticate:", 19) == 0) {
+-      if ( proxyAuthCount++ > 1 )
+-        configAuth(trimLead(buffer + 19), true, false);
+-      else
+         configAuth(trimLead(buffer + 19), true);
+     }
+ 
+@@ -1867,9 +1866,9 @@ void HTTPProtocol::addEncoding(QString e
+   }
+ }
+ 
+-void HTTPProtocol::configAuth( const char *p, bool b, bool firstCall )
++void HTTPProtocol::configAuth( const char *p, bool b )
+ {
+-  HTTP_AUTH f;
++  HTTP_AUTH f = AUTH_None;
+   const char *strAuth = p;
+ 
+   while( *p == ' ' ) p++;
+@@ -1894,15 +1893,33 @@ void HTTPProtocol::configAuth( const cha
+   {
+     kdWarning(7103) << "Unsupported or invalid authorization type requested" << endl;
+     kdWarning(7103) << "Request Authorization: " << p << endl;
+-    if ( firstCall && b )
+-      ProxyAuthentication = AUTH_None;
+-    return;
+   }
+ 
+-  // Always prefer the stronger authentication mode:
+-  // AUTH_NONE < AUTH_BASIC < AUTH_DIGEST...
+-  if ( (b && f < ProxyAuthentication) || (!b && f < Authentication) )
++  /*
++     This check ensures the following:
++     1.) Rejection of any unknown/unsupported authentication schemes
++     2.) Useage of the strongest possible authentication schemes if
++         and when multiple Proxy-Authenticate or WWW-Authenticate
++         header field is sent.
++  */
++  if ( f == AUTH_None ||
++       (b && m_iProxyAuthCount > 0 && f < ProxyAuthentication) ||
++       (!b && m_iWWWAuthCount > 0 && f < Authentication) )
++  {
++    // Since I purposefully made the Proxy-Authentication settings
++    // persistent to reduce the number of round-trips to kdesud we
++    // have to take special care when an unknown/unsupported auth-
++    // scheme is received. This check accomplishes just that...
++    if ( b )
++    {
++      if ( !m_iProxyAuthCount )
++        ProxyAuthentication = f;
++      m_iProxyAuthCount++;
++    }
++    else
++      m_iWWWAuthCount++;
+     return;
++  }
+ 
+   while (*p)
+   {
+@@ -3235,7 +3252,9 @@ void HTTPProtocol::reparseConfiguration(
+   // Use commas not spaces.
+   m_strLanguages = languageList.join( ", " );
+   kdDebug(7103) << "Languages list set to " << m_strLanguages << endl;
+-  m_strCharsets = KGlobal::locale()->charset() + QString::fromLatin1(";q=1.0, *;q=0.9, utf-8;q=0.8");
++  // Ugly conversion. kdeglobals has the xName (e.g. iso8859-1 instead of iso-8859-1)
++  m_strCharsets = KGlobal::charsets()->name(KGlobal::charsets()->xNameToID(KGlobal::locale()->charset()));
++  m_strCharsets += QString::fromLatin1(";q=1.0, *;q=0.9, utf-8;q=0.8");
+ 
+   // Launch the cookiejar if not already running
+   KConfig *cookieConfig = new KConfig("kcookiejarrc", false, false);
diff --git a/x11/kdelibs2/files/patch-http.h b/x11/kdelibs2/files/patch-http.h
new file mode 100644
index 000000000000..dbd420b0391b
--- /dev/null
+++ b/x11/kdelibs2/files/patch-http.h
@@ -0,0 +1,26 @@
+--- kio/http/http.h	2001/02/26 03:57:23	1.83.2.1
++++ kio/http/http.h	2001/03/29 23:43:13	1.83.2.2
+@@ -1,4 +1,4 @@
+-// $Id: http.h,v 1.83.2.1 2001/02/26 03:57:23 waba Exp $
++// $Id: http.h,v 1.83.2.2 2001/03/29 23:43:13 adawit Exp $
+ 
+ #ifndef __http_h__
+ #define __http_h__
+@@ -178,7 +178,7 @@ protected:
+     */
+   void addEncoding(QString, QStringList &);
+ 
+-  void configAuth(const char *, bool, bool firstCall = true );
++  void configAuth(const char *, bool);
+ #ifdef DO_SSL
+   void initSSL();
+   void closeSSL();
+@@ -362,6 +362,8 @@ protected:
+   HTTP_AUTH Authentication;
+   HTTP_AUTH ProxyAuthentication;
+   bool m_bUnauthorized;
++  short unsigned int m_iProxyAuthCount;
++  short unsigned int m_iWWWAuthCount;
+ 
+   // Persistant connections
+   bool m_bKeepAlive;
diff --git a/x11/kdelibs2/files/patch-kapp.cpp b/x11/kdelibs2/files/patch-kapp.cpp
deleted file mode 100644
index 51d25c2ae580..000000000000
--- a/x11/kdelibs2/files/patch-kapp.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdecore/kapp.cpp	Sun Feb 18 10:26:53 2001
-+++ kdecore/kapp.cpp.new	Thu Feb 22 23:58:03 2001
-@@ -795,6 +795,7 @@
-         // we already have a connection to the session manager, use it.
-         SmcRequestSaveYourself( mySmcConnection, SmSaveBoth, True,
- 				SmInteractStyleAny, False, True );
-+	SmcCloseConnection( mySmcConnection, 0, 0 );
- 
- 	// flush the request
- 	IceFlush(SmcGetIceConnection(mySmcConnection));
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 170ff7b40d45..405bf219d7b1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -18,21 +18,17 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
 USE_OPENSSL=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_QT_VER=	2
 SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+.if ${MACHINE_ARCH} == "alpha"
+CFLAGS=		-O0 ${KDE_CFLAGS}
+.endif
+
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
@@ -52,6 +48,7 @@ pre-fetch:
 .endif
 
 pre-configure:
+	${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure
 	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
 		"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
 		 s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 992af6f45bd7..be16692f3af0 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050
+MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 170ff7b40d45..405bf219d7b1 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -18,21 +18,17 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		mimelib.3:${PORTSDIR}/converters/kdesupport2
 
 USE_OPENSSL=	yes
-USE_QT2=	yes
-MOC?=		${X11BASE}/bin/moc2
+USE_QT_VER=	2
 SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
-USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
-		--with-qt-libraries=${X11BASE}/lib \
-		--with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ENV=	MOC="${MOC}" LIBQT="-lqt2" \
-		CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \
-		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++"
+.if ${MACHINE_ARCH} == "alpha"
+CFLAGS=		-O0 ${KDE_CFLAGS}
+.endif
+
 USE_GMAKE=	yes
 MAKE_ENV=	SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}"
 PLIST_SUB+=	LIBVER="${SOMAJOR}"
@@ -52,6 +48,7 @@ pre-fetch:
 .endif
 
 pre-configure:
+	${PERL} -pi -e "s@-O2@-O0@g" ${WRKSRC}/configure
 	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
 		"s@version-info 1:0@version-info ${SOMAJOR}:${SOMINOR}@g; \
 		 s@version-info 3:0@version-info ${SOMAJOR}:${SOMINOR}@g")
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 992af6f45bd7..be16692f3af0 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-2.1.tar.bz2) = d1795459c4bc8bedc4af67211275b050
+MD5 (kdelibs-2.1.1.tar.bz2) = 5904281e61ce2a8cb6d4007a8bdc99eb
diff --git a/x11/kvidtune/Makefile b/x11/kvidtune/Makefile
index 33be5f7a7059..610e4d31c44f 100644
--- a/x11/kvidtune/Makefile
+++ b/x11/kvidtune/Makefile
@@ -13,12 +13,7 @@ MASTER_SITE_SUBDIR= unstable/apps/admin
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11 \
-		kfile.3:${PORTSDIR}/x11/kdelibs11
-
-USE_QT=		yes
+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile
index d909d80e60dd..86b7eb4c0af6 100644
--- a/x11/kworldwatch/Makefile
+++ b/x11/kworldwatch/Makefile
@@ -14,11 +14,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	scrappy@freebsd.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11 \
-		kfm.3:${PORTSDIR}/x11/kdelibs11
-
-USE_QT=		yes
+USE_KDELIBS_VER=1
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
author	Will Andrews <will@FreeBSD.org>	2001-04-03 08:14:43 +0000
committer	Will Andrews <will@FreeBSD.org>	2001-04-03 08:14:43 +0000
commit	dbba8af6447e625aae93ec45e619acbecb4ab189 (patch)
tree	d696a8c2d3e835a743132aa1f6a5cc0557d1c435 /x11
parent	Update to the actual release version of 9.1.1. If you're using (diff)