- Update to 0.42

PR:		130470
Submitted by:	Ports Fury

7 files changed, 107 insertions, 250 deletions

diff --git a/audio/pd/files/patch-extra_pd_pd.c b/audio/pd/files/patch-extra_pd_pd.c
new file mode 100644
index 000000000000..1568433b4a8d
--- /dev/null
+++ b/audio/pd/files/patch-extra_pd_pd.c
@@ -0,0 +1,19 @@
+--- extra/pd~/pd~.c.orig	2008-12-12 01:29:02.000000000 +0900
++++ extra/pd~/pd~.c	2009-01-12 01:36:46.000000000 +0900
+@@ -11,6 +11,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <signal.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+@@ -47,7 +48,7 @@
+ 
+ #endif
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD__)
+ #ifdef __x86_64__
+ static char pd_tilde_dllextent[] = ".l_ia64",
+     pd_tilde_dllextent2[] = ".pd_linux";
diff --git a/audio/pd/files/patch-extra_sigmund_sigmundtilde.c b/audio/pd/files/patch-extra_sigmund_sigmundtilde.c
deleted file mode 100644
index 90baaeda5439..000000000000
--- a/audio/pd/files/patch-extra_sigmund_sigmundtilde.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/sigmund~/sigmund~.c.orig	Sun Mar 25 12:22:47 2007
-+++ extra/sigmund~/sigmund~.c	Sun Mar 25 12:22:50 2007
-@@ -16,7 +16,7 @@
- #ifdef MSW
- #include <malloc.h>
- #else
--#include <alloca.h>
-+//#include <alloca.h>
- #endif
- #include <stdlib.h>
- #ifdef NT
diff --git a/audio/pd/files/patch-src_configure.in b/audio/pd/files/patch-src_configure.in
deleted file mode 100644
index 511a137f57d9..000000000000
--- a/audio/pd/files/patch-src_configure.in
+++ /dev/null
@@ -1,142 +0,0 @@
---- src/configure.in.orig	Sat Oct 28 21:13:24 2006
-+++ src/configure.in	Sun Mar 25 13:28:57 2007
-@@ -22,6 +22,9 @@
- AC_SUBST(EXTERNTARGET)
- 
- dnl other defaults
-+dnl respect upstream CFLAGS
-+GUIFLAGS="$CFLAGS $GUIFLAGS"
-+echo Base GUIFLAGS=$GUIFLAGS
- 
- dnl check for features
- 
-@@ -83,7 +86,7 @@
-          echo "pthreads required" || exit 1)
- 
- dnl Check for fftw package
--if test x$fftw == "xyes";
-+if test x$fftw = "xyes";
- then
- AC_CHECK_LIB(fftw, fftw_one,PDLIB="$PDLIB -lfftw",
-     echo "fftw package not found - using built-in FFT"; fftw=no)
-@@ -92,62 +95,96 @@
- dnl look for tcl 8.x... do I really have to go through all this!?
- 
- foundit=no
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl.h,foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl8.7/tcl.h,
-     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl8.6/tcl.h,
-     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl8.5/tcl.h,
-     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl8.4/tcl.h,
-     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl8.3/tcl.h,
-     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     AC_CHECK_HEADER(tcl8.2/tcl.h,
-     	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,)
- fi
--if test $foundit == "no";
-+if test x$foundit = "xno";
- then
-     echo no tcl header found
-     exit -1
- fi
- 
--AC_CHECK_LIB(tcl8.7, main,,
--    AC_CHECK_LIB(tcl8.6, main,,
--	AC_CHECK_LIB(tcl8.5, main,,
--	    AC_CHECK_LIB(tcl8.4, main,,
--		AC_CHECK_LIB(tcl8.3, main,,
--		    AC_CHECK_LIB(tcl8.2, main,,
--        		AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found || exit 1)))))))
--
--AC_CHECK_LIB(tk8.7, main,,
--    AC_CHECK_LIB(tk8.6, main,,
--	AC_CHECK_LIB(tk8.5, main,,
--	    AC_CHECK_LIB(tk8.4, main,,
--		AC_CHECK_LIB(tk8.3, main,,
--		    AC_CHECK_LIB(tk8.2, main,,
--        		AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1)))))))
--
-+AC_CHECK_LIB(tcl87, main,,
-+    AC_CHECK_LIB(tcl86, main,,
-+	AC_CHECK_LIB(tcl85, main,,
-+	    AC_CHECK_LIB(tcl84, main,,
-+		AC_CHECK_LIB(tcl83, main,,
-+		    AC_CHECK_LIB(tcl82, main,,
-+        		AC_CHECK_LIB(tcl80, main,,echo no tcl library found || exit 1)))))))
-+
-+AC_CHECK_LIB(tk87, main,,
-+    AC_CHECK_LIB(tk86, main,,
-+	AC_CHECK_LIB(tk85, main,,
-+	    AC_CHECK_LIB(tk84, main,,
-+		AC_CHECK_LIB(tk83, main,,
-+		    AC_CHECK_LIB(tk82, main,,
-+        		AC_CHECK_LIB(tk80, main,,echo no tk library found || exit 1)))))))
-+
-+
-+if test `uname -s` = FreeBSD;
-+then
-+    EXT=pd_freebsd
-+    CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD\
-+    	-DUSEAPI_OSS \
-+        -I../portaudio/pa_common -I../portaudio/pablio \
-+        -I../portmidi/pm_common \
-+        -I../portmidi/pm_linux \
-+        -fno-strict-aliasing"
-+    LDFLAGS="-Wl,-export-dynamic"
-+    SYSSRC="s_audio_oss.c"
-+    if test x$portaudio = "xyes";
-+    then
-+    	MORECFLAGS="-DUSEAPI_PORTAUDIO "$MORECFLAGS
-+	SYSSRC="s_audio_pa.c \
-+	../portaudio/pa_common/pa_allocation.c  \
-+	../portaudio/pa_common/pa_converters.c  \
-+	../portaudio/pa_common/pa_cpuload.c     \
-+	../portaudio/pa_common/pa_dither.c      \
-+	../portaudio/pa_common/pa_front.c       \
-+	../portaudio/pa_common/pa_process.c     \
-+	../portaudio/pa_common/pa_skeleton.c    \
-+	../portaudio/pa_common/pa_stream.c      \
-+	../portaudio/pa_common/pa_trace.c       \
-+    	../portaudio/pablio/pablio_pd.c         \
-+	../portaudio/pablio/ringbuffer_pd.c     \
-+	../portaudio/pa_unix/pa_unix_hostapis.c \
-+	../portaudio/pa_unix/pa_unix_util.c     \
-+	../portaudio/pa_unix_oss/pa_unix_oss.c "$SYSSRC
-+    fi
-+    GUINAME="pd-gui"
-+    OSNUMBER=0
-+fi
- 
- if test `uname -s` = Linux;
- then
diff --git a/audio/pd/files/patch-src_m_sched.c b/audio/pd/files/patch-src_m_sched.c
index b8b7f33e5402..f59e37e31bc0 100644
--- a/audio/pd/files/patch-src_m_sched.c
+++ b/audio/pd/files/patch-src_m_sched.c
@@ -1,42 +1,69 @@
-$FreeBSD$
-
---- src/m_sched.c.orig	Wed May 18 04:49:44 2005
-+++ src/m_sched.c	Sun Mar 25 00:50:04 2007
-@@ -377,8 +377,8 @@
+--- src/m_sched.c.orig	2008-03-15 09:03:00.000000000 +0900
++++ src/m_sched.c	2008-08-23 22:07:34.000000000 +0900
+@@ -394,8 +394,10 @@
  the audio I/O system is still busy with previous transfers.
  */
  
