From 4ca33466dcfb67e01c468f35f7b2107aa06a9a0e Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Tue, 3 Oct 2006 00:30:05 +0000
Subject: Change test string checking to use one equal sign. Noticed on NetBSD
 when my print job didn't work (using pdq and foomatic-rip).

Bump package revision.

I also reported upstream.
---
 print/foomatic-filters/Makefile         |  4 ++--
 print/foomatic-filters/distinfo         |  4 ++--
 print/foomatic-filters/patches/patch-aa | 19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'print')

diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 83894bd4316..5c0f1ecee77 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/10/03 00:30:05 reed Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	foomatic-filters-${FOOMATIC_FILTERS_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 MASTER_SITES=	http://www.linuxprinting.org/download/foomatic/
 
 MAINTAINER=	jlam@pkgsrc.org
diff --git a/print/foomatic-filters/distinfo b/print/foomatic-filters/distinfo
index a7202d5f2f6..8291c2c57e9 100644
--- a/print/foomatic-filters/distinfo
+++ b/print/foomatic-filters/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/12/17 18:35:10 jlam Exp $
+$NetBSD: distinfo,v 1.3 2006/10/03 00:30:05 reed Exp $
 
 SHA1 (foomatic-filters-3.0.2.tar.gz) = 6d949949f432212632c704904272bc32f287b577
 RMD160 (foomatic-filters-3.0.2.tar.gz) = 612529ea462f7f1500f30ffed4aec105b410936c
 Size (foomatic-filters-3.0.2.tar.gz) = 125875 bytes
-SHA1 (patch-aa) = eb58f6cf9f14b63a47bcecfd43dd31db07336841
+SHA1 (patch-aa) = dc4a7a8287d441b7ad8fc952742eb9d645054c1f
diff --git a/print/foomatic-filters/patches/patch-aa b/print/foomatic-filters/patches/patch-aa
index 6d9f16b4848..a2f9fde3a3c 100644
--- a/print/foomatic-filters/patches/patch-aa
+++ b/print/foomatic-filters/patches/patch-aa
@@ -1,11 +1,20 @@
-$NetBSD: patch-aa,v 1.2 2005/12/17 18:35:10 jlam Exp $
-
---- foomatic-rip.in.orig	2004-08-26 16:53:35.000000000 -0400
-+++ foomatic-rip.in
-@@ -48,5 +48,5 @@ my $execpath = "@prefix@/bin:/usr/local/
+--- foomatic-rip.in.orig	2004-08-26 15:53:35.000000000 -0500
++++ foomatic-rip.in	2006-10-02 19:23:18.000000000 -0500
+@@ -47,7 +47,7 @@
+ my $execpath = "@prefix@/bin:/usr/local/bin:/usr/bin:/bin";
  
  # CUPS raster drivers are searched here
 -my $cupsfilterpath = "@prefix@/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
 +my $cupsfilterpath = "@CUPS_FILTERS@:@prefix@/lib/cups/filter";
  
  # Location of the configuration file "filter.conf", this file can be
+ # used to change the settings of foomatic-rip without editing
+@@ -5919,7 +5919,7 @@
+ 			     "      # Custom page size settings\n",
+ 			     "      # We aren't really checking for " .
+ 			     "legal vals.\n",
+-			     "      if [ \"x\${$varn}\" == 'x$val' ]; " .
++			     "      if [ \"x\${$varn}\" = 'x$val' ]; " .
+ 			     "then\n",
+ 			     "        $varn=\"\${$varn}.\${PageWidth}" .
+ 			     "x\${PageHeight}\${PageSizeUnit}\"\n",
-- 
cgit v1.2.3