libraries/ftgl: New maintainer, optional API doc.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

3 files changed, 44 insertions, 47 deletions

diff --git a/libraries/ftgl/README b/libraries/ftgl/README
index 38ead6cc5e..f7b12ee5ea 100644
--- a/libraries/ftgl/README
+++ b/libraries/ftgl/README
@@ -1,10 +1,15 @@
-FTGL is a font rendering library for OpenGL applications.
+ftgl (font rendering library for OpenGL applications)
 
 FTGL is a free, open source library to enable developers to use
-arbitrary fonts in their OpenGL (www.opengl.org) applications.
-Unlike other OpenGL font libraries FTGL uses standard font file
-formats so doesn't need a preprocessing step to convert the high
-quality font data into a lesser quality, proprietary format.
-FTGL uses the Freetype (www.freetype.org) font library to open and
-'decode' the fonts. It then takes that output and stores it in a
-format most efficient for OpenGL rendering.
+arbitrary fonts in their OpenGL (www.opengl.org) applications. Unlike
+other OpenGL font libraries FTGL uses standard font file formats so
+doesn't need a preprocessing step to convert the high quality font
+data into a lesser quality, proprietary format. FTGL uses the Freetype
+(www.freetype.org) font library to open and 'decode' the fonts. It
+then takes that output and stores it in a format most efficient for
+OpenGL rendering.
+
+By default, the HTML and PDF API documentation for ftgl is not
+included in the package. If you want to build the docs, export
+DOCS=yes in the script's environment. You only need this if you're
+developing software that uses ftgl.
diff --git a/libraries/ftgl/ftgl.SlackBuild b/libraries/ftgl/ftgl.SlackBuild
index 30886a3bfc..deb648f898 100644
--- a/libraries/ftgl/ftgl.SlackBuild
+++ b/libraries/ftgl/ftgl.SlackBuild
@@ -1,33 +1,24 @@
 #!/bin/bash
 
 # Slackware build script for ftgl
-#
-# Copyright 2020  Johannes Schoepfer, Germany
-# Copyright 2007  Niklas "Nille" Åkerström
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Originally written by Niklas "Nille" Åkerström, formerly maintained
+# by Johannes Schoepfer.
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220207 bkw: BUILD=2.
+# - take over maintenance.
+# - relicense as WTFPL with permission.
+# - add option to build the docs, now that we have texlive.
+# - do not install useless INSTALL in doc dir.
+# - remove .la file.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ftgl
 VERSION=${VERSION:-2.4.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -39,9 +30,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -75,34 +63,38 @@ rm -rf $PRGNAM-$VERSION
 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 ./autogen.sh
 
-# docs requires texlive, tetex is not sufficient
+# docs require texlive, tetex is not sufficient. we have texlive in
+# 15.0, so we can build the docs, but don't by default (most users
+# won't need them).
+DOCOPT="--disable-doc"
+[ "${DOCS:-no}" = "yes" ] && DOCOPT="--enable-doc"
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=gnu++11" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-static \
-  --disable-doc
+  $DOCOPT
 
 make GLUT_LIBS="-lglut -lGLU -lGL -lm"
 make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
+
 cp src/FT{Face,Size}.h $PKG/usr/include/FTGL
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-mv  $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp AUTHORS BUGS COPYING ChangeLog NEWS README TODO $PKGDOC
+mv $PKG/usr/share/doc/$PRGNAM/* $PKGDOC
 rm -rf $PKG/usr/share
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/ftgl/ftgl.info b/libraries/ftgl/ftgl.info
index cc9f95648b..5f673272ee 100644
--- a/libraries/ftgl/ftgl.info
+++ b/libraries/ftgl/ftgl.info
@@ -6,5 +6,5 @@ MD5SUM="fba1e1c548ebe3ab362495e96a7a0670"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"