diff options
| -rw-r--r-- | network/conkeror/conkeror.SlackBuild | 25 | ||||
| -rw-r--r-- | network/conkeror/conkeror.info | 6 |
2 files changed, 16 insertions, 15 deletions
diff --git a/network/conkeror/conkeror.SlackBuild b/network/conkeror/conkeror.SlackBuild index 5e33fd0afaecb..5701e7d3414f7 100644 --- a/network/conkeror/conkeror.SlackBuild +++ b/network/conkeror/conkeror.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for conkeror -# Copyright 2017 Azure Zanculmarktum <zanculmarktum@gmail.com> +# Copyright 2017-2018 Azure Zanculmarktum <zanculmarktum@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=conkeror -VERSION=${VERSION:-1.0.3} +VERSION=${VERSION:-1.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCVERSION=11121bed996ce84e3536c3c8266cdf3164e02b5a +SRCVER=685f24e3aeffc408dcea883e1d0c738cb18bbe8d if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -61,13 +61,13 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-${SRCVERSION%?????????????????????????????????} -if [ -f "$CWD/$PRGNAM-${SRCVERSION%?????????????????????????????????}.tar.gz" ]; then - tar xvf $CWD/$PRGNAM-${SRCVERSION%?????????????????????????????????}.tar.gz +rm -rf $PRGNAM-${SRCVER%${SRCVER#???????}} +if [ -f "$CWD/$PRGNAM-${SRCVER%${SRCVER#???????}}.tar.gz" ]; then + tar xvf $CWD/$PRGNAM-${SRCVER%${SRCVER#???????}}.tar.gz else - tar xvf $CWD/$SRCVERSION.tar.gz + tar xvf $CWD/$SRCVER.tar.gz fi -cd $PRGNAM-${SRCVERSION%?????????????????????????????????} +cd $PRGNAM-${SRCVER%${SRCVER#???????}} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -75,10 +75,11 @@ 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 {} \; -sed -i 's@^\(CFLAGS \)?\(= \).*@\1\2'"$SLKCFLAGS"'@ -s@^\(PREFIX \)?\(= \).*@\1\2/usr@ -s@^\(MANPREFIX \)?\(= \).*@\1\2/usr/man@ -s@\(\$(DESTDIR)\)/\$(PREFIX)/share/doc/conkeror@\1/usr/doc/'"$PRGNAM-$VERSION"'@g' \ +sed -i \ + -e '/^CFLAGS/s@^\(CFLAGS \)?\(= \).*@\1\2'"$SLKCFLAGS"'@' \ + -e '/^PREFIX/s@^\(PREFIX \)?\(= \).*@\1\2/usr@' \ + -e '/^MANPREFIX/s@^\(MANPREFIX \)?\(= \).*@\1\2/usr/man@' \ + -e '/\$(DESTDIR)\/\$(PREFIX)/s@\(\$(DESTDIR)\)/\$(PREFIX)/share/doc/conkeror@\1/usr/doc/'"$PRGNAM-$VERSION"'@g' \ Makefile make diff --git a/network/conkeror/conkeror.info b/network/conkeror/conkeror.info index a22db959de6fc..3ba7f57060d11 100644 --- a/network/conkeror/conkeror.info +++ b/network/conkeror/conkeror.info @@ -1,8 +1,8 @@ PRGNAM="conkeror" -VERSION="1.0.3" +VERSION="1.0.4" HOMEPAGE="http://conkeror.org/" -DOWNLOAD="http://repo.or.cz/conkeror.git/snapshot/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz" -MD5SUM="66d0f835762994225e62b04035402e39" +DOWNLOAD="http://repo.or.cz/conkeror.git/snapshot/685f24e3aeffc408dcea883e1d0c738cb18bbe8d.tar.gz" +MD5SUM="32d91dc6bc393c722423fa96e91cb87e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |