Upgrade KDE to 2.2.2:

 * General:
 	- Support for objprelink.
 	- Hack for autoconf 2.13/automake 1.4.  Note that we can't use
	  the standard USE_AUTO* because they change things in work/*;
	  KDE has its own way of doing that.
 	- Light cleanup of extra dirs in the PLISTs provided by
	   my mkplistpkg[1] script.
 	- Speedups of both compile and runtime through the usage of
	  --disable-debug and --enable-final.  The latter did not work
	  with the kdemultimedia package, unfortunately.
	- Patch updates.
 * audio/kdemultimedia2:
	- Patch to fix KSCD on FreeBSD[2].  It works very well now.
 * deskutils/kdepim:
 	- Enable kpilot[3].  Pull in the latest pilot-link stuff.
 * devel/kdesdk,
 * devel/kdevelop:
 	- No specific changes.
 * devel/qt-designer:
 	- Make this port depend almost entirely on qt23 to make it more
	  maintainable, so I don't have to keep hacking the patches to
	  get them to apply.
 * editors/koffice,
 * games/kdegames,
 * graphics/kdegraphics:
 	- No specific changes.
 * misc/kdeaddons:
	- SDL is required now.  Cull SDL PLIST_SUB and such.
	- Fix breakage from hardcoding "sdl-config".
 * misc/kdeutils2:
	- Fix problem with klaptopdaemon[4] where it didn't properly
	  display the battery time.  This patch is untested, but applied.
 * net/kdenetwork2:
	- Fix DCC for KSIRC[5].
	- Remove ktalkd from the build.  It requires some weird thing
	  in the configure script that I don't have time to look at.
 * sysutils/kdeadmin:
	- No specific changes.
 * textproc/kdoc:
	- Remove bogus requirement that kdoc requires Perl 5.6.0; it sure
	  seems to operate fine with >= 5.005.  But I'll let time tell.
 * www/quanta:
	- No specific changes (--disable-debug support only).
 * x11/kde2:
	- No specific changes.
 * x11/kdebase2:
	- Fix ksysguard compile by merging the files from the HEAD branch
	  of KDE CVS that were missing at release time for FreeBSD[6].  :\
 * x11/kdelibs2:
	- Recognize CUPS' spinoff[7].
	- Add libxslt dependency since it was removed from kdelibs.
	- Fix libxml compile problems[8] (accomplished by upgrading).
	- Remove libkformula from port Makefile; this library has been
	  spun off into koffice.
	- Fix mode problems with DCOP[9].  This allows you to save files
	  properly.  It also seems to be a FreeBSD specific problem.
	- Fix bashisms in kdeprint/imagetops script[10].
 * x11-clocks/kdetoys2:
 	- No specific changes.
 * x11-toolkits/qt23:
	- Do NOT upgrade to QT 2.3.2[11].
	- Allow devel/qt-designer to depend on this port entirely for the
	  patches by adding a perlre to accomplish this.
 * x11-wm/kdeartwork:
	- No specific changes.

Thanks to the FreeBSD/KDE[1] team[12] who helped me test these out!

[1]  http://freebsd.kde.org/;
     http://www.databits.net/cgi-bin/cvsweb.cgi/scripts/portbuild/mkplistpkg
[2]  Submitted by:	Matthew Holmes <matt@speakeasy.net>
[3]  PR:		31914
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[4]  PR:		28475
     Submitted by:	Arun Sharma <arun@sharmas.dhs.org>
[5]  Submitted by:	Luc Morin <luc_m@videotron.ca>
[6]  Found at:	http://webcvs.kde.org/kdebase/ksysguard/ksysguardd/FreeBSD/
[7]  PR:		32321
     Reported by:	gad
     Submitted by:	James A. Halstead <jah4007@cs.rit.edu>
[8]  PR:		32055
     Reported by:	William Richard <wrichard@trivalley.com>, others
[9]  PR:		31629
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[10] PR:		32358
     Submitted by:	Alexander N. Kabaev <ak03@gte.com>
[11] PR:		31809
     Requested by:	Nathan Ahlstrom <nrahlstr@winternet.com> (denied)
[12] http://freebsd.kde.org/contact.shtml;
     http://lists.csociety.org/pipermail/kde-freebsd;
     http://lists.csociety.org/listinfo/kde-freebsd

5 files changed, 99 insertions, 39 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2fe7dd86c537..0db309ff14e8 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES?=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -14,12 +14,16 @@ DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
 
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
+		autoconf213:${PORTSDIR}/devel/autoconf213 \
+		objprelink:${PORTSDIR}/devel/objprelink
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		fam.0:${PORTSDIR}/devel/fam \
-		cups.2:${PORTSDIR}/print/cups \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		pcre.0:${PORTSDIR}/devel/pcre
+		pcre.0:${PORTSDIR}/devel/pcre \
+		cups.2:${PORTSDIR}/print/cups-base \
+		xslt.1:${PORTSDIR}/textproc/libxslt
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
@@ -32,7 +36,13 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \
-		--disable-final
+		--enable-objprelink
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_FINAL)
+CONFIGURE_ARGS+=--enable-final
+.endif
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
 
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS=		-O0 ${KDE_CFLAGS}
@@ -68,6 +78,15 @@ pre-extract:
 .endif
 
 pre-configure:
+	${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+	cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
+		${GMAKE} -f Makefile.cvs
 	${PERL} -pi -e "s@-O2@-O0@g; s@\"-lfam@\"-L${LOCALBASE}/lib -lfam@g" ${WRKSRC}/configure
 	${PERL} -pi -e "s@kspell api@@g" ${WRKSRC}/doc/Makefile.in
 	(find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi.orig -e \
@@ -80,8 +99,8 @@ post-configure:
 post-install:
 	${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh > ${PREFIX}/etc/rc.d/kdelibs.sh
 	${CHMOD} 755 ${PREFIX}/etc/rc.d/kdelibs.sh
-.for LIB in DCOP kab kdecore kdesu kdeui kfile kformula kio kjs \
-	    kparts kspell ksycoca kjava
+.for LIB in DCOP kab kdecore kdesu kdeui kfile kio kjs kparts kspell \
+	    ksycoca kjava
 	@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${SOMAJOR} ${PREFIX}/lib/lib${LIB}.so
 .endfor
 .for LIB in artsc artsflow artsflow_idl kmid kmedia2_idl qtmcop soundserver_idl
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 0fe3f4482c9a..ebfd9d6443b2 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f
+MD5 (KDE/kdelibs-2.2.2.tar.bz2) = 51ec17dce9c62b50a3c2e97e4511cdcf
diff --git a/x11/kdelibs4/files/patch-kdeprint::imagetops b/x11/kdelibs4/files/patch-kdeprint::imagetops
new file mode 100644
index 000000000000..518e0b981e59
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdeprint::imagetops
@@ -0,0 +1,25 @@
+--- kdeprint/filters/imagetops.orig	Wed Nov 28 12:25:21 2001
++++ kdeprint/filters/imagetops	Wed Nov 28 12:29:50 2001
+@@ -27,11 +27,17 @@
+ # check the file mime type, and set the command correspondingly
+ cmd=
+ magic=`file -bi $FILE`
+-if [[ $magic != image/* ]] ; then
+-	echo "Not an image"
+-	exit 1;
+-fi
+-case ${magic/image\//} in
++
++case $magic in
++	image/*)
++		;;
++	*)
++		echo "Not an image"
++		exit 1;
++		;;
++esac
++
++case ${magic##image\/} in
+ 	jpeg)
+ 		cmd="djpeg -pnm"
+ 		;;
diff --git a/x11/kdelibs4/files/patch-kio::job.cpp b/x11/kdelibs4/files/patch-kio::job.cpp
new file mode 100644
index 000000000000..113a0eb1a13e
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kio::job.cpp
@@ -0,0 +1,11 @@
+--- kio/job.cpp.20011019	Fri Oct 19 16:09:57 2001
++++ kio/job.cpp	Tue Oct 30 21:49:15 2001
+@@ -2472,7 +2472,7 @@
+             // But for files coming from TAR, we want to preserve permissions -> we use default perms only if from remote
+             // The real fix would be KProtocolInfo::inputType(protocol) == T_FILESYSTEM, but we can't access ksycoca from here !
+             bool remoteSource = !(*it).uSource.isLocalFile() && ((*it).uSource.protocol() != "tar"); // HACK
+-            mode_t permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? (mode_t)-1 : (*it).permissions;
++            int permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? -1 : (*it).permissions;
+             KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ );
+             copyJob->setSourceSize( (*it).size );
+             newjob = copyJob;
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 990f3f257b84..db707e19d87e 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -1,4 +1,3 @@
-@exec %%LDCONFIG%% -m %D/lib/kde2
 bin/artsc-config
 bin/artscat
 bin/artsd
@@ -156,6 +155,7 @@ include/kallocator.h
 include/kalphapainter.h
 include/kanimwidget.h
 include/kapp.h
+include/kapplication.h
 include/karrowbutton.h
 include/kasyncio.h
 include/kaudioplayer.h
@@ -407,6 +407,7 @@ include/ksslpkcs12.h
 include/ksslsettings.h
 include/ksslutils.h
 include/ksslx509map.h
+include/kstandarddirs.h
 include/kstartupinfo.h
 include/kstaticdeleter.h
 include/kstatusbar.h
@@ -433,6 +434,7 @@ include/ktoolbarbutton.h
 include/ktoolbarradiogroup.h
 include/ktrader.h
 include/kuniqueapp.h
+include/kuniqueapplication.h
 include/kunload.h
 include/kurifilter.h
 include/kurl.h
@@ -578,6 +580,8 @@ lib/libkab.so.4
 lib/libkdecore.la
 lib/libkdecore.so
 lib/libkdecore.so.4
+lib/libkded_kssld.la
+lib/libkded_kssld.so
 lib/libkdefakes.la
 lib/libkdefakes.so
 lib/libkdefakes.so.4
@@ -596,7 +600,6 @@ lib/libkdeui.so.4
 lib/libkfile.la
 lib/libkfile.so
 lib/libkfile.so.4
-lib/libkformula.so
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.4
@@ -1009,20 +1012,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/nl/lang.entities
 share/apps/ksgmltools2/customization/nl/strings.entities
 share/apps/ksgmltools2/customization/nl/user.entities
-share/apps/ksgmltools2/customization/no/catalog
-share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/no/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/no/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/no/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/no/lang.entities
-share/apps/ksgmltools2/customization/no/strings.entities
-share/apps/ksgmltools2/customization/no/user.entities
 share/apps/ksgmltools2/customization/no-NY/catalog
 share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
@@ -1037,6 +1026,20 @@ share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/no-NY/lang.entities
 share/apps/ksgmltools2/customization/no-NY/strings.entities
 share/apps/ksgmltools2/customization/no-NY/user.entities
+share/apps/ksgmltools2/customization/no/catalog
+share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/no/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/no/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/no/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/no/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/no/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/no/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/no/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/no/lang.entities
+share/apps/ksgmltools2/customization/no/strings.entities
+share/apps/ksgmltools2/customization/no/user.entities
 share/apps/ksgmltools2/customization/pl/catalog
 share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
@@ -1051,20 +1054,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/pl/lang.entities
 share/apps/ksgmltools2/customization/pl/strings.entities
 share/apps/ksgmltools2/customization/pl/user.entities
-share/apps/ksgmltools2/customization/pt/catalog
-share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/pt/lang.entities
-share/apps/ksgmltools2/customization/pt/strings.entities
-share/apps/ksgmltools2/customization/pt/user.entities
 share/apps/ksgmltools2/customization/pt-BR/catalog
 share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
@@ -1079,6 +1068,20 @@ share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/pt-BR/lang.entities
 share/apps/ksgmltools2/customization/pt-BR/strings.entities
 share/apps/ksgmltools2/customization/pt-BR/user.entities
+share/apps/ksgmltools2/customization/pt/catalog
+share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/pt/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/pt/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/pt/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/pt/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/pt/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/pt/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/pt/lang.entities
+share/apps/ksgmltools2/customization/pt/strings.entities
+share/apps/ksgmltools2/customization/pt/user.entities
 share/apps/ksgmltools2/customization/ro/catalog
 share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook
@@ -1295,6 +1298,7 @@ share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/sv.xml
 share/apps/ksgmltools2/docbook/xsl/common/titles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/tr.xml
+share/apps/ksgmltools2/docbook/xsl/common/xh.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml
 share/apps/ksgmltools2/docbook/xsl/html/ChangeLog
@@ -2585,6 +2589,7 @@ share/services/kaclplugin.desktop
 share/services/kbzip2filter.desktop
 share/services/kcookiejar.desktop
 share/services/kded/kdeprintd.desktop
+share/services/kded/kssld.desktop
 share/services/kgzipfilter.desktop
 share/services/khtml.desktop
 share/services/khtmlimage.desktop
@@ -2687,15 +2692,15 @@ share/servicetypes/kurifilterplugin.desktop
 @dirrm share/apps/ksgmltools2/customization/ru
 @dirrm share/apps/ksgmltools2/customization/ro/entities
 @dirrm share/apps/ksgmltools2/customization/ro
+@dirrm share/apps/ksgmltools2/customization/pt/entities
 @dirrm share/apps/ksgmltools2/customization/pt-BR/entities
 @dirrm share/apps/ksgmltools2/customization/pt-BR
-@dirrm share/apps/ksgmltools2/customization/pt/entities
 @dirrm share/apps/ksgmltools2/customization/pt
 @dirrm share/apps/ksgmltools2/customization/pl/entities
 @dirrm share/apps/ksgmltools2/customization/pl
+@dirrm share/apps/ksgmltools2/customization/no/entities
 @dirrm share/apps/ksgmltools2/customization/no-NY/entities
 @dirrm share/apps/ksgmltools2/customization/no-NY
-@dirrm share/apps/ksgmltools2/customization/no/entities
 @dirrm share/apps/ksgmltools2/customization/no
 @dirrm share/apps/ksgmltools2/customization/nl/entities
 @dirrm share/apps/ksgmltools2/customization/nl