diff options
| author | sobomax <sobomax@FreeBSD.org> | 2000-07-11 16:43:49 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2000-07-11 16:43:49 +0800 |
| commit | 61e8f533edc3b57b1ff6a621ab6f519f86f1f521 (patch) | |
| tree | b322ef2b5e87cbe3e625b8e1ccad10b94fd5553d /print/pdq/files | |
| parent | 254773998d400a59b42a08df1d5904db3a5431f2 (diff) | |
| download | freebsd-ports-gnome-61e8f533edc3b57b1ff6a621ab6f519f86f1f521.tar.gz freebsd-ports-gnome-61e8f533edc3b57b1ff6a621ab6f519f86f1f521.tar.zst freebsd-ports-gnome-61e8f533edc3b57b1ff6a621ab6f519f86f1f521.zip | |
Update 2.2.1. Also support ${PREFIX} properly.
Diffstat (limited to 'print/pdq/files')
| -rw-r--r-- | print/pdq/files/patch-ab | 58 |
1 files changed, 4 insertions, 54 deletions
diff --git a/print/pdq/files/patch-ab b/print/pdq/files/patch-ab index 3b85203a2cea..9735d3419a60 100644 --- a/print/pdq/files/patch-ab +++ b/print/pdq/files/patch-ab @@ -1,5 +1,5 @@ ---- src/parse_rc.c.orig Sat May 15 01:03:20 1999 -+++ src/parse_rc.c Sat May 15 07:06:17 1999 +--- src/parse_rc.c.orig Fri Mar 31 23:36:30 2000 ++++ src/parse_rc.c Tue Jul 11 11:08:20 2000 @@ -23,7 +23,6 @@ #include <glob.h> #include <string.h> @@ -8,16 +8,7 @@ #include "parse.h" -@@ -35,6 +34,8 @@ - #include "driver.h" - #include "interface.h" - -+#define PRINTRC "/usr/local/etc/printrc" -+ - void try_parse_rc_glob (char *rc_glob, rc_items *rc) { - - glob_t globbuf; -@@ -46,12 +47,8 @@ +@@ -46,12 +45,8 @@ i = glob (d, 0, NULL, &globbuf); free (d); if (i != 0) { @@ -32,7 +23,7 @@ } else { /* Globbed something real */ for (i = 0; i < globbuf.gl_pathc; i++) { -@@ -71,11 +68,7 @@ +@@ -74,11 +69,7 @@ i = glob (d, 0, NULL, &globbuf); if (i != 0) { @@ -45,44 +36,3 @@ free (d); my_exit (1); } else { -@@ -258,7 +251,7 @@ - int trouble_flag; - - rc_locs = NULL; -- find_rc_glob_locations (type, name, "/etc/printrc", &rc_locs); -+ find_rc_glob_locations (type, name, PRINTRC, &rc_locs); - find_rc_glob_locations (type, name, "~/.printrc", &rc_locs); - - set_flag = 0; -@@ -282,7 +275,7 @@ - } - - if ( (set_flag == 0) || (trouble_flag == 1) ) { -- if (0 != append_to_rc_file ("/etc/printrc", buf) ) { -+ if (0 != append_to_rc_file (PRINTRC, buf) ) { - append_to_rc_file ("~/.printrc", buf); /* Return code not checked. - * What else can we do? - */ -@@ -299,7 +292,7 @@ - int trouble_flag; - - rc_locs = NULL; -- find_rc_glob_locations (type, name, "/etc/printrc", &rc_locs); -+ find_rc_glob_locations (type, name, PRINTRC, &rc_locs); - find_rc_glob_locations (type, name, "~/.printrc", &rc_locs); - - trouble_flag = 0; -@@ -315,11 +308,11 @@ - - /* In this case, buf should have been set to some commands that - * indicate to delete the object. For example, say printer foo is -- * defined in /etc/printrc. Ordinary users cannot delete it, but -+ * defined in /usr/local/etc/printrc. Ordinary users cannot delete it, but - * they may add the command "printer foo delete" to their own rc file. - */ - if (trouble_flag == 1) { -- if (0 != append_to_rc_file ("/etc/printrc", buf) ) { -+ if (0 != append_to_rc_file (PRINTRC, buf) ) { - append_to_rc_file ("~/.printrc", buf); /* Return code not checked. - * What else can we do? - */ |