Add -dMaxStripSize=0 to default ghostscript command line in efax.rc

configuration file so that efax continues to work with ghostscript 8.71 and
later (also tested backward compatibility with 8.63).

Bump PKGREVISION

3 files changed, 23 insertions, 15 deletions

diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index 9afedfe5aeb..e99fb61edeb 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2010/01/29 16:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/03 12:53:47 sborrill Exp $
 
 DISTNAME=	efax-0.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/serialcomm/fax/}
 
diff --git a/comms/efax/distinfo b/comms/efax/distinfo
index 10b1411becd..93fd63716b0 100644
--- a/comms/efax/distinfo
+++ b/comms/efax/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/01/29 16:14:29 joerg Exp $
+$NetBSD: distinfo,v 1.6 2010/06/03 12:53:47 sborrill Exp $
 
 SHA1 (efax-0.9.tar.gz) = 8965407996737e6ec2c8a198ba34811f5134b5d1
 RMD160 (efax-0.9.tar.gz) = 471112ab87cfcf11521a5ea7c0cb203a44e958c3
 Size (efax-0.9.tar.gz) = 96736 bytes
 SHA1 (patch-aa) = 92b663c7b9c6fce201f6a55ba3884724b60000c0
-SHA1 (patch-ab) = ea5a18f3558f28b71085a6dd2e13ddc5e17f5f26
+SHA1 (patch-ab) = 5e44b680a740fe24d9a4106163e8718bc958589e
 SHA1 (patch-ac) = afe6aaafe504f41c13a644aae4eb9c7584466db6
diff --git a/comms/efax/patches/patch-ab b/comms/efax/patches/patch-ab
index 1673adfbe7d..4b2f162c841 100644
--- a/comms/efax/patches/patch-ab
+++ b/comms/efax/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/21 22:27:01 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2010/06/03 12:53:47 sborrill Exp $
 
---- fax.orig	Wed Mar 24 08:07:28 1999
-+++ fax
+--- fax.orig	1999-03-24 08:07:28.000000000 +0000
++++ fax	2010-06-03 13:40:50.000000000 +0100
 @@ -14,12 +14,10 @@
  #    or in a configuration file (see CONFIGFILES below)
  #
@@ -27,16 +27,24 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/21 22:27:01 jtb Exp $
  
  # Your fax number in international format, 20 characters maximum.
  # Use only digits, spaces, and the "+" character.
-@@ -67,7 +65,7 @@
+@@ -66,8 +64,14 @@
+ 
  # The name of the Ghostscript executable including full path if
  # necessary.  Only required if faxing Postscript files.
- 
+-
 -GS=gs
-+GS=@LOCALBASE@/bin/gs
++#
++# Ghostscript 8.71 and later output multi-strip TIFF files by default
++# which efax does not like. This can be disabled with the
++# -dMaxStripSize=0 option. It is reported that this option also works
++# with older versions (e.g. 8.63), so it is probably safe to add it
++# by default. If you have problems use the following line instead:
++# GS=@LOCALBASE@/bin/gs
++GS="@LOCALBASE@/bin/gs -dMaxStripSize=0"
  
  # Dial string prefix and suffix such as T for tone dialing, P for
  # pulse dialing, 9 to get an external line, commas for delays or
-@@ -81,7 +79,7 @@
+@@ -81,7 +85,7 @@
  # conventions. Protect with single quotes for delayed evaluation.
  # Add a leading '#' to the file name to use binary format.
  
@@ -45,7 +53,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/21 22:27:01 jtb Exp $
  # LOCK='-x /usr/spool/uucp/LCK..$DEV'		# older systems
  # LOCK='-x /var/lock/LCK..$DEV -x /var/spool/uucp/LCK..$DEV' # both
  # LOCK='-x #/usr/spool/uucp/LCK..$DEV'		# binary format
-@@ -101,11 +99,12 @@
+@@ -101,11 +105,12 @@
  # The remaining options probably won't need to be changed.
  # ****************************************************************
  
@@ -62,7 +70,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/21 22:27:01 jtb Exp $
  
  # A command that will generate unique names for logs and received
  # files.  'date +%m%d%H%M%S' works on most systems.  Protect with
-@@ -301,8 +300,8 @@
+@@ -301,8 +306,8 @@
  # The directory to store incoming faxes and log files.  This directory
  # should already exist and be writable by the user(s) of this script.
  
@@ -73,7 +81,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/21 22:27:01 jtb Exp $
  
  # The strftime(3) pattern that generates the file name for
  # received files.  For example, at 10:45:36 on February 25,
-@@ -390,8 +389,8 @@
+@@ -390,8 +395,8 @@
  # efax even if a previous process (e.g. login) has changed it.
  # Comment out if you don't need to reset device ownership.
  
@@ -84,7 +92,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/21 22:27:01 jtb Exp $
  # MODE=660		# only owner & group
  
  # Regular expression for efax exit codes in log files that will
-@@ -404,7 +403,21 @@
+@@ -404,7 +409,21 @@
  # --- End of user configuration section ---
  # ****************************************************************