Upgrade to 2.2

4 files changed, 198 insertions, 90 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 3b06da174db1..72c63c1aab91 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -6,18 +6,21 @@
 #
 
 PORTNAME=	kdesdk
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 
 MAINTAINER=	demon@FreeBSD.org
 
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db
+
 USE_KDELIBS_VER=2
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde2
 
 MAN1=		cvs2pack.1 cvschanged.1 cvsversion.1 noncvslist.1 kde-build.1
 
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 90f79f155763..ccbf697231f8 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1 +1 @@
-MD5 (kdesdk-2.1.1.tar.bz2) = ee4222d6bdfa360729a26d3bda9c41d7
+MD5 (kdesdk-2.2.tar.bz2) = 7ae52640da283661b8ba1336b341817c
diff --git a/devel/kdesdk3/files/patch-aa b/devel/kdesdk3/files/patch-aa
new file mode 100644
index 000000000000..2d65987e5766
--- /dev/null
+++ b/devel/kdesdk3/files/patch-aa
@@ -0,0 +1,27 @@
+--- kbabel/common/libgettext/xmalloc.c.orig	Tue Aug 21 11:08:13 2001
++++ kbabel/common/libgettext/xmalloc.c	Tue Aug 21 11:09:28 2001
+@@ -26,6 +26,7 @@
+ #endif
+ 
+ #include <sys/types.h>
++#include <err.h>
+ 
+ #if STDC_HEADERS
+ # include <stdlib.h>
+@@ -61,7 +62,6 @@
+    The caller may set it to some other value.  */
+ int xmalloc_exit_failure = EXIT_FAILURE;
+ 
+-void error (int, int, const char *, ...);
+ 
+ static VOID *
+ fixup_null_alloc (n)
+@@ -73,7 +73,7 @@
+   if (n == 0)
+     p = malloc ((size_t) 1);
+   if (p == 0)
+-    error (xmalloc_exit_failure, 0, _("Memory exhausted"));
++    err (xmalloc_exit_failure, "Memory exhausted");
+   return p;
+ }
+ 
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 0ef0704b35c2..1ac257f64367 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -1,8 +1,4 @@
-bin/kbabeldict
-bin/kbabel
-bin/extractmsg
-bin/kless
-bin/kstartperf
+bin/adddebug
 bin/create_makefile
 bin/create_makefiles
 bin/cvs2pack
@@ -12,69 +8,156 @@ bin/cvslastlog
 bin/cvsversion
 bin/cxxmetric
 bin/extend_dmalloc
+bin/extractmsg
+bin/extractrc
+bin/fixsgml
 bin/gendebug
+bin/includemocs
+bin/kbabel
+bin/kbabeldict
+bin/kde-build
 bin/kdedoc
-bin/qtdoc
+bin/kdekillall
 bin/kdelnk2desktop.py
+bin/kless
+bin/kstartperf
 bin/licensecheck
-bin/adddebug
-bin/pruneemptydirs
+bin/makeobj
 bin/noncvslist
-bin/kde-build
-bin/kdekillall
+bin/po2xml
+bin/pruneemptydirs
+bin/qtdoc
+bin/split2po
+bin/swappo
+bin/xml2pot
 include/kbabel/catalog.h
 include/kbabel/catalogitem.h
-include/kbabel/editcmd.h
-include/kbabel/msgfmt.h
 include/kbabel/catalogsettings.h
-include/kbabel/findoptions.h
 include/kbabel/catalogview.h
-include/kbabel/tagextractor.h
-include/kbabel/searchengine.h
+include/kbabel/dictchooser.h
+include/kbabel/dictionarymenu.h
+include/kbabel/editcmd.h
+include/kbabel/findoptions.h
 include/kbabel/kbabeldictbox.h
 include/kbabel/kbabeldictiface.h
-include/kbabel/dictionarymenu.h
-include/kbabel/dictchooser.h
-lib/kde2/libpocompendium.so
-lib/kde2/libpocompendium.la
-lib/kde2/libpoauxiliary.so
+include/kbabel/msgfmt.h
+include/kbabel/searchengine.h
+include/kbabel/tagextractor.h
+include/kspy.h
+lib/kde2/libdbsearchengine.la
+lib/kde2/libdbsearchengine.so
 lib/kde2/libpoauxiliary.la
