Make this build.

4 files changed, 133 insertions, 42 deletions

diff --git a/devel/kdesdk2/Makefile b/devel/kdesdk2/Makefile
index 42e24ef2561..7c765f5472e 100644
--- a/devel/kdesdk2/Makefile
+++ b/devel/kdesdk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/15 22:45:57 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/18 09:08:05 skrll Exp $
 #
 
 DISTNAME=	kdesdk-2.2.1
@@ -9,8 +9,6 @@ COMMENT=	Support applications and tools used by KDE developers
 DEPENDS+=	kdebase-2.2.1:../../x11/kdebase2
 DEPENDS+=	db-2.7.7:../../databases/db
 
-BROKEN=		Needs looking into.
-
 .include "../../x11/kde2/Makefile.part2"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdesdk2/distinfo b/devel/kdesdk2/distinfo
index bf984d63625..bc869b331eb 100644
--- a/devel/kdesdk2/distinfo
+++ b/devel/kdesdk2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/10/15 22:45:57 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/10/18 09:08:06 skrll Exp $
 
 SHA1 (kdesdk-2.2.1.tar.bz2) = 02fc109eb5e30538c9bfcd385bd52675c342aee0
 Size (kdesdk-2.2.1.tar.bz2) = 1077979 bytes
 SHA1 (patch-aa) = 769ed077dedc4fef0c3fbcfaa34f2e8d9c282c00
+SHA1 (patch-ab) = 7de80906c1240bd92202609c09237639657bc712
diff --git a/devel/kdesdk2/patches/patch-ab b/devel/kdesdk2/patches/patch-ab
new file mode 100644
index 00000000000..23839756edf
--- /dev/null
+++ b/devel/kdesdk2/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2001/10/18 09:08:07 skrll Exp $
+
+--- kbabel/common/libgettext/xmalloc.c.orig	Mon Apr  9 14:30:55 2001
++++ kbabel/common/libgettext/xmalloc.c
+@@ -61,7 +61,11 @@
+    The caller may set it to some other value.  */
+ int xmalloc_exit_failure = EXIT_FAILURE;
+ 
++#ifdef __NetBSD__
++#include <err.h>
++#else
+ void error (int, int, const char *, ...);
++#endif
+ 
+ static VOID *
+ fixup_null_alloc (n)
+@@ -73,7 +77,11 @@
+   if (n == 0)
+     p = malloc ((size_t) 1);
+   if (p == 0)
++#ifdef __NetBSD__
++    err(xmalloc_exit_failure, _("Memory exhausted"));
++#else
+     error (xmalloc_exit_failure, 0, _("Memory exhausted"));
++#endif
+   return p;
+ }
+ 
diff --git a/devel/kdesdk2/pkg/PLIST b/devel/kdesdk2/pkg/PLIST
index 939cb23e903..e1b32052cc3 100644
--- a/devel/kdesdk2/pkg/PLIST
+++ b/devel/kdesdk2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 17:38:02 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/10/18 09:08:08 skrll Exp $
 bin/adddebug
 bin/create_makefile
 bin/create_makefiles
@@ -10,7 +10,10 @@ bin/cvsversion
 bin/cxxmetric
 bin/extend_dmalloc
 bin/extractmsg
+bin/extractrc
+bin/fixsgml
 bin/gendebug
+bin/includemocs
 bin/kbabel
 bin/kbabeldict
 bin/kde-build
@@ -20,9 +23,14 @@ bin/kdelnk2desktop.py
 bin/kless
 bin/kstartperf
 bin/licensecheck
+bin/makeobj
 bin/noncvslist
+bin/po2xml
 bin/pruneemptydirs
 bin/qtdoc
+bin/split2po
+bin/swappo
+bin/xml2pot
 include/kbabel/catalog.h
 include/kbabel/catalogitem.h
 include/kbabel/catalogsettings.h
@@ -36,6 +44,7 @@ include/kbabel/kbabeldictiface.h
 include/kbabel/msgfmt.h
 include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
+include/kspy.h
 lib/kde2/libdbsearchengine.a
 lib/kde2/libdbsearchengine.la
 lib/kde2/libdbsearchengine.so
@@ -45,6 +54,9 @@ lib/kde2/libpoauxiliary.so
 lib/kde2/libpocompendium.a
 lib/kde2/libpocompendium.la
 lib/kde2/libpocompendium.so
+lib/kde2/pothumbnail.a
+lib/kde2/pothumbnail.la
+lib/kde2/pothumbnail.so
 lib/libkbabel.a
 lib/libkbabel.la
 lib/libkbabel.so
@@ -65,6 +77,11 @@ lib/libkbabeldictplugin.la
 lib/libkbabeldictplugin.so
 lib/libkbabeldictplugin.so.1
 lib/libkbabeldictplugin.so.1.0
+lib/libkspy.a
+lib/libkspy.la
+lib/libkspy.so
+lib/libkspy.so.1
+lib/libkspy.so.1.0
 lib/libkstartperf.a
 lib/libkstartperf.la
 lib/libkstartperf.so
