diff --git a/d/R/R-2.7.1.tar.gz.sha1 b/d/R/R-2.7.1.tar.gz.sha1 deleted file mode 100644 index 656065a3..00000000 --- a/d/R/R-2.7.1.tar.gz.sha1 +++ /dev/null @@ -1 +0,0 @@ -cdf5f6f85463c7be007306add2f4ca7cf7babfb7 R-2.7.1.tar.gz diff --git a/d/R/R-2.9.2.tar.gz.sha1 b/d/R/R-2.9.2.tar.gz.sha1 new file mode 100644 index 00000000..faf97788 --- /dev/null +++ b/d/R/R-2.9.2.tar.gz.sha1 @@ -0,0 +1 @@ +3934743b67a57691db724606c575e38a35ecb590 R-2.9.2.tar.gz diff --git a/d/R/R.SlackBuild b/d/R/R.SlackBuild index 3cdf3fa2..ecbe4e8a 100755 --- a/d/R/R.SlackBuild +++ b/d/R/R.SlackBuild @@ -1,45 +1,48 @@ #!/bin/bash # Build script for Slackware -# Damien Goutte-Gattat "gouttegd" +# Copyright (C) 2008,2009 Damien Goutte-Gattat # -# Redistribution and use of this script, with or without modifications, is -# permitted provided that the following conditions are met: +# Redistribution and use of this script, with or without modifications, +# 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. +# 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. +# 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. # -# Latest R sourcecode is available at: -# http://www.r-project.org/ +# Contact: Damien Goutte-Gattat +# +# Latest R sourcecode is available at: . # # Recommends: l/libatlas # Source package infos NAMESRC=${NAMESRC:-R} -VERSION=${VERSION:-2.7.1} +VERSION=${VERSION:-2.9.2} ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz} WGET=${WGET:-http://cran.cict.fr/src/base/R-2/$ARCHIVE} -# Built package infos -NAMETGZ=${NAMETGZ:-R} +# Build infos +NAMEPKG=${NAMEPKG:-R} BUILD=${BUILD:-1GGD} ARCH=${ARCH:-i486} -TARGET=${TARGET:-i486} +JOBS=${JOBS:-1} +EXT=${EXT:-txz} # Directories TMP=${TMP:-/tmp} OUT=${OUT:-$TMP/build} -PKG=${PKG:-$OUT/$NAMETGZ} +PKG=${PKG:-$OUT/$NAMEPKG} CWD=$(pwd) set -e # Quit if a command returns non-zero @@ -55,10 +58,15 @@ if [ ! -d $TMP ]; then fi # Compilation flags +LIBDIRSUFFIX="" case "$ARCH" in i?86) CPUOPT="-O2 -march=$ARCH -mtune=i686" ;; +x86_64) + CPUOPT="-O2 -fPIC" + LIBDIRSUFFIX="64" + ;; *) CPUOPT="-O2" ;; @@ -66,7 +74,8 @@ esac # Get and verify the source archive if [ ! -r $ARCHIVE ]; then - wget "$WGET" + wget -c -O $ARCHIVE.part "$WGET" + mv $ARCHIVE.part $ARCHIVE fi sha1sum -c $ARCHIVE.sha1 NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1) @@ -80,6 +89,7 @@ CFLAGS=$CPUOPT \ CXXFLAGS=$CPUOPT \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --infodir=/usr/info \ --with-blas \ @@ -87,22 +97,21 @@ CXXFLAGS=$CPUOPT \ --with-system-zlib \ --with-system-bzlib \ --with-system-pcre -make -j 3 +make -j $JOBS make install DESTDIR=$PKG make install-info DESTDIR=$PKG # Strip binaries -find $PKG | xargs file | grep "ELF 32-bit LSB" | cut -d : -f 1 | \ +find $PKG | xargs file | grep "ELF \(32\|64\)-bit LSB" | cut -d : -f 1 | \ xargs strip --strip-unneeded 2> /dev/null -# Compress man and info pages +# Compress man pages, suppress info dir.* files find $PKG/usr/man -type f -exec gzip -9 '{}' \; -find $PKG/usr/info -type f -exec gzip -9 '{}' \; -rm -f $PKG/usr/info/dir.* +rm -f $PKG/usr/info/dir* # Install the documentation at the right place mkdir -p $PKG/usr/doc -mv $PKG/usr/lib/R/doc $PKG/usr/doc/$NAME +mv $PKG/usr/lib$LIBDIRSUFFIX/R/doc $PKG/usr/doc/$NAME # Copy slack-desc file install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc @@ -112,7 +121,7 @@ cd $PKG mkdir -p $OUT PACKAGING=" chown root:root . -R -/sbin/makepkg -l y -c n $OUT/$NAMETGZ-$VERSION-$ARCH-$BUILD.tgz +/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT rm -rf $PKG rm -rf $TMP/$NAME "