From f374e71f3a1ca682433e5cfff3ab47d7ce0e264b Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Wed, 28 Feb 2018 14:37:14 -0500
Subject: perl/perl-GD: Updated for v2.68, fix 32-bit build, add FastCGI.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 perl/perl-GD/README             | 14 ++++++++++----
 perl/perl-GD/perl-GD.SlackBuild | 21 +++++++++++++++++++--
 perl/perl-GD/perl-GD.info       |  6 +++---
 perl/perl-GD/slack-desc         | 10 +++++-----
 4 files changed, 37 insertions(+), 14 deletions(-)

(limited to 'perl')

diff --git a/perl/perl-GD/README b/perl/perl-GD/README
index c5889ee909..cf64941daa 100644
--- a/perl/perl-GD/README
+++ b/perl/perl-GD/README
@@ -1,6 +1,12 @@
 perl-GD (perl bindings for GD image library)
 
-GD.pm is a Perl interface to Thomas Boutell's gd graphics library
-(version 2.01 or higher; see below). GD allows you to create color
-drawings using a large number of graphics primitives, and emit the
-drawings as PNG files.
+GD.pm is a Perl interface to Thomas Boutell's gd graphics library.
+GD allows you to create color drawings using a large number of graphics
+primitives, and emit the drawings as PNG files.
+
+The package includes the bdf2gdfont.pl utility, which converts X11 BDF
+fonts to the format used by GD.
+
+perl-GD can optionally be built with support for FastCGI. To do this,
+first install libraries/fcgi, then run perl-GD.SlackBuild with FASTCGI=yes
+set in the environment.
diff --git a/perl/perl-GD/perl-GD.SlackBuild b/perl/perl-GD/perl-GD.SlackBuild
index d5b04848d7..4f1fe69a28 100644
--- a/perl/perl-GD/perl-GD.SlackBuild
+++ b/perl/perl-GD/perl-GD.SlackBuild
@@ -6,8 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180611 bkw:
+# - update for v2.68
+
+# 20180228 bkw:
+# - fix build on 32-bit. Thanks to idlemoor for the bug report.
+# - add FASTCGI option
+
 PRGNAM=perl-GD
-VERSION=${VERSION:-2.67}
+VERSION=${VERSION:-2.68}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +67,17 @@ find -L . \
 # This isn't a real issue, since on Slackware /usr/X11R6/include
 # is just a symlink to /usr/include.
 
+if [ "${FASTCGI:-no}" = "yes" ]; then
+  FCGIOPT="--fcgi"
+  WITH="with"
+else
+  FCGIOPT=""
+  WITH="without"
+fi
+
 perl Makefile.PL \
+  --lib_gd_path /usr \
+  $FCGIOPT \
   PREFIX=/usr \
   INSTALLDIRS=vendor \
   INSTALLVENDORMAN3DIR=/usr/man/man3 \
@@ -85,7 +102,7 @@ cp -a README* ChangeLog LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@WITH@,$WITH," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/perl/perl-GD/perl-GD.info b/perl/perl-GD/perl-GD.info
index 4e606c0507..4357e9099b 100644
--- a/perl/perl-GD/perl-GD.info
+++ b/perl/perl-GD/perl-GD.info
@@ -1,8 +1,8 @@
 PRGNAM="perl-GD"
-VERSION="2.67"
+VERSION="2.68"
 HOMEPAGE="https://metacpan.org/pod/GD"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-2.67.tar.gz"
-MD5SUM="b9cfc5a677b5e9fa607be1379f789855"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/GD-2.68.tar.gz"
+MD5SUM="b18bf9698608699309dfb3d09e260c63"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/perl/perl-GD/slack-desc b/perl/perl-GD/slack-desc
index 6058787187..2f83e5952f 100644
--- a/perl/perl-GD/slack-desc
+++ b/perl/perl-GD/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 perl-GD: perl-GD (perl bindings for GD image library)
 perl-GD:
-perl-GD: GD.pm is a Perl interface to Thomas Boutell's gd graphics library
-perl-GD: (version 2.01 or higher; see below). GD allows you to create color
-perl-GD: drawings using a large number of graphics primitives, and emit the
-perl-GD: drawings as PNG files.
-perl-GD:
+perl-GD: GD.pm is a Perl interface to Thomas Boutell's gd graphics
+perl-GD: library.  GD allows you to create color drawings using a
+perl-GD: large number of graphics primitives, and emit the drawings as
+perl-GD: PNG files.
 perl-GD:
+perl-GD: This package was built @WITH@ FastCGI support.
 perl-GD:
 perl-GD:
 perl-GD:
-- 
cgit v1.2.3