Attachment #76930 for bug #110825

View | Details | Raw Unified | Return to bug 110825
Collapse All | Expand All




#

PORTNAME=	pd
DISTVERSION=	0.40-2
DISTVERSIONSUFFIX=	.src
CATEGORIES=	audio
MASTER_SITES=	http://www-crca.ucsd.edu/~msp/Software/
DISTNAME=	pd-0.37-1test1.src

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Pure Data, a MIDI-capable real-time audio processor/synthesizer

WRKSRC=		${WRKDIR}/${DISTNAME:S;.src;/src;}
		tk84:${PORTSDIR}/x11-toolkits/tk84

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
MAKEFILE=	makefile
MAN1=		pd.1 pdreceive.1 pdsend.1
PATCH_WRKSRC=	${WRKSRC}/..
PLIST=		${WRKDIR}/pkg-plist
USE_GMAKE=	yes
USE_X_PREFIX=	yes
USE_AUTOTOOLS=	autoconf:259
USE_TCL=	yes
USE_TK=		yes
USE_TCL_BUILD=	yes
USE_TK_BUILD=	yes

.include <bsd.port.pre.mk>



post-configure:
	${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig
	${SED} -e "s:^LIB =:LIB =${PTHREAD_LIBS}:g; \
		s:^pddocdir = .*:pddocdir = ${PREFIX}/share/doc/pd:g; \
		s:x_midi.c ::g; s:s_midi.c ::g;" \
		s:GFLAGS = :GFLAGS = -DUSEAPI_OSS :g; \
		s:x_midi.c ::g; s:s_midi.c ::g; \
		s:^CFLAGS =:CFLAGS+=${PTHREAD_CFLAGS}:g" \
		< ${WRKSRC}/makefile.orig > ${WRKSRC}/makefile

pre-install:

Lines 1-3 Link Here

(-)pd/distinfo (-3 / +3 lines)
1	MD5 (pd-0.37-1test1.src.tar.gz) = 6f1f24d17b32bdd566fd5090a09c77f4	1	MD5 (pd-0.40-2.src.tar.gz) = 2622e12b6fa0bd69db9732972e953afb
2	SHA256 (pd-0.37-1test1.src.tar.gz) = d653a7c0be72cb7cc1c82887dd8e6c5a3c3251581ed0e25c90b315ad29f90bfe	2	SHA256 (pd-0.40-2.src.tar.gz) = a9e0bf841c6411cd301888e0afdb6f50aafcf6868a3f7b8a369f7ae744666c95
3	SIZE (pd-0.37-1test1.src.tar.gz) = 1895995	3	SIZE (pd-0.40-2.src.tar.gz) = 2158886

Line 0 Link Here

(-)pd/files/patch-extra_sigmund_sigmundtilde.c (+11 lines)
	1	--- extra/sigmund~/sigmund~.c.orig Sun Mar 25 12:22:47 2007
	2	+++ extra/sigmund~/sigmund~.c Sun Mar 25 12:22:50 2007
	3	@@ -16,7 +16,7 @@
	4	#ifdef MSW
	5	#include <malloc.h>
	6	#else
	7	-#include <alloca.h>
	8	+//#include <alloca.h>
	9	#endif
	10	#include <stdlib.h>
	11	#ifdef NT




--- 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)
@@ -136,6 +136,38 @@
         		AC_CHECK_LIB(tk8.0, main,,echo no tk library found || exit 1)))))))
 
 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 \
+	-Werror -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 \

+    GUINAME="pd-gui"
+    OSNUMBER=0
+fi
 
 if test `uname -s` = Linux;
 then
     dnl Ckecking for ALSA

Lines 11-17 Link Here

(-)pd/files/patch-src_m_conf.c (-1 / +1 lines)
11	void x_misc_setup(void);	11	void x_misc_setup(void);
12	void x_net_setup(void);	12	void x_net_setup(void);
13	void x_qlist_setup(void);	13	void x_qlist_setup(void);
14	@@ -78,7 +78,7 @@ void conf_init(void)	14	@@ -79,7 +79,7 @@ void conf_init(void)
15	x_connective_setup();	15	x_connective_setup();
16	x_time_setup();	16	x_time_setup();
17	x_arithmetic_setup();	17	x_arithmetic_setup();




$FreeBSD$

--- src/m_glob.c.orig	Sun Mar 25 00:37:25 2007
+++ src/m_glob.c	Sun Mar 25 00:38:40 2007
@@ -21,9 +21,9 @@
 void glob_audio_properties(t_pd *dummy, t_floatarg flongform);
 void glob_audio_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
 void glob_audio_setapi(t_pd *dummy, t_floatarg f);
-void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
-void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
-void glob_midi_setapi(t_pd *dummy, t_floatarg f);
+//void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
+//void glob_midi_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
+//void glob_midi_setapi(t_pd *dummy, t_floatarg f);
 void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform);
 void glob_path_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv);
 void glob_start_startup_dialog(t_pd *dummy, t_floatarg flongform);
