diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2012-01-16 12:30:50 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2012-01-16 12:30:50 +0000 |
commit | ce24535467d89805bd2aaa4b6d40efa11b238422 (patch) | |
tree | 845d0b8dc767651a3624c16efb2688013fb65f51 /print | |
parent | Update to 1.7 (diff) |
Update to 3.11.12
Notes
Notes:
svn path=/head/; revision=289323
Diffstat (limited to 'print')
-rw-r--r-- | print/hplip/Makefile | 2 | ||||
-rw-r--r-- | print/hplip/distinfo | 4 | ||||
-rw-r--r-- | print/hplip/files/patch-Makefile.in | 39 | ||||
-rw-r--r-- | print/hplip/pkg-plist | 10 |
4 files changed, 44 insertions, 11 deletions
diff --git a/print/hplip/Makefile b/print/hplip/Makefile index fe73a22849b0..b955f4886bc9 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 3.11.10 +PORTVERSION= 3.11.12 CATEGORIES= print MASTER_SITES= SF diff --git a/print/hplip/distinfo b/print/hplip/distinfo index 85ddc5a81e2a..0fc84644bbbd 100644 --- a/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,2 +1,2 @@ -SHA256 (hplip-3.11.10.tar.gz) = 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81 -SIZE (hplip-3.11.10.tar.gz) = 21419965 +SHA256 (hplip-3.11.12.tar.gz) = dcf05d1261f091a1dba1316a1f4e9034147fecbb1fff3e68179a599eb5ee4a9d +SIZE (hplip-3.11.12.tar.gz) = 21530771 diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in index 1f5a3f737a49..aa4eb9dc287c 100644 --- a/print/hplip/files/patch-Makefile.in +++ b/print/hplip/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 2010-07-19 06:20:23.000000000 +0400 -+++ ./Makefile.in 2010-08-27 00:58:13.822031467 +0400 -@@ -89,8 +89,8 @@ +--- ./Makefile.in.orig 2011-12-09 11:23:55.000000000 +0000 ++++ ./Makefile.in 2012-01-14 20:21:23.105509188 +0000 +@@ -90,8 +90,8 @@ # ip library @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT) @@ -11,35 +11,39 @@ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 = \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ scan/sane/hpaio.desc \ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ prnt/drv/hpijs.drv.in.template \ -@@ -2084,8 +2084,8 @@ +@@ -2214,9 +2214,9 @@ ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ prnt/pcl.py prnt/colorcal.py -am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \ -- data/rules/40-hplip.rules data/rules/55-hpmud.rules +- data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \ +- data/rules/55-hpmud.rules +#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \ -+# data/rules/40-hplip.rules data/rules/55-hpmud.rules ++# data/rules/86-hpmud_plugin.rules data/rules/40-hplip.rules \ ++# data/rules/55-hpmud.rules am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \ ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \ -@@ -3862,11 +3862,11 @@ +@@ -4106,12 +4106,12 @@ @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" # hpmud.rules -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d -@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \ +-@HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \ -@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3) -@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor -@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi +#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d +#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \ ++#@HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \ +#@HPLIP_BUILD_TRUE@ $(am__append_2) $(am__append_3) +#@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor +#@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi # hplip.conf @HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp -@@ -3921,14 +3921,14 @@ +@@ -4169,14 +4169,14 @@ # data @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@modelsdir = $(hplipdir)/data/models @@ -62,3 +66,22 @@ @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@pcldir = $(hplipdir)/data/pcl @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@ldldir = $(hplipdir)/data/ldl @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@postscriptdir = $(hplipdir)/data/ps +@@ -8581,12 +8581,12 @@ + + + install-dist_hplip_LogDATA: +-@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +-@FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) +-@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) +-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +-@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) ++#@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) ++#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) ++#@FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) ++#@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) ++#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) ++#@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir) + + install-data-hook: + # If scanner build, add hpaio entry to sane dll.conf. diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist index 3a90bcbb1f3b..f900da95ee7b 100644 --- a/print/hplip/pkg-plist +++ b/print/hplip/pkg-plist @@ -1,8 +1,10 @@ bin/hp-align bin/hp-check +bin/hp-check-plugin bin/hp-clean bin/hp-colorcal bin/hp-devicesettings +bin/hp-diagnose_plugin bin/hp-fab bin/hp-faxsetup bin/hp-firmware @@ -125,6 +127,7 @@ share/applications/hplip.desktop %%DATADIR%%/base/utils.py %%DATADIR%%/base/vcard.py %%DATADIR%%/base/wifi.py +%%DATADIR%%/check-plugin.py %%DATADIR%%/check.py %%DATADIR%%/clean.py %%DATADIR%%/colorcal.py @@ -299,6 +302,7 @@ share/applications/hplip.desktop %%GUI%%%%DATADIR%%/data/images/devices/OFFICEJET_PRO_1150C.png %%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_5105.png %%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_6100_Series.png +%%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_8500_a910.png %%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_G85.png %%GUI%%%%DATADIR%%/data/images/devices/OfficeJet_Series_300.png %%GUI%%%%DATADIR%%/data/images/devices/Officejet_6150_Series.png @@ -481,6 +485,7 @@ share/applications/hplip.desktop %%DATADIR%%/data/ps/clean_page.pdf.gz %%DATADIR%%/data/ps/testpage.ps.gz %%DATADIR%%/devicesettings.py +%%DATADIR%%/diagnose_plugin.py %%DATADIR%%/fab.py %%FAX%%%%DATADIR%%/fax/__init__.py %%FAX%%%%DATADIR%%/fax/coverpages.py @@ -564,6 +569,8 @@ share/applications/hplip.desktop %%GUI%%%%DATADIR%%/ui4/mimetypesdialog_base.py %%GUI%%%%DATADIR%%/ui4/nodevicesdialog.py %%GUI%%%%DATADIR%%/ui4/nodevicesdialog_base.py +%%GUI%%%%DATADIR%%/ui4/plugindiagnose.py +%%GUI%%%%DATADIR%%/ui4/plugindiagnose_base.py %%GUI%%%%DATADIR%%/ui4/plugindialog.py %%GUI%%%%DATADIR%%/ui4/plugindialog_base.py %%GUI%%%%DATADIR%%/ui4/pluginlicensedialog.py @@ -981,6 +988,7 @@ share/ppd/HP/hp-laserjet_1320nw-hpijs.ppd.gz share/ppd/HP/hp-laserjet_1320nw-ps.ppd.gz share/ppd/HP/hp-laserjet_1320tn-hpijs.ppd.gz share/ppd/HP/hp-laserjet_1320tn-ps.ppd.gz +share/ppd/HP/hp-laserjet_200_colormfp_m275-ps.ppd.gz share/ppd/HP/hp-laserjet_2100-hpijs.ppd.gz share/ppd/HP/hp-laserjet_2100-ps.ppd.gz share/ppd/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz @@ -1079,6 +1087,7 @@ share/ppd/HP/hp-laserjet_5si-hpijs-pcl3.ppd.gz share/ppd/HP/hp-laserjet_5si-ps.ppd.gz share/ppd/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz share/ppd/HP/hp-laserjet_5si_mopier-ps.ppd.gz +share/ppd/HP/hp-laserjet_600_m601_m602_m603-ps.ppd.gz share/ppd/HP/hp-laserjet_6l-hpijs.ppd.gz share/ppd/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz share/ppd/HP/hp-laserjet_6mp-ps.ppd.gz @@ -1357,6 +1366,7 @@ share/ppd/HP/hp-photosmart_380_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_420_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_470_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_5510_series-hpijs.ppd.gz +share/ppd/HP/hp-photosmart_5510d_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_6510_series-hpijs.ppd.gz share/ppd/HP/hp-photosmart_7150-hpijs.ppd.gz share/ppd/HP/hp-photosmart_7200_series-hpijs.ppd.gz |