summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/Xdialog/Xdialog.SlackBuild12
-rw-r--r--development/Xdialog/Xdialog.info4
2 files changed, 11 insertions, 5 deletions
diff --git a/development/Xdialog/Xdialog.SlackBuild b/development/Xdialog/Xdialog.SlackBuild
index 4547a1c1bb..a85a2a5e66 100644
--- a/development/Xdialog/Xdialog.SlackBuild
+++ b/development/Xdialog/Xdialog.SlackBuild
@@ -5,9 +5,9 @@
# Released under the WTFPL
PRGNAM=Xdialog
-VERSION=2.3.1
+VERSION=${VERSION:-2.3.1}
ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -27,10 +27,13 @@ fi
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
@@ -54,7 +57,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --datadir=/usr/ \
+ --datadir=/usr \
--mandir=/usr/man \
--$NLS-nls \
--build=$ARCH-slackware-linux \
@@ -75,10 +78,11 @@ make DESTDIR=$PKG install
for i in $(find . -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
)
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
cp -a [ABCINR]* $PKG/usr/doc/$PRGNAM-$VERSION
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/Xdialog/Xdialog.info b/development/Xdialog/Xdialog.info
index 55669d6f3d..871cee0705 100644
--- a/development/Xdialog/Xdialog.info
+++ b/development/Xdialog/Xdialog.info
@@ -3,6 +3,8 @@ VERSION="2.3.1"
HOMEPAGE="http://xdialog.free.fr/"
DOWNLOAD="http://xdialog.free.fr/Xdialog-2.3.1.tar.bz2"
MD5SUM="0671f8353717513bf1f0ebc80e9710f6"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="slakmagik"
EMAIL="jsun@freeshell.org"
-APPROVED="rworkman"
+APPROVED="dsomero"