bl3ify and update to kde3.2.2.

Changes:
* cervisia: Partly fix Don't execute shell scripts when the user used the
  edit file action
* cervisia: Fix Look harder whether a directory really is under CVS control
* configure: Fix Extraneous message in admin/Makefile.common using --prefix
* Umbrello: aggregation/composition & inheritance hierachy sometimes
* Umbrello: Unable to change the specification of an operation
* Umbrello: "New operation" works the wrong way around in collaboration
  diagrams
* Umbrello: SQL code generator generates "circular reference" foreign keys
* Umbrello: Drag-n-drop uses associations incorrectly
* Umbrello: code generation omits many operations
* Umbrello: compilation for Tru64 fixed
* Umbrello: fix loading of XMI files
* Umbrello: fix backspace handling in documentation window
* Umbrello: support for package nesting on CPP import

9 files changed, 121 insertions, 23 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 0a5b7aa58ba..71bc5e7a4ba 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/20 14:08:39 markd Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
@@ -10,11 +9,9 @@ CONFLICTS+=	umbrello-[0-9]*
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
-LTCONFIG_OVERRIDE+=	${WRKSRC}/kapptemplate/admin/ltconfig
-
-BUILD_DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools
+USE_PERL5=		run
 
 REPLACE_PERL=	cervisia/change_colors.pl \
 		cervisia/move_repositories.pl \
@@ -37,8 +34,10 @@ PLIST_SRC+=	${PKGDIR}/PLIST.kmtrace
 .endif
 PLIST_SRC+=	${PKGDIR}/PLIST
 
-.include "../../databases/db4/buildlink2.mk"
-.include "../../devel/libtool/buildlink2.mk"
-.include "../../meta-pkgs/kde3/buildlink2.mk"
-.include "../../x11/kdebase3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
+
+.include "../../databases/db4/buildlink3.mk"
+.include "../../devel/libtool/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdesdk3/PLIST b/devel/kdesdk3/PLIST
index d9aa55a0428..15bbbfb0762 100644
--- a/devel/kdesdk3/PLIST
+++ b/devel/kdesdk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/03/09 12:47:42 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/04/20 14:08:39 markd Exp $
 bin/adddebug
 bin/build-progress.sh
 bin/catalogmanager
@@ -319,7 +319,7 @@ share/kde/apps/kapptemplate/appframework/no-exe/INSTALL
 share/kde/apps/kapptemplate/appframework/po-Makefile.am
 share/kde/apps/kapptemplate/bin/mkinstalldirs
 share/kde/apps/kapptemplate/existing/app-Makefile.am
-share/kde/apps/kapptemplate/existing/app.desktop
+share/kde/apps/kapptemplate/existing/app-desktop
 share/kde/apps/kapptemplate/include/existing.module
 share/kde/apps/kapptemplate/include/kapptemplate.common
 share/kde/apps/kapptemplate/include/kapptemplate.module
@@ -327,8 +327,8 @@ share/kde/apps/kapptemplate/include/kpartapp.module
 share/kde/apps/kapptemplate/include/kpartplugin.module
 share/kde/apps/kapptemplate/kapp/app-Makefile.am
 share/kde/apps/kapptemplate/kapp/app-configure.in.in
+share/kde/apps/kapptemplate/kapp/app-desktop
 share/kde/apps/kapptemplate/kapp/app.cpp
-share/kde/apps/kapptemplate/kapp/app.desktop
 share/kde/apps/kapptemplate/kapp/app.h
 share/kde/apps/kapptemplate/kapp/app_client.cpp
 share/kde/apps/kapptemplate/kapp/appiface.h
@@ -354,11 +354,11 @@ share/kde/apps/kapptemplate/kapp/no-exe/lo32-app-app.png
 share/kde/apps/kapptemplate/kapp/pics-Makefile.am
 share/kde/apps/kapptemplate/kpartapp/app-Makefile.am
 share/kde/apps/kapptemplate/kpartapp/app-configure.in.in
+share/kde/apps/kapptemplate/kpartapp/app-desktop
 share/kde/apps/kapptemplate/kpartapp/app.cpp
-share/kde/apps/kapptemplate/kpartapp/app.desktop
 share/kde/apps/kapptemplate/kpartapp/app.h
+share/kde/apps/kapptemplate/kpartapp/app_part-desktop
 share/kde/apps/kapptemplate/kpartapp/app_part.cpp
-share/kde/apps/kapptemplate/kpartapp/app_part.desktop
 share/kde/apps/kapptemplate/kpartapp/app_part.h
 share/kde/apps/kapptemplate/kpartapp/app_part.rc
 share/kde/apps/kapptemplate/kpartapp/app_shell.rc
