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.
---
 print/ghostscript8-x11/files/patch-base-devs.mak | 42 ++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 print/ghostscript8-x11/files/patch-base-devs.mak

(limited to 'print/ghostscript8-x11/files/patch-base-devs.mak')

diff --git a/print/ghostscript8-x11/files/patch-base-devs.mak b/print/ghostscript8-x11/files/patch-base-devs.mak
new file mode 100644
index 000000000000..8c7cc96f7620
--- /dev/null
+++ b/print/ghostscript8-x11/files/patch-base-devs.mak
@@ -0,0 +1,42 @@
+--- base/devs.mak.orig	2009-11-12 00:50:28.000000000 +0900
++++ base/devs.mak	2015-08-21 20:37:24.364436000 +0900
+@@ -421,10 +421,10 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)lvga256.so : $(lvga256_)
+-	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl
++	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl $(XLDFLAGS)
+ 
+ $(GLOBJ)vgalib.so : $(vgalib_)
+-	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl
++	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl $(XLDFLAGS)
+ 
+ ### -------------------------- The X11 device -------------------------- ###
+ 
+@@ -457,7 +457,7 @@
+ 	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
+ 
+ $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
+-	$(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
++	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
+ 
+ $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
+  $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
+@@ -467,7 +467,7 @@
+ # const/non-const cast required by the X headers that we can't work around.
+ $(GLOBJ)gdevxres.$(OBJ) : $(GLSRC)gdevxres.c $(std_h) $(x__h)\
+  $(gsmemory_h) $(gstypes_h) $(gxdevice_h) $(gdevx_h)
+-	$(CC_NO_WARN) $(GLCCFLAGS) $(XINCLUDE) $(GLO_)gdevxres.$(OBJ) $(C_) $(GLSRC)gdevxres.c
++	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxres.$(OBJ) $(C_) $(GLSRC)gdevxres.c
+ 
+ $(GLOBJ)gdevxxf.$(OBJ) : $(GLSRC)gdevxxf.c $(GDEVX) $(math__h) $(memory__h)\
+  $(gsstruct_h) $(gsutil_h) $(gxxfont_h)
+@@ -527,7 +527,7 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)X11.so : $(x11alt_) $(x11_)
+-	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
++	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ 
+ ###### --------------- Memory-buffered printer devices --------------- ######
+ 
-- 
cgit v1.2.3