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

4 files changed, 33 insertions, 23 deletions

diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile
index aa72e178e62a..b864145c4553 100644
--- a/textproc/kdoc/Makefile
+++ b/textproc/kdoc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdoc
-PORTVERSION=	2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	textproc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -15,16 +15,13 @@ MAINTAINER=	demon@FreeBSD.org
 
 USE_BZIP2=	yes
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 500007
-BROKEN=		"Requires Perl version 5.6.0"
-.endif
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		kdoc.1 qt2kdoc.1 makekdedoc.1
+
 pre-configure:
-	${PERL} -pi -e "s#share/kdoc#lib/perl5/site_perl/${PERL_VER}#" ${WRKSRC}/Makefile.in
+	${PERL} -pi -e "s#share/kdoc#lib/perl5/site_perl/${PERL_VER}#" \
+		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/kdoc/distinfo b/textproc/kdoc/distinfo
index 74eed6aff11a..e99414a429af 100644
--- a/textproc/kdoc/distinfo
+++ b/textproc/kdoc/distinfo
@@ -1 +1 @@
-MD5 (kdoc-2.1.tar.bz2) = 7a485b33aa7e460381462a33a28b6302
+MD5 (kdoc-2.2.2.tar.bz2) = 8837d2c767c8043bc7e526b75be79561
diff --git a/textproc/kdoc/files/patch-findperl b/textproc/kdoc/files/patch-findperl
new file mode 100644
index 000000000000..9bf58fa3f3b7
--- /dev/null
+++ b/textproc/kdoc/files/patch-findperl
@@ -0,0 +1,11 @@
+--- findperl	Sun Feb 18 10:46:08 2001
++++ findperl.new	Fri Nov 30 18:26:10 2001
+@@ -6,7 +6,7 @@
+ do
+ 	if [ -x $p/perl ]
+ 	then
+-		if $p/perl -e 'require 5.6.0;' 
++		if $p/perl -e 'require 5.005;' 
+ 		then
+ 			echo $p/perl > perlbin
+ 			exit 0
diff --git a/textproc/kdoc/pkg-plist b/textproc/kdoc/pkg-plist
index 214a6341c700..4dcc50ab6555 100644
--- a/textproc/kdoc/pkg-plist
+++ b/textproc/kdoc/pkg-plist
@@ -1,23 +1,25 @@
 bin/kdoc
-bin/qt2kdoc
 bin/makekdedoc
-lib/perl5/site_perl/%%PERL_VER%%/kdocUtil.pm
+bin/qt2kdoc
+lib/perl5/site_perl/%%PERL_VER%%/Ast.pm
+lib/perl5/site_perl/%%PERL_VER%%/Iter.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocAstGen.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocAstSearch.pm
 lib/perl5/site_perl/%%PERL_VER%%/kdocAstUtil.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocParseDoc.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocCxxDocbook.pm
 lib/perl5/site_perl/%%PERL_VER%%/kdocCxxHTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocLib.pm
-lib/perl5/site_perl/%%PERL_VER%%/Ast.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocIDLhtml.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocHTMLutil.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdoctexi.pm
 lib/perl5/site_perl/%%PERL_VER%%/kdocCxxLaTeX.pm
 lib/perl5/site_perl/%%PERL_VER%%/kdocDocHelper.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocCxxDocbook.pm
-lib/perl5/site_perl/%%PERL_VER%%/Iter.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocMan.pm
 lib/perl5/site_perl/%%PERL_VER%%/kdocDocIter.pm
-lib/perl5/site_perl/%%PERL_VER%%/kdocAstGen.pm
-share/doc/kdoc/index.docbook
+lib/perl5/site_perl/%%PERL_VER%%/kdocHTMLutil.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocLib.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocMan.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocParseCxx.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocParseDoc.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocParsePy.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocParser.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdocUtil.pm
+lib/perl5/site_perl/%%PERL_VER%%/kdoctexi.pm
 share/doc/kdoc/README
+share/doc/kdoc/index.docbook
 @dirrm share/doc/kdoc