Update to 0.36-0.

10 files changed, 12 insertions, 190 deletions

diff --git a/audio/pd/Makefile b/audio/pd/Makefile
index e82411689ee7..ea67d06aad06 100644
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	pd
-PORTVERSION=	0.35.23
+PORTVERSION=	0.36.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
-DISTNAME=	pd-0.35-test23.linux
+DISTNAME=	pd-0.36-0.linux
 
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Pure Data, a MIDI-capable real-time audio processor/synthesizer
@@ -26,7 +26,7 @@ PATCH_WRKSRC=	${WRKSRC}/..
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/pd-0.35-test23/src
+WRKSRC=		${WRKDIR}/pd-0.36-0/src
 
 pre-patch:
 	${CP} ${WRKSRC}/s_linux.c ${WRKSRC}/s_freebsd.c
diff --git a/audio/pd/distinfo b/audio/pd/distinfo
index fc506caeb54b..05423b2b888e 100644
--- a/audio/pd/distinfo
+++ b/audio/pd/distinfo
@@ -1 +1,2 @@
-MD5 (pd-0.35-test23.linux.tar.gz) = 99c240b5dd0680f92f873fb7785b3965
+$FreeBSD$
+MD5 (pd-0.36-0.linux.tar.gz) = 8d78b4b31f0161a08894374f16a6b83c
diff --git a/audio/pd/files/patch-extra_fiddle~_fiddle~.c b/audio/pd/files/patch-extra_fiddle~_fiddle~.c
deleted file mode 100644
index 67d76b16f24b..000000000000
--- a/audio/pd/files/patch-extra_fiddle~_fiddle~.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- ./extra/fiddle~/fiddle~.c.orig	Mon Apr 15 15:52:45 2002
-+++ ./extra/fiddle~/fiddle~.c	Sun Oct 20 02:48:51 2002
-@@ -40,9 +40,7 @@
- #define fexp exp
- #define fsqrt sqrt
- #pragma warning (disable: 4305 4244)
--#endif
--
--#if (defined(__linux__) || defined(MACOSX))
-+#else
- #define flog log
- #define fexp exp
- #define fsqrt sqrt
-@@ -702,11 +700,11 @@
- 
-     for (npitch = 0; npitch < x->x_npitch; npitch++)
-     {
--	int index;
-+	int myindex;
- 	float best;
- 	if (npitch)
- 	{
--	    for (best = 0, index = -1, j=1; j < maxbin-1; j++)
-+	    for (best = 0, myindex = -1, j=1; j < maxbin-1; j++)
- 	    {
- 		if (histogram[j] > best && histogram[j] > histogram[j-1] &&
- 		    histogram[j] > histogram[j+1])
-@@ -726,7 +724,7 @@
- 			if (histogram[j + sigfiddle_intpartialonset[k]]
- 			    > histogram[j]) goto peaknogood;
- 		    }
--		    index = j;
-+		    myindex = j;
- 		    best = histogram[j];
- 		}
- 	    peaknogood: ;
-@@ -734,13 +732,13 @@
- 	}
- 	else
- 	{
--	    for (best = 0, index = -1, j=0; j < maxbin; j++)
-+	    for (best = 0, myindex = -1, j=0; j < maxbin; j++)
- 		if (histogram[j] > best)
--		    index = j,  best = histogram[j];
-+		    myindex = j,  best = histogram[j];
- 	}
--	if (index < 0) break;
-+	if (myindex < 0) break;
- 	histvec[npitch].h_value = best;
--	histvec[npitch].h_index = index;
-+	histvec[npitch].h_index = myindex;
-     }
- #if 1
-     if (x->x_nprint)
-@@ -1641,8 +1639,7 @@
- {
-      if (sp[0]->s_n > x->x_hop) {
-     	x->x_downsample = sp[0]->s_n / x->x_hop;
--    	post("* warning: fiddle~: will downsample input by
--%ld",x->x_downsample);
-+    	post("* warning: fiddle~: will downsample input by %ld",x->x_downsample);
-     	x->x_sr = sp[0]->s_sr / x->x_downsample;
-     } else {
-     	x->x_downsample = 1;
diff --git a/audio/pd/files/patch-extra_paf~_paf~.c b/audio/pd/files/patch-extra_paf~_paf~.c
deleted file mode 100644
index 901afc5f68aa..000000000000
--- a/audio/pd/files/patch-extra_paf~_paf~.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- extra/paf~/paf~.c.orig	Wed Mar  6 18:58:30 2002
-+++ extra/paf~/paf~.c	Fri May 24 23:15:15 2002
-@@ -161,6 +161,20 @@ static void linenv_set(t_linenv *l, floa
- #define DONE_MACHINE_TYPE
- #endif /* MACOSX */
- 
-+#ifdef __FreeBSD__
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define HIOFFSET 1
-+#define LOWOFFSET 0
-+#else
-+#define HIOFFSET 0    /* word offset to find MSB */
-+#define LOWOFFSET 1    /* word offset to find LSB */
-+#endif /* BYTE_ORDER */
-+#include <sys/types.h>
-+#define int32 int32_t
-+#define DONE_MACHINE_TYPE
-+#endif /* __FreeBSD__ */
-+
- #ifdef  __linux__
- 
- #include <endian.h>
diff --git a/audio/pd/files/patch-src_configure b/audio/pd/files/patch-src_configure
deleted file mode 100644
index 90a50b9feb35..000000000000
--- a/audio/pd/files/patch-src_configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/configure.orig	Thu Apr 25 19:16:29 2002
-+++ src/configure	Fri May 24 23:12:20 2002
-@@ -2655,6 +2655,16 @@ fi
- 
- 
- 
-+if test `uname -s` = FreeBSD;
-+then
-+    LDFLAGS="-Wl,-export-dynamic"
-+    EXT=pd_freebsd
-+    MORECFLAGS=-DDL_OPEN
-+    SYSSRC=s_freebsd.c
-+    STRIPFLAG=-s
-+    GUINAME="pd-gui"
-+    OSNUMBER=0
-+fi
- 
- if test `uname -s` = Linux;
- then
diff --git a/audio/pd/files/patch-src_d_array.c b/audio/pd/files/patch-src_d_array.c
deleted file mode 100644
index 2428de3d7a50..000000000000
--- a/audio/pd/files/patch-src_d_array.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/d_array.c.orig	Fri Nov 16 23:57:20 2001
-+++ src/d_array.c	Fri May 24 23:12:22 2002
-@@ -508,6 +508,19 @@ static void tabread4_tilde_setup(void)
- #define LOWOFFSET 0
- #define int32 long
- #else
-+#ifdef __FreeBSD__
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define HIOFFSET 1
-+#define LOWOFFSET 0
-+#else
-+#define HIOFFSET 0    /* word offset to find MSB */
-+#define LOWOFFSET 1    /* word offset to find LSB */
-+#endif /* BYTE_ORDER */
-+#include <sys/types.h>
-+#define int32 int32_t
-+#endif
-+
- #ifdef  __linux__
- #include <endian.h>
- #if !defined(__BYTE_ORDER) || !defined(__LITTLE_ENDIAN)                         
diff --git a/audio/pd/files/patch-src_d_osc.c b/audio/pd/files/patch-src_d_osc.c
deleted file mode 100644
index 1ff58bb0ffca..000000000000
--- a/audio/pd/files/patch-src_d_osc.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/d_osc.c.orig	Fri Nov 16 23:57:14 2001
-+++ src/d_osc.c	Fri May 24 23:12:26 2002
-@@ -24,6 +24,18 @@
- #define LOWOFFSET 0
- #define int32 long
- #else
-+#ifdef __FreeBSD__
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define HIOFFSET 1
-+#define LOWOFFSET 0
-+#else
-+#define HIOFFSET 0    /* word offset to find MSB */
-+#define LOWOFFSET 1    /* word offset to find LSB */
-+#endif /* BYTE_ORDER */
-+#include <sys/types.h>
-+#define int32 int32_t
-+#endif
- #ifdef __linux__
- 
- #include <endian.h>
diff --git a/audio/pd/files/patch-src_s_freebsd.c b/audio/pd/files/patch-src_s_freebsd.c
index c07683d2053f..a2bf2753268a 100644
--- a/audio/pd/files/patch-src_s_freebsd.c
+++ b/audio/pd/files/patch-src_s_freebsd.c
@@ -1,7 +1,7 @@
 $FreeBSD$
 
---- src/s_freebsd.c.orig	Fri May 23 00:52:34 2003
-+++ src/s_freebsd.c	Fri May 23 01:01:59 2003
+--- src/s_freebsd.c.orig	Sun Sep 28 15:48:40 2003
++++ src/s_freebsd.c	Sun Sep 28 15:48:41 2003
 @@ -32,7 +32,8 @@
   * 1311:forum::für::umläute:2001
   */
@@ -12,18 +12,19 @@ $FreeBSD$
  
  #if (defined(ALSA01) || defined(ALSA99))
  #define ALSA
-@@ -762,8 +762,10 @@
+@@ -765,9 +766,11 @@
  #endif
  
  #ifdef _POSIX_MEMLOCK
 +#if _POSIX_MEMLOCK != -1
      if (mlockall(MCL_FUTURE) != -1) 
      	fprintf(stderr, "memory locking enabled.\n");
-+#endif
  #endif
++#endif
  }
  
-@@ -865,7 +868,8 @@
+ /* ------------ linux-specific command-line flags -------------- */
+@@ -868,7 +871,8 @@
      }
      else
      {
@@ -33,7 +34,7 @@ $FreeBSD$
  	dev->d_bytespersamp = 2;
      }
      param = wantformat;
-@@ -2747,7 +2751,7 @@
+@@ -2750,7 +2754,7 @@
  
    /* use ctrlpanel to change, experiment, channels 1 */
  
diff --git a/audio/pd/files/patch-src_s_loader.c b/audio/pd/files/patch-src_s_loader.c
deleted file mode 100644
index e41f26a7db2e..000000000000
--- a/audio/pd/files/patch-src_s_loader.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/s_loader.c.orig	Wed Mar  6 18:58:30 2002
-+++ src/s_loader.c	Fri May 24 23:12:25 2002
-@@ -23,6 +23,9 @@
- typedef void (*t_xxx)(void);
- 
- static char sys_dllextent[] = 
-+#ifdef __FreeBSD__
-+    ".pd_freebsd";
-+#endif
- #ifdef IRIX
- #ifdef N32
-     ".pd_irix6";
diff --git a/audio/pd/files/patch-src_x_misc.c b/audio/pd/files/patch-src_x_misc.c
deleted file mode 100644
index 49075dd72d5f..000000000000
--- a/audio/pd/files/patch-src_x_misc.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/x_misc.c.orig	Fri Nov 16 23:56:31 2001
-+++ src/x_misc.c	Fri May 24 23:12:26 2002
-@@ -10,6 +10,7 @@
- #include <string.h>
- #ifdef UNIX
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/times.h>
- #include <sys/param.h>
- #endif
-@@ -18,7 +19,7 @@
- #include <time.h>
- #endif
- 
--#ifdef MACOSX
-+#if defined (MACOSX) || defined (__FreeBSD__)
- #define HZ CLK_TCK
- #endif
-