@@ -75,7 +92,6 @@ man/man1/cvschanged.1
 man/man1/cvsversion.1
 man/man1/kde-build.1
 man/man1/noncvslist.1
-share/doc/kde/HTML/en/kbabel/.anchors
 share/doc/kde/HTML/en/kbabel/back.png
 share/doc/kde/HTML/en/kbabel/bottom.png
 share/doc/kde/HTML/en/kbabel/catalogmanager.png
@@ -85,25 +101,17 @@ share/doc/kde/HTML/en/kbabel/catalogmanager_needwork.png
 share/doc/kde/HTML/en/kbabel/catalogmanager_nopot.png
 share/doc/kde/HTML/en/kbabel/catalogmanager_nopot_ok.png
 share/doc/kde/HTML/en/kbabel/catalogmanager_ok.png
-share/doc/kde/HTML/en/kbabel/commands.html
 share/doc/kde/HTML/en/kbabel/common
-share/doc/kde/HTML/en/kbabel/compilation.html
-share/doc/kde/HTML/en/kbabel/credits.html
 share/doc/kde/HTML/en/kbabel/editcopy.png
 share/doc/kde/HTML/en/kbabel/editcut.png
 share/doc/kde/HTML/en/kbabel/editpaste.png
-share/doc/kde/HTML/en/kbabel/faq.html
 share/doc/kde/HTML/en/kbabel/fileopen.png
 share/doc/kde/HTML/en/kbabel/filesave.png
 share/doc/kde/HTML/en/kbabel/find.png
 share/doc/kde/HTML/en/kbabel/forward.png
-share/doc/kde/HTML/en/kbabel/glossary.html
+share/doc/kde/HTML/en/kbabel/index.cache.bz2
 share/doc/kde/HTML/en/kbabel/index.docbook
-share/doc/kde/HTML/en/kbabel/index.html
 share/doc/kde/HTML/en/kbabel/insert_tag.png
-share/doc/kde/HTML/en/kbabel/installation.html
-share/doc/kde/HTML/en/kbabel/introduction.html
-share/doc/kde/HTML/en/kbabel/kbabel-toolbars.html
 share/doc/kde/HTML/en/kbabel/missing.png
 share/doc/kde/HTML/en/kbabel/msgid2msgstr.png
 share/doc/kde/HTML/en/kbabel/needwork.png
@@ -113,19 +121,12 @@ share/doc/kde/HTML/en/kbabel/nextfuzzy.png
 share/doc/kde/HTML/en/kbabel/nextfuzzyuntrans.png
 share/doc/kde/HTML/en/kbabel/nextuntranslated.png
 share/doc/kde/HTML/en/kbabel/ok.png
-share/doc/kde/HTML/en/kbabel/preferences-catalogmanager.html
-share/doc/kde/HTML/en/kbabel/preferences-editor.html
-share/doc/kde/HTML/en/kbabel/preferences-miscellaneous.html
-share/doc/kde/HTML/en/kbabel/preferences-save.html
-share/doc/kde/HTML/en/kbabel/preferences-search.html
-share/doc/kde/HTML/en/kbabel/preferences.html
 share/doc/kde/HTML/en/kbabel/preverror.png
 share/doc/kde/HTML/en/kbabel/prevfuzzy.png
 share/doc/kde/HTML/en/kbabel/prevfuzzyuntrans.png
 share/doc/kde/HTML/en/kbabel/previous.png
 share/doc/kde/HTML/en/kbabel/prevuntranslated.png
 share/doc/kde/HTML/en/kbabel/redo.png
-share/doc/kde/HTML/en/kbabel/requirements.html
 share/doc/kde/HTML/en/kbabel/search2msgstr.png
 share/doc/kde/HTML/en/kbabel/snap1.png
 share/doc/kde/HTML/en/kbabel/snap_catalogmanager.png
@@ -134,13 +135,30 @@ share/doc/kde/HTML/en/kbabel/stop.png
 share/doc/kde/HTML/en/kbabel/top.png
 share/doc/kde/HTML/en/kbabel/transsearch.png
 share/doc/kde/HTML/en/kbabel/undo.png
-share/doc/kde/HTML/en/kbabel/using-catalogmanager.html
-share/doc/kde/HTML/en/kbabel/using-editor.html
-share/doc/kde/HTML/en/kbabel/using-kbabel.html
+share/doc/kde/HTML/en/markup/common
+share/doc/kde/HTML/en/markup/index.cache.bz2
+share/doc/kde/HTML/en/markup/index.docbook
 share/kde/applnk/Development/kbabel.desktop
 share/kde/applnk/Development/kbabeldict.desktop
 share/kde/applnk/Utilities/kless.desktop
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/diff.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/msgid2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nexterror.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzy.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/nextuntranslated.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/preverror.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzy.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/prevuntranslated.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
+share/kde/apps/kbabel/icons/hicolor/22x22/actions/diff.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/msgid2msgstr.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/nexterror.png
@@ -153,50 +171,96 @@ share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/prevuntranslated.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/search2msgstr.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/diff.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/msgid2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nexterror.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzy.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/nextuntranslated.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/preverror.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzy.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/prevuntranslated.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/diff.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/msgid2msgstr.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nexterror.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nextfuzzy.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/nextuntranslated.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/preverror.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/prevfuzzy.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/prevuntranslated.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/diff.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/msgid2msgstr.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nexterror.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nextfuzzy.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nextfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/nextuntranslated.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/preverror.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/prevfuzzy.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/prevfuzzyuntrans.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/prevuntranslated.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/search2msgstr.png
+share/kde/apps/kbabel/icons/locolor/32x32/actions/transsearch.png
 share/kde/apps/kbabel/kbabelui.rc
 share/kde/apps/kbabel/pics/broken.png
 share/kde/apps/kbabel/pics/missing.png
 share/kde/apps/kbabel/pics/needwork.png
 share/kde/apps/kbabel/pics/ok.png
