From 27470e1676e69455acf06ae25ebd42ebd5bdecdb Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sat, 22 Aug 2015 17:48:35 +0000
Subject: - 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.
---
 .../ghostscript9-agpl-x11/files/patch-configure.ac | 74 ++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 print/ghostscript9-agpl-x11/files/patch-configure.ac

(limited to 'print/ghostscript9-agpl-x11/files/patch-configure.ac')

diff --git a/print/ghostscript9-agpl-x11/files/patch-configure.ac b/print/ghostscript9-agpl-x11/files/patch-configure.ac
new file mode 100644
index 000000000000..dc8baba689f2
--- /dev/null
+++ b/print/ghostscript9-agpl-x11/files/patch-configure.ac
@@ -0,0 +1,74 @@
+--- configure.ac.orig	2015-03-30 17:21:24.000000000 +0900
++++ configure.ac	2015-08-22 03:37:13.515866000 +0900
+@@ -892,35 +892,6 @@
+ AC_SUBST(FT_CFLAGS)
+ AC_SUBST(FT_LIBS)
+   
+-AC_MSG_CHECKING([for local jpeg library source])
+-dnl At present, we give the local source priority over the shared
+-dnl build, so that the D_MAX_BLOCKS_IN_MCU patch will be applied.
+-dnl A more sophisticated approach would be to test the shared lib
+-dnl to see whether it has already been patched.
+-LIBJPEGDIR=src
+-if test -f $srcdir/jpeg/jpeglib.h; then
+-        AC_MSG_RESULT([jpeg])
+-        SHARE_LIBJPEG=0
+-        LIBJPEGDIR=$srcdir/jpeg
+-elif test -f $srcdir/jpeg-6b/jpeglib.h; then
+-        AC_MSG_RESULT([jpeg-6b])
+-        SHARE_LIBJPEG=0
+-        LIBJPEGDIR=$srcdir/jpeg-6b
+-else
+-        AC_MSG_RESULT([no])
+-        AC_CHECK_LIB(jpeg, jpeg_set_defaults, [
+-          AC_CHECK_HEADERS([jpeglib.h], [SHARE_LIBJPEG=1])
+-        ])
+-fi
+-if test -z "$SHARE_LIBJPEG"; then
+-  AC_MSG_ERROR([I wasn't able to find a copy
+-  of the jpeg library. This is required for compiling
+-  ghostscript. Please download a copy of the source,
+-  e.g. from http://www.ijg.org/, unpack it at the
+-  top level of the gs source tree, and rename
+-  the directory to 'jpeg'.
+-  ])
+-fi
+ AC_SUBST(SHARE_LIBJPEG)
+ AC_SUBST(LIBJPEGDIR)
+ dnl check for the internal jpeg memory header
+@@ -1607,7 +1578,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"
+@@ -2074,7 +2045,10 @@
+                         DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
+                         ;;
+                         *BSD)
+-                        DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++	 		if test "x$X_DEVS" != x; then
++				INSTALL_SHARED="install-shared"
++                                DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++	 		fi
+                         DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
+                         X11_DEVS=""
+                         OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
+@@ -2133,11 +2107,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
-- 
cgit v1.2.3