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

diff --git a/print/ghostscript7-base/files/patch-eplaser:gdevesmv.c b/print/ghostscript7-base/files/patch-eplaser:gdevesmv.c
new file mode 100644
index 000000000000..cc538bf87531
--- /dev/null
+++ b/print/ghostscript7-base/files/patch-eplaser:gdevesmv.c
@@ -0,0 +1,84 @@
+--- eplaser/gdevesmv.c.orig	Mon May 17 14:25:19 2004
++++ eplaser/gdevesmv.c	Mon Aug  2 14:00:42 2004
+@@ -34,10 +34,6 @@
+ 
+  */
+ 
+-#include <stdlib.h>
+-#include <unistd.h>
+-#include <string.h>
+-
+ #include "math_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+@@ -59,6 +55,10 @@
+ #include "gspath.h"
+ #include "gzpath.h"
+ 
++#include <stdlib.h>
++#include <unistd.h>
++#include <string.h>
++
+ /* ---------------- Device definition ---------------- */
+ 
+ /* Device procedures */
+@@ -428,6 +428,16 @@
+ 
+ 
+ /* Vector device implementation */
++#if GS_VERSION_MAJOR >= 8
++private int esmv_beginpage(gx_device_vector * vdev);
++private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
++private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
++private int esmv_setdash(gx_device_vector * vdev, const float *pattern, 
++			      uint count, floatp offset);
++private int esmv_setflat(gx_device_vector * vdev, floatp flatness);
++private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, 
++			       gs_logical_operation_t diff);
++#else
+ private int esmv_beginpage(P1(gx_device_vector * vdev));
+ private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+ private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+@@ -436,10 +446,25 @@
+ private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
+ private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
+ 			       gs_logical_operation_t diff));
++#endif
+ private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+ 			       fixed y1, gx_path_type_t type);
+ private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
+ 			       gx_path_type_t type);
++#if GS_VERSION_MAJOR >= 8
++private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
++private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
++			   floatp x, floatp y, gx_path_type_t type);
++private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
++			   floatp x, floatp y, gx_path_type_t type);
++private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
++			       floatp x1, floatp y1, floatp x2, floatp y2,
++			       floatp x3, floatp y3, gx_path_type_t type);
++private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y,
++				floatp x_start, floatp y_start, gx_path_type_t type);
++
++private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type);
++#else
+ private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+ private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+ 			   floatp x, floatp y, gx_path_type_t type));
+@@ -452,6 +477,7 @@
+ 				floatp x_start, floatp y_start, gx_path_type_t type));
+ 
+ private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
++#endif
+ private int esmv_setlinewidth(gx_device_vector * vdev, floatp width);
+ private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+ private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -1771,7 +1797,7 @@
+ 		 gs_logical_operation_t lop, const gx_clip_path * pcpath)
+ {
+     gx_device_vector const	*vdev = (gx_device_vector *) dev;
+-    gx_device_esmv const	*pdev = (gx_device_esmv *) dev;
++    gx_device_esmv		*pdev = (gx_device_esmv *) dev;
+     stream			*s = gdev_vector_stream(vdev);
+     gx_color_index		color = gx_dc_pure_color(pdcolor);
+     char			obuf[64];