Update to 20000724A (custom-rolled snapshot). Rejoice, because now

Konqueror can load HTML documents, KOffice works semi-well, and KDE2 in
general seems less buggy.  Only kdeutils was left out of this mega-update.
However, it should return soon.  :-)

The massive reduction in patches is mostly the result of using perl
regex replacement.  This reduces the amount of time it will take in the
future to upgrade these ports, and load on the repository.

QT 2.2.0beta0 (aka qt-copy) is officially enabled for the express
purpose of allowing KDE2 to compile.  It is available in the qt22 port.
Additionally, GIF support is re-enabled in both Qt2 ports, so that
people can now read GIF images.  GIF support is enabled through an
internal GIF reader in Qt, and requires no patented libraries.  Special
effort was made to ensure that people do not install both qt21 and qt22
ports at the same time.

I'd like to take a moment to thank the following people for their help:
Alex Zepeda <jazepeda@pacbell.net>, Stephan Kulow <coolo@kde.org>, Harri
Porten <porten@kde.org>, Waldo Bastian <waba@kde.org>, Marc G. Fournier
<scrappy@hub.org>, Arun Sharma <adsharma@sharmas.dhs.org>, Matthias
Hoelzer-Kluepfel <mhk@caldera.de>, and many others.  Over 150 hours of hard
work, testing, etc. were put into this update.  Another couple hundred of
hours were spent by CPUs trying to compile this behemoth.  :->

Special thanks to:	Physics Computer Network @ Purdue staff, especially
			C. Stephen Gunn <csg@physics.purdue.edu>, for giving
			me access to an extremely fast machine for doing
			test builds (it performed 12 full builds of the
			entire suite in the last 7 days).

PR:			18838
Submitted by:		Arun Sharma <adsharma@sharmas.dhs.org>
Approved by:		imura, asami

3 files changed, 25 insertions, 14 deletions

diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 431b31a4ea0a..8bbb85cd7c5d 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -6,18 +6,21 @@
 #
 
 PORTNAME=	kdesupport
-PORTVERSION=	1.90
+PORTVERSION=	20000724A
 CATEGORIES=	converters kde
-MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR=	unstable/distribution/tar/src
+MASTER_SITES=	$(MASTER_SITE_LOCAL)
+MASTER_SITE_SUBDIR=	will
 
 MAINTAINER=	will@FreeBSD.org
 
-BROKEN=		"Does not compile/run properly"
+LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22
 
+WRKSRC=		${WRKDIR}/kdesupport
 MOC=		${X11BASE}/bin/moc2
+SOMAJOR=	8
+SOMINOR=	0
 USE_BZIP2=	yes
-USE_QT2=	yes
+USE_NEWGCC=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
@@ -25,8 +28,20 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-libraries=${X11BASE}/lib \
 		--without-libjpeg --without-libgif \
 		--without-libgdbm --without-libuulib \
-		--without-odbc --without-audiofile
-CONFIGURE_ENV+=	MOC="${MOC}"
+		--without-odbc --without-audiofile \
+		--with-extra-libs=${LOCALBASE}/lib
+CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
 USE_GMAKE=	yes
+PLIST_SUB+=	LIBVER="${SOMAJOR}"
+
+pre-configure:
+	${PERL} -pi -e "s@version-info 2:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/QwSpriteField/Makefile.in
+	${PERL} -pi -e "s@TOPSUBDIRS libaps@TOPSUBDIRS@g" ${WRKSRC}/configure
+	${PERL} -pi -e "s@odbc libaps@odbc@g" ${WRKSRC}/configure
+
+pre-install:
+	@(find ${WRKSRC} -name CVS | xargs rm -rf)
 
 .include <bsd.port.mk>
diff --git a/converters/kdesupport2/distinfo b/converters/kdesupport2/distinfo
index 9bba7474ad3d..687cd0a0de93 100644
--- a/converters/kdesupport2/distinfo
+++ b/converters/kdesupport2/distinfo
@@ -1 +1 @@
-MD5 (kdesupport-1.90.tar.bz2) = 884a602ec84fb40a840e1dc8403d5db4
+MD5 (kdesupport-20000724A.tar.bz2) = b92d434814d10c1698dbe9d366172a43
diff --git a/converters/kdesupport2/pkg-plist b/converters/kdesupport2/pkg-plist
index ced6e23cbf13..c37abc88b2e0 100644
--- a/converters/kdesupport2/pkg-plist
+++ b/converters/kdesupport2/pkg-plist
@@ -39,9 +39,5 @@ include/mimelib/uuencode.h
 lib/libQwSpriteField.la
 lib/libQwSpriteField.so.8
 lib/libmimelib.la
-lib/libmimelib.so.3
-@exec ln -sf libQwSpriteField.so.7 %D/lib/libQwSpriteField.so
-@exec ln -sf libmimelib.so.3 %D/lib/libmimelib.so
-@dirrm include/mimelib
-@unexec rm -f %D/lib/libQwSpriteField.so
-@unexec rm -f %D/lib/libmimelib.so
+lib/libmimelib.so.1
+include/mimelib