--void sys_pollmidiqueue( void);
--void sys_initmidiqueue( void);
-+//void sys_pollmidiqueue( void);
-+//void sys_initmidiqueue( void);
++#if !defined(__FreeBSD__)
+ void sys_pollmidiqueue( void);
+ void sys_initmidiqueue( void);
++#endif
  
   /* sys_idlehook is a hook the user can fill in to grab idle time.  Return
  nonzero if you actually used the time; otherwise we're really really idle and
-@@ -402,7 +402,7 @@
+@@ -419,7 +421,9 @@
          sys_sleepgrain = 100;
      else if (sys_sleepgrain > 5000)
          sys_sleepgrain = 5000;
--    sys_initmidiqueue();
-+//    sys_initmidiqueue();
++#if !defined(__FreeBSD__)
+     sys_initmidiqueue();
++#endif
      while (!sys_quit)
      {
          int didsomething = 0;
-@@ -454,7 +454,7 @@
+@@ -476,7 +480,9 @@
                      timeforward = SENDDACS_YES;
              else timeforward = SENDDACS_NO;
          }
--        sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
-+//        sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
++#if !defined(__FreeBSD__)
+         sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
++#endif
          sys_addhist(1);
          if (timeforward != SENDDACS_NO)
              sched_tick(sys_time + sys_time_per_dsp_tick);
-@@ -462,7 +462,7 @@
+@@ -484,7 +490,9 @@
              didsomething = 1;
  
          sys_addhist(2);
--        sys_pollmidiqueue();
-+//        sys_pollmidiqueue();
++#if !defined(__FreeBSD__)
+         sys_pollmidiqueue();
++#endif
          if (sys_pollgui())
          {
              if (!didsomething)
+@@ -522,11 +530,15 @@
+ 
+ void sched_audio_callbackfn(void)
+ {
++#if !defined(__FreeBSD__)
+     sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
++#endif
+     sys_addhist(1);
+     sched_tick(sys_time + sys_time_per_dsp_tick);
+     sys_addhist(2);
++#if !defined(__FreeBSD__)
+     sys_pollmidiqueue();
++#endif
+     sys_addhist(3);
+     sys_pollgui();
+     sys_addhist(5);
+@@ -536,7 +548,9 @@
+ 
+ static void m_callbackscheduler(void)
+ {
++#if !defined(__FreeBSD__)
+     sys_initmidiqueue();
++#endif
+     while (!sys_quit)
+     {
+ #ifdef MSW
diff --git a/audio/pd/files/patch-src_s_inter.c b/audio/pd/files/patch-src_s_inter.c
index bbf839d3c38f..80c150152213 100644
--- a/audio/pd/files/patch-src_s_inter.c
+++ b/audio/pd/files/patch-src_s_inter.c
@@ -1,6 +1,6 @@
---- src/s_inter.c.orig	Tue Aug 15 07:03:09 2006
-+++ src/s_inter.c	Sun Mar 25 13:03:16 2007
-@@ -831,7 +831,7 @@
+--- src/s_inter.c.orig	2008-03-15 09:03:00.000000000 +0900
++++ src/s_inter.c	2008-08-23 21:40:09.000000000 +0900
+@@ -839,7 +839,7 @@
  
  static int sys_watchfd;
  
@@ -9,24 +9,26 @@
  void glob_watchdog(t_pd *dummy)
  {
      if (write(sys_watchfd, "\n", 1) < 1)
-@@ -1247,7 +1247,8 @@
+@@ -1263,7 +1263,11 @@
               sys_gui("pdtk_watchdog\n");
  #endif
           sys_get_audio_apis(buf);
--         sys_get_midi_apis(buf2);
-+//         sys_get_midi_apis(buf2);
-+	 strcpy(buf2, "{}");
-          sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2,
-                                   sys_font); 
++#if defined(__FreeBSD__)
++         strcpy(buf2, "{}");
++#else
+          sys_get_midi_apis(buf2);
++#endif
+          sys_vgui("pdtk_pd_startup {%s} %s %s {%s} %s\n", pd_version, buf, buf2, 
+                   sys_font, sys_fontweight); 
      }
-@@ -1269,8 +1270,8 @@
+@@ -1285,8 +1289,10 @@
  #ifndef __linux__  /* sys_close_audio() hangs if you're in a signal? */
          fprintf(stderr, "closing audio...\n");
          sys_close_audio();
--        fprintf(stderr, "closing MIDI...\n");
--        sys_close_midi();
-+//      fprintf(stderr, "closing MIDI...\n");
-+//      sys_close_midi();
++#if !defined(__FreeBSD__)
+         fprintf(stderr, "closing MIDI...\n");
+         sys_close_midi();
++#endif
          fprintf(stderr, "... done.\n");
  #endif
          exit(n);
diff --git a/audio/pd/files/patch-src_s_main.c b/audio/pd/files/patch-src_s_main.c
index 357adac3e0e9..e97a92ed2928 100644
--- a/audio/pd/files/patch-src_s_main.c
+++ b/audio/pd/files/patch-src_s_main.c
@@ -1,47 +1,54 @@
---- src/s_main.c.orig	Wed Sep 27 19:22:35 2006
-+++ src/s_main.c	Sun Mar 25 19:47:12 2007
-@@ -310,7 +310,7 @@
+--- src/s_main.c.orig	2008-03-15 09:03:00.000000000 +0900
++++ src/s_main.c	2008-08-23 21:44:26.000000000 +0900
+@@ -301,7 +301,9 @@
      else
      {
              /* open audio and MIDI */
--        sys_reopen_midi();
-+//      sys_reopen_midi();
++#if !defined(__FreeBSD__)
+         sys_reopen_midi();
++#endif
          sys_reopen_audio();
              /* run scheduler until it quits */
-         return (m_scheduler());
-@@ -635,7 +635,7 @@
+         return (m_mainloop());
+@@ -633,7 +635,9 @@
          }
          else if (!strcmp(*argv, "-alsamidi"))
          {
--          sys_set_midi_api(API_ALSA);
-+//          sys_set_midi_api(API_ALSA);
++#if !defined(__FreeBSD__)
+           sys_set_midi_api(API_ALSA);
++#endif
              argc--; argv++;
          }
  #endif
-@@ -904,7 +904,7 @@
+@@ -916,7 +920,11 @@
              /* add "doc/5.reference" library to helppath */
      strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
      sbuf[MAXPDSTRING-30] = 0;
--    strcat(sbuf, "/doc/5.reference");
++#if defined(__FreeBSD__)
 +    strcat(sbuf, "/share/doc/pd/5.reference");
++#else
+     strcat(sbuf, "/doc/5.reference");
++#endif
      sys_helppath = namelist_append_files(sys_helppath, sbuf);
          /* correct to make audio and MIDI device lists zero based.  On
          MMIO, however, "1" really means the second device (the first one
-@@ -957,7 +957,7 @@
+@@ -969,7 +977,9 @@
          for (i = 0; i < naudiooutdev; i++)
              audiooutdev[i] = sys_soundoutdevlist[i];
      }
--    sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
-+//    sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
++#if !defined(__FreeBSD__)
+     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
++#endif
      if (sys_nmidiin >= 0)
      {
          post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
-@@ -977,7 +977,7 @@
-         rate = sys_main_srate;
-     sys_open_audio(naudioindev, audioindev, nchindev, chindev,
-         naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance, 0);
--    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
-+//    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
+@@ -992,7 +1002,9 @@
+     sys_set_audio_settings(naudioindev, audioindev, nchindev, chindev,
+         naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance, 
+         callback);
++#if !defined(__FreeBSD__)
+     sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
++#endif
  }
  
  static void sys_addreferencepath(void)
diff --git a/audio/pd/files/patch-src_u_main.tk b/audio/pd/files/patch-src_u_main.tk
deleted file mode 100644
index 35d5b1077b8c..000000000000
--- a/audio/pd/files/patch-src_u_main.tk
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/u_main.tk.orig	Sun Oct  8 20:04:07 2006
-+++ src/u_main.tk	Sun Mar 25 22:15:29 2007
-@@ -91,7 +91,7 @@
- 
- set pd_deffont {courier 12 bold}
- 
--set help_top_directory $pd_guidir/doc
-+set help_top_directory $pd_guidir/share/doc/pd
- 
- # it's unfortunate but we seem to have to turn off global bindings
- # for Text objects to get control-s and control-t to do what we want for
-@@ -513,9 +513,9 @@
-          }
-          
-     $mbar.audio add command -label {Test Audio and MIDI} \
--        -command {menu_doc_open doc/7.stuff/tools testtone.pd} 
-+        -command {menu_doc_open share/doc/pd/7.stuff/tools testtone.pd} 
-     $mbar.audio add command -label {Load Meter} \
--        -command {menu_doc_open doc/7.stuff/tools load-meter.pd} 
-+        -command {menu_doc_open share/doc/pd/7.stuff/tools load-meter.pd} 
- 
- #       the MacOS X app menu
- 
-@@ -526,7 +526,7 @@
- # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm
-          if {$pd_nt == 2} {
-                   $mbar.apple add command -label "About Pd..." -command \
--                                {menu_doc_open doc/1.manual 1.introduction.txt} 
-+                                {menu_doc_open share/doc/pd/1.manual 1.introduction.txt} 
-                   menu $mbar.apple.preferences -tearoff 0
-                   $mbar.apple add cascade -label "Preferences" -menu $mbar.apple.preferences
-                   $mbar.apple.preferences add command -label "Path..." \
-@@ -543,10 +543,10 @@
-         # the "Help" menu
-     if {$pd_nt != 2} {
-         $mbar.help add command -label {About Pd} \
--            -command {menu_doc_open doc/1.manual 1.introduction.txt} 
-+            -command {menu_doc_open share/doc/pd/1.manual 1.introduction.txt} 
-     }
-     $mbar.help add command -label {Html ...} \
--        -command {menu_doc_open doc/1.manual index.htm} 
-+        -command {menu_doc_open share/doc/pd/1.manual index.htm} 
-     $mbar.help add command -label {Browser ...} \
-         -command {menu_doc_browser $help_top_directory} 
- }