Use sh rather than bash to run update script.

Partial fix for PR 28657.  Bump PKGREVISION.

7 files changed, 50 insertions, 4 deletions

diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 3137ae2b0fd..3b7e429fe7c 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/12/10 06:17:28 markd Exp $
+# $NetBSD: Makefile,v 1.38 2004/12/23 12:54:29 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo
index 07df1f6c944..b661f288d23 100644
--- a/misc/kdepim3/distinfo
+++ b/misc/kdepim3/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.26 2004/12/10 06:17:28 markd Exp $
+$NetBSD: distinfo,v 1.27 2004/12/23 12:54:29 markd Exp $
 
 SHA1 (kdepim-3.3.2.tar.bz2) = 2d55115ef82280b208df7b501aecd2b3ea2e07be
 Size (kdepim-3.3.2.tar.bz2) = 9994033 bytes
 SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f
+SHA1 (patch-ab) = bc6a6bf4dd389cb3c1ae95c2a95ec9e54509e51c
 SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c
 SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661
 SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4
diff --git a/misc/kdepim3/patches/patch-ab b/misc/kdepim3/patches/patch-ab
new file mode 100644
index 00000000000..1f7e5f3b2e8
--- /dev/null
+++ b/misc/kdepim3/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.9 2004/12/23 12:54:29 markd Exp $
+
+--- kmail/kmail.upd.orig	2004-07-18 07:16:36.000000000 +1200
++++ kmail/kmail.upd
+@@ -67,7 +67,7 @@ Id=3.2-update-loop-on-goto-unread-settin
+ File=kmailrc
+ Group=Behaviour
+ Key=LoopOnGotoUnread
+-Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,bash
++Script=kmail-3.2-update-loop-on-goto-unread-settings.sh,sh
+ # due to a bug the first identity always had UOID 0, assign another UOID
+ Id=3.1.4-dont-use-UOID-0-for-any-identity
+ File=kmailrc
+@@ -81,7 +81,7 @@ Id=3.2-misc
+ # against being run multiple times.
+ ######################################################################
+ File=kmailrc
+-Script=kmail-3.2-misc.sh,bash
++Script=kmail-3.2-misc.sh,sh
+ #
+ # reuse this section to add trivial stuff!
+ #
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 19ffa69ab5d..de16710a3d5 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/10/13 12:16:06 markd Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/23 12:56:04 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index d02bee74513..bcf76fc9f63 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/12/10 06:13:03 markd Exp $
+$NetBSD: distinfo,v 1.12 2004/12/23 12:56:04 markd Exp $
 
 SHA1 (kdemultimedia-3.3.2.tar.bz2) = 383515292f8c02df9a960a2e9c511aebacf13b78
 Size (kdemultimedia-3.3.2.tar.bz2) = 5384470 bytes
@@ -7,6 +7,8 @@ SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
 SHA1 (patch-ad) = 272548cfda5b9d8ea2fd16d7d490ef74a5c349e6
 SHA1 (patch-ae) = 3bede7137841708b43e63500972f4c4e84fcfedb
+SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
+SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
diff --git a/multimedia/kdemultimedia3/patches/patch-af b/multimedia/kdemultimedia3/patches/patch-af
new file mode 100644
index 00000000000..c9aba6d1e43
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.3 2004/12/23 12:56:04 markd Exp $
+
+--- kioslave/audiocd/audiocd.upd.orig	2004-07-02 02:33:46.000000000 +1200
++++ kioslave/audiocd/audiocd.upd
+@@ -1,4 +1,4 @@
+ # Update for transport configuration
+ Id=1
+ File=kcmaudiocdrc
+-Script=upgrade-metadata.sh,bash
++Script=upgrade-metadata.sh,sh
diff --git a/multimedia/kdemultimedia3/patches/patch-ag b/multimedia/kdemultimedia3/patches/patch-ag
new file mode 100644
index 00000000000..5e418bb88f7
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ag
@@ -0,0 +1,9 @@
+$NetBSD: patch-ag,v 1.3 2004/12/23 12:56:04 markd Exp $
+
+--- kaudiocreator/kaudiocreator-meta.upd.orig	2004-10-03 20:42:35.000000000 +1300
++++ kaudiocreator/kaudiocreator-meta.upd
+@@ -1,3 +1,3 @@
+ Id=3
+ File=kaudiocreatorrc
+-Script=upgrade-kaudiocreator-metadata.sh,bash
++Script=upgrade-kaudiocreator-metadata.sh,sh