5 files changed, 32 insertions, 49 deletions
diff --git a/libraries/fltk13/README b/libraries/fltk/README
index a1a2910cee..67c4abfb87 100644
--- a/libraries/fltk13/README
+++ b/libraries/fltk/README
@@ -1,13 +1,9 @@
-The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a a cross-platform 
-C++ GUI toolkit for UNIX(r)/Linux(r) (X11), Microsoft(r) Windows(r), and 
-MacOS(r) X.  FLTK provides modern GUI functionality without the bloat and 
-supports 3D graphics via OpenGL(r) and its built-in GLUT emulation.  It was 
-originally developed by Mr. Bill Spitzak and is currently maintained by a 
+The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a a cross-platform
+C++ GUI toolkit for UNIX(r)/Linux(r) (X11), Microsoft(r) Windows(r), and
+MacOS(r) X.  FLTK provides modern GUI functionality without the bloat and
+supports 3D graphics via OpenGL(r) and its built-in GLUT emulation.  It was
+originally developed by Mr. Bill Spitzak and is currently maintained by a
 small group of developers across the world with a central repository in the US.
 
-CAVEATS:
-1) fltk13 can be installed alongside fltk (1.1.x), but in order to build it,
-you may need to remove fltk first (with removepkg); you can then reinstall it
-afterwards. YMMV.
-
-If you want cairo support, you need to pass CAIRO=1 to the build script.
+If you want to disable cairo support, you need to pass CAIRO=0 to the build
+script.
diff --git a/libraries/fltk13/fltk13.SlackBuild b/libraries/fltk/fltk.SlackBuild
index e7c266b918..f02a87ee2d 100644
--- a/libraries/fltk13/fltk13.SlackBuild
+++ b/libraries/fltk/fltk.SlackBuild
@@ -22,7 +22,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=fltk13
+PRGNAM=fltk
 VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
@@ -40,10 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM=fltk
 DOCFILES="ANNOUNCEMENT CHANGES COPYING CREDITS README"
-# By default Cairo library support is disabled
-CAIRO=${CAIRO:-0}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -65,8 +62,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION-source.tar.gz
-cd $SRCNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION-source.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 \
@@ -80,7 +77,8 @@ sed -i \
   src/Makefile || exit
 
 # Cairo library support
-case "$CAIRO" in
+# By default Cairo library support is enabled (like Slackware extra/fltk)
+case "${CAIRO:-1}" in
     0)  CAIRO_FLAG="dis" ;;
     *)  CAIRO_FLAG="en" ;;
 esac
@@ -116,17 +114,6 @@ make install docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
 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
 
-# Some files are to be manually renamed so they do not conflict with fltk(1.1.x)'s ones
-mv $PKG/usr/bin/fluid $PKG/usr/bin/fluid13
-mv $PKG/usr/bin/fltk-config $PKG/usr/bin/fltk13-config
-mv $PKG/usr/man/man1/fluid.1 $PKG/usr/man/man1/fluid13.1
-mv $PKG/usr/man/man1/fltk-config.1 $PKG/usr/man/man1/fltk13-config.1
-mv $PKG/usr/man/man3/fltk.3 $PKG/usr/man/man3/fltk13.3
-# Change some reference in man files
-sed -i "s|fluid|fluid13|g" $PKG/usr/man/man[1,3]/*
-sed -i "s|fltk|fltk13|g" $PKG/usr/man/man[1,3]/*
-sed -i "s|www.fltk13.org|www.fltk.org|g" $PKG/usr/man/man[1,3]/*
-
 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
 
diff --git a/libraries/fltk13/fltk13.info b/libraries/fltk/fltk.info
index acd11601de..b11769c874 100644
--- a/libraries/fltk13/fltk13.info
+++ b/libraries/fltk/fltk.info
@@ -1,4 +1,4 @@
-PRGNAM="fltk13"
+PRGNAM="fltk"
 VERSION="1.3.3"
 HOMEPAGE="http://www.fltk.org"
 DOWNLOAD="http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz"
diff --git a/libraries/fltk/slack-desc b/libraries/fltk/slack-desc
new file mode 100644
index 0000000000..f685766a0b
--- /dev/null
+++ b/libraries/fltk/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+    |-----handy-ruler------------------------------------------------------|
+fltk: FLTK (Fast Light Tool Kit 1.3.x series)
+fltk:
+fltk: The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
+fltk: a cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
+fltk: Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides
+fltk: modern GUI functionality without the bloat and supports 3D
+fltk: graphics via OpenGL(r) and its built-in GLUT emulation. It
+fltk: was originally developed by Mr. Bill Spitzak and is
+fltk: currently maintained by a small group of developers across
+fltk: the world with a central repository in the US.
+fltk:
diff --git a/libraries/fltk13/slack-desc b/libraries/fltk13/slack-desc
deleted file mode 100644
index e8a8155300..0000000000
--- a/libraries/fltk13/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.
-# Line up the first '|' above the ':' following the base package name, and
-# the '|' on the right side marks the last column you can put a character in.
-# You must make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-      |-----handy-ruler------------------------------------------------------|
-fltk13: FLTK (Fast Light Tool Kit 1.3.x series)
-fltk13:
-fltk13: The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
-fltk13: a cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
-fltk13: Microsoft(r) Windows(r), and MacOS(r) X. FLTK provides
-fltk13: modern GUI functionality without the bloat and supports 3D
-fltk13: graphics via OpenGL(r) and its built-in GLUT emulation. It
-fltk13: was originally developed by Mr. Bill Spitzak and is
-fltk13: currently maintained by a small group of developers across
-fltk13: the world with a central repository in the US.
-fltk13: