diff options
author | Eric Hameleers <alien@slackware.com> | 2015-01-08 23:32:08 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2015-01-08 23:32:08 +0000 |
commit | 1a1e6319f3f72a9451c8ea24255d1ca857f46b6c (patch) | |
tree | bf3a67bd9e6342d083c25520ce9f88ea48ad17c8 /cvsps | |
parent | 535cedbefb89612228a884ab1250495f9de9804f (diff) | |
download | asb-1a1e6319f3f72a9451c8ea24255d1ca857f46b6c.tar.gz asb-1a1e6319f3f72a9451c8ea24255d1ca857f46b6c.tar.xz |
Updated to 2.2b1
Diffstat (limited to 'cvsps')
-rwxr-xr-x | cvsps/build/cvsps.SlackBuild | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/cvsps/build/cvsps.SlackBuild b/cvsps/build/cvsps.SlackBuild index 8a78707c..bf620c13 100755 --- a/cvsps/build/cvsps.SlackBuild +++ b/cvsps/build/cvsps.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2010 Eric Hameleers <alien@slackware.com> +# Copyright 2010, 2015 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,6 +32,8 @@ # Changelog: # 2.1-1: 24/May/2010 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 2.2b1-1: 09/jan/2015 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh cvsps.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -42,7 +44,7 @@ # Set initial variables: PRGNAM=cvsps -VERSION=${VERSION:-2.1} +VERSION=${VERSION:-2.2b1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -108,10 +110,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log # Source file availability: if ! [ -f ${SOURCE} ]; then + echo "Source '$(basename ${SOURCE})' not available yet..." + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi if ! [ "x${SRCURL}" == "x" ]; then - # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then @@ -141,12 +144,13 @@ echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} cd ${PRGNAM}-${VERSION} chown -R root:root . -chmod -R u+w,go+r-w,a-s . +chmod -R u+w,go+r-w,a+rX-st . echo Building ... export CFLAGS="$SLKCFLAGS" -make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -make prefix=$PKG/usr install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log +export CXXFLAGS="$SLKCFLAGS" +make PREFIX=/usr 2>&1 | tee $OUTPUT/make-${PRGNAM}.log +make PREFIX=$PKG/usr install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION |