Sync with patches submitted upstream and add bug report URLs.

16 files changed, 95 insertions, 39 deletions

diff --git a/audio/pd/patches/patch-configure.ac b/audio/pd/patches/patch-configure.ac
new file mode 100644
index 00000000000..9f4006ba716
--- /dev/null
+++ b/audio/pd/patches/patch-configure.ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1 2011/10/05 20:02:48 wiz Exp $
+
+alloca.h is not portable.
+https://sourceforge.net/tracker/?func=detail&aid=3411730&group_id=55736&atid=478072
+
+--- configure.ac.orig	2011-02-02 04:42:27.000000000 +0000
++++ configure.ac
+@@ -214,7 +214,7 @@ AM_CONDITIONAL(FFTW, test x$fftw = xyes)
+ 
+ # Checks for header files.
+ AC_FUNC_ALLOCA
+-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/soundcard.h sys/time.h sys/timeb.h unistd.h])
++AC_CHECK_HEADERS([alloca.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/soundcard.h sys/time.h sys/timeb.h unistd.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_INT16_T
diff --git a/audio/pd/patches/patch-extra_bonk~_bonk~.c b/audio/pd/patches/patch-extra_bonk~_bonk~.c
index 5d89871d9d6..3ed8b90e3db 100644
--- a/audio/pd/patches/patch-extra_bonk~_bonk~.c
+++ b/audio/pd/patches/patch-extra_bonk~_bonk~.c
@@ -1,18 +1,21 @@
-$NetBSD: patch-extra_bonk~_bonk~.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-extra_bonk~_bonk~.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 alloca.h is not portable.
+https://sourceforge.net/tracker/?func=detail&aid=3411730&group_id=55736&atid=478072
 
 --- extra/bonk~/bonk~.c.orig	2010-08-19 01:37:00.000000000 +0000
 +++ extra/bonk~/bonk~.c
-@@ -82,11 +82,7 @@ void *bonk_class;
+@@ -82,10 +82,10 @@ void *bonk_class;
  static t_class *bonk_class;
  #endif
  
 -#ifdef _WIN32
- #include <malloc.h>
+-#include <malloc.h>
 -#elif ! defined(_MSC_VER)
--#include <alloca.h>
--#endif
++#if defined(HAVE_ALLOCA_H)
+ #include <alloca.h>
++#elsif defined(HAVE_MALLOC_H)
++#include <malloc.h>
+ #endif
  
  /* ------------------------ bonk~ ----------------------------- */
- 
diff --git a/audio/pd/patches/patch-extra_pd~_pd~.c b/audio/pd/patches/patch-extra_pd~_pd~.c
index efaa2b1a246..9dd1eaa5b0f 100644
--- a/audio/pd/patches/patch-extra_pd~_pd~.c
+++ b/audio/pd/patches/patch-extra_pd~_pd~.c
@@ -1,7 +1,8 @@
-$NetBSD: patch-extra_pd~_pd~.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-extra_pd~_pd~.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Add missing include (for SIGPIPE).
 Define extensions for NetBSD.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- extra/pd~/pd~.c.orig	2010-07-28 20:55:17.000000000 +0000
 +++ extra/pd~/pd~.c
diff --git a/audio/pd/patches/patch-extra_sigmund~_sigmund~.c b/audio/pd/patches/patch-extra_sigmund~_sigmund~.c
index 6e2aa4b2e57..777687b0b13 100644
--- a/audio/pd/patches/patch-extra_sigmund~_sigmund~.c
+++ b/audio/pd/patches/patch-extra_sigmund~_sigmund~.c
@@ -1,18 +1,21 @@
-$NetBSD: patch-extra_sigmund~_sigmund~.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-extra_sigmund~_sigmund~.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 alloca.h is not portable.
+https://sourceforge.net/tracker/?func=detail&aid=3411730&group_id=55736&atid=478072
 
 --- extra/sigmund~/sigmund~.c.orig	2010-07-28 20:55:17.000000000 +0000
 +++ extra/sigmund~/sigmund~.c
-@@ -26,11 +26,7 @@ for example, defines this in the file d_
+@@ -26,10 +26,10 @@ for example, defines this in the file d_
  #include <math.h>
  #include <stdio.h>
  #include <string.h>
 -#ifdef _WIN32
- #include <malloc.h>
+-#include <malloc.h>
 -#elif ! defined(_MSC_VER)
--#include <alloca.h>
--#endif
++#if defined(HAVE_ALLOCA_H)
+ #include <alloca.h>
++#elsif defined(HAVE_MALLOC_H)
++#include <malloc.h>
+ #endif
  #include <stdlib.h>
  #ifdef _MSC_VER
- #pragma warning( disable : 4244 )
diff --git a/audio/pd/patches/patch-src_configure b/audio/pd/patches/patch-src_configure
index 3f7570350ac..8978d556a42 100644
--- a/audio/pd/patches/patch-src_configure
+++ b/audio/pd/patches/patch-src_configure
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_configure,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_configure,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Fix unportable test(1) construct.
+https://sourceforge.net/tracker/?func=detail&aid=3411735&group_id=55736&atid=478072
 
 --- src/configure.orig	2011-03-21 01:41:34.000000000 +0000
 +++ src/configure
diff --git a/audio/pd/patches/patch-src_configure.in b/audio/pd/patches/patch-src_configure.in
new file mode 100644
index 00000000000..0d2fa5befff
--- /dev/null
+++ b/audio/pd/patches/patch-src_configure.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_configure.in,v 1.1 2011/10/05 20:02:48 wiz Exp $
+
+Fix unportable test(1) construct.
+https://sourceforge.net/tracker/?func=detail&aid=3411735&group_id=55736&atid=478072
+
+--- src/configure.in.orig	2011-02-27 00:52:58.000000000 +0000
++++ src/configure.in
+@@ -292,7 +292,7 @@ then
+     then
+         fat="no"
+     fi
+-    if test "x$fat" == "xyes";
++    if test "x$fat" = "xyes";
+     then
+         MORECFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
+             -arch i386 -arch ppc -Wno-error"
diff --git a/audio/pd/patches/patch-src_d__array.c b/audio/pd/patches/patch-src_d__array.c
index c2af6a1c64d..e11d9c56b45 100644
--- a/audio/pd/patches/patch-src_d__array.c
+++ b/audio/pd/patches/patch-src_d__array.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_d__array.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_d__array.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Detect endianness on NetBSD.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/d_array.c.orig	2010-07-28 20:55:17.000000000 +0000
 +++ src/d_array.c
diff --git a/audio/pd/patches/patch-src_d__osc.c b/audio/pd/patches/patch-src_d__osc.c
index 069dbe40d47..3b336fc7624 100644
--- a/audio/pd/patches/patch-src_d__osc.c
+++ b/audio/pd/patches/patch-src_d__osc.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_d__osc.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_d__osc.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Detect endianness on NetBSD.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/d_osc.c.orig	2010-07-28 20:55:17.000000000 +0000
 +++ src/d_osc.c
diff --git a/audio/pd/patches/patch-src_m__binbuf.c b/audio/pd/patches/patch-src_m__binbuf.c
index 396705df820..b07b0400a46 100644
--- a/audio/pd/patches/patch-src_m__binbuf.c
+++ b/audio/pd/patches/patch-src_m__binbuf.c
@@ -1,18 +1,21 @@
-$NetBSD: patch-src_m__binbuf.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_m__binbuf.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 alloca.h is not portable.
+https://sourceforge.net/tracker/?func=detail&aid=3411730&group_id=55736&atid=478072
 
 --- src/m_binbuf.c.orig	2011-03-10 06:02:41.000000000 +0000
 +++ src/m_binbuf.c
-@@ -530,11 +530,7 @@ done:
+@@ -530,10 +530,10 @@ done:
  
  #define SMALLMSG 5
  #define HUGEMSG 1000
 -#ifdef MSW
- #include <malloc.h>
+-#include <malloc.h>
 -#else
--#include <alloca.h>
--#endif
++#if defined(HAVE_ALLOCA_H)
+ #include <alloca.h>
++#elsif defined(HAVE_MALLOC_H)
++#include <malloc.h>
+ #endif
  #if HAVE_ALLOCA
  #define ATOMS_ALLOCA(x, n) ((x) = (t_atom *)((n) < HUGEMSG ?  \
-         alloca((n) * sizeof(t_atom)) : getbytes((n) * sizeof(t_atom))))
diff --git a/audio/pd/patches/patch-src_s__audio__oss.c b/audio/pd/patches/patch-src_s__audio__oss.c
index 345e21bcd0f..b204d93a6be 100644
--- a/audio/pd/patches/patch-src_s__audio__oss.c
+++ b/audio/pd/patches/patch-src_s__audio__oss.c
@@ -1,7 +1,8 @@
-$NetBSD: patch-src_s__audio__oss.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_s__audio__oss.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Use proper soundcard.h include on NetBSD and add missing argument
 to ioctl().
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/s_audio_oss.c.orig	2011-03-07 01:33:39.000000000 +0000
 +++ src/s_audio_oss.c
diff --git a/audio/pd/patches/patch-src_s__file.c b/audio/pd/patches/patch-src_s__file.c
index adbb3e32159..79ca0a001f0 100644
--- a/audio/pd/patches/patch-src_s__file.c
+++ b/audio/pd/patches/patch-src_s__file.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_s__file.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_s__file.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 File handling under NetBSD is the same as under Linux.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/s_file.c.orig	2011-03-19 22:22:27.000000000 +0000
 +++ src/s_file.c
diff --git a/audio/pd/patches/patch-src_s__loader.c b/audio/pd/patches/patch-src_s__loader.c
index 21f9da6287f..36b369adb5f 100644
--- a/audio/pd/patches/patch-src_s__loader.c
+++ b/audio/pd/patches/patch-src_s__loader.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_s__loader.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_s__loader.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Define extensions for NetBSD.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/s_loader.c.orig	2010-07-29 03:50:34.000000000 +0000
 +++ src/s_loader.c
diff --git a/audio/pd/patches/patch-src_s__stuff.h b/audio/pd/patches/patch-src_s__stuff.h
index 175aa5fc555..5b004f0079d 100644
--- a/audio/pd/patches/patch-src_s__stuff.h
+++ b/audio/pd/patches/patch-src_s__stuff.h
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_s__stuff.h,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_s__stuff.h,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Use OSS on NetBSD.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/s_stuff.h.orig	2011-03-13 00:19:29.000000000 +0000
 +++ src/s_stuff.h
diff --git a/audio/pd/patches/patch-src_s__utf8.c b/audio/pd/patches/patch-src_s__utf8.c
index 471c45b7c3c..d135cfb7f06 100644
--- a/audio/pd/patches/patch-src_s__utf8.c
+++ b/audio/pd/patches/patch-src_s__utf8.c
@@ -1,18 +1,21 @@
-$NetBSD: patch-src_s__utf8.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_s__utf8.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 alloca.h is not portable.
+https://sourceforge.net/tracker/?func=detail&aid=3411730&group_id=55736&atid=478072
 
 --- src/s_utf8.c.orig	2010-08-18 03:51:01.000000000 +0000
 +++ src/s_utf8.c
-@@ -18,11 +18,7 @@
+@@ -18,10 +18,10 @@
  #include <stdio.h>
  #include <string.h>
  #include <stdarg.h>
 -#ifdef WIN32
- #include <malloc.h>
+-#include <malloc.h>
 -#else
--#include <alloca.h>
--#endif
++#if defined(HAVE_ALLOCA_H)
+ #include <alloca.h>
++#elsif defined(HAVE_MALLOC_H)
++#include <malloc.h>
+ #endif
  
  #include "s_utf8.h"
- 
diff --git a/audio/pd/patches/patch-src_x__list.c b/audio/pd/patches/patch-src_x__list.c
index ce4e28568ba..978be29fe03 100644
--- a/audio/pd/patches/patch-src_x__list.c
+++ b/audio/pd/patches/patch-src_x__list.c
@@ -1,18 +1,21 @@
-$NetBSD: patch-src_x__list.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_x__list.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 alloca.h is not portable.
+https://sourceforge.net/tracker/?func=detail&aid=3411730&group_id=55736&atid=478072
 
 --- src/x_list.c.orig	2010-07-21 18:37:47.000000000 +0000
 +++ src/x_list.c
-@@ -4,11 +4,7 @@
+@@ -4,10 +4,10 @@
  
  #include "m_pd.h"
  /* #include <string.h> */
 -#ifdef MSW
- #include <malloc.h>
+-#include <malloc.h>
 -#else
--#include <alloca.h>
--#endif
++#if defined(HAVE_ALLOCA_H)
+ #include <alloca.h>
++#elsif defined(HAVE_MALLOC_H)
++#include <malloc.h>
+ #endif
  
  extern t_pd *newest;
- 
diff --git a/audio/pd/patches/patch-src_x__misc.c b/audio/pd/patches/patch-src_x__misc.c
index 56b94dd2133..8b909340224 100644
--- a/audio/pd/patches/patch-src_x__misc.c
+++ b/audio/pd/patches/patch-src_x__misc.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-src_x__misc.c,v 1.1.1.1 2011/09/15 01:05:05 wiz Exp $
+$NetBSD: patch-src_x__misc.c,v 1.2 2011/10/05 20:02:48 wiz Exp $
 
 Define missing symbol the same as on FreeBSD/Mac OS X.
+https://sourceforge.net/tracker/?func=detail&aid=3411732&group_id=55736&atid=478072
 
 --- src/x_misc.c.orig	2010-07-28 20:55:17.000000000 +0000
 +++ src/x_misc.c