@@ -385,6 +385,7 @@ share/kde/apps/kapptemplate/kpartplugin/plugin_app.cpp
 share/kde/apps/kapptemplate/kpartplugin/plugin_app.h
 share/kde/apps/kapptemplate/kpartplugin/plugin_app.rc
 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_arg.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
@@ -413,6 +414,7 @@ share/kde/apps/kbabel/icons/hicolor/16x16/actions/syntax.png
 share/kde/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.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_arg.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
@@ -437,6 +439,7 @@ share/kde/apps/kbabel/icons/hicolor/22x22/actions/syntax.png
 share/kde/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.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_arg.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
@@ -461,6 +464,7 @@ share/kde/apps/kbabel/icons/hicolor/32x32/actions/syntax.png
 share/kde/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.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_arg.png
 share/kde/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
@@ -491,6 +495,7 @@ share/kde/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
 share/kde/apps/kbabel/icons/locolor/22x22/actions/statistics.png
 share/kde/apps/kbabel/icons/locolor/22x22/actions/syntax.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_arg.png
 share/kde/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
@@ -620,11 +625,6 @@ share/kde/apps/umbrello/pics/datatype.xpm
 share/kde/apps/umbrello/pics/dependency.xpm
 share/kde/apps/umbrello/pics/end_state.xpm
 share/kde/apps/umbrello/pics/enum.xpm
-share/kde/apps/umbrello/pics/folder_green.png
-share/kde/apps/umbrello/pics/folder_green_open.png
-share/kde/apps/umbrello/pics/folder_grey.png
-share/kde/apps/umbrello/pics/folder_grey_open.png
-share/kde/apps/umbrello/pics/folder_home.png
 share/kde/apps/umbrello/pics/fork.xpm
 share/kde/apps/umbrello/pics/generalization.xpm
 share/kde/apps/umbrello/pics/hline.xpm
