| 1 |
scarabeus 08/12/02 13:03:28 |
| 2 |
|
| 3 |
Modified: foo2zjs-20081129-Makefile.patch |
| 4 |
Log: |
| 5 |
Fix install when using foomaticdb. |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: foo2zjs-20081129-Makefile.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/foo2zjs/files/foo2zjs-20081129-Makefile.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- foo2zjs-20081129-Makefile.patch 1 Dec 2008 15:41:10 -0000 1.1 |
| 22 |
+++ foo2zjs-20081129-Makefile.patch 2 Dec 2008 13:03:28 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-diff -urN foo2zjs/icc2ps/Makefile foo2zjs.new/icc2ps/Makefile |
| 25 |
---- foo2zjs/icc2ps/Makefile 2007-11-27 22:13:53.000000000 +0100 |
| 26 |
-+++ foo2zjs.new/icc2ps/Makefile 2008-11-29 19:13:43.000000000 +0100 |
| 27 |
+diff -urN foo2zjs.orig/icc2ps/Makefile foo2zjs/icc2ps/Makefile |
| 28 |
+--- foo2zjs.orig/icc2ps/Makefile 2007-11-27 22:13:53.000000000 +0100 |
| 29 |
++++ foo2zjs/icc2ps/Makefile 2008-12-02 13:51:12.000000000 +0100 |
| 30 |
@@ -1,11 +1,11 @@ |
| 31 |
UNAME := $(shell uname) |
| 32 |
-PREFIX= /usr |
| 33 |
@@ -15,9 +15,9 @@ |
| 34 |
INSTALL=install |
| 35 |
ifeq ($(UNAME),SunOS) |
| 36 |
INSTALL=/usr/ucb/install |
| 37 |
-diff -urN foo2zjs/Makefile foo2zjs.new/Makefile |
| 38 |
---- foo2zjs/Makefile 2008-09-23 15:56:20.000000000 +0200 |
| 39 |
-+++ foo2zjs.new/Makefile 2008-11-29 19:12:42.000000000 +0100 |
| 40 |
+diff -urN foo2zjs.orig/Makefile foo2zjs/Makefile |
| 41 |
+--- foo2zjs.orig/Makefile 2008-09-23 15:56:20.000000000 +0200 |
| 42 |
++++ foo2zjs/Makefile 2008-12-02 14:00:42.000000000 +0100 |
| 43 |
@@ -251,7 +251,7 @@ |
| 44 |
endif |
| 45 |
|
| 46 |
@@ -45,7 +45,15 @@ |
| 47 |
fi |
| 48 |
# |
| 49 |
# Install gamma correction files. These are just templates, |
| 50 |
-@@ -583,6 +584,7 @@ |
| 51 |
+@@ -570,6 +571,7 @@ |
| 52 |
+ # |
| 53 |
+ # Remove obsolete foomatic database files from previous versions |
| 54 |
+ # |
| 55 |
++ mkdir -p $(FOODB)/opt/ |
| 56 |
+ rm -f $(FOODB)/opt/foo2zjs-Media.xml |
| 57 |
+ rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml |
| 58 |
+ rm -f $(FOODB)/opt/foo2zjs-Source.xml |
| 59 |
+@@ -583,6 +585,7 @@ |
| 60 |
# Install current database files |
| 61 |
# |
| 62 |
@if [ -d $(FOODB) ]; then \ |
| 63 |
@@ -53,7 +61,7 @@ |
| 64 |
for dir in driver printer opt; do \ |
| 65 |
echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ |
| 66 |
$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ |
| 67 |
-@@ -601,10 +603,10 @@ |
| 68 |
+@@ -601,10 +604,10 @@ |
| 69 |
# |
| 70 |
# Clear foomatic cache and rebuild database if needed |
| 71 |
# |
| 72 |
@@ -68,7 +76,7 @@ |
| 73 |
foomatic-combo-xml -O >overview.xml; \ |
| 74 |
fi |
| 75 |
|
| 76 |
-@@ -736,13 +738,6 @@ |
| 77 |
+@@ -736,13 +739,6 @@ |
| 78 |
done; \ |
| 79 |
ppdmgr -u; \ |
| 80 |
elif [ -d $(PPD) ]; then \ |
| 81 |
@@ -82,7 +90,7 @@ |
| 82 |
[ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \ |
| 83 |
cd PPD; \ |
| 84 |
for ppd in *.ppd; do \ |
| 85 |
-@@ -789,10 +784,8 @@ |
| 86 |
+@@ -789,10 +785,8 @@ |
| 87 |
$(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS) |
| 88 |
|
| 89 |
|
| 90 |
@@ -95,7 +103,7 @@ |
| 91 |
|
| 92 |
install-hotplug-test: |
| 93 |
# |
| 94 |
-@@ -810,9 +803,6 @@ |
| 95 |
+@@ -810,9 +804,6 @@ |
| 96 |
# |
| 97 |
|
| 98 |
install-hotplug-prog: |
| 99 |
@@ -105,7 +113,7 @@ |
| 100 |
[ -d $(USBDIR) ] || $(INSTALL) -d -m 755 $(USBDIR)/ |
| 101 |
$(INSTALL) -c -m 755 hplj1000 $(USBDIR)/ |
| 102 |
ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hplj1005 |
| 103 |
-@@ -823,15 +813,12 @@ |
| 104 |
+@@ -823,15 +814,12 @@ |
| 105 |
ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1007 |
| 106 |
ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1008 |
| 107 |
ln -sf $(USBDIR)/hplj1000 $(USBDIR)/hpljP1505 |
| 108 |
@@ -127,7 +135,7 @@ |
| 109 |
|
| 110 |
cups: FRC |
| 111 |
if [ -x /etc/init.d/cups ]; then \ |
| 112 |
-@@ -1223,7 +1210,6 @@ |
| 113 |
+@@ -1223,7 +1211,6 @@ |
| 114 |
$(INSTALL) -c -m 644 README $(DOCDIR) |
| 115 |
$(INSTALL) -c -m 644 ChangeLog $(DOCDIR) |
Archives