-share/kde/apps/kbabel/pics/pref_catalogmanager.png
-share/kde/apps/kbabel/pics/pref_editor.png
 share/kde/apps/kbabel/pics/pref_identity.png
-share/kde/apps/kbabel/pics/pref_save.png
 share/kde/apps/kbabel/pics/splash.png
 share/kde/apps/kbabeldict/modules/dbsearchengine.rc
 share/kde/apps/kbabeldict/modules/poauxiliary.rc
 share/kde/apps/kbabeldict/modules/pocompendium.rc
+share/kde/icons/hicolor/16x16/apps/kbabel.png
+share/kde/icons/hicolor/16x16/apps/kbabeldict.png
 share/kde/icons/hicolor/16x16/mimetypes/gettext.png
+share/kde/icons/hicolor/32x32/apps/kbabel.png
+share/kde/icons/hicolor/32x32/apps/kbabeldict.png
 share/kde/icons/hicolor/32x32/mimetypes/gettext.png
+share/kde/icons/hicolor/48x48/apps/kbabel.png
 share/kde/icons/hicolor/48x48/mimetypes/gettext.png
 share/kde/icons/locolor/16x16/apps/kbabel.png
+share/kde/icons/locolor/16x16/apps/kbabeldict.png
 share/kde/icons/locolor/16x16/apps/kless.png
 share/kde/icons/locolor/16x16/mimetypes/gettext.png
 share/kde/icons/locolor/32x32/apps/kbabel.png
+share/kde/icons/locolor/32x32/apps/kbabeldict.png
 share/kde/icons/locolor/32x32/apps/kless.png
 share/kde/icons/locolor/32x32/mimetypes/gettext.png
 share/kde/mimelnk/application/x-gettext.desktop
-@comment kdelibs:dirrm share/kde/mimelnk/application
-@comment kdelibs:dirrm share/kde/icons/locolor/32x32/mimetypes
-@comment kdebase:dirrm share/kde/icons/locolor/32x32/apps
-@comment kdelibs:dirrm share/kde/icons/locolor/16x16/mimetypes
-@comment kdebase:dirrm share/kde/icons/locolor/16x16/apps
-@comment kdelibs:dirrm share/kde/icons/hicolor/48x48/mimetypes
-@comment kdelibs:dirrm share/kde/icons/hicolor/32x32/mimetypes
-@comment kdelibs:dirrm share/kde/icons/hicolor/16x16/mimetypes
+share/kde/services/pothumbnail.desktop
 @dirrm share/kde/apps/kbabeldict/modules
 @dirrm share/kde/apps/kbabeldict
 @dirrm share/kde/apps/kbabel/pics
+@dirrm share/kde/apps/kbabel/icons/locolor/32x32/actions
+@dirrm share/kde/apps/kbabel/icons/locolor/32x32
+@dirrm share/kde/apps/kbabel/icons/locolor/16x16/actions
+@dirrm share/kde/apps/kbabel/icons/locolor/16x16
+@dirrm share/kde/apps/kbabel/icons/locolor
+@dirrm share/kde/apps/kbabel/icons/hicolor/32x32/actions
+@dirrm share/kde/apps/kbabel/icons/hicolor/32x32
 @dirrm share/kde/apps/kbabel/icons/hicolor/22x22/actions
 @dirrm share/kde/apps/kbabel/icons/hicolor/22x22
+@dirrm share/kde/apps/kbabel/icons/hicolor/16x16/actions
+@dirrm share/kde/apps/kbabel/icons/hicolor/16x16
 @dirrm share/kde/apps/kbabel/icons/hicolor
 @dirrm share/kde/apps/kbabel/icons
 @dirrm share/kde/apps/kbabel
-@comment kdexxx:dirrm share/kde/apps
-@comment kdexxx:dirrm share/kde/applnk/Utilities
-@comment kdexxx:dirrm share/kde/applnk/Development
-@comment kdexxx:dirrm share/kde/applnk
+@dirrm share/doc/kde/HTML/en/markup
 @dirrm share/doc/kde/HTML/en/kbabel
-@comment kdexxx:dirrm share/doc/kde/HTML/en
-@comment kdelibs:dirrm lib/kde2
 @dirrm include/kbabel