-lib/libkbabelcommon.so.1
-lib/libkbabelcommon.so
+lib/kde2/libpoauxiliary.so
+lib/kde2/libpocompendium.la
+lib/kde2/libpocompendium.so
+lib/kde2/pothumbnail.la
+lib/kde2/pothumbnail.so
+lib/libkbabel.la
+lib/libkbabel.so
+lib/libkbabel.so.1
 lib/libkbabelcommon.la
-lib/libkbabeldict.so.1
-lib/libkbabeldict.so
+lib/libkbabelcommon.so
+lib/libkbabelcommon.so.1
 lib/libkbabeldict.la
-lib/libkbabeldictplugin.so.1
-lib/libkbabeldictplugin.so
+lib/libkbabeldict.so
+lib/libkbabeldict.so.1
 lib/libkbabeldictplugin.la
-lib/libkbabel.so.1
-lib/libkbabel.so
-lib/libkbabel.la
-lib/libkstartperf.so.1
-lib/libkstartperf.so
+lib/libkbabeldictplugin.so
+lib/libkbabeldictplugin.so.1
+lib/libkspy.la
+lib/libkspy.so
+lib/libkspy.so.1
 lib/libkstartperf.la
-share/doc/HTML/en/kbabel/.anchors
-share/doc/HTML/en/kbabel/commands.html
-share/doc/HTML/en/kbabel/compilation.html
-share/doc/HTML/en/kbabel/credits.html
-share/doc/HTML/en/kbabel/faq.html
-share/doc/HTML/en/kbabel/glossary.html
-share/doc/HTML/en/kbabel/index.html
-share/doc/HTML/en/kbabel/installation.html
-share/doc/HTML/en/kbabel/introduction.html
-share/doc/HTML/en/kbabel/kbabel-toolbars.html
-share/doc/HTML/en/kbabel/preferences-catalogmanager.html
-share/doc/HTML/en/kbabel/preferences-editor.html
-share/doc/HTML/en/kbabel/preferences-miscellaneous.html
-share/doc/HTML/en/kbabel/preferences-save.html
-share/doc/HTML/en/kbabel/preferences-search.html
-share/doc/HTML/en/kbabel/preferences.html
-share/doc/HTML/en/kbabel/requirements.html
-share/doc/HTML/en/kbabel/using-catalogmanager.html
-share/doc/HTML/en/kbabel/using-editor.html
-share/doc/HTML/en/kbabel/using-kbabel.html
-share/doc/HTML/en/kbabel/common
+lib/libkstartperf.so
+lib/libkstartperf.so.1
+share/applnk/Development/kbabel.desktop
+share/applnk/Development/kbabeldict.desktop
+share/applnk/Utilities/kless.desktop
+share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
+share/apps/kbabel/icons/hicolor/16x16/actions/diff.png
+share/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
+share/apps/kbabel/icons/hicolor/16x16/actions/msgid2msgstr.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nexterror.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzy.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nextuntranslated.png
+share/apps/kbabel/icons/hicolor/16x16/actions/preverror.png
+share/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzy.png
+share/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/16x16/actions/prevuntranslated.png
+share/apps/kbabel/icons/hicolor/16x16/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
+share/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
+share/apps/kbabel/icons/hicolor/22x22/actions/diff.png
+share/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
+share/apps/kbabel/icons/hicolor/22x22/actions/msgid2msgstr.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nexterror.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzy.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nextuntranslated.png
+share/apps/kbabel/icons/hicolor/22x22/actions/preverror.png
+share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzy.png
+share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/22x22/actions/prevuntranslated.png
+share/apps/kbabel/icons/hicolor/22x22/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
+share/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
+share/apps/kbabel/icons/hicolor/32x32/actions/diff.png
+share/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
+share/apps/kbabel/icons/hicolor/32x32/actions/msgid2msgstr.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nexterror.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzy.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nextuntranslated.png
+share/apps/kbabel/icons/hicolor/32x32/actions/preverror.png
+share/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzy.png
+share/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/32x32/actions/prevuntranslated.png
+share/apps/kbabel/icons/hicolor/32x32/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
+share/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
+share/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
+share/apps/kbabel/icons/locolor/16x16/actions/diff.png
+share/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
+share/apps/kbabel/icons/locolor/16x16/actions/msgid2msgstr.png
+share/apps/kbabel/icons/locolor/16x16/actions/nexterror.png
+share/apps/kbabel/icons/locolor/16x16/actions/nextfuzzy.png
+share/apps/kbabel/icons/locolor/16x16/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/16x16/actions/nextuntranslated.png
+share/apps/kbabel/icons/locolor/16x16/actions/preverror.png
+share/apps/kbabel/icons/locolor/16x16/actions/prevfuzzy.png
+share/apps/kbabel/icons/locolor/16x16/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/16x16/actions/prevuntranslated.png
+share/apps/kbabel/icons/locolor/16x16/actions/search2msgstr.png
+share/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
+share/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
+share/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
+share/apps/kbabel/icons/locolor/32x32/actions/diff.png
+share/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
+share/apps/kbabel/icons/locolor/32x32/actions/msgid2msgstr.png
+share/apps/kbabel/icons/locolor/32x32/actions/nexterror.png
+share/apps/kbabel/icons/locolor/32x32/actions/nextfuzzy.png
+share/apps/kbabel/icons/locolor/32x32/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/32x32/actions/nextuntranslated.png
+share/apps/kbabel/icons/locolor/32x32/actions/preverror.png
+share/apps/kbabel/icons/locolor/32x32/actions/prevfuzzy.png
+share/apps/kbabel/icons/locolor/32x32/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/32x32/actions/prevuntranslated.png
+share/apps/kbabel/icons/locolor/32x32/actions/search2msgstr.png
+share/apps/kbabel/icons/locolor/32x32/actions/transsearch.png
+share/apps/kbabel/kbabelui.rc
+share/apps/kbabel/pics/broken.png
+share/apps/kbabel/pics/missing.png
+share/apps/kbabel/pics/needwork.png
+share/apps/kbabel/pics/ok.png
+share/apps/kbabel/pics/pref_identity.png
+share/apps/kbabel/pics/splash.png
+share/apps/kbabeldict/modules/dbsearchengine.rc
+share/apps/kbabeldict/modules/poauxiliary.rc
+share/apps/kbabeldict/modules/pocompendium.rc
 share/doc/HTML/en/kbabel/back.png
 share/doc/HTML/en/kbabel/bottom.png
 share/doc/HTML/en/kbabel/catalogmanager.png
