21 files changed, 227 insertions, 29 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index 58c3e9ca8..8a71e84d6 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_elflibs
 VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -64,7 +64,7 @@ cat $CWD/symlinks-to-tracked-libs \
   | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
         -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
   | while read library ; do
-  ( [ ! -e $library ] && continue
+  ( [ ! -e $library ] && exit 0
     echo "Adding $library"
     mkdir -p $(dirname $library | cut -b2- )
     cd $(dirname $library | cut -b2- )
@@ -80,7 +80,7 @@ cat $CWD/tracked-files \
   | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
         -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
   | while read library ; do
-  ( [ ! -e $library ] && continue
+  ( [ ! -e $library ] && exit 0
     echo "Adding $library"
     mkdir -p $(dirname $library | cut -b2- )
     cd $(dirname $library | cut -b2- )
@@ -94,7 +94,7 @@ cat $CWD/symlinks-to-tracked-libs-tmp \
   | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
         -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
   | while read library ; do
-  ( [ ! -e $library ] && continue
+  ( [ ! -e $library ] && exit 0
     echo "Adding $library"
     mkdir -p $(dirname $library | cut -b2- )
     cd $(dirname $library | cut -b2- )
@@ -110,7 +110,7 @@ cat $CWD/tracked-files-tmp \
   | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
         -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
   | while read library ; do
-  ( [ ! -e $library ] && continue
+  ( [ ! -e $library ] && exit 0
     echo "Adding $library"
     mkdir -p $(dirname $library | cut -b2- )
     cd $(dirname $library | cut -b2- )
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
index 3f5e260c0..d6e46f6ac 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -44,7 +44,7 @@
 /usr/lib/libhistory.so.6
 /usr/lib/libhistory.so.7
 /usr/lib/libidn.so.12
-/usr/lib/libidn2.so.4
+/usr/lib/libidn2.so.0
 /usr/lib/libjpeg.so.62
 /usr/lib/libturbojpeg.so.0
 /usr/lib/liblber-2.4.so.2
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
index a99ffb7e2..2e0d30830 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
@@ -2,4 +2,3 @@
 # like to keep copies of temporarily until we can recompile
 # everything that's still using them.  Once that happens, they'll
 # be dropped from this package.
-/usr/lib/libidn2.so.0
diff --git a/source/l/libdvdread/libdvdread.SlackBuild b/source/l/libdvdread/libdvdread.SlackBuild
index 72259ed36..34685671f 100755
--- a/source/l/libdvdread/libdvdread.SlackBuild
+++ b/source/l/libdvdread/libdvdread.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libdvdread
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/libpsl/libpsl.SlackBuild b/source/l/libpsl/libpsl.SlackBuild
index 8a0bfc7b0..e68f72832 100755
--- a/source/l/libpsl/libpsl.SlackBuild
+++ b/source/l/libpsl/libpsl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libpsl
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index 39744116f..4d3abdd01 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=bind
 VERSION=${VERSION:-9.12.3-P1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index c11540346..59fe9b385 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=curl
 VERSION=${VERSION:-$(echo curl-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/dhcpcd/dhcpcd-7.1.0.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-7.1.0.tar.xz.distinfo
deleted file mode 100644
index 1d7f9ffa0..000000000
--- a/source/n/dhcpcd/dhcpcd-7.1.0.tar.xz.distinfo
+++ /dev/null
@@ -1 +0,0 @@
-SHA256 (dhcpcd-7.1.0.tar.xz) = 019ff03f4495c58be1b43a5543a4f427b6a2c3f6a3850a112bc0baca50771243
diff --git a/source/n/dhcpcd/dhcpcd-7.1.1.tar.xz.distinfo b/source/n/dhcpcd/dhcpcd-7.1.1.tar.xz.distinfo
new file mode 100644
index 000000000..14a69c65f
--- /dev/null
+++ b/source/n/dhcpcd/dhcpcd-7.1.1.tar.xz.distinfo
@@ -0,0 +1 @@
+SHA256 (dhcpcd-7.1.1.tar.xz) = a27924873df92c47ad8b76a4fba4dfb41afaa3f90a4ba5f0e8e3ad446d792441
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild
index 97968a8eb..eaf61a40a 100755
--- a/source/n/dnsmasq/dnsmasq.SlackBuild
+++ b/source/n/dnsmasq/dnsmasq.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=dnsmasq
 VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index 2a87b9698..40e523c25 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gnutls
 VERSION=${VERSION:-$(echo gnutls-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 673b703cf..e5af5d80e 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=iputils
 VERSION=s20180629
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -40,7 +40,7 @@ fi
 # 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  echo "$PKGNAM-$(echo $VERSION | tr -d 's')-$ARCH-$BUILD.txz"
   exit 0
 fi
 
@@ -138,5 +138,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/iputils-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/iputils-$(echo $VERSION | tr -d 's')-$ARCH-$BUILD.txz
diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild
index 457eca751..33cdc6a0c 100755
--- a/source/n/lftp/lftp.SlackBuild
+++ b/source/n/lftp/lftp.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=lftp
 VERSION=${VERSION:-$(echo lftp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/n/s-nail/s-nail.SlackBuild b/source/n/s-nail/s-nail.SlackBuild
index 96bb49530..d77b79250 100755
--- a/source/n/s-nail/s-nail.SlackBuild
+++ b/source/n/s-nail/s-nail.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=s-nail
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/n/wget/wget.SlackBuild b/source/n/wget/wget.SlackBuild
index 26d36f518..bcf4a3f60 100755
--- a/source/n/wget/wget.SlackBuild
+++ b/source/n/wget/wget.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=wget
 VERSION=${VERSION:-$(echo wget-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/n/whois/whois.SlackBuild b/source/n/whois/whois.SlackBuild
index 8485fe7a7..c4b9b3d18 100755
--- a/source/n/whois/whois.SlackBuild
+++ b/source/n/whois/whois.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=whois
 VERSION=${VERSION:-$(echo ${PKGNAM}_*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine architecture for build & packaging:
 if [ -z "$ARCH" ]; then
diff --git a/source/x/ttf-tlwg/COPYING b/source/x/ttf-tlwg/COPYING
new file mode 100644
index 000000000..c0d005d34
--- /dev/null
+++ b/source/x/ttf-tlwg/COPYING
@@ -0,0 +1,197 @@
+This package collects Thai scalable fonts available in free licenses, and
+maintains and distributes them under GNU General Public License with
+original authors' permissions.
+
+Some fonts cannot be GPL, because they are based on fonts with different
+licenses. See the list of such fonts at the end of this file.
+
+Copyright:
+
+	- Kinnari:
+
+	Copyright (C) 1999 Db Type. All Rights Reserved.
+	Copyright (C) 2007 National Electronics and Computer Technology Center.
+	All Rights Reserved.
+
+	- Garuda:
+
+	Generated by NECTEC for Public Domain.
+	Modified under GNU General Public License by TLWG.
+
+	- Norasi:
+
+	Copyright (C) 1999, The National Font Project (v.beta). 
+	Yannis Haralambous, Virach Sornlertlamvanich and Anutara Tantraporn.
+	All rights reserved.
+	Modified under GNU General Public License, with creators' permission,
+	by Thai Linux Working Group (TLWG).
+
+	- Loma:
+
+	Copyright (C) 2003, NECTEC. All rights reserved.
+
+	- TlwgMono:
+
+	Copyright (C) 2003 Poonlap Veerathanabutr <poonlap@linux.thai.net>
+
+	- Tlwg Typewriter:
+
+	Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
+
+	- Tlwg Typist:
+
+	Tlwg Typist, based on Poonlap Veerathanabutr's Tlwg Typewriter.
+
+	Copyright (C) 2005-2014 Theppitak Karoonboonyanan.
+
+	Tlwg Typewriter, Free Thai Pseudo Monospace outline font.
+
+	Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
+
+	- Tlwg Typo:
+
+	Tlwg Typo, based on Poonlap Veerathanabutr's Tlwg Typewriter.
+
+	Copyright (C) 2005-2014 Theppitak Karoonboonyanan.
+
+	Tlwg Typewriter, Free Thai Pseudo Monospace outline font.
+
+	Copyright (C) 2003, 2004 Poonlap Veerathanabutr <poonlap@linux.thai.net>
+
+	- Purisa:
+
+	Copyright (C) 2003, 2004 Poonlap Veerathanabutr 
+	<poonlap@linux.thai.net>, GPL license
+
+	- Sawasdee:
+
+	Copyright (C) 2007 Pol Udomwittayanukul <webnaipol@gmail.com>.
+	All rights reserved.
+
+	- Umpush:
+
+	Copyright (C) 2003 NECTEC. All rights reserved.
+	Copyright (c) 2007 Widhaya Trisarnwadhana <widhaya3@gmail.com>.
+	All rights reserved.
+
+	- Laksaman:
+
+	Laksaman, based on TH Sarabun New.
+
+	Copyright (c) 2014 Theppitak Karoonboonyanan.
+
+	TH Sarabun New:
+
+	Copyright (c) 2010-2011 by Software Industry Promotion Agency
+	(Public Organization) (SIPA). All rights reserved.
+	Created by : Suppakit CHALERMLARP.
+
+License:
+
+	This font is free software; you can redistribute it and/or modify it
+	under the terms of the GNU General Public License as published by the
+	Free Software Foundation; either version 2 of the License, or (at your
+	option) any later version.
+
+	This font is distributed in the hope that it will be useful, but
+	WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+	General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this font; if not, write to the Free Software Foundation,
+	Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+	As a special exception, if you create a document which uses this font,
+	and embed this font or unaltered portions of this font into the
+	document, this font does not by itself cause the resulting document
+	to be covered by the GNU General Public License. This exception does
+	not however invalidate any other reasons why the document might be
+	covered by the GNU General Public License. If you modify this font,
+	you may extend this exception to your version of the font, but you
+	are not obligated to do so. If you do not wish to do so, delete this
+	exception statement from your version.
+
+See included GPL file for the GNU General Public License (GPL) terms.
+
+
+* Non-GPL Fonts:
+
+- Waree:
+
+Copyright:
+
+	Copyright (C) 2003 by Bitstream, Inc. All Rights Reserved.
+	TLWG changes are in public domain.
+
+	Bitstream Vera is a trademark of Bitstream, Inc.
+
+License:
+
+	Permission is hereby granted, free of charge, to any person obtaining
+	a copy of the fonts accompanying this license ("Fonts") and associated
+	documentation files (the "Font Software"), to reproduce and distribute
+	the Font Software, including without limitation the rights to use,
+	copy, merge, publish, distribute, and/or sell copies of the Font
+	Software, and to permit persons to whom the Font Software is furnished
+	to do so, subject to the following conditions:
+
+	The above copyright and trademark notices and this permission notice
+	shall be included in all copies of one or more of the Font Software
+	typefaces.
+
+	The Font Software may be modified, altered, or added to, and in
+	particular the designs of glyphs or characters in the Fonts may be
+	modified and additional glyphs or characters may be added to the
+	Fonts, only if the fonts are renamed to names not containing either
+	the words "Bitstream" or the word "Vera".
+
+	This License becomes null and void to the extent applicable to Fonts
+	or Font Software that has been modified and is distributed under the
+	"Bitstream Vera" names.
+
+	The Font Software may be sold as part of a larger software package
+	but no copy of one or more of the Font Software typefaces may be sold
+	by itself.
+
+	THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+	MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+	OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+	BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR
+	OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL,
+	OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+	OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+	SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+	Except as contained in this notice, the names of Gnome, the Gnome
+	Foundation, and Bitstream Inc., shall not be used in advertising or
+	otherwise to promote the sale, use or other dealings in this Font
+	Software without prior written authorization from the Gnome Foundation
+	or Bitstream Inc., respectively. For further information, contact:
+	fonts at gnome dot org. 
+
+
+* LaTeX Supports
+
+LaTeX package "fonts-tlwg" was moved from the thailatex package, so that
+fonts are maintained and generated from a single place.  Therefore,
+the original copyright and license are retained here.
+
+Copyright:
+	Copyright (C) 1999 National Electronics and Computer Technology Center
+	(NECTEC), Thailand.  All rights reserved.
+
+License:
+	It may be distributed and/or modified under the conditions of
+	the LaTeX Project Public License, either version 1.3
+	of this license or (at your option) any later version.
+	The latest version of this license is in
+	  http://www.latex-project.org/lppl.txt
+	and version 1.3 or later is part of all distributions of LaTeX
+	version 2005/12/01 or later.
+
+	This work has the LPPL maintenance status "maintained".
+
+	The Current Maintainer of this work is Theppitak Karoonboonyanan.
+
diff --git a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild
index 962145d0b..5b77a7d3e 100755
--- a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild
+++ b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=ttf-tlwg
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 ARCH=noarch
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # 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
@@ -55,12 +55,15 @@ find . \
 mkdir -p $PKG/usr/share/fonts/TTF/
 cp -a *.ttf fonts.* $PKG/usr/share/fonts/TTF/
 mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cp -a etc/fonts/conf.avail/* $PKG/etc/fonts/conf.avail 
+cp -a fontconfig/conf.avail/* $PKG/etc/fonts/conf.avail 
 ( cd $PKG/etc/fonts/conf.d && \
   ln -sf ../conf.avail/* .
 )
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a $CWD/COPYING $PKG/usr/doc/$PKGNAM-$VERSION
+chown root:root $PKG/usr/doc/$PKGNAM-$VERSION/COPYING
+chmod 644 $PKG/usr/doc/$PKGNAM-$VERSION/COPYING
 cp -a \
   AUTHORS COPYING* INSTALL LICENSE README* TODO \
   $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/x/ttf-tlwg/ttf-tlwg.url b/source/x/ttf-tlwg/ttf-tlwg.url
index 9b1deefc8..c3ab22954 100644
--- a/source/x/ttf-tlwg/ttf-tlwg.url
+++ b/source/x/ttf-tlwg/ttf-tlwg.url
@@ -1,3 +1,2 @@
-http://linux.thai.net/pub/thailinux/software/thai-ttf/thai-ttf-0.4.15.tar.gz
 ftp://linux.thai.net/pub/thailinux/software/fonts-tlwg/fonts/
-
+https://github.com/tlwg/fonts-tlwg/raw/master/COPYING
diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild
index fb1172067..4d559b369 100755
--- a/source/xfce/xfwm4/xfwm4.SlackBuild
+++ b/source/xfce/xfwm4/xfwm4.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfwm4
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
@@ -70,7 +70,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
diff --git a/source/xfce/xfwm4/xfwm4.url b/source/xfce/xfwm4/xfwm4.url
new file mode 100644
index 000000000..1c0e70666
--- /dev/null
+++ b/source/xfce/xfwm4/xfwm4.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/xfce/xfwm4/4.12/xfwm4-4.12.5.tar.bz2