diff options
| -rw-r--r-- | libraries/libproxy/libproxy.SlackBuild | 34 | ||||
| -rw-r--r-- | libraries/libproxy/libproxy.info | 6 |
2 files changed, 25 insertions, 15 deletions
diff --git a/libraries/libproxy/libproxy.SlackBuild b/libraries/libproxy/libproxy.SlackBuild index f8967b625b87..edaf407076b5 100644 --- a/libraries/libproxy/libproxy.SlackBuild +++ b/libraries/libproxy/libproxy.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libproxy -# Copyright 2009 Robby Workman Northport, AL, USA +# Copyright 2009,2010 Robby Workman Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libproxy -VERSION=${VERSION:-0.2.3} -ARCH=${ARCH:-i486} +VERSION=${VERSION:-0.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# 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 + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -59,15 +71,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --build=$ARCH-slackware-linux +cmake . \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Dlibdir=/usr/lib${LIBDIRSUFFIX} \ + -Dmoduledir=/usr/lib${LIBDIRSUFFIX}/libproxy/${VERSION}/modules \ + -DPERL_VENDORINSTALL=yes make make install DESTDIR=$PKG diff --git a/libraries/libproxy/libproxy.info b/libraries/libproxy/libproxy.info index 12b33fcb9741..95b78ef6cd5f 100644 --- a/libraries/libproxy/libproxy.info +++ b/libraries/libproxy/libproxy.info @@ -1,8 +1,8 @@ PRGNAM="libproxy" -VERSION="0.2.3" +VERSION="0.4.2" HOMEPAGE="http://code.google.com/p/libproxy/" -DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.2.3.tar.gz" -MD5SUM="86b635e1eb2d665cfbef4c6134fe6604" +DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.4.2.tar.gz" +MD5SUM="e8c584ba761373b038b756851cdd3fa1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" |