@@ -84,6 +167,7 @@ share/doc/HTML/en/kbabel/catalogmanager_needwork.png
 share/doc/HTML/en/kbabel/catalogmanager_nopot.png
 share/doc/HTML/en/kbabel/catalogmanager_nopot_ok.png
 share/doc/HTML/en/kbabel/catalogmanager_ok.png
+share/doc/HTML/en/kbabel/common
 share/doc/HTML/en/kbabel/editcopy.png
 share/doc/HTML/en/kbabel/editcut.png
 share/doc/HTML/en/kbabel/editpaste.png
@@ -91,6 +175,7 @@ share/doc/HTML/en/kbabel/fileopen.png
 share/doc/HTML/en/kbabel/filesave.png
 share/doc/HTML/en/kbabel/find.png
 share/doc/HTML/en/kbabel/forward.png
+share/doc/HTML/en/kbabel/index.cache.bz2
 share/doc/HTML/en/kbabel/index.docbook
 share/doc/HTML/en/kbabel/insert_tag.png
 share/doc/HTML/en/kbabel/missing.png
@@ -116,51 +201,44 @@ share/doc/HTML/en/kbabel/stop.png
 share/doc/HTML/en/kbabel/top.png
 share/doc/HTML/en/kbabel/transsearch.png
 share/doc/HTML/en/kbabel/undo.png
