diff options
| -rw-r--r-- | gis/grass/grass.SlackBuild | 37 | ||||
| -rw-r--r-- | gis/grass/grass.info | 8 |
2 files changed, 21 insertions, 24 deletions
diff --git a/gis/grass/grass.SlackBuild b/gis/grass/grass.SlackBuild index 8f1b6cc3efac..0a6bd02a7417 100644 --- a/gis/grass/grass.SlackBuild +++ b/gis/grass/grass.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=grass -VERSION=${VERSION:-7.2.2} +VERSION=${VERSION:-7.8.0} +SHRTVER=`echo $VERSION | sed "s/\([0-9]*\).\([0-9]*\)..*/\1\2/"` BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -152,25 +153,25 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # Install the pkgconfig file: install -D -m0644 grass.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/grass.pc -# Create unversioned symlinks: -( cd $PKG/opt ; ln -s $PRGNAM-$VERSION $PRGNAM ) -( cd $PKG/usr/bin ; ln -s grass72 $PRGNAM ) + Create unversioned symlinks: +( cd $PKG/opt ; ln -s $PRGNAM$SHRTVER $PRGNAM ) +( cd $PKG/usr/bin ; ln -s $PRGNAM$SHRTVER $PRGNAM ) -# Remove hardcoded version strings: + Remove hardcoded version strings: sed -i -e "s/-${VERSION}//g" \ - $PKG/usr/bin/grass72 \ + $PKG/usr/bin/$PRGNAM$SHRTVER \ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/grass.pc # Remove packaging directory pollution: sed -i -e "s;$PKG;;" \ - $PKG/usr/bin/grass72 \ - $PKG/opt/$PRGNAM-$VERSION/demolocation/.grassrc72 \ - $PKG/opt/$PRGNAM-$VERSION/etc/fontcap \ - $PKG/opt/$PRGNAM-$VERSION/include/Make/Grass.make \ - $PKG/opt/$PRGNAM-$VERSION/include/Make/Platform.make + $PKG/usr/bin/$PRGNAM$SHRTVER \ + $PKG/opt/$PRGNAM$SHRTVER/demolocation/.grassrc$SHRTVER \ + $PKG/opt/$PRGNAM$SHRTVER/etc/fontcap \ + $PKG/opt/$PRGNAM$SHRTVER/include/Make/Grass.make \ + $PKG/opt/$PRGNAM$SHRTVER/include/Make/Platform.make # Documentation: -PKGOPTMAN=$PKG/opt/$PRGNAM-$VERSION/docs/man +PKGOPTMAN=$PKG/opt/$PRGNAM$SHRTVER/docs/man find $PKGOPTMAN -type f -exec gzip -9 {} \; for i in $( find $PKGOPTMAN -type l ) ; do \ ln -s $( readlink $i ).gz $i.gz ; rm $i ; done @@ -180,12 +181,8 @@ cp -a \ $PKG/usr/man/man1/grass.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -mv \ - $PKG/opt/$PRGNAM-$VERSION/{AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} \ - $PKG/opt/$PRGNAM-$VERSION/*.csv \ - $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ChangeLog* INSTALL README SUBMITTING* TODO \ + AUTHORS CHANGES COPYING GPL.TXT REQUIREMENTS.html INSTALL README.md SUBMITTING* TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -200,9 +197,9 @@ cp -a \ $PKG/usr/share/pixmaps/${PRGNAM}.png # Cleanup: -rm -rf $PKG/opt/$PRGNAM-$VERSION/demolocation/PERMANENT/.tmp -rm $PKG/opt/$PRGNAM-$VERSION/config.status -rm -rf $PKG/opt/$PRGNAM-$VERSION/share/ +rm -rf $PKG/opt/$PRGNAM/demolocation/PERMANENT/.tmp +rm $PKG/opt/$PRGNAM/config.status +rm -rf $PKG/opt/$PRGNAM/share/ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/gis/grass/grass.info b/gis/grass/grass.info index f13614420162..2ce125aa93db 100644 --- a/gis/grass/grass.info +++ b/gis/grass/grass.info @@ -1,10 +1,10 @@ PRGNAM="grass" -VERSION="7.2.2" +VERSION="7.8.0" HOMEPAGE="https://grass.osgeo.org/" -DOWNLOAD="https://grass.osgeo.org/grass72/source/grass-7.2.2.tar.gz" -MD5SUM="4a908a63bb9b7af34fee9569316c0fb6" +DOWNLOAD="https://grass.osgeo.org/grass78/source/grass-7.8.0.tar.gz" +MD5SUM="e9b9d3bbbfe3ef9055ea1398b2222de4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gdal numpy wxPython" +REQUIRES="gdal numpy3 wxPython4 zstd" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" |