@@ -96,12 +96,12 @@
         gensym("audio-dialog"), A_GIMME, 0);
     class_addmethod(glob_pdobject, (t_method)glob_audio_setapi,
         gensym("audio-setapi"), A_FLOAT, 0);
-    class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
-        gensym("midi-setapi"), A_FLOAT, 0);
-    class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
-        gensym("midi-properties"), A_DEFFLOAT, 0);
-    class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
-        gensym("midi-dialog"), A_GIMME, 0);
+    //    class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
+    //        gensym("midi-setapi"), A_FLOAT, 0);
+    //    class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
+    //        gensym("midi-properties"), A_DEFFLOAT, 0);
+    //    class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
+    //        gensym("midi-dialog"), A_GIMME, 0);
     class_addmethod(glob_pdobject, (t_method)glob_start_path_dialog,
         gensym("start-path-dialog"), 0);
     class_addmethod(glob_pdobject, (t_method)glob_path_dialog,




$FreeBSD: ports/audio/pd/files/patch-src_m_sched.c,v 1.1 2003/11/12 00:55:19 trevor Exp $

--- 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 @@
 the audio I/O system is still busy with previous transfers.
 */
 

+//void sys_pollmidiqueue( void);
+//void sys_initmidiqueue( void);
 
  /* 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 @@
         sys_sleepgrain = 100;
     else if (sys_sleepgrain > 5000)
         sys_sleepgrain = 5000;
-    sys_initmidiqueue();
+//    sys_initmidiqueue();
     while (!sys_quit)
     {
         int didsomething = 0;
@@ -454,7 +454,7 @@
                     timeforward = SENDDACS_YES;
             else timeforward = SENDDACS_NO;
         }
-        sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
+//        sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
         sys_addhist(1);
         if (timeforward != SENDDACS_NO)
             sched_tick(sys_time + sys_time_per_dsp_tick);
@@ -462,7 +462,7 @@
             didsomething = 1;
 
         sys_addhist(2);
-        sys_pollmidiqueue();
+//        sys_pollmidiqueue();
         if (sys_pollgui())
         {
             if (!didsomething)




--- src/s_file.c.orig	Sat Dec 31 21:08:37 2005
+++ src/s_file.c	Sun Mar 25 01:47:57 2007
@@ -339,7 +339,7 @@
             break;
         nmidioutdev++;
     }
-    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
+//    sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
 
         /* search path */
     if (sys_getpreference("npath", prefbuf, MAXPDSTRING))
@@ -397,8 +397,8 @@
     int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
     int i, rate, advance;
     char buf1[MAXPDSTRING], buf2[MAXPDSTRING];
-    int nmidiindev, midiindev[MAXMIDIINDEV];
-    int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
+//    int nmidiindev, midiindev[MAXMIDIINDEV];
+//    int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
 
     sys_initsavepreferences();
 
@@ -431,7 +431,7 @@
     sprintf(buf1, "%d", rate);
     sys_putpreference("rate", buf1);
 
-        /* MIDI settings */
+        /* MIDI settings
     sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
     sys_putpreference("nomidiin", (nmidiindev <= 0 ? "True" : "False"));
     for (i = 0; i < nmidiindev; i++)
@@ -447,6 +447,7 @@
         sprintf(buf2, "%d", midioutdev[i]);
         sys_putpreference(buf1, buf2);
     }
+    */
         /* file search path */
 
     for (i = 0; 1; i++)




--- 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 @@
 
 static int sys_watchfd;
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
 void glob_watchdog(t_pd *dummy)
 {
     if (write(sys_watchfd, "\n", 1) < 1)
@@ -1247,7 +1247,8 @@
              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); 
     }
@@ -1269,8 +1270,8 @@
 #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();
         fprintf(stderr, "... done.\n");
 #endif
         exit(n);




--- 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 @@
     else
     {
             /* open audio and MIDI */
-        sys_reopen_midi();
+//      sys_reopen_midi();
         sys_reopen_audio();
             /* run scheduler until it quits */
         return (m_scheduler());
@@ -635,7 +635,7 @@
         }
         else if (!strcmp(*argv, "-alsamidi"))
         {
-          sys_set_midi_api(API_ALSA);
+//          sys_set_midi_api(API_ALSA);
             argc--; argv++;
         }
 #endif
@@ -904,7 +904,7 @@
             /* add "doc/5.reference" library to helppath */
     strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
     sbuf[MAXPDSTRING-30] = 0;
-    strcat(sbuf, "/doc/5.reference");
+    strcat(sbuf, "/share/doc/pd/5.reference");
     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 @@
         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 (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);
 }
 
 static void sys_addreferencepath(void)




