5 files changed, 110 insertions, 0 deletions
diff --git a/academic/grace/patches/xmgrace-fftw.patch b/academic/grace/patches/xmgrace-fftw.patch
new file mode 100644
index 0000000000..e4dac78592
--- /dev/null
+++ b/academic/grace/patches/xmgrace-fftw.patch
@@ -0,0 +1,33 @@
+diff -Naur grace-5.1.22.orig/configure grace-5.1.22/configure
+--- grace-5.1.22.orig/configure	2008-05-21 16:52:09.000000000 -0400
++++ grace-5.1.22/configure	2009-10-01 12:40:20.976239041 -0400
+@@ -15690,7 +15690,7 @@
+ 
+   if test "x$fftw_library" = "x"
+   then
+-    fftw_library=-lfftw
++    fftw_library=-ldfftw
+   fi
+ 
+   { echo "$as_me:$LINENO: checking for FFTW library >= 2.1.3" >&5
+@@ -15722,7 +15722,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-#include <fftw.h>
++#include <dfftw.h>
+ #include <string.h>
+       int main(void) {
+         char *vlib = (char *) fftw_version;
+diff -Naur grace-5.1.22.orig/src/fourier.c grace-5.1.22/src/fourier.c
+--- grace-5.1.22.orig/src/fourier.c	2004-07-03 16:47:45.000000000 -0400
++++ grace-5.1.22/src/fourier.c	2009-10-01 12:41:14.567703801 -0400
+@@ -230,7 +230,7 @@
+ #else
+ /* Start of new FFTW-based transforms by Marcus H. Mendenhall */
+ 
+-#include <fftw.h>
++#include <dfftw.h>
+ #include <string.h>
+ 
+ static char  *wisdom_file=0;
diff --git a/academic/grace/patches/xmgrace-help.patch b/academic/grace/patches/xmgrace-help.patch
new file mode 100644
index 0000000000..d8e2780c3c
--- /dev/null
+++ b/academic/grace/patches/xmgrace-help.patch
@@ -0,0 +1,17 @@
+--- src/xmgrace.c	2007/04/26 09:39:20	1.1
++++ src/xmgrace.c	2007/04/26 09:40:26
+@@ -864,10 +864,10 @@
+ 
+     menupane = CreateMenu(menubar, "Help", 'H', TRUE);
+ 
+-    CreateMenuButton(menupane, "User's Guide", 'G', HelpCB, "doc/UsersGuide.html");
+-    CreateMenuButton(menupane, "Tutorial", 'T', HelpCB, "doc/Tutorial.html");
+-    CreateMenuButton(menupane, "FAQ", 'Q', HelpCB, "doc/FAQ.html");
+-    CreateMenuButton(menupane, "Changes", 'C', HelpCB, "doc/CHANGES.html");
++    CreateMenuButton(menupane, "User's Guide", 'G', HelpCB, "/usr/share/doc/packages/xmgrace/doc/UsersGuide.html");
++    CreateMenuButton(menupane, "Tutorial", 'T', HelpCB, "/usr/share/doc/packages/xmgrace/doc/Tutorial.html");
++    CreateMenuButton(menupane, "FAQ", 'Q', HelpCB, "/usr/share/doc/packages/xmgrace/doc/FAQ.html");
++    CreateMenuButton(menupane, "Changes", 'C', HelpCB, "/usr/share/doc/packages/xmgrace/doc/CHANGES.html");
+ 
+     CreateMenuSeparator(menupane);
+  
diff --git a/academic/grace/patches/xmgrace-netcdf.patch b/academic/grace/patches/xmgrace-netcdf.patch
new file mode 100644
index 0000000000..f18fbb6fe1
--- /dev/null
+++ b/academic/grace/patches/xmgrace-netcdf.patch
@@ -0,0 +1,16 @@
+diff -Naur grace-5.1.21.orig/configure grace-5.1.21/configure
+--- grace-5.1.21.orig/configure	2007-02-16 17:44:49.000000000 -0500
++++ grace-5.1.21/configure	2008-04-03 08:54:45.000000000 -0400
+@@ -15181,7 +15181,11 @@
+       int main(void) {
+         char *vlib;
+         vlib = nc_inq_libvers();
+-        if (strcmp(vlib, "3.0") < 0) {
++	/* nc_inq_libvers() has changed.  It now returns a long string,
++	   a portion of which is in quotes. Advance the pointer to 
++	   eliminate the first quote, then compare.  But also need
++           to ensure backward compatibility. */
++        if ((strcmp(vlib, "3.0") || strcmp(++vlib, "3.0")) < 0) {
+           exit(1);
+         }
+         exit(0);
diff --git a/academic/grace/patches/xmgrace-null.patch b/academic/grace/patches/xmgrace-null.patch
new file mode 100644
index 0000000000..5a8eb77057
--- /dev/null
+++ b/academic/grace/patches/xmgrace-null.patch
@@ -0,0 +1,11 @@
+--- src/fontwin.c
++++ src/fontwin.c	2006/01/17 09:08:26
+@@ -126,7 +126,7 @@
+ 	fonttool_frame = XmCreateDialogShell(app_shell, "Font tool", NULL, 0);
+ 	handle_close(fonttool_frame);
+         fonttool_panel = XtCreateWidget("fonttool_panel", xmFormWidgetClass, 
+-                                        fonttool_frame, NULL, 0);
++                                        fonttool_frame, NULL, NULL);
+ 
+         font_select_item = CreateFontChoice(fonttool_panel, "Font:");
+         XtVaSetValues(font_select_item->menu,
diff --git a/academic/grace/patches/xmgrace-strip.patch b/academic/grace/patches/xmgrace-strip.patch
new file mode 100644
index 0000000000..5ac62995cc
--- /dev/null
+++ b/academic/grace/patches/xmgrace-strip.patch
@@ -0,0 +1,33 @@
+--- auxiliary/Makefile
++++ auxiliary/Makefile
+@@ -27,7 +27,7 @@
+ install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary
+ 	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/auxiliary; done
+-	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) -s $$i $(DESTDIR)$(GRACE_HOME)/bin; done
++	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
+ 	for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
+ 
+ tests : dummy
+--- grconvert/Makefile
++++ grconvert/Makefile
+@@ -42,7 +42,7 @@
+ 
+ install : $(PROG)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
+-	$(INSTALL_PROGRAM) -s $(PROG) $(DESTDIR)$(GRACE_HOME)/bin/$(PROG)
++	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(GRACE_HOME)/bin/$(PROG)
+ 
+ dummy :
+ 
+--- src/Makefile
++++ src/Makefile
+@@ -60,7 +60,7 @@
+ 
+ install : $(GRACE)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/bin
+-	$(INSTALL_PROGRAM) -s $(GRACE) $(DESTDIR)$(GRACE_HOME)/bin/$(GRACE)
++	$(INSTALL_PROGRAM) $(GRACE) $(DESTDIR)$(GRACE_HOME)/bin/$(GRACE)
+ 	cd $(DESTDIR)$(GRACE_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
+ 
+ tests : dummy