diff options
| -rw-r--r-- | network/pptpd/README | 5 | ||||
| -rw-r--r-- | network/pptpd/doinst.sh | 2 | ||||
| -rw-r--r-- | network/pptpd/plugins_Makefile.diff | 2 | ||||
| -rw-r--r-- | network/pptpd/pptpd.SlackBuild | 14 | ||||
| -rw-r--r-- | network/pptpd/pptpd.info | 2 | ||||
| -rw-r--r-- | network/pptpd/slack-desc | 12 |
6 files changed, 21 insertions, 16 deletions
diff --git a/network/pptpd/README b/network/pptpd/README index 62067a82b0..b22265f73b 100644 --- a/network/pptpd/README +++ b/network/pptpd/README @@ -1,3 +1,2 @@ -pptpd (PoPToP) is a Point to Point Tunneling Server that -provides a Virtual Private Networking (VPN) server which -is compatible with Microsoft VPN clients. +pptpd (PoPToP) is a Point to Point Tunneling Server that provides a Virtual +Private Networking (VPN) server which is compatible with Microsoft VPN clients. diff --git a/network/pptpd/doinst.sh b/network/pptpd/doinst.sh index e2a762aa12..a87c60e606 100644 --- a/network/pptpd/doinst.sh +++ b/network/pptpd/doinst.sh @@ -1,5 +1,3 @@ -#!/bin/sh - config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" diff --git a/network/pptpd/plugins_Makefile.diff b/network/pptpd/plugins_Makefile.diff index 376a899430..52d4134a90 100644 --- a/network/pptpd/plugins_Makefile.diff +++ b/network/pptpd/plugins_Makefile.diff @@ -14,7 +14,7 @@ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) -LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd -+LIBDIR ?= $(prefix)/lib/pptpd ++LIBDIR ?= $(prefix)/@baselibdir@/pptpd install: $(PLUGINS) - $(INSTALL) -d $(LIBDIR) diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild index 25407b7454..89551690d7 100644 --- a/network/pptpd/pptpd.SlackBuild +++ b/network/pptpd/pptpd.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pptpd -# Copyright 2007,2008 Robby Workman, Northport, Alabama, USA +# Copyright 2007-2009 Robby Workman, Northport, Alabama, USA # All rights reserved. # @@ -36,10 +36,13 @@ OUTPUT=${OUTPUT:-/tmp} 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 @@ -59,10 +62,12 @@ find . \ # Fix the plugins Makefile patch -p1 < $CWD/plugins_Makefile.diff +sed -i "s%@baselibdir@%$lib${LIBDIRSUFFIX}%" plugins/Makefile CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -87,8 +92,9 @@ cat samples/options.pptpd > $PKG/etc/ppp/options.pptpd.new cat samples/chap-secrets > $PKG/etc/ppp/chap-secrets.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \ - html tools debian $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO html tools debian \ + $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 0644 {} \; find $PKG/usr/doc -type d -name 'CVS' | xargs rm -rf @@ -97,4 +103,4 @@ 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/pptpd/pptpd.info b/network/pptpd/pptpd.info index 94bd80d0ec..42a9360a63 100644 --- a/network/pptpd/pptpd.info +++ b/network/pptpd/pptpd.info @@ -2,7 +2,9 @@ PRGNAM="pptpd" VERSION="1.3.4" HOMEPAGE="http://www.poptop.org/" DOWNLOAD="http://downloads.sourceforge.net/poptop/pptpd-1.3.4.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="b38df9c431041922c997c1148bedf591" +MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" APPROVED="David Somero"
\ No newline at end of file diff --git a/network/pptpd/slack-desc b/network/pptpd/slack-desc index 20fb75d56b..9a1f5ae63f 100644 --- a/network/pptpd/slack-desc +++ b/network/pptpd/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| pptpd: pptpd (PoPToP Point to Point Tunneling Server) -pptpd: +pptpd: pptpd: This implements a Virtual Private Networking Server (VPN) that is pptpd: compatible with Microsoft VPN clients. It allows windows users to pptpd: connect to an internal firewalled network using their dialup. -pptpd: +pptpd: pptpd: Homepage: http://www.poptop.org/ -pptpd: -pptpd: -pptpd: -pptpd: +pptpd: +pptpd: +pptpd: +pptpd: |