aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/wvdial/README2
-rw-r--r--network/wvdial/slack-desc8
-rw-r--r--network/wvdial/wvdial.SlackBuild16
-rw-r--r--network/wvdial/wvdial.info2
4 files changed, 18 insertions, 10 deletions
diff --git a/network/wvdial/README b/network/wvdial/README
index a4fe8c76a1664..4b9dd3b7f7b02 100644
--- a/network/wvdial/README
+++ b/network/wvdial/README
@@ -2,4 +2,4 @@ WvDial is a program that makes it easy to connect your Linux workstation
to the Internet. It will automatically detect your modem, and it can log
into almost any Internet provider's server without any special configuration.
-This requires wvstreams (which is also available from SlackBuilds.org).
+This requires wvstreams.
diff --git a/network/wvdial/slack-desc b/network/wvdial/slack-desc
index 4a50855925c69..9d1f1f3f39219 100644
--- a/network/wvdial/slack-desc
+++ b/network/wvdial/slack-desc
@@ -12,8 +12,8 @@ wvdial: wvdial is a program that makes it easy to connect your Linux
wvdial: workstation to the Internet. It will automatically detect your
wvdial: modem, and it can log into almost any Internet provider's
wvdial: server without any special configuration.
-wvdial:
+wvdial:
wvdial: http://alumnit.ca/wiki/index.php?page=WvDial
-wvdial:
-wvdial:
-wvdial:
+wvdial:
+wvdial:
+wvdial:
diff --git a/network/wvdial/wvdial.SlackBuild b/network/wvdial/wvdial.SlackBuild
index 28c60043d643c..cf1cdd23844c2 100644
--- a/network/wvdial/wvdial.SlackBuild
+++ b/network/wvdial/wvdial.SlackBuild
@@ -17,10 +17,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
@@ -45,8 +48,10 @@ make prefix=/usr MANDIR=/usr/man
make prefix=/usr MANDIR=/usr/man install DESTDIR=$PKG
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || exit 1
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || exit 1
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null
)
( cd $PKG/usr/man
@@ -60,8 +65,9 @@ mv $PKG/etc/ppp/peers/wvdial-pipe $PKG/etc/ppp/peers/wvdial-pipe.new
mv $PKG/etc/ppp/peers/wvdial $PKG/etc/ppp/peers/wvdial.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYING.LIB ChangeLog FAQ README TODO MENUS \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ CHANGES COPYING.LIB ChangeLog FAQ README TODO MENUS \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
@@ -69,4 +75,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/wvdial/wvdial.info b/network/wvdial/wvdial.info
index 357ce5fa0293e..129c4f8e6b710 100644
--- a/network/wvdial/wvdial.info
+++ b/network/wvdial/wvdial.info
@@ -3,6 +3,8 @@ VERSION="1.60"
HOMEPAGE="http://alumnit.ca/wiki/index.php?page=WvDial"
DOWNLOAD="http://alumnit.ca/download/wvdial-1.60.tar.gz"
MD5SUM="27fbbde89f8fd9f6e735a8efa5217fc9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Vincent Batts"
EMAIL="vbatts@batts.mine.nu"
APPROVED="rworkman"