10 files changed, 160 insertions, 66 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index a79424d415ef..3e0f005ca629 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -156,7 +156,7 @@ DJ970_SRCS=	${DJ970}.c.gz
 #
 # For that reason, integlation of stp driver is disabled by default.
 GPRINT=		gimp-print
-GPRINT_VERS=	4.2.6
+GPRINT_VERS=	4.2.7
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
diff --git a/print/ghostscript-gnu/Makefile.inc b/print/ghostscript-gnu/Makefile.inc
index 807973db1e9f..927cd6e3a186 100644
--- a/print/ghostscript-gnu/Makefile.inc
+++ b/print/ghostscript-gnu/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	7.07
-GS_REVISION=	11
+GS_REVISION=	12
 GS_EPOCH=	0
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index 7b438e63e6cc..3871ad5050bf 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -8,8 +8,8 @@ MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 SIZE (ghostscript/gdevdj9.c.gz) = 20139
-MD5 (ghostscript/gimp-print-4.2.6.tar.gz) = c7aae843d6a705cb8983b2f06c1f7819
-SIZE (ghostscript/gimp-print-4.2.6.tar.gz) = 5056790
+MD5 (ghostscript/gimp-print-4.2.7.tar.gz) = 766be49f44a6a682d857e5aefec414d4
+SIZE (ghostscript/gimp-print-4.2.7.tar.gz) = 5178122
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 SIZE (ghostscript/gdevmd2k-0.2a.tar.gz) = 9955
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript-gnu/files/patch-lib:gs_init.ps b/print/ghostscript-gnu/files/patch-lib:gs_init.ps
index 70de88245ddc..143fa1a1d673 100644
--- a/print/ghostscript-gnu/files/patch-lib:gs_init.ps
+++ b/print/ghostscript-gnu/files/patch-lib:gs_init.ps
@@ -1,6 +1,14 @@
---- lib/gs_init.ps.orig	Fri Feb  1 12:25:45 2002
-+++ lib/gs_init.ps	Sat Feb  9 01:42:10 2002
-@@ -1274,7 +1274,7 @@
+--- lib/gs_init.ps.orig	Sat Jan 22 13:15:37 2005
++++ lib/gs_init.ps	Sat Jan 22 13:15:05 2005
+@@ -119,6 +119,7 @@
+ currentdict /NOFONTPATH known   /NOFONTPATH exch def
+ currentdict /NOGC known   /NOGC exch def
+ currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if
++currentdict /NOMEDIAATTRS known /NOMEDIAATTRS exch def
+ currentdict /NOPAGEPROMPT known   /NOPAGEPROMPT exch def
+ currentdict /NOPAUSE known   /NOPAUSE exch def
+ currentdict /NOPLATFONTS known   /NOPLATFONTS exch def
+@@ -1274,7 +1275,7 @@
  % Set the default screen and BG/UCR.
  /.setdefaultbgucr {
    systemdict /setblackgeneration known {
@@ -9,7 +17,7 @@
    } if
  } bind def
  /.useloresscreen {	% - .useloresscreen <bool>
-@@ -1874,3 +1874,7 @@
+@@ -1883,3 +1884,7 @@
  userdict /AGM_preserve_spots false put
  
  % The interpreter will run the initial procedure (start).
diff --git a/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps b/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps
index 1e0cf12559a7..1e9444732d86 100644
--- a/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps
+++ b/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps
@@ -1,6 +1,6 @@
---- lib/gs_setpd.ps.orig	Mon Mar 31 22:02:22 2003
-+++ lib/gs_setpd.ps	Sat May 17 06:57:49 2003
-@@ -323,21 +323,42 @@
+--- lib/gs_setpd.ps.orig	Sat Apr 12 16:02:38 2003
++++ lib/gs_setpd.ps	Sat Jan 22 13:15:05 2005
+@@ -324,21 +324,42 @@
      } bind
  .dicttomark readonly def
  
@@ -14,32 +14,17 @@
 -/.inputselectionkeys [
 -  /MediaPosition /Orientation
 -] readonly def
-+% M. Sweet, Easy Software Products:
-+%
-+% Define NOMEDIAATTRS to turn the default (but unimplementable) media
-+% selection policies for setpagedevice.  This is used by CUPS to
-+% support the standard Adobe media attributes.
-+currentdict /NOMEDIAATTRS known {
-+  % Define the keys used in input attribute matching.
-+  /.inputattrkeys [
-+    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
-+	  % The following are documented in Adobe's supplement for v2017.
-+    /LeadingEdge /MediaClass
-+  ] readonly def
-+  % Define other keys used in media selection.
-+  /.inputselectionkeys [
-+    /MediaPosition /Orientation
-+  ] readonly def
- 
+-
 -% Define the keys used in output attribute matching.
 -/.outputattrkeys [
 -  /OutputType
 -] readonly def
-+  % Define the keys used in output attribute matching.
-+  /.outputattrkeys [
-+    /OutputType
-+  ] readonly def
-+} {
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to support
++% the standard Adobe media attributes.
++NOMEDIAATTRS {
 +  % Define only PageSize for input attribute matching.
 +  /.inputattrkeys [
 +    /PageSize
@@ -53,7 +38,61 @@
 +  /.outputattrkeys [
 +    /noOutputAttrKeys
 +  ] readonly def
++} {
++  % Define the keys used in input attribute matching.
++  /.inputattrkeys [
++    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
++	  % The following are documented in Adobe's supplement for v2017.
++    /LeadingEdge /MediaClass
++  ] readonly def
++  % Define other keys used in media selection.
++  /.inputselectionkeys [
++    /MediaPosition /Orientation
++  ] readonly def
++
++  % Define the keys used in output attribute matching.
++  /.outputattrkeys [
++    /OutputType
++  ] readonly def
 +} ifelse
  
  % Define all the parameters that should always be copied to the merged
  % dictionary.
+@@ -367,7 +388,13 @@
+   /PageSize false		% obsolete alias for .MediaSize
+   /InputAttributes false
+   .inputattrkeys
+-    { dup /PageSize eq
++    % M. Sweet, Easy Software Products:
++    %
++    % Treat LeadingEdge like PageSize so that a common Ghostscript driver
++    % doesn't need the NOMEDIAATTRS definition.
++    %
++    % { dup /PageSize eq
++    { dup dup /PageSize eq exch /LeadingEdge eq or
+        { pop }
+        { { 2 index /InputAttributes .knownget { null eq } { true } ifelse } }
+       ifelse
+@@ -442,11 +469,22 @@
+ % They are expected to consume the top 2 operands.
+ % NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize)
+ % the same as 0, i.e., we signal an error.
++%
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to support
++% the standard Adobe media attributes.
+   0 {		% Set errorinfo and signal a configurationerror.
++      NOMEDIAATTRS {
++        % NOMEDIAATTRS means that the default policy is 7...
++        pop 2 index exch 7 put
++      } {
+ 	pop dup 4 index exch get 2 array astore
+ 	$error /errorinfo 3 -1 roll put
+ 	cleartomark
+ 	/setpagedevice load /configurationerror signalerror
++      } ifelse
+   } bind
+   1 {		% Roll back the failed request to its previous status.
+ DEBUG { (Rolling back.) = pstack flush } if
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index a79424d415ef..3e0f005ca629 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -156,7 +156,7 @@ DJ970_SRCS=	${DJ970}.c.gz
 #
 # For that reason, integlation of stp driver is disabled by default.
 GPRINT=		gimp-print
-GPRINT_VERS=	4.2.6
+GPRINT_VERS=	4.2.7
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
diff --git a/print/ghostscript7/Makefile.inc b/print/ghostscript7/Makefile.inc
index 807973db1e9f..927cd6e3a186 100644
--- a/print/ghostscript7/Makefile.inc
+++ b/print/ghostscript7/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	7.07
-GS_REVISION=	11
+GS_REVISION=	12
 GS_EPOCH=	0
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index 7b438e63e6cc..3871ad5050bf 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -8,8 +8,8 @@ MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 SIZE (ghostscript/gdevdj9.c.gz) = 20139
-MD5 (ghostscript/gimp-print-4.2.6.tar.gz) = c7aae843d6a705cb8983b2f06c1f7819
-SIZE (ghostscript/gimp-print-4.2.6.tar.gz) = 5056790
+MD5 (ghostscript/gimp-print-4.2.7.tar.gz) = 766be49f44a6a682d857e5aefec414d4
+SIZE (ghostscript/gimp-print-4.2.7.tar.gz) = 5178122
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 SIZE (ghostscript/gdevmd2k-0.2a.tar.gz) = 9955
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript7/files/patch-lib:gs_init.ps b/print/ghostscript7/files/patch-lib:gs_init.ps
index 70de88245ddc..143fa1a1d673 100644
--- a/print/ghostscript7/files/patch-lib:gs_init.ps
+++ b/print/ghostscript7/files/patch-lib:gs_init.ps
@@ -1,6 +1,14 @@
---- lib/gs_init.ps.orig	Fri Feb  1 12:25:45 2002
-+++ lib/gs_init.ps	Sat Feb  9 01:42:10 2002
-@@ -1274,7 +1274,7 @@
+--- lib/gs_init.ps.orig	Sat Jan 22 13:15:37 2005
++++ lib/gs_init.ps	Sat Jan 22 13:15:05 2005
+@@ -119,6 +119,7 @@
+ currentdict /NOFONTPATH known   /NOFONTPATH exch def
+ currentdict /NOGC known   /NOGC exch def
+ currentdict /NOINTERPOLATE .knownget { /INTERPOLATE exch not def } if
++currentdict /NOMEDIAATTRS known /NOMEDIAATTRS exch def
+ currentdict /NOPAGEPROMPT known   /NOPAGEPROMPT exch def
+ currentdict /NOPAUSE known   /NOPAUSE exch def
+ currentdict /NOPLATFONTS known   /NOPLATFONTS exch def
+@@ -1274,7 +1275,7 @@
  % Set the default screen and BG/UCR.
  /.setdefaultbgucr {
    systemdict /setblackgeneration known {
@@ -9,7 +17,7 @@
    } if
  } bind def
  /.useloresscreen {	% - .useloresscreen <bool>
-@@ -1874,3 +1874,7 @@
+@@ -1883,3 +1884,7 @@
  userdict /AGM_preserve_spots false put
  
  % The interpreter will run the initial procedure (start).
diff --git a/print/ghostscript7/files/patch-lib:gs_setpd.ps b/print/ghostscript7/files/patch-lib:gs_setpd.ps
index 1e0cf12559a7..1e9444732d86 100644
--- a/print/ghostscript7/files/patch-lib:gs_setpd.ps
+++ b/print/ghostscript7/files/patch-lib:gs_setpd.ps
@@ -1,6 +1,6 @@
---- lib/gs_setpd.ps.orig	Mon Mar 31 22:02:22 2003
-+++ lib/gs_setpd.ps	Sat May 17 06:57:49 2003
-@@ -323,21 +323,42 @@
+--- lib/gs_setpd.ps.orig	Sat Apr 12 16:02:38 2003
++++ lib/gs_setpd.ps	Sat Jan 22 13:15:05 2005
+@@ -324,21 +324,42 @@
      } bind
  .dicttomark readonly def
  
@@ -14,32 +14,17 @@
 -/.inputselectionkeys [
 -  /MediaPosition /Orientation
 -] readonly def
-+% M. Sweet, Easy Software Products:
-+%
-+% Define NOMEDIAATTRS to turn the default (but unimplementable) media
-+% selection policies for setpagedevice.  This is used by CUPS to
-+% support the standard Adobe media attributes.
-+currentdict /NOMEDIAATTRS known {
-+  % Define the keys used in input attribute matching.
-+  /.inputattrkeys [
-+    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
-+	  % The following are documented in Adobe's supplement for v2017.
-+    /LeadingEdge /MediaClass
-+  ] readonly def
-+  % Define other keys used in media selection.
-+  /.inputselectionkeys [
-+    /MediaPosition /Orientation
-+  ] readonly def
- 
+-
 -% Define the keys used in output attribute matching.
 -/.outputattrkeys [
 -  /OutputType
 -] readonly def
-+  % Define the keys used in output attribute matching.
-+  /.outputattrkeys [
-+    /OutputType
-+  ] readonly def
-+} {
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to support
++% the standard Adobe media attributes.
++NOMEDIAATTRS {
 +  % Define only PageSize for input attribute matching.
 +  /.inputattrkeys [
 +    /PageSize
@@ -53,7 +38,61 @@
 +  /.outputattrkeys [
 +    /noOutputAttrKeys
 +  ] readonly def
++} {
++  % Define the keys used in input attribute matching.
++  /.inputattrkeys [
++    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
++	  % The following are documented in Adobe's supplement for v2017.
++    /LeadingEdge /MediaClass
++  ] readonly def
++  % Define other keys used in media selection.
++  /.inputselectionkeys [
++    /MediaPosition /Orientation
++  ] readonly def
++
++  % Define the keys used in output attribute matching.
++  /.outputattrkeys [
++    /OutputType
++  ] readonly def
 +} ifelse
  
  % Define all the parameters that should always be copied to the merged
  % dictionary.
+@@ -367,7 +388,13 @@
+   /PageSize false		% obsolete alias for .MediaSize
+   /InputAttributes false
+   .inputattrkeys
+-    { dup /PageSize eq
++    % M. Sweet, Easy Software Products:
++    %
++    % Treat LeadingEdge like PageSize so that a common Ghostscript driver
++    % doesn't need the NOMEDIAATTRS definition.
++    %
++    % { dup /PageSize eq
++    { dup dup /PageSize eq exch /LeadingEdge eq or
+        { pop }
+        { { 2 index /InputAttributes .knownget { null eq } { true } ifelse } }
+       ifelse
+@@ -442,11 +469,22 @@
+ % They are expected to consume the top 2 operands.
+ % NOTE: we currently treat all values other than 0, 1, or 7 (for PageSize)
+ % the same as 0, i.e., we signal an error.
++%
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn off the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to support
++% the standard Adobe media attributes.
+   0 {		% Set errorinfo and signal a configurationerror.
++      NOMEDIAATTRS {
++        % NOMEDIAATTRS means that the default policy is 7...
++        pop 2 index exch 7 put
++      } {
+ 	pop dup 4 index exch get 2 array astore
+ 	$error /errorinfo 3 -1 roll put
+ 	cleartomark
+ 	/setpagedevice load /configurationerror signalerror
++      } ifelse
+   } bind
+   1 {		% Roll back the failed request to its previous status.
+ DEBUG { (Rolling back.) = pstack flush } if