bl3ify and update to kde3.2.2.

Changes:
* Kig: fix some untranslated UI strings.
* kstars: fixes to LX200 telescope driver.
* kstars: fixed some broken URLs for object-specific links.

4 files changed, 16 insertions, 20 deletions

diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 76d8ea54233..8ded5d7181e 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/20 13:33:00 markd Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
@@ -11,9 +10,10 @@ REPLACE_PERL=	\
 	kvoctrain/kvoctrain/langen2kvtml \
 	kvoctrain/kvoctrain/spotlight2kvtml
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeedu3/PLIST b/misc/kdeedu3/PLIST
index 800300f9adf..ff336962174 100644
--- a/misc/kdeedu3/PLIST
+++ b/misc/kdeedu3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/09 12:19:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/20 13:33:00 markd Exp $
 bin/celestrongps
 bin/flashkard
 bin/indiserver
@@ -1632,10 +1632,6 @@ share/kde/icons/hicolor/48x48/apps/kids.png
 share/kde/icons/hicolor/48x48/apps/menubar.png
 share/kde/icons/locolor/16x16/actions/edit_add.png
 share/kde/icons/locolor/16x16/actions/edit_remove.png
-share/kde/icons/locolor/16x16/apps/kbruch.png
-share/kde/icons/locolor/16x16/apps/kig.png
-share/kde/icons/locolor/32x32/apps/kbruch.png
-share/kde/icons/locolor/32x32/apps/kig.png
 share/kde/mimelnk/application/x-edu.desktop
 share/kde/mimelnk/application/x-edugallery.desktop
 share/kde/mimelnk/application/x-kgeo.desktop
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index de509407926..e6d74bc1cad 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2004/03/09 12:19:09 markd Exp $
+$NetBSD: distinfo,v 1.15 2004/04/20 13:33:00 markd Exp $
 
-SHA1 (kdeedu-3.2.1.tar.bz2) = 424e881c10a6ac307e363ae35534af17c237b8d2
-Size (kdeedu-3.2.1.tar.bz2) = 22400086 bytes
-SHA1 (patch-aa) = 4ff64b130b167da7cda9e19c6f688192ff7a600e
+SHA1 (kdeedu-3.2.2.tar.bz2) = fe14ba534d30467ba95e7cbfda95fb4324993aaf
+Size (kdeedu-3.2.2.tar.bz2) = 22380094 bytes
+SHA1 (patch-aa) = c214ca252a58424bf28042583a66256f44e697a7
diff --git a/misc/kdeedu3/patches/patch-aa b/misc/kdeedu3/patches/patch-aa
index fab63cb0a93..c84a09be99e 100644
--- a/misc/kdeedu3/patches/patch-aa
+++ b/misc/kdeedu3/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2004/02/07 14:19:08 xtraeme Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/20 13:33:00 markd Exp $
 
---- kiten/Makefile.in.orig	2004-02-07 15:02:19.000000000 +0100
-+++ kiten/Makefile.in	2004-02-07 15:02:48.000000000 +0100
-@@ -393,7 +393,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
- 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- kiten/Makefile.in.orig	2004-04-06 02:40:43.000000000 +1200
++++ kiten/Makefile.in
+@@ -104,7 +104,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \