- Split ghostscript into X11-independent and -dependent parts:

 * print/ghostscript{7,8,9,9-agpl}-base

   Installs Ghostscript binary, libgs, and related files.
   These ports do not depend on X11 libraries (i.e. x11* devices
   are not available).  USES=ghostscript will set dependency on
   one of them depending on GHOSTSCRIPT_DEFAULT.

   The default device is set to "display" or "bbox".

 * print/ghostscript{7,8,9,9-agpl}-x11

   Installs a shared library which provides X11 support to
   the installed Ghostscript binaries.  x11* devices will be
   enabled when the library is available.

   This depends on *-base (RUN_DEPENDS).  USES=ghostscript:x11
   will set dependency on one of them.

- Fix integer overflow reported as CVE-2015-3228.

- Update Uses/ghostscript.mk:

 * Add x11 keyword.  nox11 keyword is now obsolete.

 * Use packagename in *_DEPENDS line to prevent relationship between
   -base and -x11 packages from being broken.

- Fix x11/nox11 keyword and bump PORTREVISION in ports using
  USES=ghostscript to update dependency of pre-compiled packages.

1 files changed, 57 insertions, 0 deletions

diff --git a/print/ghostscript8-base/files/patch-base-configure.ac b/print/ghostscript8-base/files/patch-base-configure.ac
new file mode 100644
index 000000000000..955405b1c8e7
--- /dev/null
+++ b/print/ghostscript8-base/files/patch-base-configure.ac
@@ -0,0 +1,57 @@
+--- base/configure.ac.orig	2009-11-24 17:36:27.000000000 +0900
++++ base/configure.ac	2015-08-21 20:48:08.929511000 +0900
+@@ -402,7 +402,7 @@
+ 	PNGDEVS="$PNGDEVS_ALL"
+ else
+ 	AC_MSG_RESULT([no])
+-	AC_CHECK_LIB(png, png_check_sig, [
++	AC_CHECK_LIB(png, png_sig_cmp, [
+ 	  AC_CHECK_HEADERS(png.h, [
+ 		SHARE_LIBPNG=1
+ 		PNGDEVS="$PNGDEVS_ALL"
+@@ -434,7 +434,7 @@
+ 	AC_CHECK_LIB(tiff, TIFFOpen,
+ 		     [AC_CHECK_HEADERS(tiff.h, [HAVE_SYSTEM_LIBTIFF=1;SHARE_LIBTIFF=1])],
+ 		     [], [-ljpeg])
+-	if test -z $LOCAL_LIBTIFF_VERSION && test "x$HAVE_SYSTEM_LIBTIFF" == x; then
++	if test -z $LOCAL_LIBTIFF_VERSION && test "x$HAVE_SYSTEM_LIBTIFF" = x; then
+ 	    AC_MSG_NOTICE([Could not find a copy of libtiff on your system.
+ Disabling tiff output devices.])
+ 	else
+@@ -758,7 +758,7 @@
+ X_DEVS=""
+ X_LIBS=""
+ 
+-if test x$no_x != xyes; then
++if test x$with_x != xno; then
+ 	if test "$x_libraries" = "/usr/lib"; then
+ 		echo "Ignoring X library directory \"$x_libraries\" requested by configure."
+ 		x_libraries="NONE"
+@@ -1063,7 +1063,11 @@
+ 		;;
+ 		*BSD)
+ 		DYNAMIC_CFLAGS="-fPIC"
+-		DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++		if test "x$X_DEVS" != x; then
++			INSTALL_SHARED="install-shared"
++		else
++			DYNAMIC_DEVS=""
++		fi
+ 		DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
+ 		DYNAMIC_LDFLAGS="-fPIC -shared"
+ 		DYNAMIC_LIBS=""
+@@ -1119,11 +1123,11 @@
+ 	fontpath="${fontpath}:$datadir/fonts/default/TrueType"
+ 
+ 	# These font directories are used by IRIX...
+-	fontpath="${fontpath}:/usr/lib/DPS/outline/base"
++	# fontpath="${fontpath}:/usr/lib/DPS/outline/base"
+ 
+ 	# These font directories are used by Solaris...
+-	fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1"
+-	fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType"
++	# fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1"
++	# fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType"
+ 
+ 	# This font directory is used by CUPS...
+ 	if test "x$CUPSCONFIG" != x; then