12 files changed, 140 insertions, 8 deletions
diff --git a/audio/splay/distinfo b/audio/splay/distinfo
index c2ff7b08037..a971bcdfb22 100644
--- a/audio/splay/distinfo
+++ b/audio/splay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:52 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/08/08 21:11:20 joerg Exp $
 
 SHA1 (splay-0.8.2.tar.gz) = 25288afa1b52bf25be8f9c4ceb44325c50fa00c8
 RMD160 (splay-0.8.2.tar.gz) = f1a99ad9e7e70f5e0000aede05966cc5a0b36ad3
@@ -8,4 +8,5 @@ SHA1 (patch-ab) = 9fc28c320ad90922dd0aa583904acd58f4cf3ba1
 SHA1 (patch-ac) = f90b0e93ed4e72d20926e1bbe7dd5d21f4b39770
 SHA1 (patch-ad) = 5d52e0878eb313a7d7684a6505daa4ece3add746
 SHA1 (patch-ae) = 6b343541593d1d6ca8dd641ebb299a95d3bdc067
+SHA1 (patch-af) = dfe6c6fba890fb0b413b6b73a42904d3ca6b7d66
 SHA1 (patch-ai) = 9ac8c7aa7a7d341585e57dec4ddba4e285db7b34
diff --git a/audio/splay/patches/patch-af b/audio/splay/patches/patch-af
new file mode 100644
index 00000000000..5f06c331e9f
--- /dev/null
+++ b/audio/splay/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2007/08/08 21:11:20 joerg Exp $
+
+--- mpegsound/wavetoraw.cc.orig	2007-08-08 20:52:11.000000000 +0000
++++ mpegsound/wavetoraw.cc
+@@ -9,7 +9,7 @@
+ #include "config.h"
+ #endif
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #include "mpegsound.h"
+ 
diff --git a/time/plan/distinfo b/time/plan/distinfo
index a293a9f7b52..6e4b55a9753 100644
--- a/time/plan/distinfo
+++ b/time/plan/distinfo
@@ -1,11 +1,16 @@
-$NetBSD: distinfo,v 1.8 2007/04/28 15:20:43 reed Exp $
+$NetBSD: distinfo,v 1.9 2007/08/08 21:07:48 joerg Exp $
 
 SHA1 (plan-1.9.tar.gz) = 65afff961f801f888714993a9ed6e42a95b2d958
 RMD160 (plan-1.9.tar.gz) = 7bed3f29c62341c264c9edeb60666d83092139ea
 Size (plan-1.9.tar.gz) = 441599 bytes
 SHA1 (patch-aa) = 8909b4fab90facef041879bc41d81e84a3bd7430
 SHA1 (patch-ab) = 6670c398271e5ee6d32194c0b69850f381b5cc5c
+SHA1 (patch-ac) = cc9b1d9dacd1c84eeee0c9a82193d0d588ca64e4
+SHA1 (patch-ad) = 0a5e3b54576759d42381596925612509b4f94671
 SHA1 (patch-ae) = 64c71d707c8e99837a2395fc0cf115eb9f71d9cd
 SHA1 (patch-af) = 58fadadd62916452aa2036ddf9a26b7448149804
 SHA1 (patch-ag) = e99b6cf76ea463b9e75ee6760aaa1ad2e3a1afa1
-SHA1 (patch-ai) = c5cd47ea2bb004219df7807f107ff26fdcc53f51
+SHA1 (patch-ah) = b5067b9d0cf20a599fb9b1288a89ebc0d5a7da92
+SHA1 (patch-ai) = 23c6a25095296d932435969c884ae706820d9a1d
+SHA1 (patch-aj) = 05bb2fcef75bc11c1904bc2bc54f171b42f04167
+SHA1 (patch-ak) = 4a76d71c457d43950b9d4c2beb9e6f86da2590aa
diff --git a/time/plan/patches/patch-ac b/time/plan/patches/patch-ac
new file mode 100644
index 00000000000..ec888545a54
--- /dev/null
+++ b/time/plan/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 2007/08/08 21:07:48 joerg Exp $
+
+--- weekcalc.c.orig	2007-08-08 20:37:57.000000000 +0000
++++ weekcalc.c
+@@ -8,9 +8,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC
+-#include <malloc.h>
+-#endif
+ #include <time.h>
+ #include <Xm/Xm.h>
+ #include "cal.h"
diff --git a/time/plan/patches/patch-ad b/time/plan/patches/patch-ad
new file mode 100644
index 00000000000..a217c20106c
--- /dev/null
+++ b/time/plan/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2007/08/08 21:07:48 joerg Exp $
+
+--- servmenu.c.orig	2007-08-08 20:39:15.000000000 +0000
++++ servmenu.c
+@@ -8,7 +8,7 @@
+ 
+ #include <stdio.h>
+ #include <time.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <Xm/Xm.h>
+ #include <Xm/DialogS.h>
+ #include <Xm/Form.h>
diff --git a/time/plan/patches/patch-ah b/time/plan/patches/patch-ah
new file mode 100644
index 00000000000..5728ccc5dd8
--- /dev/null
+++ b/time/plan/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.3 2007/08/08 21:07:49 joerg Exp $
+
+--- yovcalc.c.orig	2007-08-08 20:40:01.000000000 +0000
++++ yovcalc.c
+@@ -8,9 +8,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC
+-#include <malloc.h>
+-#endif
+ #include <time.h>
+ #include <Xm/Xm.h>
+ #include "cal.h"
diff --git a/time/plan/patches/patch-ai b/time/plan/patches/patch-ai
index 92a73672bf9..3c9ad505b11 100644
--- a/time/plan/patches/patch-ai
+++ b/time/plan/patches/patch-ai
@@ -1,8 +1,20 @@
-$NetBSD: patch-ai,v 1.2 2007/04/28 15:20:43 reed Exp $
+$NetBSD: patch-ai,v 1.3 2007/08/08 21:07:49 joerg Exp $
 
