10 files changed, 21 insertions, 100 deletions

diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc
index 96c31a5495d3..9a49ba4042d6 100644
--- a/print/ghostscript-afpl/Makefile.inc
+++ b/print/ghostscript-afpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-GS_VERSION=	8.50
+GS_VERSION=	8.51
 GS_REVISION=	0
 GS_EPOCH=	1
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 0ca9b7f873cb..3983a4fd133c 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,5 +1,5 @@
-MD5 (ghostscript/ghostscript-8.50.tar.bz2) = bd49a30d7485ad382f69b49a06d045fd
-SIZE (ghostscript/ghostscript-8.50.tar.bz2) = 8837036
+MD5 (ghostscript/ghostscript-8.51.tar.bz2) = 8b328b47cce3b7f97f35296aae8e7b77
+SIZE (ghostscript/ghostscript-8.51.tar.bz2) = 8377372
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript-afpl/files/patch-lib:gs_init.ps b/print/ghostscript-afpl/files/patch-lib:gs_init.ps
index 70de88245ddc..11ec1bba61cd 100644
--- a/print/ghostscript-afpl/files/patch-lib:gs_init.ps
+++ b/print/ghostscript-afpl/files/patch-lib:gs_init.ps
@@ -1,6 +1,6 @@
---- 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 Mar  5 07:02:23 2005
++++ lib/gs_init.ps	Thu Apr 21 13:05:43 2005
+@@ -1440,7 +1440,7 @@
  % Set the default screen and BG/UCR.
  /.setdefaultbgucr {
    systemdict /setblackgeneration known {
@@ -9,8 +9,8 @@
    } if
  } bind def
  /.useloresscreen {	% - .useloresscreen <bool>
-@@ -1874,3 +1874,7 @@
- userdict /AGM_preserve_spots false put
+@@ -2241,3 +2241,7 @@
+ ifelse
  
  % The interpreter will run the initial procedure (start).
 +
diff --git a/print/ghostscript-afpl/files/patch-src:gdevccr.c b/print/ghostscript-afpl/files/patch-src:gdevccr.c
deleted file mode 100644
index 56bb760b8ac8..000000000000
--- a/print/ghostscript-afpl/files/patch-src:gdevccr.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gdevccr.c.orig	Fri Feb 22 07:24:51 2002
-+++ src/gdevccr.c	Sun Nov 10 22:38:51 2002
-@@ -112,8 +112,11 @@
- /* ------ Color mapping routines ------ */
- /* map an rgb color to a ccr cmy bitmap */
- private gx_color_index
--ccr_map_rgb_color(gx_device *pdev, ushort r, ushort g, ushort b)
-+ccr_map_rgb_color(gx_device *pdev, const ushort cv[])
- {
-+  ushort r = cv[0];
-+  ushort g = cv[1];
-+  ushort b = cv[2];
-   register int shift = gx_color_value_bits - 1;
-   r>>=shift;
-   g>>=shift;
diff --git a/print/ghostscript-afpl/files/patch-src:gdevcp50.c b/print/ghostscript-afpl/files/patch-src:gdevcp50.c
deleted file mode 100644
index ffc8308ec35d..000000000000
--- a/print/ghostscript-afpl/files/patch-src:gdevcp50.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gdevcp50.c.orig	Fri Feb 22 07:24:51 2002
-+++ src/gdevcp50.c	Sun Nov 10 22:35:13 2002
-@@ -204,9 +204,12 @@
-  
- /* Map a r-g-b color to a color index. */
- private gx_color_index
--cp50_rgb_color(gx_device *dev, gx_color_value r, gx_color_value g,
--  gx_color_value b)
--{   return ((ulong)gx_color_value_to_byte(r) << 16)+
-+cp50_rgb_color(gx_device *dev, const gx_color_value cv[])
-+{
-+    gx_color_value r = cv[0];
-+    gx_color_value g = cv[1];
-+    gx_color_value b = cv[2];
-+    return ((ulong)gx_color_value_to_byte(r) << 16)+
-            ((uint)gx_color_value_to_byte(g) << 8) +
-            gx_color_value_to_byte(b);
- }
diff --git a/print/ghostscript-afpl/files/patch-src:gdevifno.c b/print/ghostscript-afpl/files/patch-src:gdevifno.c
deleted file mode 100644
index b3bc447dd27a..000000000000
--- a/print/ghostscript-afpl/files/patch-src:gdevifno.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/gdevifno.c.orig	Sun Jun 16 14:48:55 2002
-+++ src/gdevifno.c	Sun Nov 10 22:49:32 2002
-@@ -99,8 +99,10 @@
-  * rgb and color map entries
-  */
- private gx_color_index 
--inferno_rgb2cmap(gx_device *dev, gx_color_value red,
--  gx_color_value green, gx_color_value blue) {
-+inferno_rgb2cmap(gx_device *dev, const gx_color_value cv[]) {
-+	gx_color_value red = cv[0];
-+	gx_color_value green = cv[1];
-+	gx_color_value blue = cv[2];
- 	int shift;
- 	inferno_device *bdev = (inferno_device*) dev;
- 	int nbits = bdev->nbits;
diff --git a/print/ghostscript-afpl/files/patch-src:gdevmgr.c b/print/ghostscript-afpl/files/patch-src:gdevmgr.c
deleted file mode 100644
index 8f2dc4028c34..000000000000
--- a/print/ghostscript-afpl/files/patch-src:gdevmgr.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gdevmgr.c.orig	Sun Jun 16 14:48:55 2002
-+++ src/gdevmgr.c	Sun Nov 10 22:52:19 2002
-@@ -364,9 +364,11 @@
- /* (1/6, 1/2, and 5/6), instead of the obvious 8x8x4. */
- 
- gx_color_index
--mgr_8bit_map_rgb_color(gx_device *dev, gx_color_value r, gx_color_value g,
--  gx_color_value b)
--{	uint rv = r / (gx_max_color_value / 7 + 1);
-+mgr_8bit_map_rgb_color(gx_device *dev, const gx_color_value cv[])
-+{	gx_color_value r = cv[0];
-+	gx_color_value g = cv[1];
-+	gx_color_value b = cv[2];
-+	uint rv = r / (gx_max_color_value / 7 + 1);
- 	uint gv = g / (gx_max_color_value / 7 + 1);
- 	uint bv = b / (gx_max_color_value / 7 + 1);
- 	return (gx_color_index)
diff --git a/print/ghostscript-afpl/files/patch-src:zmedia2.c b/print/ghostscript-afpl/files/patch-src:zmedia2.c
deleted file mode 100644
index 9033a4388085..000000000000
--- a/print/ghostscript-afpl/files/patch-src:zmedia2.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/zmedia2.c.orig	Fri Apr 27 02:57:41 2001
-+++ src/zmedia2.c	Fri Nov  2 04:08:16 2001
-@@ -429,11 +429,17 @@
- 
- 	rx = ry, ry = temp;
-     }
--    /* Adjust the medium size if flexible. */ 
--    if (medium->p.x < MIN_MEDIA_SIZE && mx > rx)
--	mx = rx;
--    if (medium->p.y < MIN_MEDIA_SIZE && my > ry)
--	my = ry;
-+    /* If 'medium' is flexible, adjust 'mx' and 'my' towards 'rx' and 'ry',
-+       respectively. Note that 'mx' and 'my' have just acquired the largest
-+       permissible value, medium->q. */
-+    if (medium->p.x < mx)	/* non-empty width range */
-+      if (rx < medium->p.x) mx = medium->p.x;	/* minimum */
-+      else if (mx > rx) mx = rx;	/* fits */
-+      /* else use medium->q.x, i.e., the maximum */
-+    if (medium->p.y < my)	/* non-empty height range */
-+      if (ry < medium->p.y) my = medium->p.y;	/* minimum */
-+      else if (my > ry) my = ry;	/* fits */
-+      /* else use medium->q.y, i.e., the maximum */
- 
-     /* Translate to align the centers. */ 
-     gs_make_translation(mx / 2, my / 2, pmat);
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 75a910d6226f..710cba7e3dd9 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/bdftops
+bin/dumphint
 bin/dvipdf
 bin/eps2eps
 bin/ert
@@ -75,12 +76,14 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-3
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-B5pc
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-ETenms-B5
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-CID
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Host
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Mac
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-4
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBK-EUC
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBpc-EUC
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-CID
@@ -90,6 +93,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-0
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-1
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-4
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90ms-RKSJ
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90pv-RKSJ
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-CID
@@ -98,6 +102,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-CID
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Host
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Mac
@@ -228,7 +233,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/doc/Lib.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Maintain.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Make.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/New-user.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/News.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/PUBLIC
 %%DATADIR%%/%%GS_VERSION%%/doc/Projects.htm
@@ -241,7 +245,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/doc/Readme.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Release.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Source.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/Tester.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Unix-lpr.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Use.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Xfonts.htm
@@ -303,6 +306,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/dnj750c.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/dnj750m.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/docie.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/dumphint.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/errpage.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/font2c.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/font2pcl.ps
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 8d83ed4b1803..5f7fdd275ec9 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -65,6 +65,7 @@ else
 		xcf xcfcmyk \
 		faxg3 faxg32d faxg4 \
 		miff24 inferno jpeg jpeggray \
+		mgrmono mgrgray2 mgrgray4 mgrgray8 mgr4 mgr8 \
 		pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pdfwrite \
 		psdrgb psdcmyk \
 		bit bitrgb bitcmyk plan9bm pam pbm pbmraw \
@@ -291,6 +292,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "inferno"  "Inferno bitmaps" "$status_inferno" \
   "jpeg"     "JPEG format, RGB output" "$status_jpeg" \
   "jpeggray" "JPEG format, gray output" "$status_jpeggray" \
+  "mgrmono"  "MGR devices 1-bit monochrome" "$status_mgrmono" \
+  "mgrgray2" "MGR devices 2-bit gray scale" "$status_mgrgray2" \
+  "mgrgray4" "MGR devices 4-bit gray scale" "$status_mgrgray4" \
+  "mgrgray8" "MGR devices 8-bit gray scale" "$status_mgrgray8" \
+  "mgr4"     "MGR devices 4-bit (VGA) color" "$status_mgr4" \
+  "mgr8"     "MGR devices 8-bit color" "$status_mgr8" \
   "pcxmono"  "PCX file format, monochrome 1-bit b/w" "$status_pcxmono" \
   "pcxgray"  "PCX file format, 8-bit gray scale" "$status_pcxgray" \
   "pcx16"    "PCX file format, 4-bit planar EGA/VGA color" "$status_pcx16" \