diff options
Diffstat (limited to 'source/n/slrn')
| -rw-r--r-- | source/n/slrn/doinst.sh | 1 | ||||
| -rwxr-xr-x | source/n/slrn/slrn.SlackBuild | 22 |
2 files changed, 18 insertions, 5 deletions
diff --git a/source/n/slrn/doinst.sh b/source/n/slrn/doinst.sh index ad59028c..23baae41 100644 --- a/source/n/slrn/doinst.sh +++ b/source/n/slrn/doinst.sh @@ -12,4 +12,5 @@ config() { } config etc/slrn.rc.new +config var/spool/slrnpull/slrnpull.conf.new diff --git a/source/n/slrn/slrn.SlackBuild b/source/n/slrn/slrn.SlackBuild index d2a50362..d983724d 100755 --- a/source/n/slrn/slrn.SlackBuild +++ b/source/n/slrn/slrn.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,17 @@ VERSION=0.9.9p1 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -65,7 +77,7 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/slrn-$VERSION \ --with-docdir=/usr/doc/slrn-$VERSION \ --with-ssl \ - --with-slrnpull \ + --with-slrnpull=/var/spool/slrnpull \ --enable-setgid-code \ --with-server-file=/etc/nntpserver \ --with-slanginc=/usr/include/slang \ @@ -92,7 +104,7 @@ rm -f $PKG/usr/doc/slrn-$VERSION/changes.txt chown root.news $PKG/usr/bin/slrnpull chmod 2750 $PKG/usr/bin/slrnpull mkdir -p $PKG/var/spool/slrnpull/{data,news,out.going/rejects} -cp -a $PKG/usr/doc/slrn-$VERSION/slrnpull/slrnpull.conf $PKG/var/spool/slrnpull +cp -a $PKG/usr/doc/slrn-$VERSION/slrnpull/slrnpull.conf $PKG/var/spool/slrnpull/slrnpull.conf.new chown -R news.news $PKG/var/spool/slrnpull chmod -R 3777 $PKG/var/spool/slrnpull/out.going |