Update to version 8.50

PR:		ports/75690
Submitted by:	Ports Fury

22 files changed, 585 insertions, 28 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 3b4255a91e08..81051de7ff55 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -169,6 +169,7 @@ LIPS_SRCS=	${LIPS_NAME}.tar.gz
 
 # EPAG - additional driver for Epson ESC/Page printers
 # http://www.humblesoft.com/gdevepag.html
+# XXX FIXME
 EPAG=		epag
 EPAG_VERS=	3.09
 EPAG_NAME=	${EPAG}-${EPAG_VERS}
@@ -193,6 +194,7 @@ GDI_NAME=	Samsung-SmartGDI-all-GS
 GDI_SRCS=	${GDI_NAME}.orig.tar.gz
 
 # LXM3200 - additional driver for Lexmark 3200/Z12/Z22/Z31/Z32
+# XXX FIXME
 LXM3200=	lxm3200
 LXM3200_VERS=	20030501
 LXM3200_NAME=	${LXM3200}-tweaked-${LXM3200_VERS}
@@ -264,6 +266,7 @@ post-extract:
 # for EPAG driver
 	${ECHO_MSG} ">>>   extracting ${EPAG_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
+	${LN} -sf ${EPAG_NAME} ${WRKSRC}/${EPAG}
 # for EPLASER driver
 	${ECHO_MSG} ">>>   extracting ${EPLASER_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRCS}
diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc
index 99578c582489..96c31a5495d3 100644
--- a/print/ghostscript-afpl/Makefile.inc
+++ b/print/ghostscript-afpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-GS_VERSION=	8.30
+GS_VERSION=	8.50
 GS_REVISION=	0
 GS_EPOCH=	1
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 7132cdf39430..0ca9b7f873cb 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,5 +1,5 @@
-MD5 (ghostscript/ghostscript-8.30.tar.bz2) = 0c82873f1a981e8e7925c5e6b4e42d28
-SIZE (ghostscript/ghostscript-8.30.tar.bz2) = 7054262
+MD5 (ghostscript/ghostscript-8.50.tar.bz2) = bd49a30d7485ad382f69b49a06d045fd
+SIZE (ghostscript/ghostscript-8.50.tar.bz2) = 8837036
 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-alps:gdevalps.c b/print/ghostscript-afpl/files/patch-alps:gdevalps.c
new file mode 100644
index 000000000000..ad77a9e9af10
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-alps:gdevalps.c
@@ -0,0 +1,22 @@
+--- alps/gdevalps.c.orig	Wed Nov 24 09:28:35 1999
++++ alps/gdevalps.c	Fri Dec 17 19:12:35 2004
+@@ -173,7 +173,7 @@
+ {
+   int lnum;
+   int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
+-  byte *data = (byte *)gs_malloc(8, line_size, "md50_print_page(data)" );
++  byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md50_print_page(data)" );
+   int skipping = 0;
+   int nbyte;
+   int nskip;
+@@ -232,8 +232,8 @@
+ {
+   int lnum;
+   int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
+-  byte *data = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)");
+-  byte *out_start = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)");
++  byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)");
++  byte *out_start = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)");
+   int skipping = 0;
+   int nbyte;
+ 
diff --git a/print/ghostscript-afpl/files/patch-epag:gdevepag.c b/print/ghostscript-afpl/files/patch-epag:gdevepag.c
new file mode 100644
index 000000000000..e0009a57b348
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-epag:gdevepag.c
@@ -0,0 +1,35 @@
+--- epag/gdevepag.c.orig	Sat Jul  8 13:33:09 2000
++++ epag/gdevepag.c	Fri Dec 31 19:59:24 2004
+@@ -417,15 +417,15 @@
+   cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ;
+   if(cont->maxY < cont->bh) cont->maxY = cont->bh;
+   
+-  cont->bp  = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)");
+-  cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
++  cont->bp  = gs_malloc(pdev->memory, bpl , cont->maxY, "epag_skip_blank_init(bp)");
++  cont->bp2 = gs_malloc(pdev->memory, bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
+ 
+   cont->h = cont->r = 0;
+ 
+-  cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
++  cont->bubbleTbl=gs_malloc(pdev->memory, sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
+   for(i=0;i<cont->maxBx;i++)
+     cont->bubbleTbl[i] = NULL;
+-  cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
++  cont->bubbleBuffer=gs_malloc(pdev->memory, sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
+   bbtbl = (EpagBubble *)cont->bubbleBuffer;
+   for(i=0;i<cont->maxBx-1;i++)
+     bbtbl[i].next = &bbtbl[i+1];
+@@ -436,9 +436,9 @@
+ private void
+ epag_page_close(EpagPageCont *cont)
+ {
+-  gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
+-  gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
+-  gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
++  gs_free(pdev->memory, cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
++  gs_free(pdev->memory, cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
++  gs_free(pdev->memory, cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
+ }
+ 
+ private int
diff --git a/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.c b/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.c
new file mode 100644
index 000000000000..46887cfad39c
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.c
@@ -0,0 +1,23 @@
+--- gdev10v/gdev10v.c.orig	Sat Dec 11 04:10:45 1993
++++ gdev10v/gdev10v.c	Fri Dec 17 19:15:49 2004
+@@ -152,8 +152,8 @@
+ 	int bytes_per_column = bits_per_column / 8;
+ 	int x_skip_unit = bytes_per_column * (xres / 180);
+ 	int y_skip_unit = (yres / 180);
+-	byte *in = (byte *)gs_malloc(8, line_size, "bj10v_print_page(in)");
+-	byte *out = (byte *)gs_malloc(bits_per_column, line_size, "bj10v_print_page(out)");
++	byte *in = (byte *)gs_malloc(pdev->memory, 8, line_size, "bj10v_print_page(in)");
++	byte *out = (byte *)gs_malloc(pdev->memory, bits_per_column, line_size, "bj10v_print_page(out)");
+ 	int lnum = 0;
+ 	int y_skip = 0;
+ 	int code = 0;
+@@ -275,7 +275,7 @@
+ 	/* Eject the page */
+ xit:	prn_putc(pdev, 014);	/* form feed */
+ 	prn_flush(pdev);
+-	gs_free((char *)out, bits_per_column, line_size, "bj10v_print_page(out)");
+-	gs_free((char *)in, 8, line_size, "bj10v_print_page(in)");
++	gs_free(pdev->memory, (char *)out, bits_per_column, line_size, "bj10v_print_page(out)");
++	gs_free(pdev->memory, (char *)in, 8, line_size, "bj10v_print_page(in)");
+ 	return code;
+ }
diff --git a/print/ghostscript-afpl/files/patch-lex7000:src:gdevlx7.c b/print/ghostscript-afpl/files/patch-lex7000:src:gdevlx7.c
new file mode 100644
index 000000000000..d3a72fa97dd3
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lex7000:src:gdevlx7.c
@@ -0,0 +1,31 @@
+--- lex7000/src/gdevlx7.c.orig	Fri Dec 31 17:22:48 2004
++++ lex7000/src/gdevlx7.c	Fri Dec 31 17:24:39 2004
+@@ -615,14 +615,14 @@
+    dprintf2("Current resolution is %f width x %f height dpi\n",
+ 	 pdev->x_pixels_per_inch, pdev->y_pixels_per_inch );
+ #endif
+-   pbuf = (byte *)gs_malloc(rpbufsize, 1, "lxmgen_print_page(pbuf)");
++   pbuf = (byte *)gs_malloc(pdev->memory, rpbufsize, 1, "lxmgen_print_page(pbuf)");
+    if (pbuf == NULL)
+       return_error(gs_error_VMerror);
+ 
+-   outbuf = (byte *)gs_malloc(OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
++   outbuf = (byte *)gs_malloc(pdev->memory, OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
+    if (outbuf == NULL)
+    {
+-      gs_free((char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)");
++      gs_free(pdev->memory, (char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)");
+       return_error(gs_error_VMerror);
+    }
+    /* initialize begin of outbuf ... */
+@@ -799,8 +799,8 @@
+ 
+    /* eject page */
+    lex_eject(prn_stream);
+-   gs_free((char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)");
+-   gs_free((char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
++   gs_free(pdev->memory, (char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)");
++   gs_free(pdev->memory, (char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
+ 
+ #ifdef DEBUG
+    dprintf1("[%s] print_page() end\n",pdev->dname);
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevespg.c b/print/ghostscript-afpl/files/patch-lips:gdevespg.c
new file mode 100644
index 000000000000..ae28dffd626e
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lips:gdevespg.c
@@ -0,0 +1,20 @@
+--- lips/gdevespg.c.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevespg.c	Fri Dec 17 19:39:57 2004
+@@ -142,7 +142,7 @@
+     if (pdev->PageCount == 0)
+ 	escpage_printer_initialize(pdev, fp, num_coipes);
+ 
+-    if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)")))
++    if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)")))
+ 	return_error(gs_error_VMerror);
+ 
+     if (lprn->NegativePrint) {
+@@ -154,7 +154,7 @@
+     if (code < 0)
+ 	return code;
+ 
+-    gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)");
++    gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)");
+ 
+     if (pdev->Duplex)
+ 	fprintf(fp, "%c0dpsE", GS);
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevl4r.c b/print/ghostscript-afpl/files/patch-lips:gdevl4r.c
index 353ec2399a84..e7ab9d0ecbe2 100644
--- a/print/ghostscript-afpl/files/patch-lips:gdevl4r.c
+++ b/print/ghostscript-afpl/files/patch-lips:gdevl4r.c
@@ -1,5 +1,5 @@
 --- lips/gdevl4r.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevl4r.c	Tue Jan 13 01:28:40 2004
++++ lips/gdevl4r.c	Fri Dec 17 19:19:02 2004
 @@ -53,8 +53,8 @@
  #define lips_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\
  		    print_page_copies, image_out, cassetFeed, username)\
@@ -36,6 +36,85 @@
  private int lips4type_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, int num_copies, int ptype);
  
  private int
+@@ -597,7 +602,7 @@
+     /* Initialize printer. */
+     lips_job_start(pdev, ptype, prn_stream, num_copies);
+ 
+-    if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
++    if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
+ 	return_error(gs_error_VMerror);
+ 
+ 
+@@ -607,7 +612,7 @@
+     if (code < 0)
+ 	return code;
+ 
+-    gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
++    gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
+ 
+     /* eject page */
+     lips_job_end(pdev, prn_stream);
+@@ -641,9 +646,9 @@
+ 
+     if (pdev->color_info.depth == 1)
+       {
+-	if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
++	if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
+ 	  return_error(gs_error_VMerror);
+-	if (!(lprn->CompBuf2 = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf2)")))
++	if (!(lprn->CompBuf2 = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf2)")))
+ 	  return_error(gs_error_VMerror);
+ 
+ 	if (lprn->NegativePrint) {
+@@ -663,8 +668,8 @@
+ 	if (code < 0)
+ 	  return code;
+ 	
+-	gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
+-	gs_free(lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)");
++	gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
++	gs_free(pdev->memory, lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)");
+       }
+     else
+       {
+@@ -903,15 +908,15 @@
+     int lnum = 0;
+ 
+     /* Memory Allocate */
+-    if (!(pBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)")))
++    if (!(pBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(prevBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)")))
++    if (!(prevBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(ComBuff = (byte *) gs_malloc(Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)")))
++    if (!(ComBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(TotalBuff = (byte *) gs_malloc((Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)")))
++    if (!(TotalBuff = (byte *) gs_malloc(pdev->memory, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(diffBuff = (byte *) gs_malloc(Xpixel * num_components * 2, sizeof(byte), "lips_print_page")))
++    if (!(diffBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components * 2, sizeof(byte), "lips_print_page")))
+ 	return_error(gs_error_VMerror);
+ 
+     /* make output data */
+@@ -927,11 +932,11 @@
+ 			    pdev->height - (lnum - NUM_LINES_4C));
+     }
+     /* Free Memory */
+-    gs_free(pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)");
+-    gs_free(prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)");
+-    gs_free(ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)");
+-    gs_free(TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)");
+-    gs_free(diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page");
++    gs_free(pdev->memory, pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)");
++    gs_free(pdev->memory, prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)");
++    gs_free(pdev->memory, ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)");
++    gs_free(pdev->memory, TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)");
++    gs_free(pdev->memory, diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page");
+ 
+     return 0;
+ }
 @@ -1065,11 +1070,25 @@
  	if (paper_size == USER_SIZE) {
  	    fprintf(prn_stream, "%c2 I", LIPS_CSI);
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlprn.c b/print/ghostscript-afpl/files/patch-lips:gdevlprn.c
new file mode 100644
index 000000000000..236cc5a3a8f5
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lips:gdevlprn.c
@@ -0,0 +1,35 @@
+--- lips/gdevlprn.c.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevlprn.c	Fri Dec 17 19:21:08 2004
+@@ -219,13 +219,13 @@
+     maxBy = (pdev->height + lprn->nBh - 1) / lprn->nBh;
+     maxY = lprn->BlockLine / lprn->nBh * lprn->nBh;
+ 
+-    if (!(lprn->ImageBuf = gs_malloc(bpl, maxY, "lprn_print_image(ImageBuf)")))
++    if (!(lprn->ImageBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_image(ImageBuf)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(lprn->TmpBuf = gs_malloc(bpl, maxY, "lprn_print_iamge(TmpBuf)")))
++    if (!(lprn->TmpBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_iamge(TmpBuf)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(lprn->bubbleTbl = gs_malloc(sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)")))
++    if (!(lprn->bubbleTbl = gs_malloc(pdev->memory, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)")))
+ 	return_error(gs_error_VMerror);
+-    if (!(bubbleBuffer = gs_malloc(sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)")))
++    if (!(bubbleBuffer = gs_malloc(pdev->memory, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)")))
+ 	return_error(gs_error_VMerror);
+ 
+     for (i = 0; i < maxBx; i++)
+@@ -261,10 +261,10 @@
+     }
+     lprn_bubble_flush_all(pdev, fp);	/* flush the rest of bubble */
+ 
+-    gs_free(lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)");
+-    gs_free(lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)");
+-    gs_free(lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)");
+-    gs_free(bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)");
++    gs_free(pdev->memory, lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)");
++    gs_free(pdev->memory, lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)");
++    gs_free(pdev->memory, lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)");
++    gs_free(pdev->memory, bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)");
+ 
+     return code;
+ }
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevnpdl.c b/print/ghostscript-afpl/files/patch-lips:gdevnpdl.c
new file mode 100644
index 000000000000..ad237e348f15
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lips:gdevnpdl.c
@@ -0,0 +1,20 @@
+--- lips/gdevnpdl.c.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevnpdl.c	Fri Dec 31 17:32:52 2004
+@@ -582,7 +582,7 @@
+     int code;
+     int maxY = lprn->BlockLine / lprn->nBh * lprn->nBh;
+ 
+-    if (!(lprn->CompBuf = gs_malloc(line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)")))
++    if (!(lprn->CompBuf = gs_malloc(pdev->memory, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)")))
+ 	return_error(gs_error_VMerror);
+ 
+ 
+@@ -680,7 +680,7 @@
+     /* Form Feed */
+     fputs("\014", prn_stream);
+ 
+-    gs_free(lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)");
++    gs_free(pdev->memory, lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)");
+     return 0;
+ }
+ 
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevrpdl.c b/print/ghostscript-afpl/files/patch-lips:gdevrpdl.c
new file mode 100644
index 000000000000..8673cb716108
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-lips:gdevrpdl.c
@@ -0,0 +1,20 @@
+--- lips/gdevrpdl.c.orig	Thu Nov  2 12:09:18 2000
++++ lips/gdevrpdl.c	Fri Dec 31 17:34:04 2004
+@@ -81,7 +81,7 @@
+     if (pdev->PageCount == 0)
+ 	rpdl_printer_initialize(pdev, prn_stream, num_coipes);
+ 
+-    if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)")))
++    if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)")))
+ 	return_error(gs_error_VMerror);
+ 
+     lprn->NegativePrint = false; /* Not Support */
+@@ -90,7 +90,7 @@
+     if (code < 0)
+ 	return code;
+ 
+-    gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)");
++    gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)");
+ 
+     fprintf(prn_stream, "\014");	/* Form  Feed */
+ 
diff --git a/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c b/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c
index fef3a6452e40..bafbc2dde9b5 100644
--- a/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c
+++ b/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c
@@ -1,5 +1,5 @@
 --- lxm3200/gdevlx32.c.orig	Wed Apr 23 01:06:20 2003
-+++ lxm3200/gdevlx32.c	Thu May 15 08:24:08 2003
++++ lxm3200/gdevlx32.c	Fri Dec 17 19:46:04 2004
 @@ -422,9 +422,11 @@
   * of the nearest color.
   */
@@ -23,3 +23,30 @@
  			break;
  	}
  
+@@ -732,10 +734,10 @@
+ 	/* Allocate memory for the buffers and
+ 	 * verify that the allocation was done properly.
+ 	 */
+-	gendata.scanbuf = (byte *)gs_malloc(gendata.numbytes, gendata.numblines, 
++	gendata.scanbuf = (byte *)gs_malloc(pdev->memory, gendata.numbytes, gendata.numblines, 
+ 																			"lxm3200_print_page(scanbuf)");
+ 
+-	gendata.outdata = (byte *)gs_malloc(gendata.numbytes, 30, 
++	gendata.outdata = (byte *)gs_malloc(pdev->memory, gendata.numbytes, 30, 
+ 																			"lxm3200_print_page(outdata)");
+  
+ 	if(gendata.scanbuf == NULL || 
+@@ -944,11 +946,11 @@
+ freeresources(void)
+ {
+ 	if(gendata.scanbuf)
+-		gs_free((char *)gendata.scanbuf, gendata.numbytes, gendata.numblines,
++		gs_free(pdev->memory, (char *)gendata.scanbuf, gendata.numbytes, gendata.numblines,
+ 						"lxm3200:freeresources(scanbuf)");
+ 
+ 	if(gendata.outdata)
+-		gs_free((char *)gendata.outdata, gendata.numbytes, 30, 
++		gs_free(pdev->memory, (char *)gendata.outdata, gendata.numbytes, 30, 
+ 						"lxm3200:freeresources(outdata)");
+ }
+ 
diff --git a/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c b/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c
index 4b1049db015c..1aeeb74be38f 100644
--- a/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c
+++ b/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c
@@ -1,5 +1,23 @@
 --- md2k/gdevmd2k.c.orig	Sun May  2 14:07:57 1999
-+++ md2k/gdevmd2k.c	Fri Nov  8 07:29:13 2002
++++ md2k/gdevmd2k.c	Fri Dec 17 19:10:22 2004
+@@ -495,7 +495,7 @@
+     int i, j;
+ 
+     /* allocate memory */
+-    work = (byte *)gs_malloc(3+sizeof(int), line_size,
++    work = (byte *)gs_malloc(pdev->memory, 3+sizeof(int), line_size,
+ 			     "alps_print_page(work)");
+     if (work == 0)
+ 	return_error(gs_error_VMerror);
+@@ -597,7 +597,7 @@
+ 	   "\033\052\162\103"
+ 	   "\033\045\0\130", 1, 9, prn_stream);
+ 
+-    gs_free((char *)work, 3+sizeof(int), line_size, "alps_print_page(work)");
++    gs_free(pdev->memory, (char *)work, 3+sizeof(int), line_size, "alps_print_page(work)");
+     return 0;
+ }
+ 
 @@ -638,11 +638,13 @@
      (k) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
  
diff --git a/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c b/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c
index ffdae781ffa1..862e9f1801c2 100644
--- a/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c
+++ b/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c
@@ -1,5 +1,5 @@
 --- mjc/gdevmjc.c.orig	Sat Nov  2 17:58:50 1996
-+++ mjc/gdevmjc.c	Sun Nov 10 21:37:22 2002
++++ mjc/gdevmjc.c	Fri Dec 31 16:24:50 2004
 @@ -43,7 +43,8 @@
  #include <limits.h>
  #include "gdevprn.h"
@@ -259,6 +259,30 @@
  
  
  private int
+@@ -988,7 +980,7 @@
+ 
+ /* NOZ */
+   xtalbuff_size = plane_size*8 + 64;
+-  xtalbuff = (short *) gs_malloc( xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
++  xtalbuff = (short *) gs_malloc(pdev->memory, xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
+   memset(xtalbuff, 0, xtalbuff_size*(16*4+2*4) * W);
+   {
+   	int i;
+@@ -1027,12 +1019,12 @@
+   	p += xtalbuff_size;
+   }
+ 
+-  storage = (word *) gs_malloc(storage_size_words, W, "mj_colour_print_page");
++  storage = (word *) gs_malloc(pdev->memory, storage_size_words, W, "mj_colour_print_page");
+ 
+ /* prepare a temporary buffer for mj_raster_cmd */
+ 
+   mj_tmp_buf_size = plane_size;
+-  mj_tmp_buf = (byte *) gs_malloc(mj_tmp_buf_size, W ,"mj_raster_buffer");
++  mj_tmp_buf = (byte *) gs_malloc(pdev->memory, mj_tmp_buf_size, W ,"mj_raster_buffer");
+ 
+ #if 0
+   fprintf(stderr, "storage_size_words :%d\n", storage_size_words);
 @@ -1163,7 +1155,8 @@
  
    /* Send each scan line in turn */
@@ -269,7 +293,19 @@
      int cErr, mErr, yErr, kErr;
      int this_pass, i;
      long int lnum;
-@@ -1412,10 +1405,10 @@
+@@ -1403,19 +1396,19 @@
+     fflush(prn_stream);
+   }
+   /* free temporary storage */
+-  gs_free((char *) storage, storage_size_words, W, "mj_colour_print_page");
+-  gs_free((char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer");
+-  gs_free((char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
++  gs_free(pdev->memory, (char *) storage, storage_size_words, W, "mj_colour_print_page");
++  gs_free(pdev->memory, (char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer");
++  gs_free(pdev->memory, (char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
+ 
+   return 0;
+ }
  
  void 
  mj_color_correct(gx_color_value *Rptr ,gx_color_value *Gptr , gx_color_value *Bptr )
diff --git a/print/ghostscript-afpl/files/patch-src:gdevcd8.c b/print/ghostscript-afpl/files/patch-src:gdevcd8.c
index f92af5b292f4..b5257edb49de 100644
--- a/print/ghostscript-afpl/files/patch-src:gdevcd8.c
+++ b/print/ghostscript-afpl/files/patch-src:gdevcd8.c
@@ -1,5 +1,5 @@
 --- src/gdevcd8.c.orig	Mon Feb 28 16:01:59 2000
-+++ src/gdevcd8.c	Wed Dec 10 21:32:53 2003
++++ src/gdevcd8.c	Fri Dec 17 19:42:52 2004
 @@ -406,19 +406,19 @@
  };
  
@@ -236,6 +236,24 @@
  
  
  private void
+@@ -1175,7 +1175,7 @@
+        2bpp feature of the hp850 someday, it is sized like storage.
+        storagee contains the errors from b/w fs-ditherng */
+ 
+-    data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W,
++    data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W,
+ 					    "cdj850_print_page");
+ 
+     /* if we can't allocate working area */
+@@ -1196,7 +1196,7 @@
+     (*cdj850->terminate_page) (pdev, prn_stream);
+ 
+     /* Free Memory */
+-    gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W,
++    gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W,
+ 	    "hp850_print_page");
+ 
+     return 0;
 @@ -2744,13 +2744,14 @@
      (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
  
diff --git a/print/ghostscript-afpl/files/patch-src:gdevdj9.c b/print/ghostscript-afpl/files/patch-src:gdevdj9.c
index f58a6c7de792..ef473318ad07 100644
--- a/print/ghostscript-afpl/files/patch-src:gdevdj9.c
+++ b/print/ghostscript-afpl/files/patch-src:gdevdj9.c
@@ -1,5 +1,5 @@
---- src/gdevdj9.c.orig	Fri Nov  8 06:15:08 2002
-+++ src/gdevdj9.c	Sun Nov 10 22:00:45 2002
+--- src/gdevdj9.c.orig	Fri Dec 17 19:31:42 2004
++++ src/gdevdj9.c	Fri Dec 17 19:44:07 2004
 @@ -243,19 +243,19 @@
  };
  
@@ -205,6 +205,24 @@
  
  
  /* assign_dpi:  
+@@ -863,7 +863,7 @@
+ 		 2bpp feature of the hp970 someday, it is sized like storage.
+ 		 storagee contains the errors from b/w fs-ditherng */
+ 
+-	data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W,
++	data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W,
+ 					    "cdj970_print_page");
+ 
+ 	/* if we can't allocate working area */
+@@ -884,7 +884,7 @@
+ 	(*cdj970->terminate_page) (pdev, prn_stream);
+ 
+ 	/* Free Memory */
+-	gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W,
++	gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W,
+ 	    "hp970_print_page");
+ 
+ 	PageCtr ++;
 @@ -2292,12 +2292,13 @@
  /* gdev_cmyk_map_cmyk_color: 
  ----------------------------------------------------------------------------------*/
diff --git a/print/ghostscript-afpl/files/patch-src:gdevgdi.c b/print/ghostscript-afpl/files/patch-src:gdevgdi.c
index 460db38f4b8e..49d575dd8c27 100644
--- a/print/ghostscript-afpl/files/patch-src:gdevgdi.c
+++ b/print/ghostscript-afpl/files/patch-src:gdevgdi.c
@@ -1,5 +1,5 @@
 --- src/gdevgdi.c.orig	Wed Jun 19 19:32:49 2002
-+++ src/gdevgdi.c	Mon Jul 21 13:44:41 2003
++++ src/gdevgdi.c	Fri Dec 31 17:41:18 2004
 @@ -60,8 +60,8 @@
  #define GDI_REPEAT_LENGTH 2
  #define GDI_BAND_HEIGHT   128
@@ -53,6 +53,19 @@
  private FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp);
  private FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo, 
                       unsigned char ubCompMode, unsigned int usBandWidth, 
+@@ -193,9 +207,9 @@
+ 	}
+ 
+         ul_band_size = band_width_bytes * band_height;
+-        ibp = (byte *)gs_malloc(ul_band_size, 1, "gdi_print_page");
+-        obp = (byte *)gs_malloc(ul_band_size*13/10, 1, "gdi_print_page");
+-        tmp = (byte *)gs_malloc(raster, 1, "gdi_print_page");
++        ibp = (byte *)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page");
++        obp = (byte *)gs_malloc(pdev->memory, ul_band_size*13/10, 1, "gdi_print_page");
++        tmp = (byte *)gs_malloc(pdev->memory, raster, 1, "gdi_print_page");
+ 
+         if (!ibp) return_error(gs_error_VMerror);
+         if (!obp) return_error(gs_error_VMerror);
 @@ -220,7 +234,7 @@
              memset(obp, 0x00, ul_band_size*13/10);
              for (j=0; j<band_height; j++) {
@@ -102,7 +115,7 @@
 +		    int f, g, h;
 +		    if (!fudge) {
 +		      ASSERT(use_band == ibp);
-+		      use_band = (byte*)gs_malloc(/*XXX 'mem' ptr goes here*//*,*/ ul_band_size, 1, "gdi_print_page/fudge");
++		      use_band = (byte*)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page/fudge");
 +		      fudge=1;
 +		    }
 +		    memcpy(use_band, ibp, ul_band_size);
@@ -130,7 +143,7 @@
 +	      oh_well:
 +		if (fudge > 1) {
 +		  ASSERT(use_band != ibp);
-+		  gs_free(use_band, ul_band_size, 1, "gdi_print_page/fudge");
++		  gs_free(pdev->memory, use_band, ul_band_size, 1, "gdi_print_page/fudge");
 +		  /*fprintf(stderr, "smartgdi: band %d fudge factor is %d\n", i, fudge);*/
 +		}
 +	      }
@@ -138,7 +151,7 @@
  		break;
  	    case GDI_COMP_SCANLINE:
                  ul_comp_size = bmp2run(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
-@@ -253,7 +323,7 @@
+@@ -253,15 +323,15 @@
  
              prn_stream = WriteBandHeader(prn_stream, i, compression_type, (band_width_bytes * 8),
                                           band_height, ul_comp_size); 
@@ -147,6 +160,17 @@
              fwrite(obp, ul_comp_size, 1, prn_stream);
          }
      
+         /* Trailer Output */
+         WriteTrailerData(prn_stream);
+-        gs_free(ibp, ul_band_size, 1, "gdi_line_buffer");
+-        gs_free(obp, ul_band_size*13/10, 1, "gdi_line_buffer");
+-        gs_free(tmp, raster, 1, "gdi_line_buffer");
++        gs_free(pdev->memory, ibp, ul_band_size, 1, "gdi_line_buffer");
++        gs_free(pdev->memory, obp, ul_band_size*13/10, 1, "gdi_line_buffer");
++        gs_free(pdev->memory, tmp, raster, 1, "gdi_line_buffer");
+         return code;
+ }
+ 
 @@ -271,50 +341,50 @@
    unsigned char buffer[300];
    int dots_per_inch = (int)pdev->y_pixels_per_inch;
diff --git a/print/ghostscript-afpl/files/patch-src:gdevlx50.c b/print/ghostscript-afpl/files/patch-src:gdevlx50.c
index 01ceae208cd3..b762afcec85d 100644
--- a/print/ghostscript-afpl/files/patch-src:gdevlx50.c
+++ b/print/ghostscript-afpl/files/patch-src:gdevlx50.c
@@ -1,5 +1,50 @@
---- src/gdevlx50.c.orig	Thu May 15 07:38:07 2003
-+++ src/gdevlx50.c	Thu May 15 08:02:58 2003
+--- src/gdevlx50.c.orig	Fri Dec 17 19:31:43 2004
++++ src/gdevlx50.c	Fri Dec 17 22:31:26 2004
+@@ -1120,18 +1120,18 @@
+ 
+ 				/* Allocate a buffer for a single scan line */
+ 	    lineBuffer	= (byte *)gs_alloc_byte_array
+-		( &gs_memory_default, lx5000dev->scanLineBytes, 1,
++		( lx5000dev->memory, lx5000dev->scanLineBytes, 1,
+ 		  "lx5000_print_page(lineBuffer)" );
+ 
+ 	    swipeBuf	= (byte *)gs_alloc_byte_array
+-		( &gs_memory_default, lx5000dev->swipeBufSize, 1,
++		( lx5000dev->memory, lx5000dev->swipeBufSize, 1,
+ 		  "lx5000_print_page(swipeBuf)" );
+ 
+ 	    for ( colour = 0 ; colour < numColours; colour++ )
+ 	    {
+ 		if ( ( colourBufs[colour] =
+ 		       (byte *)gs_alloc_byte_array
+-		       ( &gs_memory_default, lx5000dev->penBufSize, 1,
++		       ( lx5000dev->memory, lx5000dev->penBufSize, 1,
+ 			 "lx5000_print_page(colourBufs)"
+ 			 )
+ 		       ) == NULL )
+@@ -1172,19 +1172,19 @@
+ 	for ( colour = 0; colour < numColours; colour++ )
+ 	{
+ 	    if ( colourBufs[colour] != NULL )
+-		gs_free_object( &gs_memory_default,
++		gs_free_object( lx5000dev->memory,
+ 				(char *)colourBufs[colour],
+ 				"lx5000_print_page(colourBufs)" );
+ 	    colourBufs[ colour ]	= NULL;
+ 	    colourBufPtrs[ colour ]	= NULL;
+ 	}
+ 	if ( swipeBuf != NULL )
+-	    gs_free_object( &gs_memory_default,
++	    gs_free_object( lx5000dev->memory,
+ 			    (char *)swipeBuf, "lx5000_print_page(swipeBuf)" );
+ 	swipeBuf	= NULL;
+ 	*swipeBufPtr	= NULL;
+ 	if ( lineBuffer != NULL )
+-	    gs_free_object( &gs_memory_default,
++	    gs_free_object( lx5000dev->memory,
+ 		    (char *)lineBuffer, "lx5000_print_page(lineBuffer)" );
+ 	lineBuffer	= NULL;
+ 	*lineBufferPtr	= NULL;
 @@ -2603,9 +2603,12 @@
  
  /* Map CMYK to color. */
diff --git a/print/ghostscript-afpl/files/patch-src:gdevperm.c b/print/ghostscript-afpl/files/patch-src:gdevperm.c
new file mode 100644
index 000000000000..da5d52ceedf8
--- /dev/null
+++ b/print/ghostscript-afpl/files/patch-src:gdevperm.c
@@ -0,0 +1,11 @@
+--- src/gdevperm.c.orig	Fri Jun 18 16:00:47 2004
++++ src/gdevperm.c	Fri Dec 31 18:06:42 2004
+@@ -289,7 +289,7 @@
+ 	(strncmp((const char *)name, (const char *)str, name_size) == 0))
+ 
+ private int
+-perm_get_color_comp_index(const gx_device *pdev, const char *pname,
++perm_get_color_comp_index(gx_device *pdev, const char *pname,
+ 					int name_size, int component_type)
+ {
+     const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev;
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 0f02d3552a82..75a910d6226f 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -63,16 +63,53 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-UCS2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2C
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-H
 %%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-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-GBK-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBpc-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Mac
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-UCS2
 %%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-90ms-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90pv-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Mac
+%%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-H-CID
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Host
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Mac
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCms-UHC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCpc-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2C
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-H
@@ -86,29 +123,72 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-UCS2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2C
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hankaku
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hiragana
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-UCS2
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2C
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Katakana
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Roman
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90ms-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90pv-RKSJ
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-B5pc
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-ETen-B5
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBK-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBpc-EUC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCms-UHC
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCpc-EUC
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
@@ -117,6 +197,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultCMYK
 %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultGray
 %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultRGB
+%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/TrivialCMYK
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Latin1
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode
@@ -225,6 +306,7 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/errpage.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/font2c.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/font2pcl.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/ghostpdf.ppd
 %%DATADIR%%/%%GS_VERSION%%/lib/gs_agl.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/gs_btokn.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/gs_ccfnt.ps
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 24318889da52..8d83ed4b1803 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -32,7 +32,6 @@ else
 		lips2p lips3 lips4 bjc880j lips4v \
 		m8510 coslw2p coslwxl uniprint \
 		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
-		epag \
 		escpage lp2000 \
 		alc8600 alc8500 alc2000 alc4000 alc1900 alc4100 \
 		lp9800c lp9000c lp9500c lp8800c lp8300c lp8500c lp3000c \
@@ -52,7 +51,7 @@ else
 		pj pjetxl pjxl paintjet \
 		pjxl300 pxlmono pxlcolor \
 		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
-		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
+		lx5000 lex2050 lex3200 lex5700 lex7000 \
 		cp50 necp6 \
 		npdl \
 		oce9050 oki182 okiibm atx23 atx24 atx38 r4081 \
@@ -66,7 +65,6 @@ 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 \
@@ -150,7 +148,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" "$status_eps9mid" \
   "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" "$status_eps9high" \
   "lp8000"   "Epson LP-8000 line printer" "$status_lp8000" \
-  "epag"     "Epson ESC/Page laser printer (generic) [EPAG]" "$status_epag" \
   "escpage"  "Epson ESC/Page laser printer (generic) [LIPS]" "$status_escpage" \
   "lp2000"   "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" "$status_lp2000" \
   "alc8600"  "Epson AL-C8600 color laser printer [EPLASER]" "$status_alc8600" \
@@ -248,7 +245,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "imagen"   "Imagen ImPress printers" "$status_imagen" \
   "fs600"    "Kyocera FS-600 (600 dpi)" "$status_fs600" \
   "lxm5700m" "Lexmark 5700 monotone" "$status_lxm5700m" \
-  "lxm3200"  "Lexmark 3200/Z12/Z22/Z31/Z32 [LXM3200]" "$status_lxm3200" \
   "lx5000"   "Lexmark 5000/Z51/Z82 [LX5000]" "$status_lx5000" \
   "lex2050"  "Lexmark 2050 [LEX7000]" "$status_lex2050" \
   "lex3200"  "Lexmark 3200 [LEX7000]" "$status_lex3200" \
@@ -295,12 +291,6 @@ 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" \