2 files changed, 24 insertions, 14 deletions
diff --git a/misc/ydpdict/ydpdict.SlackBuild b/misc/ydpdict/ydpdict.SlackBuild
index 091768ac73..287c7a7d30 100644
--- a/misc/ydpdict/ydpdict.SlackBuild
+++ b/misc/ydpdict/ydpdict.SlackBuild
@@ -1,30 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ydpdict
 # Written by Cezary M. Kruk (c.kruk@bigfoot.com)
 
 # Modified by the SlackBuilds.org project
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ydpdict
-VERSION=${VERSION:-1.0.2}
+VERSION=${VERSION:-1.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -53,6 +63,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+./autogen.sh
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,8 +77,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --build=$ARCH-slackware-linux
 
-patch -p0 < $CWD/ydpdict.patch
-
 make
 make install DESTDIR=$PKG
 
@@ -81,7 +91,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 mv $PKG/etc/ydpdict.conf $PKG/etc/ydpdict.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -89,4 +99,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/misc/ydpdict/ydpdict.info b/misc/ydpdict/ydpdict.info
index 38d6266e12..902ac6ac2c 100644
--- a/misc/ydpdict/ydpdict.info
+++ b/misc/ydpdict/ydpdict.info
@@ -1,8 +1,8 @@
 PRGNAM="ydpdict"
-VERSION="1.0.2"
-HOMEPAGE="http://toxygen.net/ydpdict/"
-DOWNLOAD="http://toxygen.net/ydpdict/ydpdict-1.0.2.tar.gz"
-MD5SUM="339be2191e94f0af5abcd037c3ef368a"
+VERSION="1.0.3"
+HOMEPAGE="https://github.com/wojtekka/ydpdict"
+DOWNLOAD="https://github.com/wojtekka/ydpdict/archive/1.0.3/ydpdict-1.0.3.tar.gz"
+MD5SUM="8af97ad2598a5e339c778fa949349b12"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libydpdict"