misc/recode: Updated for version 3.6

3 files changed, 30 insertions, 15 deletions

diff --git a/misc/recode/recode.SlackBuild b/misc/recode/recode.SlackBuild
index 7c5cafa4c4b5..c8063e50ae20 100644
--- a/misc/recode/recode.SlackBuild
+++ b/misc/recode/recode.SlackBuild
@@ -8,6 +8,8 @@
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 # Further small mods by Richard Hoyle <hoyle.richard@gmail.com>
+# Updating and testing for Slackware 13 (including x86_64 and Multilib)
+# by Chris Abela <chris.abela>
 
 PRGNAM=recode
 VERSION=3.6
@@ -22,8 +24,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
@@ -46,19 +53,25 @@ for patch in $CWD/patches/* ; do
   bzcat $patch | patch -p1 --verbose --backup || exit 1
 done
 
+# libdir and target are critical for x86_64
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-static=no
+  --enable-static=no \
+  --libdir=/usr/lib"$LIBDIRSUFFIX" \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux \
+  --target=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
-
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -77,4 +90,4 @@ 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/misc/recode/recode.info b/misc/recode/recode.info
index c46170413f38..6ffd2db061d9 100644
--- a/misc/recode/recode.info
+++ b/misc/recode/recode.info
@@ -1,8 +1,10 @@
 PRGNAM="recode"
 VERSION="3.6"
-HOMEPAGE="http://directory.fsf.org/project/recode/"
+HOMEPAGE="http://www.gnu.org/software/recode/recode.html"
 DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/recode/recode-3.6.tar.gz"
 MD5SUM="be3f40ad2e93dae5cd5f628264bf1877"
-MAINTAINER="Niki Kovacs"
-EMAIL="contact@kikinovak.net"
-APPROVED="rworkman"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Chris Abela"
+EMAIL="chris.abela@maltats.com"
+APPROVED="dsomero"
diff --git a/misc/recode/slack-desc b/misc/recode/slack-desc
index e51f70ab4c48..f0e39a4a78a8 100644
--- a/misc/recode/slack-desc
+++ b/misc/recode/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler-----------------------------------------------------|
+      |-------handy-ruler-----------------------------------------------------|
 recode: Recode (a Charset converter)
 recode: 
 recode: The recode program recognizes or produces approximately 150 character
-recode: sets and can convert almost any character set to almost any other. 
-recode: When exact translations are not possible, the program may get rid of
+recode: sets and can convert almost any character set to almost any other. When
+recode: exact translations are not possible, the program may get rid of
 recode: offending characters or use approximations. Particular attention has
 recode: been paid to the proper representation of French language diacritics.
 recode: 
-recode: Project homepage: http://directory.fsf.org/project/recode/
+recode: Homepage: http://www.gnu.org/software/recode/recode.html
 recode: 
 recode: