diff options
| -rw-r--r-- | misc/zyGrib/Makefile.patch | 6 | ||||
| -rw-r--r-- | misc/zyGrib/zyGrib.SlackBuild | 41 | ||||
| -rw-r--r-- | misc/zyGrib/zyGrib.info | 8 |
3 files changed, 10 insertions, 45 deletions
diff --git a/misc/zyGrib/Makefile.patch b/misc/zyGrib/Makefile.patch index b51f38fa9c034..7de540183af35 100644 --- a/misc/zyGrib/Makefile.patch +++ b/misc/zyGrib/Makefile.patch @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-09-10 06:59:30.000000000 +0000 -+++ Makefile 2011-11-23 14:49:17.000000000 +0000 -@@ -58,15 +58,15 @@ +--- Makefile.orig 2013-01-06 08:44:57.000000000 +0000 ++++ Makefile 2013-02-22 16:33:32.302831589 +0000 +@@ -36,15 +36,15 @@ install: zyGrib mkdir -p $(INSTALLDIR) mkdir -p $(INSTALLDIR)/bin diff --git a/misc/zyGrib/zyGrib.SlackBuild b/misc/zyGrib/zyGrib.SlackBuild index d9ddb061ce032..4d3861f56192c 100644 --- a/misc/zyGrib/zyGrib.SlackBuild +++ b/misc/zyGrib/zyGrib.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for zyGrib -# Copyright 2011,2012 Chris Abela, Malta +# Copyright 2011,2012,2013 Chris Abela, Malta # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=zyGrib -VERSION=${VERSION:-5.0.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-6.1.2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,18 +54,6 @@ else LIBDIRSUFFIX="" fi -make_configure () { - for DIR in $@; do - cd $DIR - mv Makefile Makefile.in - autoscan - mv configure.scan configure.in - autoheader - autoconf - cd - > /dev/null - done -} - set -e # In case the source was fetched with wget or some other downloader: @@ -85,32 +73,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# src/zyGrib.pro is looking for the wrong qwt library -sed -i 's/lqwt-qt4/lqwt/' src/zyGrib.pro -# src/bzip2/Makefile is looking in the wrong place for qmake.conf -sed -i 's/share\/qt4/lib\/qt/1' src/bzip2/Makefile - # Makefile installs a good local installation, but we need a system installation patch -p0 < $CWD/Makefile.patch -# Prepare the source for configure -ln -s src/proj-4.6.0/install-sh . -make_configure . src src/bzip2 src/zlib-1.2.3 -find ./src/zlib-1.2.3 -name Makefile -exec mv {} {}.in \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -# See http://www.zygrib.org/forum/viewtopic.php?f=3&t=221&view=print -[ "$ARCH" = x86_64 ] && make veryclean make make install INSTALLDIR=$PKG/opt/$PRGNAM diff --git a/misc/zyGrib/zyGrib.info b/misc/zyGrib/zyGrib.info index e1af6aca89de2..fb3c966b4d806 100644 --- a/misc/zyGrib/zyGrib.info +++ b/misc/zyGrib/zyGrib.info @@ -1,10 +1,10 @@ PRGNAM="zyGrib" -VERSION="5.0.6" +VERSION="6.1.2" HOMEPAGE="http://www.zygrib.org/" -DOWNLOAD="http://pkgs.fedoraproject.org/lookaside/pkgs/zyGrib/zyGrib-5.0.6.tgz/ce2811a7abe9cc8f6703374130add902/zyGrib-5.0.6.tgz" -MD5SUM="ce2811a7abe9cc8f6703374130add902" +DOWNLOAD="http://www.zygrib.org/getfile.php?file=zyGrib-6.1.2.tgz" +MD5SUM="6397c2080b118cf2de048d14b9b19b35" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qwt" +REQUIRES="qwt proj libnova" MAINTAINER="Chris Abela" EMAIL="kristofru@gmail.com" |