void function cannot return value

3 files changed, 46 insertions, 1 deletions

diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 2dbc9ff2038..0f8d93b5564 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.29 2010/02/23 20:31:26 drochner Exp $
+$NetBSD: distinfo,v 1.30 2010/03/04 11:16:27 tnn Exp $
 
 SHA1 (ghostscript-8.71.tar.gz) = 629299140f612fac32f6289be0904107dfd1b555
 RMD160 (ghostscript-8.71.tar.gz) = efce74cf22cf99b2b1a145df466e79a86e3dfefb
 Size (ghostscript-8.71.tar.gz) = 25240801 bytes
+SHA1 (patch-aa) = 31f2107c474398a350916df6fe793a5920f81169
 SHA1 (patch-ab) = 7a98cad37f94394f172bdac23f5dd73fb1f08006
+SHA1 (patch-ac) = b1f71dc446f433be0b07b0511dc1028e8e3b77f3
 SHA1 (patch-ad) = 8b3b743b2d6405ea35bfb16970942ecd55702401
 SHA1 (patch-af) = 13aa7b5159cbd5413353b48380d5665ed879fe64
 SHA1 (patch-ag) = bdfbe40c849537d84ac2b3def4a0a3a87ecc152f
diff --git a/print/ghostscript/patches/patch-aa b/print/ghostscript/patches/patch-aa
new file mode 100644
index 00000000000..a3047c5b222
--- /dev/null
+++ b/print/ghostscript/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2010/03/04 11:16:27 tnn Exp $
+
+--- base/gsnogc.c.orig	2009-11-25 19:59:11.000000000 +0000
++++ base/gsnogc.c
+@@ -32,7 +32,7 @@ nogc_alloc_string(gs_memory_t * mem, uin
+ static void
+ nogc_free_string(gs_memory_t * mem, byte * str, uint size, client_name_t cname)
+ {
+-    return gs_free_object(mem, str, cname);
++    gs_free_object(mem, str, cname);
+ }
+ 
+ static byte *
diff --git a/print/ghostscript/patches/patch-ac b/print/ghostscript/patches/patch-ac
new file mode 100644
index 00000000000..5f9c16d18fe
--- /dev/null
+++ b/print/ghostscript/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.9 2010/03/04 11:16:27 tnn Exp $
+
+--- base/gdevpx.c.orig	2009-12-12 03:45:55.000000000 +0000
++++ base/gdevpx.c
+@@ -730,8 +730,10 @@ pclxl_write_image_data_DeltaRow(gx_devic
+                                "pclxl_write_image_data_DeltaRow(buf)");
+     prow = gs_alloc_bytes(xdev->v_memory, width_bytes, "pclxl_write_image_data_DeltaRow(prow)");
+     /* the RLE routine can write uncompressed without extra-allocation */
+-    if ((buf == 0) || (prow == 0))
+-        return pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
++    if ((buf == 0) || (prow == 0)) {
++        pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
++        return;
++    }
+     /* initialize the seed row */
+     memset(prow, 0, width_bytes);
+     cdata = buf;
+@@ -760,8 +762,10 @@ pclxl_write_image_data(gx_device_pclxl *
+ 		       uint raster, uint width_bits, int y, int height)
+ {
+     /* If we only have 1 line, it does not make sense to do DeltaRow */
+-    if (height < 2)
+-    return pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
++    if (height < 2) {
++        pclxl_write_image_data_RLE(xdev, data, data_bit, raster, width_bits, y, height);
++        return;
++    }
+ 
+     switch(xdev->CompressMode){
+     case eDeltaRowCompression: