[pkgsrc/pkgsrc-2006Q3]: pkgsrc/print/foomatic-filters Pullup ticket 1861 - re...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ab0796018df9
branches:  pkgsrc-2006Q3
changeset: 519145:ab0796018df9
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Oct 18 19:45:50 2006 +0000

description:
Pullup ticket 1861 - requested by dmcmahill
portability fixes for foomatic-filters

Revisions pulled up:
- pkgsrc/print/foomatic-filters/Makefile                1.15, 1.16
- pkgsrc/print/foomatic-filters/distinfo                1.3
- pkgsrc/print/foomatic-filters/patches/patch-aa        1.3

   Module Name:         pkgsrc
   Committed By:        reed
   Date:                Tue Oct  3 00:30:05 UTC 2006

   Modified Files:
        pkgsrc/print/foomatic-filters: Makefile distinfo
        pkgsrc/print/foomatic-filters/patches: patch-aa

   Log Message:
   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.
---
   Module Name:         pkgsrc
   Committed By:        dmcmahill
   Date:                Tue Oct 10 00:27:30 UTC 2006

   Modified Files:
        pkgsrc/print/foomatic-filters: Makefile

   Log Message:
   Don't try and install the man page on solaris.  It is broken with
   solaris nroff right now.  This lets this package build and package on
   solaris.

diffstat:

 print/foomatic-filters/Makefile         |  17 ++++++++++++++---
 print/foomatic-filters/distinfo         |   4 ++--
 print/foomatic-filters/patches/patch-aa |  19 ++++++++++++++-----
 3 files changed, 30 insertions(+), 10 deletions(-)

diffs (83 lines):

diff -r 3b33a72da32b -r ab0796018df9 print/foomatic-filters/Makefile
--- a/print/foomatic-filters/Makefile   Tue Oct 17 20:37:57 2006 +0000
+++ b/print/foomatic-filters/Makefile   Wed Oct 18 19:45:50 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: Makefile,v 1.14.4.1 2006/10/18 19:45:50 salo 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@localhost
@@ -12,7 +12,6 @@
 CONFLICTS+=    foomatic-gswrapper-[0-9]*
 
 USE_TOOLS+=    gmake gs:run perl:run
-INSTALL_TARGET=        install-bin install-man
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -28,6 +27,18 @@
 PKG_OPTIONS_VAR=       PKG_OPTIONS.foomatic
 PKG_SUPPORTED_OPTIONS= cups
 
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=    MANINSTALL
+
+.if ${OPSYS} == "SunOS"
+# SunOS nroff has problems with foomatic-rip.1
+MANINSTALL=     none
+INSTALL_TARGET=        install-bin
+.else
+INSTALL_TARGET=        install-bin install-man
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
diff -r 3b33a72da32b -r ab0796018df9 print/foomatic-filters/distinfo
--- a/print/foomatic-filters/distinfo   Tue Oct 17 20:37:57 2006 +0000
+++ b/print/foomatic-filters/distinfo   Wed Oct 18 19:45:50 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/12/17 18:35:10 jlam Exp $
+$NetBSD: distinfo,v 1.2.8.1 2006/10/18 19:45:50 salo 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 -r 3b33a72da32b -r ab0796018df9 print/foomatic-filters/patches/patch-aa
--- a/print/foomatic-filters/patches/patch-aa   Tue Oct 17 20:37:57 2006 +0000
+++ b/print/foomatic-filters/patches/patch-aa   Wed Oct 18 19:45:50 2006 +0000
@@ -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",