academic/grace: Updated for version 5.1.25 (+ new maintainer)

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

8 files changed, 29 insertions, 132 deletions

diff --git a/academic/grace/grace.SlackBuild b/academic/grace/grace.SlackBuild
index 67ea658611..a4005d50b9 100644
--- a/academic/grace/grace.SlackBuild
+++ b/academic/grace/grace.SlackBuild
@@ -1,11 +1,30 @@
 #!/bin/sh
 
 # Slackware build script for grace
+
 # Written by B. Jogai <jogaib {at} comcast [dot] net>
 # Substantially modified by Robby Workman <rworkman@slackware.com>
+# Updated by Fellype do Nascimento <fellype (at) gmail (dot) com
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=grace
-VERSION=${VERSION:-5.1.23}
+VERSION=${VERSION:-5.1.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-"_SBo"}
 
@@ -51,18 +70,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Apply some miscellaneous fixup patches
-patch -p0 < $CWD/patches/xmgrace-null.patch
-patch -p0 < $CWD/patches/xmgrace-help.patch
-patch -p0 < $CWD/patches/xmgrace-strip.patch
-
-# The invocation of nc_inq_libvers() has changed with the newer netcdf
-patch -p1 < $CWD/patches/xmgrace-netcdf.patch
-
-# The header and library files of package fftw2 have been split
-# up into single and double.  grace uses double.
-patch -p1 < $CWD/patches/xmgrace-fftw.patch
-
 # Fix paths to docs in src/xmgrace.c
 sed -i "s%/usr/share/doc/packages/%/usr/lib${LIBDIRSUFFIX}/%g" src/xmgrace.c
 
@@ -107,9 +114,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
   ln -s ../../doc/$PRGNAM-$VERSION doc
 )
 
-# We're going to leave the man pages where they are, since grace (might|does)
-# look for them in its docs dir. Since grace might still use them directly,
-# we're going to leave them uncompressed. Don't fuss - disk space is cheap  :-)
+rm -f $PKG/usr/man/man1/*
+cp -a $PKG/usr/doc/$PRGNAM-$VERSION/*.1 $PKG/usr/man/man1
+gzip -9 $PKG/usr/man/man1/*.?
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/academic/grace/grace.info b/academic/grace/grace.info
index 95e4e4f1ea..2ba34f78e3 100644
--- a/academic/grace/grace.info
+++ b/academic/grace/grace.info
@@ -1,10 +1,10 @@
 PRGNAM="grace"
-VERSION="5.1.23"
+VERSION="5.1.25"
 HOMEPAGE="http://plasma-gate.weizmann.ac.il/Grace/"
-DOWNLOAD="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/grace-5.1.23.tar.gz"
-MD5SUM="e2b28ebe31288952d899fbb5c97858ae"
+DOWNLOAD="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/grace-5.1.25.tar.gz"
+MD5SUM="c0482b1f18b113192946a96f5ff35a4d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="netcdf"
-MAINTAINER="B. Jogai"
-EMAIL="jogaib <at> comcast {dot} net"
+MAINTAINER="Fellype do Nascimento"
+EMAIL="fellype (at) gmail (dot) com"
diff --git a/academic/grace/patches/xmgrace-fftw.patch b/academic/grace/patches/xmgrace-fftw.patch
deleted file mode 100644
index e4dac78592..0000000000
--- a/academic/grace/patches/xmgrace-fftw.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index d8e2780c3c..0000000000
--- a/academic/grace/patches/xmgrace-help.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index f18fbb6fe1..0000000000
--- a/academic/grace/patches/xmgrace-netcdf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 5a8eb77057..0000000000
--- a/academic/grace/patches/xmgrace-null.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 5ac62995cc..0000000000
--- a/academic/grace/patches/xmgrace-strip.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
diff --git a/academic/grace/xmgrace.desktop b/academic/grace/xmgrace.desktop
index 183f364c08..08273f63e3 100644
--- a/academic/grace/xmgrace.desktop
+++ b/academic/grace/xmgrace.desktop
@@ -5,4 +5,4 @@ Name=xmgrace
 Terminal=false
 Comment=Scientific Plotting Application
 Icon=/usr/share/pixmaps/xmgrace.png
-Categories=Qt;KDE;Graphics;Development;
+Categories=Education;Science;