4 files changed, 39 insertions, 15 deletions
diff --git a/development/bluefish/README b/development/bluefish/README
index 52080b7673..c3d3051af3 100644
--- a/development/bluefish/README
+++ b/development/bluefish/README
@@ -1,5 +1,12 @@
-Bluefish is a powerful editor for experienced web designers and programmers. 
-Bluefish supports many programming and markup languages, but it focuses on 
-editing dynamic and interactive websites. See features for an extensive 
-overview, take a look at the screenshots, or download it right away. 
-Bluefish is an open source development project released under the GPL licence.
+Bluefish is a powerful editor for experienced web designers and
+programmers. Bluefish supports many programming and markup languages,
+but it focuses on editing dynamic and interactive websites. See
+features for an extensive overview, take a look at the screenshots,
+or download it right away. Bluefish is an open source development
+project released under the GPL license.
+
+If you want to build Bluefish with GTK2,
+
+GTK2=yes ./bluefish.SlackBuild
+
+otherwise GTK3 will be used by default.
diff --git a/development/bluefish/bluefish.SlackBuild b/development/bluefish/bluefish.SlackBuild
index 817f0a4dff..35ae07435c 100644
--- a/development/bluefish/bluefish.SlackBuild
+++ b/development/bluefish/bluefish.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for bluefish
 
@@ -25,10 +25,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=bluefish
-VERSION=${VERSION:-2.2.10}
+VERSION=${VERSION:-2.2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,7 +41,20 @@ if [ -z "$ARCH" ]; then
   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
+
+# Do we still want GTK2?
+gtkversion=""
+if [ "$GTK2" = "yes" ]; then
+  gtkversion="--with-gtk2"
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -83,6 +99,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-update-databases \
   --disable-xml-catalog-update \
   --enable-static=no \
+  $gtkversion \
   --build=$ARCH-slackware-linux
 
 make
@@ -95,7 +112,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  AUTHORS COPYING ChangeLog INSTALL README TODO \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -104,4 +121,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/development/bluefish/bluefish.info b/development/bluefish/bluefish.info
index b628e67e1e..f45bde7a11 100644
--- a/development/bluefish/bluefish.info
+++ b/development/bluefish/bluefish.info
@@ -1,10 +1,10 @@
 PRGNAM="bluefish"
-VERSION="2.2.10"
+VERSION="2.2.15"
 HOMEPAGE="http://bluefish.openoffice.nl/index.html"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/bluefish-2.2.10.tar.bz2"
-MD5SUM="06cc710505856cb328444d834f5e9666"
+DOWNLOAD="https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.15.tar.bz2"
+MD5SUM="48018bcfef0faeceb66b0f2d814ded03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Edward W. Koenig"
-EMAIL="kingbeowulf@gmail.com"
+EMAIL="kingbeowulf@linuxgalaxy.org"
diff --git a/development/bluefish/slack-desc b/development/bluefish/slack-desc
index 6d172685b8..6c1526083b 100644
--- a/development/bluefish/slack-desc
+++ b/development/bluefish/slack-desc
@@ -13,7 +13,7 @@ bluefish: and programmers. Bluefish supports many programming and markup
 bluefish: languages, but it focuses on editing dynamic and interactive
 bluefish: websites. See features for an extensive overview, take a look
 bluefish: at the screenshots, or download it right away. Bluefish is an
-bluefish: open source development project, released under the GPL licence.
+bluefish: open source development project, released under the GPL license.
 bluefish:
 bluefish: Homepage: http://bluefish.openoffice.nl/index.html
 bluefish: