made new patch for building with pd-0.38; removed obsolete patches; ../Makefile now properly unpatches, so I removed the stupid script

svn path=/trunk/; revision=2678

5 files changed, 68 insertions, 47 deletions

diff --git a/packages/darwin_app/patches/configure.jackosx.patch b/packages/darwin_app/patches/configure.jackosx.patch
deleted file mode 100644
index 2094f38f..00000000
--- a/packages/darwin_app/patches/configure.jackosx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/configure,v
-retrieving revision 1.4
-diff -r1.4 configure
-5996c5996
-< # support for jack, on either linux or darwin:
----
-> # support for jack on linux :
-5999,6001c5999,6004
-<     MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
-<     SYSSRC=$SYSSRC" s_audio_jack.c"
-<     LDFLAGS=$LDFLAGS" -lrt -ljack"
----
->     if test `uname -s` = Linux
->     then
->         MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
->         SYSSRC=$SYSSRC" s_audio_jack.c"
->         LDFLAGS=$LDFLAGS" -lrt -ljack"
->     fi
diff --git a/packages/darwin_app/patches/darwin_build-0.38.patch b/packages/darwin_app/patches/darwin_build-0.38.patch
new file mode 100644
index 00000000..1f20f14b
--- /dev/null
+++ b/packages/darwin_app/patches/darwin_build-0.38.patch
@@ -0,0 +1,68 @@
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/pure-data/pd/src/configure.in,v
+retrieving revision 1.7
+diff -w -r1.7 configure.in
+14a15
+> AC_SUBST(TCLTK_FRAMEWORKS_PATH)
+175a177
+> 
+213a216,224
+> 
+>     if test x$jack == "xyes";
+>     then
+>         LDFLAGS=$LDFLAGS" -lrt -ljack"
+>     fi
+>     if test x$jack == "xrun";
+>     then
+>         LDFLAGS=$LDFLAGS" -lrt -ljack"
+>     fi
+241,244c252,265
+<     GUIFLAGS="-F../../Frameworks -framework Tcl -framework Tk \
+<         -I../../Frameworks/Tk.framework/Versions/Current/Headers \
+<         -I../../Frameworks/Tcl.framework/Versions/Current/Headers \
+<         -I../../Frameworks/Tcl.framework/Versions/8.4/PrivateHeaders"
+---
+> # find the Tcl/Tk Frameworks
+> 	 TCLTK_STANDALONE=`/bin/ls -1dr /Volumes/TclTkAquaStandalone-8.4.* | head -1`
+> 	 if test -d "../../Frameworks";
+>     then
+>         # Miller's location
+>         TCLTK_FRAMEWORKS_PATH="../../Frameworks"
+>     else
+> 	     # get it from the default install location
+>         TCLTK_FRAMEWORKS_PATH="/Library/Frameworks"
+>     fi		 
+>     GUIFLAGS="-F$TCLTK_FRAMEWORKS_PATH -framework Tcl -framework Tk \
+>         -I$TCLTK_FRAMEWORKS_PATH/Tk.framework/Versions/Current/Headers \
+>         -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/Current/Headers \
+>         -I$TCLTK_FRAMEWORKS_PATH/Tcl.framework/Versions/8.4/PrivateHeaders"
+249c270
+< 	OPT_CFLAGS="-O2"
+---
+>         OPT_CFLAGS="-O2 -fast -fPIC -mcpu=7450 -faltivec"
+252a274
+> 
+256,257c278,281
+< 	MORECFLAGS=$MORECFLAGS" -DUSEAPI_JACK"
+< 	SYSSRC=$SYSSRC" s_audio_jack.c"
+---
+>     fi
+>     if test x$jack == "xrun";
+>     then
+>         LDFLAGS=$LDFLAGS" -framework Jack"
+267d290
+<     LDFLAGS=$LDFLAGS" -lrt -ljack"
+273d295
+<     LDFLAGS=$LDFLAGS" -lrt -ljack"
+Index: makefile.in
+===================================================================
+RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
+retrieving revision 1.5
+diff -w -r1.5 makefile.in
+102,103c102,103
+< 	../../Frameworks/Tk.framework/Versions/Current/Tk \
+< 	../../Frameworks/Tcl.framework/Versions/Current/Tcl \
+---
+> 	@TCLTK_FRAMEWORKS_PATH@/Tk.framework/Versions/Current/Tk \
+> 	@TCLTK_FRAMEWORKS_PATH@/Tcl.framework/Versions/Current/Tcl \
diff --git a/packages/darwin_app/patches/makefile.in.patch b/packages/darwin_app/patches/makefile.in.patch
deleted file mode 100644
index 4543d109..00000000
--- a/packages/darwin_app/patches/makefile.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: makefile.in
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
-retrieving revision 1.3
-diff -r1.3 makefile.in
-103,104c103,104
-< 	/Library/Frameworks/Tk.framework/Versions/Current/Tk \
-< 	/Library/Frameworks/Tcl.framework/Versions/Current/Tcl \
----
-> 	/Applications/Utilities/Wish\ Shell.app/Contents/Frameworks/Tk.framework/Versions/Current/Tk \
-> 	/Applications/Utilities/Wish\ Shell.app/Contents/Frameworks/Tcl.framework/Versions/Current/Tcl \
diff --git a/packages/darwin_app/patches/s_audio_jack.patch b/packages/darwin_app/patches/s_audio_jack.patch
deleted file mode 100644
index e1910ccd..00000000
--- a/packages/darwin_app/patches/s_audio_jack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: s_audio_jack.c
-===================================================================
-RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v
-retrieving revision 1.4
-diff -r1.4 s_audio_jack.c
-43c43,45
-< 	
----
->         #ifdef MACOSX
->         jack_out_max = nframes;
->         #else	
-45a48
->         #endif 
diff --git a/packages/darwin_app/patches/unpatch b/packages/darwin_app/patches/unpatch
deleted file mode 100755
index 9ba3a16e..00000000
--- a/packages/darwin_app/patches/unpatch
+++ /dev/null
@@ -1,3 +0,0 @@
-cd ../../../pd/src 
-rm s_inter.c makefile.in u_main.tk s_audio_jack.c configure
-cvs update s_inter.c makefile.in u_main.tk s_audio_jack.c configure