diff options
-rw-r--r-- | network/pptp/doinst.sh | 2 | ||||
-rw-r--r-- | network/pptp/pptp.SlackBuild | 22 | ||||
-rw-r--r-- | network/pptp/pptp.info | 2 | ||||
-rw-r--r-- | network/pptp/slack-desc | 8 |
4 files changed, 16 insertions, 18 deletions
diff --git a/network/pptp/doinst.sh b/network/pptp/doinst.sh index 3e64e4f38e56e..8239943d87d1c 100644 --- a/network/pptp/doinst.sh +++ b/network/pptp/doinst.sh @@ -1,5 +1,3 @@ -#!/bin/sh - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild index 46fc7212ad423..d7d156b2c0219 100644 --- a/network/pptp/pptp.SlackBuild +++ b/network/pptp/pptp.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for pptp # Copyright 2007 AbortRetryFail <abortretryfail@gmail.com> -# Copyright 2007,2008 Robby Workman, Northport, Alabama, USA +# Copyright 2007-2009 Robby Workman, Northport, Alabama, USA # All rights reserved. # @@ -35,16 +35,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# The Makefile uses -O0 by default. It should be a simple sed -# to remedy this, but I figured if the upstream guys don't trust -# their code to be optimized, maybe we shouldn't either :-) - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -62,14 +61,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make -make install DESTDIR=$PKG +make OPTIMIZE="$SLKCFLAGS" +make install MANDIR=$PKG/usr/man DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mv $PKG/usr/share/man $PKG/usr -rmdir $PKG/usr/share ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done @@ -80,12 +77,13 @@ mv $PKG/etc/ppp/options.pptp $PKG/etc/ppp/options.pptp.new # Reference docs, in this case, might be handy to have around mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog DEVELOPERS INSTALL NEWS PROTOCOL-SECURITY \ - README TODO USING Documentation/* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING DEVELOPERS NEWS PROTOCOL-SECURITY README TODO USING Documentation/* \ + $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/pptp/pptp.info b/network/pptp/pptp.info index 4db2a5eba5c27..b991a78a1d36b 100644 --- a/network/pptp/pptp.info +++ b/network/pptp/pptp.info @@ -2,7 +2,9 @@ PRGNAM="pptp" VERSION="1.7.2" HOMEPAGE="http://pptpclient.sourceforge.net/" DOWNLOAD="http://downloads.sourceforge.net/pptpclient/pptp-1.7.2.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="4c3d19286a37459a632c7128c92a9857" +MD5SUM_x86_64="" MAINTAINER="AbortRetryFail" EMAIL="abortretryfail@gmail.com" APPROVED="rworkman,Erik Hanson" diff --git a/network/pptp/slack-desc b/network/pptp/slack-desc index fbe63f09b5987..7b5bf8da6ddec 100644 --- a/network/pptp/slack-desc +++ b/network/pptp/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| pptp: pptp (a PPTP Client for Linux) -pptp: +pptp: pptp: PPTP Client is a Linux, FreeBSD, NetBSD, and OpenBSD client for the pptp: proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP. pptp: It allows connection to a PPTP based Virtual Private Network (VPN) pptp: as used by pptp: employers and some cable and ADSL internet service pptp: providers. -pptp: +pptp: pptp: For more information, see http://pptpclient.sourceforge.net/ -pptp: -pptp: +pptp: +pptp: |