[PC-BSD Commits] r3834 - in pcbsd: branches/7.1/system-overlay/PCBSD/local/etc branches/7.1/system-overlay/PCBSD/local/etc/foomatic branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter trunk/system-overlay/PCBSD/local/etc trunk/system-overlay/PCBSD/local/etc/foomatic trunk/system-overlay/PCBSD/local/libexec/cups/filter trunk-current/system-overlay/PCBSD/local/etc trunk-current/system-overlay/PCBSD/local/etc/foomatic trunk-current/system-overlay/PCBSD/local/libexec/cups/filter

svn at pcbsd.org svn at pcbsd.org
Tue Apr 21 13:27:36 PDT 2009


Author: kris
Date: 2009-04-21 13:27:35 -0700 (Tue, 21 Apr 2009)
New Revision: 3834

Added:
   pcbsd/branches/7.1/system-overlay/PCBSD/local/etc/foomatic/
   pcbsd/branches/7.1/system-overlay/PCBSD/local/etc/foomatic/filter.conf
   pcbsd/trunk-current/system-overlay/PCBSD/local/etc/foomatic/
   pcbsd/trunk-current/system-overlay/PCBSD/local/etc/foomatic/filter.conf
   pcbsd/trunk/system-overlay/PCBSD/local/etc/foomatic/
   pcbsd/trunk/system-overlay/PCBSD/local/etc/foomatic/filter.conf
Modified:
   pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
   pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
   pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
Log:

Fixed up foomatic-rip-hplip further, and added correct filter.conf file



Modified: pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
===================================================================
--- pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 19:39:05 UTC (rev 3833)
+++ pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 20:27:35 UTC (rev 3834)
@@ -1011,12 +1011,12 @@
 	    $ppdfile = "$configpath/${printer}.ppd";
 	} elsif (-r "/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
 	    $ppdfile = "/etc/cups/ppd/${printer}.ppd";
-	} elsif (-r "/usr/local/etc/cups/ppd/${printer}.ppd") {
-	    $ppdfile = "/usr/local/etc/cups/ppd/${printer}.ppd";
+	} elsif (-r "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
+	    $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
 	} elsif (-r "/usr/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
 	    $ppdfile = "/usr/share/ppr/PPDFiles/${printer}.ppd";
-	} elsif (-r "/usr/local/share/ppr/PPDFiles/${printer}.ppd") {
-	    $ppdfile = "/usr/local/share/ppr/PPDFiles/${printer}.ppd";
+	} elsif (-r "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
+	    $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
 	} else {
 	    rip_die ("There is no readable PPD file for the printer " .
 		     "$printer, is it configured?",

Modified: pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 19:39:05 UTC (rev 3833)
+++ pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 20:27:35 UTC (rev 3834)
@@ -1011,12 +1011,12 @@
 	    $ppdfile = "$configpath/${printer}.ppd";
 	} elsif (-r "/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
 	    $ppdfile = "/etc/cups/ppd/${printer}.ppd";
-	} elsif (-r "/usr/local/etc/cups/ppd/${printer}.ppd") {
-	    $ppdfile = "/usr/local/etc/cups/ppd/${printer}.ppd";
+	} elsif (-r "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
+	    $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
 	} elsif (-r "/usr/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
 	    $ppdfile = "/usr/share/ppr/PPDFiles/${printer}.ppd";
-	} elsif (-r "/usr/local/share/ppr/PPDFiles/${printer}.ppd") {
-	    $ppdfile = "/usr/local/share/ppr/PPDFiles/${printer}.ppd";
+	} elsif (-r "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
+	    $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
 	} else {
 	    rip_die ("There is no readable PPD file for the printer " .
 		     "$printer, is it configured?",

Modified: pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
===================================================================
--- pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 19:39:05 UTC (rev 3833)
+++ pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 20:27:35 UTC (rev 3834)
@@ -1011,12 +1011,12 @@
 	    $ppdfile = "$configpath/${printer}.ppd";
 	} elsif (-r "/etc/cups/ppd/${printer}.ppd") { # CUPS config dir
 	    $ppdfile = "/etc/cups/ppd/${printer}.ppd";
-	} elsif (-r "/usr/local/etc/cups/ppd/${printer}.ppd") {
-	    $ppdfile = "/usr/local/etc/cups/ppd/${printer}.ppd";
+	} elsif (-r "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
+	    $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
 	} elsif (-r "/usr/share/ppr/PPDFiles/${printer}.ppd") { # PPR PPDs
 	    $ppdfile = "/usr/share/ppr/PPDFiles/${printer}.ppd";
-	} elsif (-r "/usr/local/share/ppr/PPDFiles/${printer}.ppd") {
-	    $ppdfile = "/usr/local/share/ppr/PPDFiles/${printer}.ppd";
+	} elsif (-r "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
+	    $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
 	} else {
 	    rip_die ("There is no readable PPD file for the printer " .
 		     "$printer, is it configured?",



More information about the Commits mailing list