-share/apps/kbabeldict/modules/pocompendium.rc
-share/apps/kbabeldict/modules/poauxiliary.rc
-share/apps/kbabel/pics/broken.png
-share/apps/kbabel/pics/missing.png
-share/apps/kbabel/pics/needwork.png
-share/apps/kbabel/pics/ok.png
-share/apps/kbabel/pics/pref_editor.png
-share/apps/kbabel/pics/pref_identity.png
-share/apps/kbabel/pics/pref_save.png
-share/apps/kbabel/pics/pref_catalogmanager.png
-share/apps/kbabel/pics/splash.png
-share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
-share/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
-share/apps/kbabel/icons/hicolor/22x22/actions/msgid2msgstr.png
-share/apps/kbabel/icons/hicolor/22x22/actions/nexterror.png
-share/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzy.png
-share/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzyuntrans.png
-share/apps/kbabel/icons/hicolor/22x22/actions/nextuntranslated.png
-share/apps/kbabel/icons/hicolor/22x22/actions/preverror.png
-share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzy.png
-share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
-share/apps/kbabel/icons/hicolor/22x22/actions/prevuntranslated.png
-share/apps/kbabel/icons/hicolor/22x22/actions/search2msgstr.png
-share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
-share/apps/kbabel/kbabelui.rc
-share/mimelnk/application/x-gettext.desktop
-share/icons/locolor/16x16/mimetypes/gettext.png
+share/doc/HTML/en/markup/common
+share/doc/HTML/en/markup/index.cache.bz2
+share/doc/HTML/en/markup/index.docbook
+share/icons/hicolor/16x16/apps/kbabel.png
+share/icons/hicolor/16x16/apps/kbabeldict.png
+share/icons/hicolor/16x16/mimetypes/gettext.png
+share/icons/hicolor/32x32/apps/kbabel.png
+share/icons/hicolor/32x32/apps/kbabeldict.png
+share/icons/hicolor/32x32/mimetypes/gettext.png
+share/icons/hicolor/48x48/apps/kbabel.png
+share/icons/hicolor/48x48/mimetypes/gettext.png
 share/icons/locolor/16x16/apps/kbabel.png
+share/icons/locolor/16x16/apps/kbabeldict.png
 share/icons/locolor/16x16/apps/kless.png
-share/icons/locolor/32x32/mimetypes/gettext.png
+share/icons/locolor/16x16/mimetypes/gettext.png
 share/icons/locolor/32x32/apps/kbabel.png
+share/icons/locolor/32x32/apps/kbabeldict.png
 share/icons/locolor/32x32/apps/kless.png
-share/icons/hicolor/32x32/mimetypes/gettext.png
-share/icons/hicolor/48x48/mimetypes/gettext.png
-share/icons/hicolor/16x16/mimetypes/gettext.png
-share/applnk/Utilities/kless.desktop
-share/applnk/Development/kbabeldict.desktop
-share/applnk/Development/kbabel.desktop
-@dirrm include/kbabel
+share/icons/locolor/32x32/mimetypes/gettext.png
+share/mimelnk/application/x-gettext.desktop
+share/services/pothumbnail.desktop
+@dirrm share/doc/HTML/en/markup
 @dirrm share/doc/HTML/en/kbabel
 @dirrm share/apps/kbabeldict/modules
 @dirrm share/apps/kbabeldict
 @dirrm share/apps/kbabel/pics
+@dirrm share/apps/kbabel/icons/locolor/32x32/actions
+@dirrm share/apps/kbabel/icons/locolor/32x32
+@dirrm share/apps/kbabel/icons/locolor/16x16/actions
+@dirrm share/apps/kbabel/icons/locolor/16x16
+@dirrm share/apps/kbabel/icons/locolor
+@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
+@dirrm share/apps/kbabel/icons/hicolor/32x32
 @dirrm share/apps/kbabel/icons/hicolor/22x22/actions
 @dirrm share/apps/kbabel/icons/hicolor/22x22
+@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
+@dirrm share/apps/kbabel/icons/hicolor/16x16
 @dirrm share/apps/kbabel/icons/hicolor
 @dirrm share/apps/kbabel/icons
 @dirrm share/apps/kbabel
+@dirrm include/kbabel