Changeset 3833

Timestamp:

04/21/09 12:39:05 (11 months ago)

Author:

kris

Message:

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

Location:

pcbsd

Files:

• branches/7.1/system-overlay/PCBSD/local/bin/foomatic-rip (added)
• branches/7.1/system-overlay/PCBSD/local/bin/lprsetup.sh (added)
• branches/7.1/system-overlay/PCBSD/local/bin/unix-lpr.sh (added)
• branches/7.1/system-overlay/PCBSD/local/etc/rc.d/cupsd (added)
• branches/7.1/system-overlay/PCBSD/local/libexec (added)
• branches/7.1/system-overlay/PCBSD/local/libexec/cups (added)
• branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter (added)
• branches/7.1/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip (added)
• trunk-current/system-overlay/PCBSD/local/bin/foomatic-rip (modified) (1 diff)
• trunk-current/system-overlay/PCBSD/local/bin/lprsetup.sh (added)
• trunk-current/system-overlay/PCBSD/local/bin/unix-lpr.sh (added)
• trunk-current/system-overlay/PCBSD/local/etc/rc.d/cupsd (added)
• trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip (modified) (2 diffs)
• trunk/system-overlay/PCBSD/local/bin/foomatic-rip (modified) (1 diff)
• trunk/system-overlay/PCBSD/local/bin/lprsetup.sh (added)
• trunk/system-overlay/PCBSD/local/bin/unix-lpr.sh (added)
• trunk/system-overlay/PCBSD/local/etc/rc.d/cupsd (added)
• trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip (modified) (2 diffs)

pcbsd/trunk-current/system-overlay/PCBSD/local/bin/foomatic-rip

@@ -48 +48 @@
 
 # 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

pcbsd/trunk-current/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip

@@ -48 +48 @@
 
 # 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
@@ -1012 +1012 @@
         } 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 " .

pcbsd/trunk/system-overlay/PCBSD/local/bin/foomatic-rip

@@ -48 +48 @@
 
 # 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

pcbsd/trunk/system-overlay/PCBSD/local/libexec/cups/filter/foomatic-rip-hplip

@@ -48 +48 @@
 
 # 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
@@ -1012 +1012 @@
         } 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 " .