summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/nvi/nvi.SlackBuild15
-rw-r--r--development/nvi/nvi.info2
2 files changed, 12 insertions, 5 deletions
diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild
index 65ab297325..b8d56b7bca 100644
--- a/development/nvi/nvi.SlackBuild
+++ b/development/nvi/nvi.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for nvi
-# Copyright 2008 Robby Workman Northport, Alabama (USA)
+# Copyright 2008-2009 Robby Workman Northport, Alabama (USA)
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -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
@@ -61,6 +64,7 @@ cd build.unix
CFLAGS="$SLKCFLAGS" \
../dist/configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -68,8 +72,7 @@ cd build.unix
--enable-widechar \
--disable-static \
--program-prefix="n" \
- --build=$ARCH-slackware-linux \
- --host=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux
make
make install DESTDIR=$PKG
cd -
@@ -88,11 +91,13 @@ cd -
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes LICENSE README* TODO docs/html $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ Changes LICENSE README* TODO docs/html \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
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/development/nvi/nvi.info b/development/nvi/nvi.info
index 848a925f93..06942ba2e6 100644
--- a/development/nvi/nvi.info
+++ b/development/nvi/nvi.info
@@ -2,7 +2,9 @@ PRGNAM="nvi"
VERSION="1.81.6"
HOMEPAGE="http://www.kotnet.org/~skimo/nvi/"
DOWNLOAD="http://www.kotnet.org/~skimo/nvi/devel/nvi-1.81.6.tar.bz2"
+DOWNLOAD_x86_64=""
MD5SUM="88d1e23115ee9f2961186b62e55f5704"
+MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="Michiel"