--- src/t_main.c.orig	Sun Feb 13 00:32:01 2005
+++ src/t_main.c	Sun Feb 13 00:32:11 2005
@@ -19,14 +19,6 @@
 #include <stdlib.h>
 
 /*
- * The following variable is a special hack that is needed in order for
- * Sun shared libraries to be used for Tcl.
- */
-
-extern int matherr(void);
-int *tclDummyMathPtr = (int *) matherr;
-
-/*
  *----------------------------------------------------------------------
  *
  * main --




--- src/t_tkcmd.c.orig	Sat Dec 31 21:08:37 2005
+++ src/t_tkcmd.c	Sun Mar 25 12:12:15 2007
@@ -50,6 +50,10 @@
 #define STARTGUI
 #endif
 
+#ifdef __FreeBSD__
+#define STARTGUI
+#endif
+
 #define FIRSTPORTNUM 5600
 
 void tcl_mess(char *s);




--- 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} 
 }




--- src/x_list.c.orig	Fri Nov  3 05:22:20 2006
+++ src/x_list.c	Sun Mar 25 01:34:15 2007
@@ -7,7 +7,8 @@
 #ifdef MSW
 #include <malloc.h>
 #else
-#include <alloca.h>
+#include <stdlib.h>
+/*#include <alloca.h>*/
 #endif
 
 extern t_pd *newest;

Return to bug 110825

Lines 6-33 Link Here

(-)pd/Makefile (-15 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= pd	8	PORTNAME= pd
9	PORTVERSION= 0.39	9	DISTVERSION= 0.40-2
		10	DISTVERSIONSUFFIX= .src
10	CATEGORIES= audio	11	CATEGORIES= audio
11	MASTER_SITES= http://www-crca.ucsd.edu/~msp/Software/	12	MASTER_SITES= http://www-crca.ucsd.edu/~msp/Software/
12	DISTNAME= pd-0.37-1test1.src
13		13
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Pure Data, a MIDI-capable real-time audio processor/synthesizer	15	COMMENT= Pure Data, a MIDI-capable real-time audio processor/synthesizer
16		16
17	LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84 \	17	WRKSRC= ${WRKDIR}/${DISTNAME:S;.src;/src;}
18	tk84:${PORTSDIR}/x11-toolkits/tk84
19
20	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
21	CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \	19	CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" \
22	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -ltk84 -ltcl84"	20	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
23	MAKEFILE= makefile	21	MAKEFILE= makefile
24	MAN1= pd.1 pdreceive.1 pdsend.1	22	MAN1= pd.1 pdreceive.1 pdsend.1
25	PATCH_WRKSRC= ${WRKSRC}/..	23	PATCH_WRKSRC= ${WRKSRC}/..
26	PLIST= ${WRKDIR}/pkg-plist	24	PLIST= ${WRKDIR}/pkg-plist
27	USE_GMAKE= yes	25	USE_GMAKE= yes
28	USE_X_PREFIX= yes
29	USE_AUTOTOOLS= autoconf:259	26	USE_AUTOTOOLS= autoconf:259
30	WRKSRC= ${WRKDIR}/pd-0.37-1test1/src	27	USE_TCL= yes
		28	USE_TK= yes
		29	USE_TCL_BUILD= yes
		30	USE_TK_BUILD= yes
31		31
32	.include <bsd.port.pre.mk>	32	.include <bsd.port.pre.mk>
33		33
Lines 40-51 Link Here
40		40
41	post-configure:	41	post-configure:
42	${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig	42	${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.orig
43	${SED} -e "s:^INCLUDE = :INCLUDE = -I${LOCALBASE}/include/tk8.4 \	43	${SED} -e "s:^LIB =:LIB =${PTHREAD_LIBS}:g; \
44	-I${LOCALBASE}/include/tcl8.4 -I${X11BASE}/include :g; \	44	s:^pddocdir = .*:pddocdir = ${PREFIX}/share/doc/pd:g; \
45	s:^LIB =:LIB =${PTHREAD_LIBS}:g; \	45	s:x_midi.c ::g; s:s_midi.c ::g;" \
46	s:GFLAGS = :GFLAGS = -DUSEAPI_OSS :g; \
47	s:x_midi.c ::g; s:s_midi.c ::g; \
48	s:^CFLAGS =:CFLAGS+=${PTHREAD_CFLAGS}:g" \
49	< ${WRKSRC}/makefile.orig > ${WRKSRC}/makefile	46	< ${WRKSRC}/makefile.orig > ${WRKSRC}/makefile
50		47
51	pre-install:	48	pre-install:

Lines 1-21 Link Here

(-)pd/files/patch-src_configure.in (-13 / +112 lines)
1	$FreeBSD: ports/audio/pd/files/patch-src_configure.in,v 1.1 2003/11/12 00:55:19 trevor Exp $	1	--- src/configure.in.orig Sat Oct 28 21:13:24 2006
2		2	+++ src/configure.in Sun Mar 25 13:28:57 2007
3	--- src/configure.in.orig Fri Sep 26 21:40:18 2003	3	@@ -22,6 +22,9 @@
4	+++ src/configure.in Tue Nov 11 23:53:26 2003	4	AC_SUBST(EXTERNTARGET)
5	@@ -136,6 +136,38 @@
6	AC_CHECK_LIB(tk8.0, main,,echo no tk library found \|\| exit 1)))))))
7		5
		6	dnl other defaults
		7	+dnl respect upstream CFLAGS
		8	+GUIFLAGS="$CFLAGS $GUIFLAGS"
		9	+echo Base GUIFLAGS=$GUIFLAGS
8		10
		11	dnl check for features
		12
		13	@@ -83,7 +86,7 @@
		14	echo "pthreads required" \|\| exit 1)
		15
		16	dnl Check for fftw package
		17	-if test x$fftw == "xyes";
		18	+if test x$fftw = "xyes";
		19	then
		20	AC_CHECK_LIB(fftw, fftw_one,PDLIB="$PDLIB -lfftw",
		21	echo "fftw package not found - using built-in FFT"; fftw=no)
		22	@@ -92,62 +95,96 @@
		23	dnl look for tcl 8.x... do I really have to go through all this!?
		24
		25	foundit=no
		26	-if test $foundit == "no";
		27	+if test x$foundit = "xno";
		28	then
		29	AC_CHECK_HEADER(tcl.h,foundit=yes,)
		30	fi
		31	-if test $foundit == "no";
		32	+if test x$foundit = "xno";
		33	then
		34	AC_CHECK_HEADER(tcl8.7/tcl.h,
		35	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.7";foundit=yes,)
		36	fi
		37	-if test $foundit == "no";
		38	+if test x$foundit = "xno";
		39	then
		40	AC_CHECK_HEADER(tcl8.6/tcl.h,
		41	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.6";foundit=yes,)
		42	fi
		43	-if test $foundit == "no";
		44	+if test x$foundit = "xno";
		45	then
		46	AC_CHECK_HEADER(tcl8.5/tcl.h,
		47	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.5";foundit=yes,)
		48	fi
		49	-if test $foundit == "no";
		50	+if test x$foundit = "xno";
		51	then
		52	AC_CHECK_HEADER(tcl8.4/tcl.h,
		53	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.4";foundit=yes,)
		54	fi
		55	-if test $foundit == "no";
		56	+if test x$foundit = "xno";
		57	then
		58	AC_CHECK_HEADER(tcl8.3/tcl.h,
		59	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.3";foundit=yes,)
		60	fi
		61	-if test $foundit == "no";
		62	+if test x$foundit = "xno";
		63	then
		64	AC_CHECK_HEADER(tcl8.2/tcl.h,
		65	GUIFLAGS="$GUIFLAGS -I/usr/include/tcl8.2";foundit=yes,)
		66	fi
		67	-if test $foundit == "no";
		68	+if test x$foundit = "xno";
		69	then
		70	echo no tcl header found
		71	exit -1
		72	fi
		73
		74	-AC_CHECK_LIB(tcl8.7, main,,
75	- AC_CHECK_LIB(tcl8.6, main,,
76	- AC_CHECK_LIB(tcl8.5, main,,
77	- AC_CHECK_LIB(tcl8.4, main,,
78	- AC_CHECK_LIB(tcl8.3, main,,
79	- AC_CHECK_LIB(tcl8.2, main,,
80	- AC_CHECK_LIB(tcl8.0, main,,echo no tcl library found \|\| exit 1)))))))
81	-
82	-AC_CHECK_LIB(tk8.7, main,,
83	- AC_CHECK_LIB(tk8.6, main,,
84	- AC_CHECK_LIB(tk8.5, main,,
85	- AC_CHECK_LIB(tk8.4, main,,
86	- AC_CHECK_LIB(tk8.3, main,,
87	- AC_CHECK_LIB(tk8.2, main,,
88	- AC_CHECK_LIB(tk8.0, main,,echo no tk library found \|\| exit 1)))))))
89	-
90	+AC_CHECK_LIB(tcl87, main,,
91	+ AC_CHECK_LIB(tcl86, main,,
92	+ AC_CHECK_LIB(tcl85, main,,
93	+ AC_CHECK_LIB(tcl84, main,,
94	+ AC_CHECK_LIB(tcl83, main,,
95	+ AC_CHECK_LIB(tcl82, main,,
96	+ AC_CHECK_LIB(tcl80, main,,echo no tcl library found \|\| exit 1)))))))
97	+
98	+AC_CHECK_LIB(tk87, main,,
99	+ AC_CHECK_LIB(tk86, main,,
100	+ AC_CHECK_LIB(tk85, main,,
101	+ AC_CHECK_LIB(tk84, main,,
102	+ AC_CHECK_LIB(tk83, main,,
103	+ AC_CHECK_LIB(tk82, main,,
104	+ AC_CHECK_LIB(tk80, main,,echo no tk library found \|\| exit 1)))))))
105	+
106	+
9	+if test `uname -s` = FreeBSD;	107	+if test `uname -s` = FreeBSD;
10	+then	108	+then
11	+ EXT=pd_freebsd	109	+ EXT=pd_freebsd
12	+ MORECFLAGS="-DPA_USE_OSS -DPA_LITTLE_ENDIAN \	110	+ CPPFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD\
13	+ -DUSEAPI_OSS \	111	+ -DUSEAPI_OSS \
14	+ -I../portaudio/pa_common \	112	+ -I../portaudio/pa_common -I../portaudio/pablio \
15	+ -I../portaudio/pablio -I../portaudio/portmidi-macosx \	113	+ -I../portmidi/pm_common \
		114	+ -I../portmidi/pm_linux \
16	+ -Werror -fno-strict-aliasing"	115	+ -Werror -fno-strict-aliasing"
		116	+ LDFLAGS="-Wl,-export-dynamic"
17	+ SYSSRC="s_audio_oss.c"	117	+ SYSSRC="s_audio_oss.c"
18	+ if test x$portaudio == "xyes";	118	+ if test x$portaudio = "xyes";
19	+ then	119	+ then
20	+ MORECFLAGS="-DUSEAPI_PORTAUDIO "$MORECFLAGS	120	+ MORECFLAGS="-DUSEAPI_PORTAUDIO "$MORECFLAGS
21	+ SYSSRC="s_audio_pa.c \	121	+ SYSSRC="s_audio_pa.c \
Lines 37-43 Link Here
37	+ GUINAME="pd-gui"	137	+ GUINAME="pd-gui"
38	+ OSNUMBER=0	138	+ OSNUMBER=0
39	+fi	139	+fi
40	+	140
41	if test `uname -s` = Linux;	141	if test `uname -s` = Linux;
42	then	142	then
43	dnl Ckecking for ALSA

Lines 1-30 Link Here

(-)pd/files/patch-src_m_glob.c (-15 / +21 lines)
1	$FreeBSD: ports/audio/pd/files/patch-src_m_glob.c,v 1.1 2003/11/12 00:55:19 trevor Exp $	1	$FreeBSD$
2		2
3	--- src/m_glob.c.orig Thu Jul 31 20:48:15 2003	3	--- src/m_glob.c.orig Sun Mar 25 00:37:25 2007
4	+++ src/m_glob.c Tue Nov 11 22:43:27 2003	4	+++ src/m_glob.c Sun Mar 25 00:38:40 2007
5	@@ -21,8 +21,8 @@ void glob_finderror(t_pd *dummy);	5	@@ -21,9 +21,9 @@
6	void glob_audio_properties(t_pd *dummy, t_floatarg flongform);	6	void glob_audio_properties(t_pd *dummy, t_floatarg flongform);
7	void glob_audio_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);	7	void glob_audio_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
8	void glob_audio_setapi(t_pd *dummy, t_floatarg f);	8	void glob_audio_setapi(t_pd *dummy, t_floatarg f);
9	-void glob_midi_properties(t_pd *dummy, t_floatarg flongform);	9	-void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
10	-void glob_midi_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);	10	-void glob_midi_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
		11	-void glob_midi_setapi(t_pd *dummy, t_floatarg f);
11	+//void glob_midi_properties(t_pd *dummy, t_floatarg flongform);	12	+//void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
12	+//void glob_midi_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);	13	+//void glob_midi_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
		14	+//void glob_midi_setapi(t_pd *dummy, t_floatarg f);
13	void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform);	15	void glob_start_path_dialog(t_pd *dummy, t_floatarg flongform);
14	void glob_path_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);	16	void glob_path_dialog(t_pd dummy, t_symbol s, int argc, t_atom *argv);
15	void glob_ping(t_pd *dummy);	17	void glob_start_startup_dialog(t_pd *dummy, t_floatarg flongform);
16	@@ -89,10 +89,10 @@ void glob_init(void)	18	@@ -96,12 +96,12 @@
17	gensym("audio-dialog"), A_GIMME, 0);	19	gensym("audio-dialog"), A_GIMME, 0);
18	class_addmethod(glob_pdobject, (t_method)glob_audio_setapi,	20	class_addmethod(glob_pdobject, (t_method)glob_audio_setapi,
19	gensym("audio-setapi"), A_FLOAT, 0);	21	gensym("audio-setapi"), A_FLOAT, 0);
		22	- class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
		23	- gensym("midi-setapi"), A_FLOAT, 0);
