Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c79f989e9c829612a6e01af7d6517ccfa3c04131
commit c79f989e9c829612a6e01af7d6517ccfa3c04131 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sat Jan 8 22:09:46 2011 +0100 foo2zjs-2010_12_22-1-i686 - version bump diff --git a/source/apps-extra/foo2zjs/FrugalBuild b/source/apps-extra/foo2zjs/FrugalBuild index bb63cbf..e9bdf89 100644 --- a/source/apps-extra/foo2zjs/FrugalBuild +++ b/source/apps-extra/foo2zjs/FrugalBuild @@ -3,19 +3,20 @@ # Contributor: pete (pete [at] teamlupus.hu) pkgname=foo2zjs -pkgver=2007_10_30 -pkgrel=2 +pkgver=2010_12_22 +pkgrel=1 pkgdesc="A linux printer driver for ZjStream protocol" url="http://foo2zjs.rkkda.com/"; license="GPL2" up2date="lynx -dump http://foo2zjs.rkkda.com/Changelog|head -n 1|cut -d ' ' -f 1|sed y/-/_/" -source=($url/$pkgname.tar.gz $pkgname-destdir.patch) +source=($url/$pkgname.tar.gz) groups=('apps-extra') archs=('i686' 'x86_64') # Deps revised, now it more close to correct (libjpeg?) depends=('ghostscript' 'groff' 'a2ps') rodepends=('cups' 'libjpeg' 'foomatic-filters-ppds' 'udev') ## TODO: add some firmware wrapper ? I mean for /lib/firmware ?!? +options=('noversrc') build() { Fcd $pkgname @@ -29,7 +30,8 @@ build() { #./getweb 1000 || Fdie ## heh well get all ./getweb all || Fdie - Fmkdir /usr/share/cups/model + Fmkdir /usr/share/cups/model /usr/lib/cups/filter + Fsed '$(shell cups-config --serverbin 2>/dev/null)' '$(DESTDIR)/$(shell cups-config --serverbin 2>/dev/null)' Makefile Fmakeinstall Fexerel /etc/hotplug/usb/hplj1000 Fln /etc/hotplug/usb/hplj1000 /etc/hotplug/usb/hplj1005 @@ -38,7 +40,6 @@ build() { Ffilerel hplj10xx.rules /etc/udev/rules.d/11-hplj10xx.rules Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver } -sha1sums=('86bedce14766ac2f3f9aaf54984f824bcce8c2a4' \ - '7b89eae53167a7ebef0cd9f7f405f2a787e3d13c') +sha1sums=('f5818156947b2d21b530ed593f36ab9ee3052444') # optimization OK diff --git a/source/apps-extra/foo2zjs/foo2zjs-destdir.patch b/source/apps-extra/foo2zjs/foo2zjs-destdir.patch deleted file mode 100644 index 3ca6bd0..0000000 --- a/source/apps-extra/foo2zjs/foo2zjs-destdir.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur foo2zjs/Makefile foo2zjs-p/Makefile ---- foo2zjs/Makefile 2007-04-24 12:43:44.000000000 +0200 -+++ foo2zjs-p/Makefile 2007-04-30 18:31:13.000000000 +0200 -@@ -7,8 +7,7 @@ - VERSION=0.0 - - # Installation prefix... --PREFIX=/usr/local --PREFIX=/usr -+PREFIX=$(DESTDIR)/usr - - # Pathnames for this package... - BIN=$(PREFIX)/bin -@@ -22,7 +21,7 @@ - DOCDIR=$(PREFIX)/share/doc/foo2zjs/ - - # Pathnames for referenced packages... --FOODB=/usr/share/foomatic/db/source -+FOODB=$(DESTDIR)/usr/share/foomatic/db/source - - # User ID's - LPuid=-olp -@@ -401,7 +400,7 @@ - # - install -c $(PROGS) $(SHELLS) $(BIN)/ - if [ "$(BINPROGS)" != "" ]; then \ -- install -c $(BINPROGS) /bin/; \ -+ install -c $(BINPROGS) $(PREFIX)/bin/; \ - fi - # - # Install gamma correction files. These are just templates, -@@ -528,9 +527,9 @@ - fi; \ - done - --MODEL=/usr/share/cups/model --LOCALMODEL=/usr/local/share/cups/model --PPD=/usr/share/ppd -+MODEL=$(DESTDIR)/usr/share/cups/model -+LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model -+PPD=$(DESTDIR)/usr/share/ppd - install-ppd: - # - # Install PPD files for CUPS -@@ -559,8 +558,8 @@ - done; \ - fi - --USBDIR=/etc/hotplug/usb --UDEVDIR=/etc/udev/rules.d -+USBDIR=$(DESTDIR)/etc/hotplug/usb -+UDEVDIR=$(DESTDIR)/etc/udev/rules.d - RULES=hplj10xx.rules - install-hotplug: install-hotplug-test install-hotplug-prog - -@@ -916,8 +915,7 @@ - install -c -m 644 README $(DOCDIR) - install -c -m 644 ChangeLog $(DOCDIR) - --GROFF=/usr/local/test/bin/groff --GROFF=groff -+GROFF=/usr/bin/groff - manual.pdf: $(MANPAGES) - -$(GROFF) -t -man $(MANPAGES) | ps2pdf - $@ - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
