- update libgd to 2.3.0

- new option RAQM
- resurrect deprecated gdlib-config
- bump dependend ports

2 files changed, 114 insertions, 34 deletions

diff --git a/graphics/gd/files/gdlib-config.in b/graphics/gd/files/gdlib-config.in
new file mode 100644
index 000000000000..f2123096d62f
--- /dev/null
+++ b/graphics/gd/files/gdlib-config.in
@@ -0,0 +1,114 @@
+#!/bin/sh
+#
+#	$FreeBSD$
+#
+# Return information about the local GD library installation
+#
+# Modeled for ports:
+#	audio/mp3plot
+#	devel/cvsgraph
+#	graphics/R-cran-GDD
+#	graphics/a2png
+#	graphics/gdtclft
+#	graphics/lua-gd
+#	graphics/mscgen
+#	graphics/p5-GD
+#	math/gnuplot
+#	net-p2p/amule
+#	net-p2p/mldonkey
+#	science/octopus
+
+echo "gdlib-config: warning: this script is deprecated;" \
+     "please use the pkg-config file instead." >&2
+sleep 10
+
+# installation directories
+prefix=%%PREFIX%%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+bindir=${exec_prefix}/bin
+
+usage()
+{
+	cat <<EOF
+Print information on GD library's version, configuration, and use.
+Usage: gdlib-config [options]
+Options:
+	--libdir          # directory where GD library is installed
+	--includedir      # directory where GD library headers are installed
+	--version         # complete GD library version string
+	--majorversion    # GD library major version number
+	--minorversion    # GD library minor version number
+	--revision        # GD library revision version number
+	--ldflags         # options required for linking against GD library
+	--libs            # libs required for linking against GD library
+	--cflags          # options required for compiling GD library apps
+	--includes        # same as --cflags
+	--features        # lists features compiled into gd, separated by spaces.
+                          # Currently (as of 2.2.5) the optional features
+                          # are GD_PNG, GD_JPEG, GD_XPM, GD_FREETYPE, and 
+                          # GD_FONTCONFIG. When these features are reported by
+                          # --features, it is safe to include calls to the
+                          # related functions in your code.
+	--all             # print a summary of all GD library configure options
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+    case "$1" in
+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) optarg= ;;
+    esac
+
+    case $1 in
+    --libdir)
+	echo "${libdir}"
+	;;
+    --includedir)
+	echo "${includedir}"
+	;;
+    --version)
+	echo "%%PORTVERSION%%"
+	;;
+    --majorversion)
+	echo %%MAJORVERSION%%
+	;;
+    --minorversion)
+	echo 2
+	;;
+    --revision)
+	echo 5
+	;;
+    --ldflags)
+	echo " -L${prefix}/lib -fstack-protector-strong "
+	;;
+    --libs)
+	echo "-lgd"
+	;;
+    --cflags|--includes)
+	echo "-I${includedir}"
+	;;
+    --features)
+	echo GD_GIF GD_GIFANIM GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE GD_FONTCONFIG GD_JPEG GD_TIFF GD_WEBP
+	;;
+    --all)
+	echo "GD library  2.2.5"
+	echo "includedir: ${includedir}"
+	echo "cflags:     -I${includedir}"
+	echo "ldflags:     -L${prefix}/lib -fstack-protector-strong "
+	echo "libs:       -lgd"
+	echo "libdir:     $libdir"
+	echo "features:   GD_GIF GD_GIFANIM GD_OPENPOLYGON GD_ZLIB GD_PNG GD_FREETYPE GD_FONTCONFIG GD_JPEG GD_TIFF GD_WEBP"
+	;;
+    *)
+	usage 1 1>&2
+	;;
+    esac
+    shift
+done
diff --git a/graphics/gd/files/patch-gd_gif_in.c b/graphics/gd/files/patch-gd_gif_in.c
deleted file mode 100644
index a034136a8611..000000000000
--- a/graphics/gd/files/patch-gd_gif_in.c
+++ /dev/null
@@ -1,34 +0,0 @@
-See:
-
-	https://bugs.php.net/bug.php?id=75571
-
---- src/gd_gif_in.c	2017-08-30 07:05:54.000000000 -0400
-+++ src/gd_gif_in.c	2018-07-11 15:39:11.746181000 -0400
-@@ -336,9 +336,4 @@
- 	}
- 
--	if(!im->colorsTotal) {
--		gdImageDestroy(im);
--		return 0;
--	}
--
- 	/* Check for open colors at the end, so
- 	 * we can reduce colorsTotal and ultimately
-@@ -352,4 +347,9 @@
- 	}
- 
-+	if(!im->colorsTotal) {
-+		gdImageDestroy(im);
-+		return 0;
-+	}
-+
- 	return im;
- }
-@@ -447,6 +447,5 @@
- GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
- {
--	int i, j, ret;
--	unsigned char count;
-+	int i, j, ret, count;
- 
- 	if(flag) {