20	- class_addmethod(glob_pdobject, (t_method)glob_midi_properties,	24	- class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
21	- gensym("midi-properties"), A_DEFFLOAT, 0);	25	- gensym("midi-properties"), A_DEFFLOAT, 0);
22	- class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,	26	- class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
23	- gensym("midi-dialog"), A_GIMME, 0);	27	- gensym("midi-dialog"), A_GIMME, 0);
24	+// class_addmethod(glob_pdobject, (t_method)glob_midi_properties,	28	+ // class_addmethod(glob_pdobject, (t_method)glob_midi_setapi,
25	+// gensym("midi-properties"), A_DEFFLOAT, 0);	29	+ // gensym("midi-setapi"), A_FLOAT, 0);
26	+// class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,	30	+ // class_addmethod(glob_pdobject, (t_method)glob_midi_properties,
27	+// gensym("midi-dialog"), A_GIMME, 0);	31	+ // gensym("midi-properties"), A_DEFFLOAT, 0);
		32	+ // class_addmethod(glob_pdobject, (t_method)glob_midi_dialog,
		33	+ // gensym("midi-dialog"), A_GIMME, 0);
28	class_addmethod(glob_pdobject, (t_method)glob_start_path_dialog,	34	class_addmethod(glob_pdobject, (t_method)glob_start_path_dialog,
29	gensym("start-path-dialog"), A_DEFFLOAT, 0);	35	gensym("start-path-dialog"), 0);
30	class_addmethod(glob_pdobject, (t_method)glob_path_dialog,	36	class_addmethod(glob_pdobject, (t_method)glob_path_dialog,

Lines 1-8 Link Here

(-)pd/files/patch-src_m_sched.c (-27 / +27 lines)
1	$FreeBSD: ports/audio/pd/files/patch-src_m_sched.c,v 1.1 2003/11/12 00:55:19 trevor Exp $	1	$FreeBSD: ports/audio/pd/files/patch-src_m_sched.c,v 1.1 2003/11/12 00:55:19 trevor Exp $
2		2
3	--- src/m_sched.c.orig Wed Aug 27 18:02:19 2003	3	--- src/m_sched.c.orig Wed May 18 04:49:44 2005
4	+++ src/m_sched.c Tue Nov 11 22:45:18 2003	4	+++ src/m_sched.c Sun Mar 25 00:50:04 2007
5	@@ -377,8 +377,8 @@ call. This call returns true if samples	5	@@ -377,8 +377,8 @@
6	the audio I/O system is still busy with previous transfers.	6	the audio I/O system is still busy with previous transfers.
7	*/	7	*/
8		8
Lines 11-42 Link Here
11	+//void sys_pollmidiqueue( void);	11	+//void sys_pollmidiqueue( void);
12	+//void sys_initmidiqueue( void);	12	+//void sys_initmidiqueue( void);
13		13
14	int m_scheduler( void)	14	/* sys_idlehook is a hook the user can fill in to grab idle time. Return
15	{	15	nonzero if you actually used the time; otherwise we're really really idle and
16	@@ -398,7 +398,7 @@ int m_scheduler( void)	16	@@ -402,7 +402,7 @@
17	sys_sleepgrain = 100;	17	sys_sleepgrain = 100;
18	else if (sys_sleepgrain > 5000)	18	else if (sys_sleepgrain > 5000)
19	sys_sleepgrain = 5000;	19	sys_sleepgrain = 5000;
20	- sys_initmidiqueue();	20	- sys_initmidiqueue();
21	+// sys_initmidiqueue();	21	+// sys_initmidiqueue();
22	while (1)	22	while (!sys_quit)
23	{	23	{
24	int didsomething = 0;	24	int didsomething = 0;
25	@@ -440,7 +440,7 @@ int m_scheduler( void)	25	@@ -454,7 +454,7 @@
26	timeforward = SENDDACS_YES;	26	timeforward = SENDDACS_YES;
27	else timeforward = SENDDACS_NO;	27	else timeforward = SENDDACS_NO;
28	}	28	}
29	- sys_setmiditimediff(0, 1e-6 * sys_schedadvance);	29	- sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
30	+// sys_setmiditimediff(0, 1e-6 * sys_schedadvance);	30	+// sys_setmiditimediff(0, 1e-6 * sys_schedadvance);
31	sys_addhist(1);	31	sys_addhist(1);
32	if (timeforward != SENDDACS_NO)	32	if (timeforward != SENDDACS_NO)
33	sched_tick(sys_time + sys_time_per_dsp_tick);	33	sched_tick(sys_time + sys_time_per_dsp_tick);
34	@@ -448,7 +448,7 @@ int m_scheduler( void)	34	@@ -462,7 +462,7 @@
35	didsomething = 1;	35	didsomething = 1;
36		36
37	sys_addhist(2);	37	sys_addhist(2);
38	- sys_pollmidiqueue();	38	- sys_pollmidiqueue();
39	+// sys_pollmidiqueue();	39	+// sys_pollmidiqueue();
40	if (sys_pollgui())	40	if (sys_pollgui())
41	{	41	{
42	if (!didsomething)	42	if (!didsomething)

Line 0 Link Here

(-)pd/files/patch-src_s_file.c (+39 lines)
	1	--- src/s_file.c.orig Sat Dec 31 21:08:37 2005
	2	+++ src/s_file.c Sun Mar 25 01:47:57 2007
	3	@@ -339,7 +339,7 @@
	4	break;
	5	nmidioutdev++;
	6	}
	7	- sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
	8	+// sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
	9
	10	/* search path */
	11	if (sys_getpreference("npath", prefbuf, MAXPDSTRING))
	12	@@ -397,8 +397,8 @@
	13	int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
	14	int i, rate, advance;
	15	char buf1[MAXPDSTRING], buf2[MAXPDSTRING];
	16	- int nmidiindev, midiindev[MAXMIDIINDEV];
	17	- int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
	18	+// int nmidiindev, midiindev[MAXMIDIINDEV];
	19	+// int nmidioutdev, midioutdev[MAXMIDIOUTDEV];
	20
	21	sys_initsavepreferences();
	22
	23	@@ -431,7 +431,7 @@
	24	sprintf(buf1, "%d", rate);
	25	sys_putpreference("rate", buf1);
	26
	27	- /* MIDI settings */
	28	+ /* MIDI settings
	29	sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
	30	sys_putpreference("nomidiin", (nmidiindev <= 0 ? "True" : "False"));
	31	for (i = 0; i < nmidiindev; i++)
	32	@@ -447,6 +447,7 @@
	33	sprintf(buf2, "%d", midioutdev[i]);
	34	sys_putpreference(buf1, buf2);
	35	}
	36	+ */
	37	/* file search path */
	38
	39	for (i = 0; 1; i++)

Lines 1-15 Link Here

(-)pd/files/patch-src_s_inter.c (-14 / +31 lines)
1	$FreeBSD: ports/audio/pd/files/patch-src_s_inter.c,v 1.1 2003/11/12 00:55:19 trevor Exp $	1	--- src/s_inter.c.orig Tue Aug 15 07:03:09 2006
2		2	+++ src/s_inter.c Sun Mar 25 13:03:16 2007
3	--- src/s_inter.c.orig Mon Jul 28 16:49:04 2003	3	@@ -831,7 +831,7 @@
4	+++ src/s_inter.c Tue Nov 11 22:46:26 2003	4
5	@@ -893,8 +893,8 @@ void sys_bail(int n)	5	static int sys_watchfd;
6	#ifndef __linux /* sys_close_audio() hangs if you're in a signal? */	6
7	fprintf(stderr, "closing audio...\n");	7	-#ifdef __linux__
8	sys_close_audio();	8	+#if defined(__linux__) \|\| defined(__FreeBSD__)
9	- fprintf(stderr, "closing MIDI...\n");	9	void glob_watchdog(t_pd *dummy)
10	- sys_close_midi();	10	{
11	+// fprintf(stderr, "closing MIDI...\n");	11	if (write(sys_watchfd, "\n", 1) < 1)
12	+// sys_close_midi();	12	@@ -1247,7 +1247,8 @@
13	fprintf(stderr, "... done.\n");	13	sys_gui("pdtk_watchdog\n");
14	#endif	14	#endif
15	exit(1);	15	sys_get_audio_apis(buf);
		16	- sys_get_midi_apis(buf2);
		17	+// sys_get_midi_apis(buf2);
		18	+ strcpy(buf2, "{}");
		19	sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2,
		20	sys_font);
		21	}
		22	@@ -1269,8 +1270,8 @@
		23	#ifndef __linux__ /* sys_close_audio() hangs if you're in a signal? */
		24	fprintf(stderr, "closing audio...\n");
		25	sys_close_audio();
		26	- fprintf(stderr, "closing MIDI...\n");
		27	- sys_close_midi();
		28	+// fprintf(stderr, "closing MIDI...\n");
		29	+// sys_close_midi();
		30	fprintf(stderr, "... done.\n");
		31	#endif
		32	exit(n);

Lines 1-15 Link Here

(-)pd/files/patch-src_s_main.c (-15 / +47 lines)
1	$FreeBSD: ports/audio/pd/files/patch-src_s_main.c,v 1.1 2003/11/12 00:55:19 trevor Exp $	1	--- src/s_main.c.orig Wed Sep 27 19:22:35 2006
2		2	+++ src/s_main.c Sun Mar 25 19:47:12 2007
3	--- src/s_main.c.orig Wed Oct 29 20:38:54 2003	3	@@ -310,7 +310,7 @@
4	+++ src/s_main.c Tue Nov 11 22:45:46 2003	4	else
5	@@ -253,8 +253,8 @@ int sys_main(int argc, char **argv)	5	{
6	if (sys_startgui(sys_guidir->s_name)) /* start the gui */	6	/* open audio and MIDI */
7	return(1);	7	- sys_reopen_midi();
8	/* open audio and MIDI */	8	+// sys_reopen_midi();
9	- sys_open_midi(sys_nmidiin, sys_midiindevlist,	9	sys_reopen_audio();
10	- sys_nmidiout, sys_midioutdevlist);	10	/* run scheduler until it quits */
11	+// sys_open_midi(sys_nmidiin, sys_midiindevlist,	11	return (m_scheduler());
12	+// sys_nmidiout, sys_midioutdevlist);	12	@@ -635,7 +635,7 @@
13	sys_open_audio(sys_nsoundin, sys_soundindevlist, sys_nchin, sys_chinlist,	13	}
14	sys_nsoundout, sys_soundoutdevlist, sys_nchout, sys_choutlist,	14	else if (!strcmp(*argv, "-alsamidi"))
15	sys_main_srate, sys_main_advance, 1);	15	{
		16	- sys_set_midi_api(API_ALSA);
		17	+// sys_set_midi_api(API_ALSA);
		18	argc--; argv++;
		19	}
		20	#endif
		21	@@ -904,7 +904,7 @@
		22	/* add "doc/5.reference" library to helppath */
		23	strncpy(sbuf, sys_libdir->s_name, MAXPDSTRING-30);
		24	sbuf[MAXPDSTRING-30] = 0;
		25	- strcat(sbuf, "/doc/5.reference");
		26	+ strcat(sbuf, "/share/doc/pd/5.reference");
		27	sys_helppath = namelist_append_files(sys_helppath, sbuf);
		28	/* correct to make audio and MIDI device lists zero based. On
		29	MMIO, however, "1" really means the second device (the first one
		30	@@ -957,7 +957,7 @@
		31	for (i = 0; i < naudiooutdev; i++)
		32	audiooutdev[i] = sys_soundoutdevlist[i];
		33	}
		34	- sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
		35	+// sys_get_midi_params(&nmidiindev, midiindev, &nmidioutdev, midioutdev);
		36	if (sys_nmidiin >= 0)
		37	{
		38	post("sys_nmidiin %d, nmidiindev %d", sys_nmidiin, nmidiindev);
		39	@@ -977,7 +977,7 @@
		40	rate = sys_main_srate;
		41	sys_open_audio(naudioindev, audioindev, nchindev, chindev,
		42	naudiooutdev, audiooutdev, nchoutdev, choutdev, rate, advance, 0);
		43	- sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
		44	+// sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
		45	}
		46
		47	static void sys_addreferencepath(void)

Lines 1-17 Link Here

(-)pd/files/patch-src_t_main.c (-17 lines)
1	--- src/t_main.c.orig Sun Feb 13 00:32:01 2005
2	+++ src/t_main.c Sun Feb 13 00:32:11 2005
3	@@ -19,14 +19,6 @@
4	#include <stdlib.h>
5
6	/*
7	- * The following variable is a special hack that is needed in order for
8	- * Sun shared libraries to be used for Tcl.
9	- */
10	-
11	-extern int matherr(void);
12	-int tclDummyMathPtr = (int ) matherr;
13	-
14	-/*
15	*----------------------------------------------------------------------
16	*
17	* main --

Line 0 Link Here

(-)pd/files/patch-src_t_tkcmd.c (+13 lines)
	1	--- src/t_tkcmd.c.orig Sat Dec 31 21:08:37 2005
	2	+++ src/t_tkcmd.c Sun Mar 25 12:12:15 2007
	3	@@ -50,6 +50,10 @@
	4	#define STARTGUI
	5	#endif
	6
	7	+#ifdef __FreeBSD__
	8	+#define STARTGUI
	9	+#endif
	10	+
	11	#define FIRSTPORTNUM 5600
	12
	13	void tcl_mess(char *s);

Line 0 Link Here

(-)pd/files/patch-src_u_main.tk (+45 lines)
	1	--- src/u_main.tk.orig Sun Oct 8 20:04:07 2006
	2	+++ src/u_main.tk Sun Mar 25 22:15:29 2007
	3	@@ -91,7 +91,7 @@
	4
	5	set pd_deffont {courier 12 bold}
	6
	7	-set help_top_directory $pd_guidir/doc
	8	+set help_top_directory $pd_guidir/share/doc/pd
	9
	10	# it's unfortunate but we seem to have to turn off global bindings
	11	# for Text objects to get control-s and control-t to do what we want for
	12	@@ -513,9 +513,9 @@
	13	}
	14
	15	$mbar.audio add command -label {Test Audio and MIDI} \
	16	- -command {menu_doc_open doc/7.stuff/tools testtone.pd}
	17	+ -command {menu_doc_open share/doc/pd/7.stuff/tools testtone.pd}
	18	$mbar.audio add command -label {Load Meter} \
	19	- -command {menu_doc_open doc/7.stuff/tools load-meter.pd}
	20	+ -command {menu_doc_open share/doc/pd/7.stuff/tools load-meter.pd}
	21
	22	# the MacOS X app menu
	23
	24	@@ -526,7 +526,7 @@
	25	# See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm
	26	if {$pd_nt == 2} {
	27	$mbar.apple add command -label "About Pd..." -command \
	28	- {menu_doc_open doc/1.manual 1.introduction.txt}
	29	+ {menu_doc_open share/doc/pd/1.manual 1.introduction.txt}
	30	menu $mbar.apple.preferences -tearoff 0
	31	$mbar.apple add cascade -label "Preferences" -menu $mbar.apple.preferences
	32	$mbar.apple.preferences add command -label "Path..." \
	33	@@ -543,10 +543,10 @@
	34	# the "Help" menu
	35	if {$pd_nt != 2} {
	36	$mbar.help add command -label {About Pd} \
	37	- -command {menu_doc_open doc/1.manual 1.introduction.txt}
	38	+ -command {menu_doc_open share/doc/pd/1.manual 1.introduction.txt}
	39	}
	40	$mbar.help add command -label {Html ...} \
	41	- -command {menu_doc_open doc/1.manual index.htm}
	42	+ -command {menu_doc_open share/doc/pd/1.manual index.htm}
	43	$mbar.help add command -label {Browser ...} \
	44	-command {menu_doc_browser $help_top_directory}
	45	}

Line 0 Link Here

(-)pd/files/patch-src_x_list.c (+12 lines)
	1	--- src/x_list.c.orig Fri Nov 3 05:22:20 2006
	2	+++ src/x_list.c Sun Mar 25 01:34:15 2007
	3	@@ -7,7 +7,8 @@
	4	#ifdef MSW
	5	#include <malloc.h>
	6	#else
	7	-#include <alloca.h>
	8	+#include <stdlib.h>
	9	+/#include <alloca.h>/
	10	#endif
	11
	12	extern t_pd *newest;