graphics/mtpaint: Updated for version 3.40.

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

3 files changed, 62 insertions, 60 deletions

diff --git a/graphics/mtpaint/README b/graphics/mtpaint/README
index b4ae1d776f..ac2825e45a 100644
--- a/graphics/mtpaint/README
+++ b/graphics/mtpaint/README
@@ -1,19 +1,12 @@
-mtPaint is a painting program which Mark Tyler developed from scratch so
-he could easily create pixel art and manipulate digital photos.
-
-It uses the GTK+ toolkit (version 1 or 2) and runs on PC's via the
-GNU/Linux or Windows operating systems. Due to its efficient design it
-can run on older PC hardware (e.g. a 200MHz CPU and 16MB of free RAM).
-
-mtPaint is free software, which means you are able to freely use, modify
-and distribute it according to the GNU General Public License.
-
-Currently mtPaint is maintained by Dmitry Groshev.
-
-If you want internationalization, pass INTL=yes to the SlackBuild.
-If you want this built as a gtk1 app, pass GTK1=yes; else it will be
-gtk2.
-If you want gtk{1,2} widgets then pass TKWIDGETS=yes; else it will use
-its own file and color selector widgets.
-If you want the handbook installed (about a three meg html book) then
-pass HANDBOOK=yes.
+mtPaint is a GTK+ painting program which Mark Tyler developed from
+scratch. Currently mtPaint is maintained by Dmitry Groshev. It is
+aimed to be simple and easy to use. 
+
+mtPaint can edit indexed palette or 24 bit RGB images and offers basic
+painting and palette manipulation tools. It also can handle JPEG, GIF,
+TIFF, BMP, XPM, and XBM files.
+
+NOTES:
+mtPaint comes with its own file and color selector widgets. To use the
+GTK default ones, pass TKWIDGETS=yes to the script. If you want this
+to build as a GTK1 app, pass GTK1=yes
diff --git a/graphics/mtpaint/mtpaint.SlackBuild b/graphics/mtpaint/mtpaint.SlackBuild
index 7ccd534395..ecffc07a7e 100644
--- a/graphics/mtpaint/mtpaint.SlackBuild
+++ b/graphics/mtpaint/mtpaint.SlackBuild
@@ -1,17 +1,36 @@
 #!/bin/sh
 
 # Slackware build script for mtpaint
-# Written by slakmagik <slakmagik@gmail.com>
-# Released under the WTFPL
+
+# Copyright 2020 Petar Petrov slackalaxy@gmail.com
+# Copyright 2010-2020 slackmagik <slakmagik@gmail.com>
+# 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.
 
 PRGNAM=mtpaint
 VERSION=${VERSION:-3.40}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +41,8 @@ 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"
@@ -39,13 +58,10 @@ fi
 if [ "$GTK1" = yes ]; then
   GTK1=gtk1
 fi
+
 if [ "$TKWIDGETS" = yes ]; then
   TKWIDGETS="gtkfilesel gtkcolsel"
 fi
-if [ "$INTL" = yes ]; then
-  INTL=intl
-fi
-HANDBOOK=${HANDBOOK:-no}
 
 set -e
 
@@ -55,14 +71,16 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
+unzip $CWD/${PRGNAM}_handbook-$VERSION.zip
+
 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 600 -o -perm 444 -o -perm 440 \
-  -o -perm 400 \) -exec chmod 644 {} \;
+ \( -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 {} \;
 
-# bring deprecated function call into conformance with libpng14
+# Bring deprecated function call into conformance with libpng14
 sed -i 's/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/' src/png.c
 
 # Fix build with giflib-5.1 (thanks to Arch)
@@ -73,34 +91,25 @@ sed -i 's:DGifCloseFile(giffy):DGifCloseFile(giffy, NULL):g' src/png.c
 sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
 sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
 
+# If you do not want the international language support, remove 'intl'
+# from the line below.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure cflags man $GTK1 $TKWIDGETS $INTL \
+./configure cflags intl man $GTK1 $TKWIDGETS \
   --prefix=/usr \
   --mandir=/usr/man/man1 \
   --docdir=/usr/doc/$PRGNAM-$VERSION
 
-# mtpaint autostrips the binary and autocompresses the manpage but doesn't
-# automatically create the viewer link
 make
 make DESTDIR=$PKG install
-(cd $PKG/usr/bin && ln -s mtpaint mtv)
-
-if [ "$HANDBOOK" = yes ]; then
-  unzip $CWD/${PRGNAM}_handbook-$VERSION.zip
-  ( cd ${PRGNAM}_handbook-$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 600 -o -perm 444 -o -perm 440 \
-      -o -perm 400 \) -exec chmod 644 {} \;
-    make DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION install
-    cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION/COPYING.handbook )
-else
-  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-fi
-cp -a [CNR]* $PKG/usr/doc/$PRGNAM-$VERSION
+
+# Install the handbook
+cd ${PRGNAM}_handbook-$VERSION
+make DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION install
+cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION/COPYING.handbook
+cd ..
+
+cp -a NEWS README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/graphics/mtpaint/slack-desc b/graphics/mtpaint/slack-desc
index 8a591b2cbf..f17d196539 100644
--- a/graphics/mtpaint/slack-desc
+++ b/graphics/mtpaint/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 mtpaint: mtpaint (Mark Tyler's Painting Program)
 mtpaint:
-mtpaint: mtPaint is a GTK+1/2 based painting program designed for creating
-mtpaint: icons and pixel based artwork. It can edit indexed palette or 24 bit
-mtpaint: RGB images and offers painting and palette manipulation tools.
-mtpaint:
-mtpaint: Homepage: http://mtpaint.sourceforge.net/
-mtpaint:
+mtpaint: mtPaint is a GTK+ painting program which is scratch is aimed to
+mtpaint: be simple and easy to use. It can edit indexed palette or 24 bit
+mtpaint: RGB images and offers basic painting and palette manipulation
+mtpaint: tools. It also can handle JPEG, GIF, TIFF, BMP, XPM, and XBM
+mtpaint: files.
 mtpaint:
+mtpaint: Home: http://mtpaint.sourceforge.net/
 mtpaint:
 mtpaint: