ham/fldigi: Updated for version 3.21.83.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 31 insertions, 23 deletions

diff --git a/ham/fldigi/README b/ham/fldigi/README
index 2dc5842852..655724acf9 100644
--- a/ham/fldigi/README
+++ b/ham/fldigi/README
@@ -1,8 +1,12 @@
-Fldigi is a "digital modem" program for Linux, FreeBSD, and Windows.  
-This software allows amateur radio enthusiasts to communicate using a 
-number of digital protocols, including but not limited to PSK, 
-Hellschreiber, Olivia, Morse Code, and many more.  Receiving signals is 
-as simple as plugging an audio cable into your line in or microphone 
-port on your sound card, and transmitting can be accomplished using one 
-of any number of prebuilt or homebrew interfaces which can found on the 
-internet.
+Fldigi is a "digital modem" program for Linux, FreeBSD, and
+Windows.  This software allows amateur radio enthusiasts to
+communicate using a number of digital protocols, including
+but not limited to PSK, Hellschreiber, Olivia, Morse Code,
+and many more.  Receiving signals is as simple as plugging
+an audio cable into your line in or microphone port on your
+sound card, and transmitting can be accomplished using one
+of any number of prebuilt or homebrew interfaces which can
+found on the internet.
+
+Fldigi can also use libsndfile and pulseaudio if they are
+available at build time, as well as hamlib.
diff --git a/ham/fldigi/doinst.sh b/ham/fldigi/doinst.sh
index 4e8ba7071d..5fb28930db 100644
--- a/ham/fldigi/doinst.sh
+++ b/ham/fldigi/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/ham/fldigi/fldigi.SlackBuild b/ham/fldigi/fldigi.SlackBuild
index 102747f84f..2bd86afe03 100644
--- a/ham/fldigi/fldigi.SlackBuild
+++ b/ham/fldigi/fldigi.SlackBuild
@@ -16,16 +16,20 @@
 # wrong and prevent it from happening in the future.
 # In which case, I may just send YOU five dollars.
 
+# Oh, and feel free to copy it and modify it as you
+# see fit. Or as I see fit. Or as I fit. Although
+# that is unlikely, as I am rather tall.
+
 PRGNAM=fldigi
-VERSION=${VERSION:-3.21.49}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.21.83}
+BUILD=${BUILD:-1}
 TAG=${TAG:_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-      *) ARCH=$( uname -m ) ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -58,13 +62,15 @@ tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 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 {} \;
+ \( -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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+# Fix for FLTK-13 package
+FLTK_CONFIG=$( which fltk13-config ) \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
@@ -77,15 +83,14 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* INSTALL NEWS README* doc/* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -name "Makefile" -exec rm {} \;
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
diff --git a/ham/fldigi/fldigi.info b/ham/fldigi/fldigi.info
index cce7259a41..1ce0c1a0b8 100644
--- a/ham/fldigi/fldigi.info
+++ b/ham/fldigi/fldigi.info
@@ -1,10 +1,10 @@
 PRGNAM="fldigi"
-VERSION="3.21.49"
+VERSION="3.21.83"
 HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/fldigi-3.21.49.tar.gz"
-MD5SUM="55b4a20173390d9fdfef52e8c975aa89"
+DOWNLOAD="http://www.w1hkj.com/downloads/fldigi/fldigi-3.21.83.tar.gz"
+MD5SUM="f3fc84bb963fd8e0e7dd179597ba2d17"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fltk portaudio"
+REQUIRES="portaudio fltk13"
 MAINTAINER="JK Wood"
 EMAIL="joshuakwood@gmail.com"