diff options
Diffstat (limited to 'source/n/alpine/alpine.SlackBuild')
| -rwxr-xr-x | source/n/alpine/alpine.SlackBuild | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 5bf3b445..9f2a91c8 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,15 +22,15 @@ PKGNAM=alpine -VERSION=${VERSION:-2.11} -ALPINEBUILD=${ALPINEBUILD:-1} -IMAPDBUILD=${IMAPDBUILD:-1} +VERSION=${VERSION:-2.20} +ALPINEBUILD=${ALPINEBUILD:-2} +IMAPDBUILD=${IMAPDBUILD:-2} PINEPGP=${PINEPGP:-0.18.0} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -46,8 +46,8 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $PKG/etc -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then @@ -62,7 +62,7 @@ cd alpine-$VERSION # Make sure ownerships and permissions are sane: chown -R root:root . find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; @@ -79,6 +79,7 @@ CFLAGS="$SLKCFLAGS" \ --with-c-client-target=slx \ --with-system-pinerc=/etc/pine.conf \ --with-system-fixed-pinerc=/etc/pine.conf.fixed \ + --with-passfile=.alpine.passfile \ --disable-debug \ --with-debug-level=0 \ --without-tcl \ @@ -87,7 +88,11 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux # Correct paths and programs in tech-notes.txt: -zcat $CWD/alpine.tech-notes.txt.diff.gz | patch -p1 --verbose || exit 1 +( cd doc/tech-notes + sed -i "s,/usr/local/lib/pine.info,/usr/lib/pine.info,g" tech-notes.txt + sed -i "s,/usr/local/lib,/etc,g" tech-notes.txt + sed -i "s,/usr/local,/etc,g" tech-notes.txt +) # Build and install: # Since we build non-compliant to RFC3501 we have to answer 'y' half-way: @@ -102,9 +107,8 @@ make install SSLTYPE=unix DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ LICENSE NOTICE README* VERSION \ - doc/tech-notes.txt doc/brochure.txt doc/mailcap.unx doc/mime.types \ + doc/tech-notes* doc/brochure.txt doc/mailcap.unx doc/mime.types \ $PKG/usr/doc/${PKGNAM}-$VERSION -gzip -9 $PKG/usr/doc/${PKGNAM}-$VERSION/tech-notes.txt # Add pinepgp support: cd $TMP |