Bring in my fixes for KDE2 for users of XFree86 4.0.x. Basically, what

this involves is this:  Cull GL from Qt by default, but still provide a
Qt+GL library that may or may not have threads.  Then also provide a Qt
library that has threads but not GL.  This allows us to make KDE2 depend
on a library that will *not* have threads, ever.  Threads will be
revisited at a later date.  Ports that require GL support need to be
updated to use the hacked library, libqtgl.so.4.  The net result is that
we bloat our qt2 package by 1.5-2.5MB for compatability.  Also, static
qt will not have GL support.

Introduce bsd.kde.mk, which will be tested on bento before becoming
fully activated.

Replace qt22-static with qt2-static, since it's just a proxy.  Update
qt-designer to depend on qt23.  Also make the old hack to package the
correct lib obsolete by using PLIST_SUB instead.

Miscellaneous changes:  remove LIBQTFILE from CONFIGURE_ENV, it's not
used anymore.  Solve namespace pollution problems with the devel/pth and
devel/libgnugetopt ports.  Hopefully.

Suggested by:	ade, asami, sobomax (bsd.kde.mk)
Repocopied by:	asami (qt22-static --> qt2-static)

1 files changed, 109 insertions, 0 deletions

diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
new file mode 100644
index 000000000000..5981a6e46b96
--- /dev/null
+++ b/Mk/bsd.kde.mk
@@ -0,0 +1,109 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# $FreeBSD$
+#
+# Please view me with 4 column tabs!
+
+# Please make sure all changes to this file are past through the maintainer. 
+# Do not commit them yourself (unless of course you're the Port's Wraith ;).
+KDE_MAINTAINER=		will@FreeBSD.org
+
+.if defined(_POSTMKINCLUDED)
+
+# This section contains the USE_ definitions.
+# XXX: Write HAVE_ definitions sometime.
+
+# USE_QT_VER		- Says that the port uses the Qt toolkit.  A number, currently
+#					  1 or 2, specifies which major version of Qt to use.  This
+#					  implies USE_NEWGCC.
+# USE_KDELIBS_VER	- Says that the port uses KDE libraries.  A number, currently 1
+#					  or 2, specifies which major version of KDE to use.  This
+#					  implies USE_QT of the appropriate version.
+# USE_KDEBASE_VER	- Says that the port uses the KDE base system.  A number,
+#					  currently 1 or 2, specifies which major version of KDE to
+#					  use.  This implies USE_KDELIBS of the appropriate version.
+
+# Compat shims.
+.if defined(USE_QT)
+QT_VER=			1
+pre-everything::
+	@${ECHO} ">>> Warning:  this port needs to be updated as it uses the old-style USE_QT variable!"
+.endif
+.if defined(USE_QT2)
+QT_VER=			2
+pre-everything::
+	@${ECHO} ">>> Warning:  this port needs to be updated as it uses the old-style USE_QT2 variable!"
+.endif
+
+# USE_QT_VER section
+.if defined(USE_QT_VER)
+
+# Qt 1.x common stuff
+.if ${USE_QT_VER} == 1
+LIB_DEPENDS+=	qt.3:${PORTSDIR}/x11-toolkits/qt145
+USE_NEWGCC=		yes
+MOC?=			${X11BASE}/bin/moc
+.if defined(PREFIX)
+QTDIR=			${PREFIX}
+.else
+QTDIR=			${X11BASE}
+.endif
+CONFIGURE_ENV+=	MOC="${MOC}" QTDIR="${QTDIR}"
+
+.else
+
+# Qt 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	qt2.4:${PORTSDIR}/x11-toolkits/qt23
+USE_NEWGCC=		yes
+QTNAME=			qt2
+MOC?=			${X11BASE}/bin/moc2
+CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \
+				--with-qt-libraries=${X11BASE}/lib \
+				--with-extra-libs=${LOCALBASE}/lib
+QTCPPFLAGS=		-I/usr/include -D_GETOPT_H -D_PTH_H_ -D_PTH_PTHREAD_H_ -I${LOCALBASE}/include -I${PREFIX}/include
+QTCFGLIBS=		-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++
+CONFIGURE_ENV+=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
+				CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
+.endif
+.endif
+# End of USE_QT section
+
+# USE_KDELIBS section
+.if defined(USE_KDELIBS_VER)
+
+# kdelibs 1.x common stuff 
+.if ${USE_KDELIBS_VER} == 1
+LIB_DEPENDS+=	kdelibs.3:${PORTSDIR}/x11/kdelibs11
+QT_VER=			1
+
+.else
+
+# kdelibs 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	kdelibs.4:${PORTSDIR}/x11/kdelibs2
+QT_VER=			2
+
+.endif
+.endif
+# End of USE_KDELIBS section
+
+# USE_KDEBASE_VER section
+.if defined(USE_KDEBASE_VER)
+
+# kdebase 1.x common stuff
+.if ${USE_KDEBASE_VER} == 1
+RUN_DEPENDS+=	kcontrol:${PORTSDIR}/x11/kdebase11
+USE_KDELIBS=	1
+
+.else
+
+# kdebase 2.x common stuff -- DEFAULT
+LIB_DEPENDS+=	kparts.4:${PORTSDIR}/x11/kdebase2
+USE_KDELIBS=	2
+
+.endif
+.endif
+# End of USE_KDEBASE_VER
+
+.endif
+# End of use part.