6 files changed, 44 insertions, 32 deletions
diff --git a/misc/recode/README b/misc/recode/README
index ea9fd353e8939..7fb2d7ed196ae 100644
--- a/misc/recode/README
+++ b/misc/recode/README
@@ -3,3 +3,7 @@ and can convert almost any character set to almost any other.  When exact
 translations are not possible, the program may get rid of offending characters
 or use approximations. Particular attention has been paid to the proper
 representation of French language diacritics.
+
+Although we normally wouldn't put anything beta on SlackBuilds but
+this fixes some long-standing bugs that everyone else has been
+fixing through patches for years.
diff --git a/misc/recode/patches/debian-edited-recode_3.6-12.diff.bz2 b/misc/recode/patches/debian-edited-recode_3.6-12.diff.bz2
deleted file mode 100644
index b2d4511ac6f36..0000000000000
--- a/misc/recode/patches/debian-edited-recode_3.6-12.diff.bz2
+++ /dev/null
diff --git a/misc/recode/patches/ubuntu-edited-recode_3.6-14ubuntu1.patch.bz2 b/misc/recode/patches/ubuntu-edited-recode_3.6-14ubuntu1.patch.bz2
deleted file mode 100644
index fb3f049dece36..0000000000000
--- a/misc/recode/patches/ubuntu-edited-recode_3.6-14ubuntu1.patch.bz2
+++ /dev/null
diff --git a/misc/recode/recode.SlackBuild b/misc/recode/recode.SlackBuild
index a08d2b691f236..9f87ad960eb0d 100644
--- a/misc/recode/recode.SlackBuild
+++ b/misc/recode/recode.SlackBuild
@@ -3,19 +3,38 @@
 # Copyright (c) 2007 Niki Kovacs <contact@kikinovak.net>
 # Copyright 2014 Ryan P.C. McQuen, WA, <ryan.q@linux.com>
 #
-# By:        Niki Kovacs <contact@kikinovak.net>
-# For:       recode
-# URL:       ftp://ftp.gnu.org/pub/gnu/recode/
+# Slackware build script for recode
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 # Further small mods by Richard Hoyle <hoyle.richard@gmail.com>
 # Updating and testing for Slackware (including x86_64 and Multilib)
 # previously by Chris Abela <kristofru@gmail.com>
-# by Ryan P.C. McQuen, WA, <ryan.q@linux.com>
+# Now by Ryan P.C. McQuen
+
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=recode
-VERSION=3.6
-BUILD=${BUILD:-2}
+SRCNAM=Recode
+VERSION=${VERSION:-3.7_beta2}
+SRCVER=$(echo $VERSION | tr _ -)
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,23 +70,17 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$SRCVER.tar.gz || tar xvf $CWD/v$SRCVER.tar.gz
+cd $SRCNAM-$SRCVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Some important fixes from debian and ubuntu.
-# We normally don't like this idea, as it puts us maintaining the upstream
-# sources, but in this case, we'll make an exception.
-# I *really* don't like the non-bugfix parts of the debian patch, but I
-# guess I'll let it slide  --rworkman
-for patch in $CWD/patches/* ; do
-  bzcat $patch | patch -p1 --verbose --backup || exit 1
-done
+# allow recode to be built on a gcc that is not ancient -ryan
+sed -i "s/bool ignore : 2;/bool ignore : 1;/g" ./src/recodext.h
 
 # libdir and target are critical for x86_64
 CFLAGS="$SLKCFLAGS" \
@@ -82,23 +95,18 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 make install DESTDIR=$PKG
-chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+mv $PKG/usr/share/man/* $PKG/usr/man
+rm -rf $PKG/usr/share/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
+mv $PKG/usr/share/info $PKG/usr/
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS BACKLOG COPYING* NEWS PATCHES-AC README THANKS TODO \
+cp -a ABOUT-NLS AUTHORS COPYING* NEWS README THANKS TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/misc/recode/recode.info b/misc/recode/recode.info
index 256bedb6a86d7..80059359ab7de 100644
--- a/misc/recode/recode.info
+++ b/misc/recode/recode.info
@@ -1,8 +1,8 @@
 PRGNAM="recode"
-VERSION="3.6"
+VERSION="3.7_beta2"
 HOMEPAGE="http://recode.progiciels-bpi.ca/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/recode-3.6.tar.gz"
-MD5SUM="be3f40ad2e93dae5cd5f628264bf1877"
+DOWNLOAD="https://github.com/pinard/Recode/archive/v3.7-beta2.tar.gz"
+MD5SUM="fd0e609d54fad968fcb52a8eca2d6bf0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/misc/recode/slack-desc b/misc/recode/slack-desc
index b84f6437b7bee..ab7cbaa13c854 100644
--- a/misc/recode/slack-desc
+++ b/misc/recode/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-recode: Recode (a Charset converter)
+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. When