1 files changed, 10 insertions, 19 deletions
diff --git a/source/n/pinentry/pinentry.SlackBuild b/source/n/pinentry/pinentry.SlackBuild
index d01b1295d..3329405b2 100755
--- a/source/n/pinentry/pinentry.SlackBuild
+++ b/source/n/pinentry/pinentry.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net) 
+# Copyright 2006, 2014  Robby Workman, Tuscaloosa, AL, USA
 # Copyright 2007, 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -29,7 +29,7 @@ BUILD=${BUILD:-1}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -38,8 +38,8 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
   ARCHQUADLET=""
 elif [ "$ARCH" = "s390" ]; then
@@ -78,40 +78,31 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Needs to be done manually:
-# http://lists.gnupg.org/pipermail/gnupg-devel/2009-June/025197.html
-for file in qt4/*.moc ; do 
-  moc ${file/.moc/.h} > $file
-done
-
-# Note that building the gtk1 interface is disabled
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
+  --mandir=/usr/man \
   --infodir=/usr/info \
-  --enable-pinentry-gtk=no \
   --enable-pinentry-curses \
   --enable-fallback-curses \
   --enable-pinentry-gtk2 \
-  --enable-pinentry-qt4 \
   --build=$ARCH-slackware-linux$ARCHQUADLET \
   --host=$ARCH-slackware-linux$ARCHQUADLET || exit 1
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Replace the qt3 version with a symlink to the qt4 one:
-( cd $PKG/usr/bin
-  rm -f pinentry-qt
-  ln -sf pinentry-qt4 pinentry-qt
-)
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+# Just in case: a compat link
+ln -s pinentry-qt $PKG/usr/bin/pinentry-qt4
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+
 rm $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info