---- holiday.c.orig	2005-01-09 03:44:34.000000000 -0600
-+++ holiday.c	2007-04-26 09:22:32.000000000 -0500
-@@ -52,7 +52,7 @@
+--- holiday.c.orig	2005-01-09 09:44:34.000000000 +0000
++++ holiday.c
+@@ -20,11 +20,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
+-#ifndef NEWSOS4
+-#ifndef STDLIBMALLOC
+-#include <malloc.h>
+-#endif
+-#endif
+ #ifdef CPP_PATH
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -52,7 +47,7 @@ static int calc_pascha(int);
  extern int yyparse(void);
  
  
diff --git a/time/plan/patches/patch-aj b/time/plan/patches/patch-aj
new file mode 100644
index 00000000000..03c76100a2e
--- /dev/null
+++ b/time/plan/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.3 2007/08/08 21:07:49 joerg Exp $
+
+--- daycalc.c.orig	2007-08-08 20:41:35.000000000 +0000
++++ daycalc.c
+@@ -8,9 +8,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#if !defined NEWSOS4 && !defined STDLIBMALLOC
+-#include <malloc.h>
+-#endif
+ #include <time.h>
+ #include <Xm/Xm.h>
+ #include "cal.h"
diff --git a/time/plan/patches/patch-ak b/time/plan/patches/patch-ak
new file mode 100644
index 00000000000..c76fa3121df
--- /dev/null
+++ b/time/plan/patches/patch-ak
@@ -0,0 +1,16 @@
+$NetBSD: patch-ak,v 1.1 2007/08/08 21:07:49 joerg Exp $
+
+--- help.c.orig	2007-08-08 20:42:55.000000000 +0000
++++ help.c
+@@ -17,11 +17,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
+-#ifndef NEWSOS4
+-#ifndef STDLIBMALLOC
+-#include <malloc.h>
+-#endif
+-#endif
+ #include <Xm/Xm.h>
+ #include <Xm/DialogS.h>
+ #include <Xm/Form.h>
diff --git a/x11/ssystem/distinfo b/x11/ssystem/distinfo
index 2c710a68b94..1f9328e8887 100644
--- a/x11/ssystem/distinfo
+++ b/x11/ssystem/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:20 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/08/08 21:09:02 joerg Exp $
 
 SHA1 (ssystem-1.6.tar.gz) = b22f766159c8e9c861c23aa6ca47f374294a847a
 RMD160 (ssystem-1.6.tar.gz) = 33b9e84fbd1f0ce22c25931effe21fce589fb1e1
 Size (ssystem-1.6.tar.gz) = 1037947 bytes
 SHA1 (patch-aa) = f44692941d5b001d6b3017a5a8af8c0e0aab00b7
+SHA1 (patch-ab) = 5851d684371ae46124041e2275dadb4e61a5f547
+SHA1 (patch-ac) = ea9736f69be4ea552bb2d73faf697c0cb314eede
diff --git a/x11/ssystem/patches/patch-ab b/x11/ssystem/patches/patch-ab
new file mode 100644
index 00000000000..e86704bf553
--- /dev/null
+++ b/x11/ssystem/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2007/08/08 21:09:02 joerg Exp $
+
+--- ssystem.c.orig	2007-08-08 20:49:13.000000000 +0000
++++ ssystem.c
+@@ -21,9 +21,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#ifndef __FreeBSD__
+-#include <malloc.h>
+-#endif
+ #include <time.h>
+ #include <setjmp.h>
+ #include "ssystem.h"
diff --git a/x11/ssystem/patches/patch-ac b/x11/ssystem/patches/patch-ac
new file mode 100644
index 00000000000..ca4bbf478fc
--- /dev/null
+++ b/x11/ssystem/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2007/08/08 21:09:03 joerg Exp $
+
+--- init.c.orig	2007-08-08 20:49:33.000000000 +0000
++++ init.c
+@@ -30,9 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+-#ifndef __FreeBSD__
+-#include <malloc.h>
+-#endif
+ #include <time.h>
+ #include "jpeglib.h"
+ #include <setjmp.h>