diff --git a/devel/kdesdk3/buildlink3.mk b/devel/kdesdk3/buildlink3.mk
new file mode 100644
index 00000000000..5f082b5e48b
--- /dev/null
+++ b/devel/kdesdk3/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 14:08:39 markd Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+KDESDK_BUILDLINK3_MK:=	${KDESDK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kdesdk
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkdesdk}
+BUILDLINK_PACKAGES+=	kdesdk
+
+.if !empty(KDESDK_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kdesdk+=	kdesdk>=3.2.0
+BUILDLINK_RECOMMENDED.kdesdk?=	kdesdk>=3.2.2
+BUILDLINK_PKGSRCDIR.kdesdk?=	../../devel/kdesdk3
+.endif	# KDESDK_BUILDLINK3_MK
+
+.include "../../databases/db4/buildlink3.mk"
+.include "../../devel/libtool/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../x11/kdebase3/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index a1bb0bc56f6..554cd359d6f 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.12 2004/03/09 12:47:42 markd Exp $
+$NetBSD: distinfo,v 1.13 2004/04/20 14:08:39 markd Exp $
 
-SHA1 (kdesdk-3.2.1.tar.bz2) = a53e9531a77844bd7a6bf62cc269891b95833bba
-Size (kdesdk-3.2.1.tar.bz2) = 3970806 bytes
+SHA1 (kdesdk-3.2.2.tar.bz2) = c68d6c028812617694628f7f0138573ca87ea5be
+Size (kdesdk-3.2.2.tar.bz2) = 3931291 bytes
 SHA1 (patch-ab) = a975fd30cbee8107856774161f9216cde2548a10
 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307
+SHA1 (patch-ad) = d4343e4979ce9b08db1de0a91a71d7c3f786ded9
+SHA1 (patch-ae) = a392368724a39c31d1a797fed0fdb5153962ca2f
+SHA1 (patch-af) = 39f0abfae3c6931535962fc9a91de425ed0e27ff
+SHA1 (patch-ag) = e01c7aed761cc92fbb7c19e6466ef8cb82211a15
+SHA1 (patch-ah) = cb6b2a83df6dfd324c421e58ce9fa1d23718a06b
+SHA1 (patch-ai) = fc84162c181dfd0c8db338e92e8c091397784368
diff --git a/devel/kdesdk3/patches/patch-ae b/devel/kdesdk3/patches/patch-ae
new file mode 100644
index 00000000000..4fca38ee0d6
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/04/20 14:08:39 markd Exp $
+
+--- kompare/libdiff2/Makefile.in.orig	2004-04-06 02:53:01.000000000 +1200
++++ kompare/libdiff2/Makefile.in
+@@ -391,7 +391,7 @@ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-INCLUDES = -D INLINE_DIFFERENCES=0 -D EXCLUDE_DIFF_OPTION=0 -I$(top_srcdir)/kompare/komparepart -I$(top_srcdir)/kompare/interfaces $(all_includes)
++INCLUDES = -DINLINE_DIFFERENCES=0 -DEXCLUDE_DIFF_OPTION=0 -I$(top_srcdir)/kompare/komparepart -I$(top_srcdir)/kompare/interfaces $(all_includes)
+ noinst_HEADERS = \
+ 	levenshteintable.h \
+ 	kompare.h \
diff --git a/devel/kdesdk3/patches/patch-af b/devel/kdesdk3/patches/patch-af
new file mode 100644
index 00000000000..ea74345ab17
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.1 2004/04/20 14:08:39 markd Exp $
+
+--- kompare/komparenavtreepart/Makefile.am.orig	2003-11-30 22:50:02.000000000 +1300
++++ kompare/komparenavtreepart/Makefile.am
+@@ -3,8 +3,8 @@
+ #########################################################################
+ 
+ INCLUDES = \
+-	-D INLINE_DIFFERENCES=0 \
+-	-D EXCLUDE_DIFF_OPTION=0 \
++	-DINLINE_DIFFERENCES=0 \
++	-DEXCLUDE_DIFF_OPTION=0 \
+ 	-I$(top_srcdir)/kompare/libdiff2 \
+ 	-I$(top_srcdir)/kompare/komparepart \
+ 	$(all_includes)
diff --git a/devel/kdesdk3/patches/patch-ag b/devel/kdesdk3/patches/patch-ag
new file mode 100644
index 00000000000..8760c33f90b
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2004/04/20 14:08:39 markd Exp $
+
+--- kompare/komparenavtreepart/Makefile.in.orig	2004-04-06 02:53:00.000000000 +1200
++++ kompare/komparenavtreepart/Makefile.in
+@@ -369,8 +369,8 @@ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ INCLUDES = \
+-	-D INLINE_DIFFERENCES=0 \
+-	-D EXCLUDE_DIFF_OPTION=0 \
++	-DINLINE_DIFFERENCES=0 \
++	-DEXCLUDE_DIFF_OPTION=0 \
+ 	-I$(top_srcdir)/kompare/libdiff2 \
+ 	-I$(top_srcdir)/kompare/komparepart \
+ 	$(all_includes)
diff --git a/devel/kdesdk3/patches/patch-ah b/devel/kdesdk3/patches/patch-ah
new file mode 100644
index 00000000000..0a542917527
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/04/20 14:08:39 markd Exp $
+
+--- kompare/komparepart/Makefile.am.orig	2003-11-30 22:50:02.000000000 +1300
++++ kompare/komparepart/Makefile.am
+@@ -2,7 +2,7 @@
+ # KPART SECTION
+ #########################################################################
+ 
+-INCLUDES = -D INLINE_DIFFERENCES=0 -D EXCLUDE_DIFF_OPTION=0 -I$(top_srcdir)/kompare/libdiff2 -I$(top_srcdir)/kompare/interfaces $(all_includes)
++INCLUDES = -DINLINE_DIFFERENCES=0 -DEXCLUDE_DIFF_OPTION=0 -I$(top_srcdir)/kompare/libdiff2 -I$(top_srcdir)/kompare/interfaces $(all_includes)
+ 
+ noinst_HEADERS = \
+ 	kompare_part.h \
diff --git a/devel/kdesdk3/patches/patch-ai b/devel/kdesdk3/patches/patch-ai
new file mode 100644
index 00000000000..5ece8ea9bbc
--- /dev/null
+++ b/devel/kdesdk3/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/04/20 14:08:39 markd Exp $
+
+--- kompare/komparepart/Makefile.in.orig	2004-04-06 02:53:00.000000000 +1200
++++ kompare/komparepart/Makefile.in
+@@ -412,7 +412,7 @@ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-INCLUDES = -D INLINE_DIFFERENCES=0 -D EXCLUDE_DIFF_OPTION=0 -I$(top_srcdir)/kompare/libdiff2 -I$(top_srcdir)/kompare/interfaces $(all_includes)
++INCLUDES = -DINLINE_DIFFERENCES=0 -DEXCLUDE_DIFF_OPTION=0 -I$(top_srcdir)/kompare/libdiff2 -I$(top_srcdir)/kompare/interfaces $(all_includes)
+ noinst_HEADERS = \
+ 	kompare_part.h \
+ 	kompareview.h \