- 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, 212 insertions, 0 deletions

diff --git a/print/ghostscript9-base/files/patch-base-unix-gcc.mak b/print/ghostscript9-base/files/patch-base-unix-gcc.mak
new file mode 100644
index 000000000000..8aea189c6f90
--- /dev/null
+++ b/print/ghostscript9-base/files/patch-base-unix-gcc.mak
@@ -0,0 +1,212 @@
+--- base/unix-gcc.mak.orig	2012-08-08 17:01:36.000000000 +0900
++++ base/unix-gcc.mak	2012-10-14 02:32:51.000000000 +0900
+@@ -22,16 +22,17 @@
+ # source, generated intermediate file, and object directories
+ # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
+ 
+-BINDIR=./$(BUILDDIRPREFIX)bin
+-GLSRCDIR=./base
+-GLGENDIR=./$(BUILDDIRPREFIX)obj
+-GLOBJDIR=./$(BUILDDIRPREFIX)obj
++.CURDIR?=.
++BINDIR=${.CURDIR}/$(BUILDDIRPREFIX)bin
++GLSRCDIR=${.CURDIR}/base
++GLGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj
++GLOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj
+ AUXDIR=$(GLGENDIR)/aux
+-PSSRCDIR=./psi
+-PSLIBDIR=./lib
+-PSRESDIR=./Resource
+-PSGENDIR=./$(BUILDDIRPREFIX)obj
+-PSOBJDIR=./$(BUILDDIRPREFIX)obj
++PSSRCDIR=${.CURDIR}/psi
++PSLIBDIR=${.CURDIR}/lib
++PSRESDIR=${.CURDIR}/Resource
++PSGENDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj
++PSOBJDIR=${.CURDIR}/$(BUILDDIRPREFIX)obj
+ 
+ # Do not edit the next group of lines.
+ 
+@@ -50,11 +51,10 @@
+ # the directories also define the default search path for the
+ # initialization files (gs_*.ps) and the fonts.
+ 
+-INSTALL = $(GLSRCDIR)/instcopy -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
+ 
+-prefix = /usr/local
++prefix = ${PREFIX}
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+@@ -104,7 +104,7 @@
+ #               This uses the more secure temporary file creation call
+ #               Enable this if it is available on your platform.
+ 
+-CAPOPT= -DHAVE_MKSTEMP
++CAPOPT= -DHAVE_MKSTEMP -DHAVE_HYPOT
+ 
+ # Define the name of the executable file.
+ 
+@@ -139,7 +139,7 @@
+ # some older JPEG streams that violate the standard. If the JPEG
+ # library built from local sources, the patch will be applied.
+ 
+-SHARE_JPEG=0
++SHARE_JPEG=1
+ JPEG_NAME=jpeg
+ 
+ # Define the directory where the PNG library sources are stored,
+@@ -153,13 +153,13 @@
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define whether to use a shared version of libtiff and where
+ # it is stored and what its name is.
+ 
+-SHARE_LIBTIFF=0
++SHARE_LIBTIFF=1
+ TIFFSRCDIR=tiff
+ TIFFPLATFORM=unix
+ TIFFCONFIG_SUFFIX=.unix
+@@ -174,15 +174,23 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+ # Choose shared or compiled in libjbig2dec and source location
+-SHARE_JBIG2=0
++SHARE_JBIG2=1
+ JBIG2_LIB=jbig2dec
+ JBIG2SRCDIR=jbig2dec
+ 
++# Choose the library to use for (JPXDecode support)
++# whether to link to an external build or compile in from source
++# and source location and configuration flags for compiling in
++JPX_LIB=jasper
++SHARE_JPX=0
++JPXSRCDIR=jasper
++JPX_CFLAGS=-DJAS_CONFIGURE
++
+ # Define the directory where the icclib source are stored.
+ # See icclib.mak for more information
+ ICCSRCDIR=icclib
+@@ -223,7 +231,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++CC?=cc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -240,7 +248,7 @@
+ # Define the added flags for standard, debugging, profiling 
+ # and shared object builds.
+ 
+-CFLAGS_STANDARD=-O2
++CFLAGS_STANDARD?=-O2
+ CFLAGS_DEBUG=-g -O0
+ CFLAGS_PROFILE=-pg -O2
+ CFLAGS_SO=-fPIC
+@@ -256,7 +264,8 @@
+ # We don't include -ansi, because this gets in the way of the platform-
+ #   specific stuff that <math.h> typically needs; nevertheless, we expect
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+-XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
++#XCFLAGS+=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
++XCFLAGS+=-DUPD_SIGNAL=0 -I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+ 
+ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+ 
+@@ -267,7 +276,7 @@
+ #	-R /usr/local/xxx/lib:/usr/local/lib
+ # giving the full path names of the shared library directories.
+ # XLDFLAGS can be set from the command line.
+-XLDFLAGS=
++XLDFLAGS+=-L${LOCALBASE}/lib
+ 
+ LDFLAGS=$(XLDFLAGS)
+ 
+@@ -278,7 +287,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=-rdynamic -ldl
++EXTRALIBS+=-Wl,-export-dynamic
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+@@ -300,7 +309,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/usr/X11R6/include
++XINCLUDE=-I${LOCALBASE}/include
+ 
+ # Define the directory/ies and library names for the X11 library files.
+ # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
+@@ -315,29 +324,29 @@
+ #XLIBS=Xt SM ICE Xext X11
+ 
+ #XLIBDIRS=-L/usr/local/X/lib
+-XLIBDIRS=-L/usr/X11R6/lib
++XLIBDIRS=-L${LOCALBASE}/lib
+ XLIBDIR=
+-XLIBS=Xt Xext X11
++XLIBS=Xt SM ICE Xext X11
+ 
+ # Define the .dev module that implements thread and synchronization
+ # primitives for this platform.
+ 
+ # If POSIX sync primitives are used, also change the STDLIBS to include
+ # the pthread library.
+-#SYNC=posync
++SYNC=posync
+ 
+ # define the file name extension for a shared lib
+ DYNANIC_LIB_EXT=so
+ 
+ # Default is No sync primitives since some platforms don't have it (HP-UX)
+-SYNC=nosync
++#SYNC=nosync
+ 
+ SOC_LOADER=dxmainc.c
+ # ------ Devices and features ------ #
+ 
+ # Choose the language feature(s) to include.  See gs.mak for details.
+ 
+-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev
++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev
+ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
+ # The following is strictly for testing.
+ FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
+@@ -476,6 +485,9 @@
+ include $(GLSRCDIR)/png.mak
+ include $(GLSRCDIR)/tiff.mak
+ include $(GLSRCDIR)/jbig2.mak
++include $(GLSRCDIR)/jasper.mak
++include $(GLSRCDIR)/ldf_jb2.mak
++include $(GLSRCDIR)/lwf_jp2.mak
+ include $(GLSRCDIR)/icclib.mak
+ include $(GLSRCDIR)/lcms.mak
+ include $(GLSRCDIR)/ijs.mak
+@@ -486,6 +498,7 @@
+ include $(GLSRCDIR)/unix-dll.mak
+ include $(GLSRCDIR)/unix-end.mak
+ include $(GLSRCDIR)/unixinst.mak
++include $(CONTRIBDIR)/contrib.mak
+ 
+ # This has to come last so it won't be taken as the default target.
+ $(AK):