[PC-BSD Commits] r3833 - in pcbsd: branches/7.1/system-overlay/PCBSD/local branches/7.1/system-overlay/PCBSD/local/bin branches/7.1/system-overlay/PCBSD/local/etc/rc.d branches/7.1/system-overlay/PCBSD/local/libexec branches/7.1/system-overlay/PCBSD/local/libexec/cups branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter trunk/system-overlay/PCBSD/local/bin trunk/system-overlay/PCBSD/local/etc/rc.d trunk/system-overlay/PCBSD/local/libexec/cups/filter trunk-current/system-overlay/PCBSD/local/bin trunk-current/system-overlay/PCBSD/local/etc/rc.d trunk-current/system-overlay/PCBSD/local/libexec/cups/filter

svn at pcbsd.org svn at pcbsd.org
Tue Apr 21 12:39:06 PDT 2009


Author: kris
Date: 2009-04-21 12:39:05 -0700 (Tue, 21 Apr 2009)
New Revision: 3833

Added:
   pcbsd/branches/7.1/system-overlay/PCBSD/local/bin/foomatic-rip
   pcbsd/branches/7.1/system-overlay/PCBSD/local/bin/lprsetup.sh
   pcbsd/branches/7.1/system-overlay/PCBSD/local/bin/unix-lpr.sh
   pcbsd/branches/7.1/system-overlay/PCBSD/local/etc/rc.d/cupsd
   pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/
   pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/
   pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/
   pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
   pcbsd/trunk-current/system-overlay/PCBSD/local/bin/lprsetup.sh
   pcbsd/trunk-current/system-overlay/PCBSD/local/bin/unix-lpr.sh
   pcbsd/trunk-current/system-overlay/PCBSD/local/etc/rc.d/cupsd
   pcbsd/trunk/system-overlay/PCBSD/local/bin/lprsetup.sh
   pcbsd/trunk/system-overlay/PCBSD/local/bin/unix-lpr.sh
   pcbsd/trunk/system-overlay/PCBSD/local/etc/rc.d/cupsd
Modified:
   pcbsd/trunk-current/system-overlay/PCBSD/local/bin/foomatic-rip
   pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
   pcbsd/trunk/system-overlay/PCBSD/local/bin/foomatic-rip
   pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
Log:

Added our fix to CUPS, which corrects issues with foomatic and such not respecting LOCALBASE properly




Property changes on: pcbsd/branches/7.1/system-overlay/PCBSD/local/bin/foomatic-rip
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/branches/7.1/system-overlay/PCBSD/local/bin/lprsetup.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/branches/7.1/system-overlay/PCBSD/local/bin/unix-lpr.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/branches/7.1/system-overlay/PCBSD/local/etc/rc.d/cupsd
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip
___________________________________________________________________
Added: svn:executable
   + *

Modified: pcbsd/trunk/system-overlay/PCBSD/local/bin/foomatic-rip
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/local/bin/foomatic-rip	2009-04-21 17:14:22 UTC (rev 3832)
+++ pcbsd/trunk/system-overlay/PCBSD/local/bin/foomatic-rip	2009-04-21 19:39:05 UTC (rev 3833)
@@ -47,7 +47,7 @@
 my $execpath = "/PCBSD/local/bin:/usr/local/bin:/usr/bin:/bin";
 
 # CUPS raster drivers are searched here
-my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
+my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
 
 # Location of the configuration file "filter.conf", this file can be
 # used to change the settings of foomatic-rip without editing


Property changes on: pcbsd/trunk/system-overlay/PCBSD/local/bin/lprsetup.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/system-overlay/PCBSD/local/bin/unix-lpr.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk/system-overlay/PCBSD/local/etc/rc.d/cupsd
___________________________________________________________________
Added: svn:executable
   + *

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 17:14:22 UTC (rev 3832)
+++ pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 19:39:05 UTC (rev 3833)
@@ -47,7 +47,7 @@
 my $execpath = "NONE/bin:/PCBSD/local/bin:/usr/bin:/bin";
 
 # CUPS raster drivers are searched here
-my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/PCBSD/lib/cups/filter";
+my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
 
 # Location of the configuration file "filter.conf", this file can be
 # used to change the settings of foomatic-rip without editing
@@ -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 "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
-	    $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
+	} elsif (-r "/usr/local/etc/cups/ppd/${printer}.ppd") {
+	    $ppdfile = "/usr/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 "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
-	    $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
+	} elsif (-r "/usr/local/share/ppr/PPDFiles/${printer}.ppd") {
+	    $ppdfile = "/usr/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/bin/foomatic-rip
===================================================================
--- pcbsd/trunk-current/system-overlay/PCBSD/local/bin/foomatic-rip	2009-04-21 17:14:22 UTC (rev 3832)
+++ pcbsd/trunk-current/system-overlay/PCBSD/local/bin/foomatic-rip	2009-04-21 19:39:05 UTC (rev 3833)
@@ -47,7 +47,7 @@
 my $execpath = "/PCBSD/local/bin:/usr/local/bin:/usr/bin:/bin";
 
 # CUPS raster drivers are searched here
-my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/usr/local/lib/cups/filter:/usr/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
+my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
 
 # Location of the configuration file "filter.conf", this file can be
 # used to change the settings of foomatic-rip without editing


Property changes on: pcbsd/trunk-current/system-overlay/PCBSD/local/bin/lprsetup.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk-current/system-overlay/PCBSD/local/bin/unix-lpr.sh
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: pcbsd/trunk-current/system-overlay/PCBSD/local/etc/rc.d/cupsd
___________________________________________________________________
Added: svn:executable
   + *

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 17:14:22 UTC (rev 3832)
+++ pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip	2009-04-21 19:39:05 UTC (rev 3833)
@@ -47,7 +47,7 @@
 my $execpath = "NONE/bin:/PCBSD/local/bin:/usr/bin:/bin";
 
 # CUPS raster drivers are searched here
-my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/PCBSD/lib/cups/filter";
+my $cupsfilterpath = "/PCBSD/local/lib/cups/filter:/PCBSD/local/lib/cups/filter:/PCBSD/local/libexec/cups/filter:/opt/cups/filter:/usr/lib/cups/filter";
 
 # Location of the configuration file "filter.conf", this file can be
 # used to change the settings of foomatic-rip without editing
@@ -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 "/PCBSD/local/etc/cups/ppd/${printer}.ppd") {
-	    $ppdfile = "/PCBSD/local/etc/cups/ppd/${printer}.ppd";
+	} elsif (-r "/usr/local/etc/cups/ppd/${printer}.ppd") {
+	    $ppdfile = "/usr/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 "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd") {
-	    $ppdfile = "/PCBSD/local/share/ppr/PPDFiles/${printer}.ppd";
+	} elsif (-r "/usr/local/share/ppr/PPDFiles/${printer}.ppd") {
+	    $ppdfile = "/usr/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