diff options
Diffstat (limited to 'print')
48 files changed, 1862 insertions, 1728 deletions
diff --git a/print/hplip/Makefile b/print/hplip/Makefile index a03e22d7eb8e..aaa8cc907bcf 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 1.7.4a +PORTVERSION= 2.7.9 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -20,15 +20,22 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ usb:${PORTSDIR}/devel/libusb \ netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp -CONFLICTS= hpijs-* foomatic-filters-* +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \ + foomatic-rip:${PORTSDIR}/print/foomatic-filters + +CONFLICTS= hpijs-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ - --disable-pp-build + --disable-pp-build \ + --enable-foomatic-ppd-install \ + --with-icondir=${LOCALBASE}/share/applications \ + --with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend + USE_LDCONFIG= yes USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes -USE_RC_SUBR= hpiod.sh hpssd.sh +USE_RC_SUBR= hpssd.sh CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" @@ -53,45 +60,55 @@ post-extract: @${RM} -r ${WRKSRC}/data/images/CVS post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/share/cups|${LOCALBASE}/share/cups|g ; \ - s|/usr/lib/cups/backend|${LOCALBASE}/libexec/cups/backend|g ; \ - s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ - ${WRKSRC}/configure ${WRKSRC}/prnt/hpijs/configure - @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g ; \ - s|/usr/lib|${LOCALBASE}/lib|g ; \ - s|/etc/init.d|${LOCALBASE}/etc/rc.d|g ; \ - s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g ; \ - s|/etc/hp|${LOCALBASE}/etc/hp|g' \ - ${WRKSRC}/Makefile.in \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g ; \ - s|/usr/lib|${LOCALBASE}/lib|g' \ - ${WRKSRC}/prnt/hpijs/foomatic-rip - @${REINPLACE_CMD} -e 's|/etc/hp/|${LOCALBASE}/etc/hp/|g ; \ - s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ - ${WRKSRC}/base/g.py \ - ${WRKSRC}/fax/backend/hpfax.py \ - ${WRKSRC}/hpssd.py \ - ${WRKSRC}/io/hpiod/hpiod.h \ - ${WRKSRC}/api/hplip_api.h \ - ${WRKSRC}/prnt/hpijs/configure.in - @${REINPLACE_CMD} -e 's|#!/usr/bin/env python|#!${LOCALBASE}/bin/python|g' \ - ${WRKSRC}/*.py \ - ${WRKSRC}/*/*.py \ - ${WRKSRC}/*/*/*.py - @${REINPLACE_CMD} -e 's|-ldld||g ; \ - s|-ldl||g' \ - ${WRKSRC}/prnt/hpijs/configure \ - ${WRKSRC}/prnt/hpijs/configure.in \ - ${WRKSRC}/prnt/hpijs/Makefile.in \ - ${WRKSRC}/prnt/hpijs/aclocal.m4 - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/hp|${LOCALBASE}/etc/hp|g ; \ + s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g' \ + ${WRKSRC}/Makefile.am \ + ${WRKSRC}/Makefile.in \ + ${WRKSRC}/check.py \ + ${WRKSRC}/hpssd.py \ + ${WRKSRC}/base/g.py \ + ${WRKSRC}/doc/release_notes.html \ + ${WRKSRC}/doc/tech_docs/man_pages/hpssd.html \ + ${WRKSRC}/fax/backend/hpfax.py \ + ${WRKSRC}/installer/distros.dat \ + ${WRKSRC}/installer/core_install.py \ + ${WRKSRC}/prnt/hpijs/ljzjs.cpp + + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/configure.in .if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|install-data-am: install-docDATA|install-data-am:|g' \ - ${WRKSRC}/prnt/hpijs/Makefile.in - @${REINPLACE_CMD} -e 's|install-dist_xmlDATA install-docDATA|install-dist_xmlDATA|g' \ + @${REINPLACE_CMD} -e 's|install-dist_www7DATA install-docDATA|install-dist_www7DATA|g ; \ + s|install-dist_unrelDATA install-dist_www0DATA|install-dist_unrelDATA|g ; \ + s|install-dist_www1DATA install-dist_www21DATA||g ; \ + s|install-dist_www22DATA install-dist_www23DATA||g ; \ + s|install-dist_www241DATA install-dist_www242DATA||g ; \ + s|install-dist_www243DATA install-dist_www24DATA||g ; \ + s|install-dist_www251DATA install-dist_www252DATA||g ; \ + s|install-dist_www261DATA install-dist_www2DATA||g ; \ + s|install-dist_www3DATA install-dist_www4DATA||g ; \ + s|install-dist_www5DATA install-dist_www61DATA||g ; \ + s|install-dist_www6DATA install-dist_www7DATA||g' \ ${WRKSRC}/Makefile.in .endif + @${REINPLACE_CMD} -e 's|install-dist_prntSCRIPTS install-dist_rulesDATA|install-dist_prntSCRIPTS|g ; \ + s|install-hpPROGRAMS install-hplip_confDATA|install-hpPROGRAMS|g' \ + ${WRKSRC}/Makefile.in +# @${REINPLACE_CMD} -e 's|install-dist_www7DATA install-docDATA|install-dist_www7DATA|g' \ +# ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|-ldld||g ; \ + s|-ldl||g ; \ + s|-dld||g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/configure.in \ + ${WRKSRC}/foomatic-db-hpijs/make_configure \ + ${WRKSRC}/Makefile.in \ + ${WRKSRC}/Makefile.am \ + ${WRKSRC}/aclocal.m4 \ + ${WRKSRC}/foomatic-db-hpijs/configure.ac + + @${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \ + ${WRKSRC}/hpssd.py pre-su-install: @${MKDIR} ${PREFIX}/share/applications @@ -101,13 +118,12 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd - @${LN} -sf ${PREFIX}/bin/foomatic-rip \ - ${PREFIX}/libexec/cups/filter/foomatic-rip @${MKDIR} ${PREFIX}/etc/hp # Auto-generate sample configuration file - @${ECHO} "home=${PREFIX}/share/hplip" >> ${WRKSRC}/hplip.conf - @${ECHO} "ppd=${PREFIX}/share/ppd" >> ${WRKSRC}/hplip.conf @${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample +.if !exists(${PREFIX}/etc/hp/hplip.conf) + @${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf +.endif @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/print/hplip/distinfo b/print/hplip/distinfo index 78bce36380f5..df8f7df03a51 100644 --- a/print/hplip/distinfo +++ b/print/hplip/distinfo @@ -1,3 +1,3 @@ -MD5 (hplip-1.7.4a.tar.gz) = 210e948d1f1f376426a2cca0ed9d1e6c -SHA256 (hplip-1.7.4a.tar.gz) = 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e -SIZE (hplip-1.7.4a.tar.gz) = 13566965 +MD5 (hplip-2.7.9.tar.gz) = a05aeb5679c3ce429bea7f3335609aee +SHA256 (hplip-2.7.9.tar.gz) = e8867529434411f6c44ef6224405f92fd6be25f04513946621bf209b2e81baaf +SIZE (hplip-2.7.9.tar.gz) = 14488632 diff --git a/print/hplip/files/hpiod.sh.in b/print/hplip/files/hpiod.sh.in deleted file mode 100644 index b24681234b8c..000000000000 --- a/print/hplip/files/hpiod.sh.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# PROVIDE: hpiod -# REQUIRE: NETWORKING -# KEYWORD: shutdown - -. %%RC_SUBR%% - -name=hpiod -rcvar=${name}_enable - -command="%%PREFIX%%/sbin/${name}" -pidfile="/var/run/${name}.pid" -portfile="/var/run/${name}.port" -hpiod_user=hplip - -start_precmd="hpiod_prestart" - -load_rc_config $name - -: ${hpiod_enable="NO"} - -hpiod_prestart() -{ - touch ${pidfile} - touch ${portfile} - chown ${hpiod_user} ${pidfile} - chown ${hpiod_user} ${portfile} -} - -run_rc_command $* diff --git a/print/hplip/files/hpssd.sh.in b/print/hplip/files/hpssd.sh.in index 065bb88badde..105076f0a135 100644 --- a/print/hplip/files/hpssd.sh.in +++ b/print/hplip/files/hpssd.sh.in @@ -13,7 +13,6 @@ rcvar=${name}_enable command="%%PREFIX%%/sbin/${name}" command_interpreter="%%PREFIX%%/bin/python" pidfile="/var/run/${name}.pid" -portfile="/var/run/${name}.port" hpssd_user=nobody command_args=">/dev/null" @@ -26,9 +25,7 @@ load_rc_config $name hpssd_prestart() { touch ${pidfile} - touch ${portfile} chown ${hpssd_user} ${pidfile} - chown ${hpssd_user} ${portfile} } run_rc_command $* diff --git a/print/hplip/files/patch-Makefile.am b/print/hplip/files/patch-Makefile.am new file mode 100644 index 000000000000..beb9769cde6c --- /dev/null +++ b/print/hplip/files/patch-Makefile.am @@ -0,0 +1,37 @@ +--- Makefile.am.orig Fri Sep 21 15:36:07 2007 ++++ Makefile.am Tue Oct 9 19:31:35 2007 +@@ -45,7 +45,7 @@ + www243dir = $(docdir)/install/step4/suse + dist_www243_DATA = $(wwwsrc)/install/step4/suse/* + www251dir = $(docdir)/install/manual +-dist_www251_DATA = $(wwwsrc)/install/manual/* ++dist_www251_DATA = $(wwwsrc)/install/manual/*.html + www252dir = $(docdir)/install/manual/distros + dist_www252_DATA = $(wwwsrc)/install/manual/distros/* + www261dir = $(docdir)/install/install +@@ -53,13 +53,13 @@ + www3dir = $(docdir)/styles + dist_www3_DATA = $(wwwsrc)/styles/* + www4dir = $(docdir)/images +-dist_www4_DATA = $(wwwsrc)/images/* ++dist_www4_DATA = $(wwwsrc)/images/*.png + www5dir = $(docdir)/supported_devices + dist_www5_DATA = $(wwwsrc)/supported_devices/* + www6dir = $(docdir)/tech_docs +-dist_www6_DATA = $(wwwsrc)/tech_docs/* ++dist_www6_DATA = $(wwwsrc)/tech_docs/*.html + www61dir = $(docdir)/tech_docs/man_pages +-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/* ++dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html + www7dir = $(docdir)/troubleshooting + dist_www7_DATA = $(wwwsrc)/troubleshooting/* + endif +@@ -131,7 +131,7 @@ + dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz + dist_models_DATA = data/models/models.dat + if GUI_BUILD +-dist_images_DATA = data/images/* ++dist_images_DATA = data/images/*.png + endif + dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ + data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in index add4fc086982..0f340db071ce 100644 --- a/print/hplip/files/patch-Makefile.in +++ b/print/hplip/files/patch-Makefile.in @@ -1,143 +1,72 @@ ---- Makefile.in.orig Fri Mar 23 16:39:45 2007 -+++ Makefile.in Wed Apr 18 17:00:46 2007 -@@ -434,7 +434,7 @@ - www243dir = $(docdir)/install/step4/suse - dist_www243_DATA = $(wwwsrc)/install/step4/suse/* - www251dir = $(docdir)/install/manual --dist_www251_DATA = $(wwwsrc)/install/manual/* -+dist_www251_DATA = $(wwwsrc)/install/manual/*.html - www252dir = $(docdir)/install/manual/distros - dist_www252_DATA = $(wwwsrc)/install/manual/distros/* - www261dir = $(docdir)/install/install -@@ -446,12 +446,12 @@ - www5dir = $(docdir)/supported_devices - dist_www5_DATA = $(wwwsrc)/supported_devices/* - www6dir = $(docdir)/tech_docs --dist_www6_DATA = $(wwwsrc)/tech_docs/* -+dist_www6_DATA = $(wwwsrc)/tech_docs/*.html - www61dir = $(docdir)/tech_docs/man_pages --dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/* -+dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html - www7dir = $(docdir)/troubleshooting - dist_www7_DATA = $(wwwsrc)/troubleshooting/* --dist_hplip_DATA = $(doc_DATA) hplip.conf -+dist_hplip_DATA = $(doc_DATA) - dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh install.py hplip-install - cmddir = $(hplipdir) - dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \ -@@ -2884,20 +2884,9 @@ - # - # If scanner build, install sane backend. - if [ "$(scan_build)" = "yes" ]; then \ -- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ -- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ -- touch $(DESTDIR)/etc/sane.d/dll.conf; \ -- fi; \ -- $(mkinstalldirs) $(DESTDIR)$(sanedir); \ -- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SONOVER); \ -- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOSHORT); \ -- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOLONG); \ -- if [ -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ -- if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ -- echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \ -- echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ -- fi \ -- fi \ -+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SONOVER); \ -+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOSHORT); \ -+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \ - fi - - install-data-hook: install-pcardext install-cupsext -@@ -2945,63 +2934,41 @@ - done - # - # Edit hpiod.conf in destdir. -- echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -- echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -- echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -+ echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(PACKAGE).conf -+ echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(PACKAGE).conf -+ echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(PACKAGE).conf - if [ "$(network_build)" = "yes" ]; then \ -- echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "network-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "network-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(pp_build)" = "yes" ]; then \ -- echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "pp-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "pp-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(gui_build)" = "yes" ]; then \ -- echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "gui-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "gui-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(scan_build)" = "yes" ]; then \ -- echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "scanner-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "scanner-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(fax_build)" = "yes" ]; then \ -- echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "fax-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "fax-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(cups11_build)" = "yes" ]; then \ -- echo -e "cups11-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "cups11-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "cups11-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -- fi -- echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -- echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf --# --# Install hpiod.conf. -- $(mkinstalldirs) $(DESTDIR)/etc/hp -- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp --# --# Create hpiod start/stop script from hpiod.sh in destdir. -- sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \ -- sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \ -- rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp --# --# Install hpiod start/stop script. -- $(mkinstalldirs) $(DESTDIR)/etc/init.d -- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d --# --# Run chkconfig/install_initd if DESTDIR="". -- if [ "$(DESTDIR)" = "" ]; then \ -- if [ "$(INSTALLINITD)" != "" ]; then \ -- $(INSTALLINITD) $(PACKAGE); \ -- elif [ "$(CHKCONFIG)" != "" ]; then \ -- $(CHKCONFIG) $(PACKAGE) reset; \ -- fi \ -+ echo -e "cups11-build=0" >> $(PACKAGE).conf; \ - fi -+ echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf -+ echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf - # - # Install fax support. Let hpijs symlink hpppddir to cupsppddir. - if [ "$(fax_build)" = "yes" ]; then \ -@@ -3032,8 +2999,8 @@ - done - # - # Remove hplip.conf and hplip start/stop script. -- rm -f $(DESTDIR)/etc/hp/$(PACKAGE).conf -- rm -f $(DESTDIR)/etc/init.d/$(PACKAGE) -+ rm -f $(DESTDIR)/usr/local/etc/hp/$(PACKAGE).conf -+ rm -f $(DESTDIR)/usr/local/etc/rc.d/$(PACKAGE) - # - # Remove fax support. - rm -f $(DESTDIR)$(hpfaxdir)/hpfax +--- Makefile.in.orig Fri Sep 28 19:33:08 2007 ++++ Makefile.in Tue Oct 9 21:10:19 2007 +@@ -671,7 +671,7 @@ + dist_faxppdDATA_INSTALL = $(INSTALL_DATA) + am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc + dist_hplipDATA_INSTALL = $(INSTALL_DATA) +-am__dist_images_DATA_DIST = data/images/* ++am__dist_images_DATA_DIST = data/images/*.png + dist_imagesDATA_INSTALL = $(INSTALL_DATA) + am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \ + data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \ +@@ -1610,7 +1610,7 @@ + dist_www242DATA_INSTALL = $(INSTALL_DATA) + am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/* + dist_www243DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/* ++am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*.html + dist_www251DATA_INSTALL = $(INSTALL_DATA) + am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/* + dist_www252DATA_INSTALL = $(INSTALL_DATA) +@@ -1618,13 +1618,13 @@ + dist_www261DATA_INSTALL = $(INSTALL_DATA) + am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* + dist_www3DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www4_DATA_DIST = $(wwwsrc)/images/* ++am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png + dist_www4DATA_INSTALL = $(INSTALL_DATA) + am__dist_www5_DATA_DIST = $(wwwsrc)/supported_devices/* + dist_www5DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/* ++am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*.html + dist_www6DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/* ++am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*.html + dist_www61DATA_INSTALL = $(INSTALL_DATA) + am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/* + dist_www7DATA_INSTALL = $(INSTALL_DATA) +@@ -1840,7 +1840,7 @@ + @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse + @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/* + @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual +-@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/* ++@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*.html + @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros + @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/* + @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install +@@ -1848,13 +1848,13 @@ + @DOC_BUILD_TRUE@www3dir = $(docdir)/styles + @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/* + @DOC_BUILD_TRUE@www4dir = $(docdir)/images +-@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/* ++@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*.png + @DOC_BUILD_TRUE@www5dir = $(docdir)/supported_devices + @DOC_BUILD_TRUE@dist_www5_DATA = $(wwwsrc)/supported_devices/* + @DOC_BUILD_TRUE@www6dir = $(docdir)/tech_docs +-@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/* ++@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*.html + @DOC_BUILD_TRUE@www61dir = $(docdir)/tech_docs/man_pages +-@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/* ++@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html + @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting + @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/* + @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc +@@ -1904,7 +1904,7 @@ + @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization + @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz + @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat +-@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/* ++@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*.png + @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ + @HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ + @HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \ diff --git a/print/hplip/files/patch-base_utils.py b/print/hplip/files/patch-base_utils.py new file mode 100644 index 000000000000..92d4757c8cee --- /dev/null +++ b/print/hplip/files/patch-base_utils.py @@ -0,0 +1,53 @@ +--- base/utils.py.orig Wed Oct 10 00:23:07 2007 ++++ base/utils.py Wed Oct 10 00:27:04 2007 +@@ -54,6 +54,50 @@ + + return callable + ++# For pidfile locking (must be "static" and global to the whole app) ++prv_pidfile = None ++prv_pidfile_name = "" ++ ++def get_pidfile_lock (a_pidfile_name=""): ++ """ Call this to either lock the pidfile, or to update it after a fork() ++ Credit: Henrique M. Holschuh <hmh@debian.org> ++ """ ++ global prv_pidfile ++ global prv_pidfile_name ++ if prv_pidfile_name == "": ++ try: ++ prv_pidfile_name = a_pidfile_name ++ prv_pidfile = os.fdopen(os.open(prv_pidfile_name, os.O_RDWR | os.O_CREAT, 0644), 'r+') ++ fcntl.fcntl(prv_pidfile.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC) ++ while 1: ++ try: ++ fcntl.flock(prv_pidfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB) ++ except (OSError, IOError), e: ++ if e.errno == errno.EINTR: ++ continue ++ elif e.errno == errno.EWOULDBLOCK: ++ try: ++ prv_pidfile.seek(0) ++ otherpid = int(prv_pidfile.readline(), 10) ++ sys.stderr.write ("can't lock %s, running daemon's pid may be %d\n" % (prv_pidfile_name, otherpid)) ++ except (OSError, IOError), e: ++ sys.stderr.write ("error reading pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ ++ sys.exit(1) ++ sys.stderr.write ("can't lock %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ sys.exit(1) ++ break ++ except (OSError, IOError), e: ++ sys.stderr.write ("can't open pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ sys.exit(1) ++ try: ++ prv_pidfile.seek(0) ++ prv_pidfile.write("%d\n" % (os.getpid())) ++ prv_pidfile.flush() ++ prv_pidfile.truncate() ++ except (OSError, IOError), e: ++ log.error("can't update pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ + def daemonize (stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): + """ + Credit: Jürgen Hermann, Andy Gimblett, and Noah Spurrier diff --git a/print/hplip/files/patch-configure b/print/hplip/files/patch-configure deleted file mode 100644 index 22f040c1d5c1..000000000000 --- a/print/hplip/files/patch-configure +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.bak Fri May 5 10:01:57 2006 -+++ configure Fri May 5 10:03:39 2006 -@@ -22100,29 +22100,9 @@ - echo "$as_me:$LINENO: result: \"using $CUPS_BACKEND_PATH\"" >&5 - echo "${ECHO_T}\"using $CUPS_BACKEND_PATH\"" >&6 - --ICONSEARCHPATH="/usr/lib/menu /usr/share/applications" --ICON="hplip hplip.desktop" -+ICON_PATH="/usr/share/applications" -+ICON_FILE="hplip.desktop" - --echo "$as_me:$LINENO: checking \"for icon directory\"" >&5 --echo $ECHO_N "checking \"for icon directory\"... $ECHO_C" >&6 --ICON_PATH="" --ICON_FILE="" --idx=1 --for i in $ICONSEARCHPATH; do -- if test -d "$i"; then -- ICON_PATH="$i" -- jdx=1 -- for j in $ICON; do -- if test "$jdx" = "$idx"; then -- break -- fi -- jdx=$jdx+1 -- done -- ICON_FILE="$j" -- break -- fi -- idx=$idx+1 --done - if test "$ICON_PATH" != ""; then - echo "$as_me:$LINENO: result: \"using $ICON_PATH/$ICON_FILE\"" >&5 - echo "${ECHO_T}\"using $ICON_PATH/$ICON_FILE\"" >&6 diff --git a/print/hplip/files/patch-hplip.conf b/print/hplip/files/patch-hplip.conf deleted file mode 100644 index 82d374200c3f..000000000000 --- a/print/hplip/files/patch-hplip.conf +++ /dev/null @@ -1,8 +0,0 @@ ---- hplip.conf.orig Mon Aug 7 03:19:37 2006 -+++ hplip.conf Mon Aug 7 03:20:58 2006 -@@ -6,3 +6,5 @@ - [hpssd] - # port=0 (dynamic IP port) - port=2207 (IANA IP port) -+[dirs] -+run=/var/run diff --git a/print/hplip/files/patch-hpssd.py b/print/hplip/files/patch-hpssd.py new file mode 100644 index 000000000000..f3e7a9c8b22e --- /dev/null +++ b/print/hplip/files/patch-hpssd.py @@ -0,0 +1,21 @@ +--- hpssd.py Fri Oct 12 19:42:15 2007 ++++ /usr/local/sbin/hpssd Fri Oct 12 23:59:31 2007 +@@ -664,6 +664,10 @@ + if prop.daemonize: + utils.daemonize() + ++ # Lock pidfile before we muck around with system state ++ # Patch by Henrique M. Holschuh <hmh@debian.org> ++ utils.get_pidfile_lock(os.path.join(sys_cfg.dirs.run, 'hpssd.pid')) ++ + # hpssd server dispatcher object + try: + server = hpssd_server(prop.hpssd_host, prop.hpssd_port) +@@ -688,6 +692,7 @@ + + log.debug("Cleaning up...") + finally: ++ os.remove(os.path.join(sys_cfg.dirs.run, 'hpssd.pid')) + server.close() + return 0 + diff --git a/print/hplip/files/patch-io_hpiod_device.cpp b/print/hplip/files/patch-io_hpiod_device.cpp deleted file mode 100644 index 13bd9bb419cd..000000000000 --- a/print/hplip/files/patch-io_hpiod_device.cpp +++ /dev/null @@ -1,262 +0,0 @@ ---- io/hpiod/device.cpp.orig Thu Jun 15 02:02:11 2006 -+++ io/hpiod/device.cpp Sun Jul 16 16:57:30 2006 -@@ -25,6 +25,9 @@ - \*****************************************************************************/ - - #include "hpiod.h" -+#ifdef __FreeBSD__ -+#include <dev/usb/usb.h> -+#endif - - const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.', - 'p','o','w','e','r',' ','1',';', -@@ -111,21 +114,240 @@ - - #elif defined(__FreeBSD__) - --/* -- * Anish Mistry amistry@am-productions.biz is working on libusb extensions for FreeBSD. His current implementation does not handle device exceptions (ie: paperout). -- * Once this issue is resolved we will be glade to add his code to the project. -- */ -- - int Device::Write(int fd, const void *buf, int size) - { -- syslog(LOG_ERR, "error Write: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__); -- return -1; -+ int nwrote, total, write_len, r, ep, endpoint_fd; -+ void *tmp_buf = (void *)buf; -+ fd_set ready; -+ char *pEndPoint = NULL; -+ -+ if (FD[fd].pHD == NULL) -+ { -+ syslog(LOG_ERR, "invalid Device::Write state: %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ -+ if ((ep = GetOutEP(dev, FD[fd].Config, FD[fd].Interface, FD[fd].AltSetting, USB_ENDPOINT_TYPE_BULK)) < 0) -+ { -+ syslog(LOG_ERR, "invalid bulk out endpoint %s %s %d\n", URI, __FILE__, __LINE__); -+ return -1; -+ } -+ -+ /* We only want the address, so mask out the direction bits */ -+ ep = (ep & USB_ENDPOINT_ADDRESS_MASK); -+ /* open endpoint */ -+ /* allocate data for the usb endpoint string */ -+ pEndPoint = (char *)malloc(strlen(dev->filename)+20); -+ if(!pEndPoint) -+ return -1; -+ /* create device endpoint name string */ -+ sprintf(pEndPoint, "%s.%d", dev->filename, ep); -+ -+ /* open the endpoint with read write access */ -+ endpoint_fd = open(pEndPoint, O_WRONLY, 0); -+ free(pEndPoint); -+ if(endpoint_fd < 0) -+ { -+ /* we failed to open the endpoint */ -+ return -1; -+ } -+ -+ total = size; -+ write_len = size; -+ -+ while (total > 0) -+ { -+ FD_ZERO(&ready); -+ FD_SET(endpoint_fd, &ready); -+ -+ if (!FD_ISSET(endpoint_fd, &ready)) -+ { -+ close(endpoint_fd); -+ return -1; -+ } -+ nwrote = write(endpoint_fd, tmp_buf, write_len); -+ -+ if (nwrote < 0) -+ { -+ close(endpoint_fd); -+ return -1; -+ } -+ -+ write_len -= nwrote; -+ tmp_buf = (void *)((long)tmp_buf + nwrote); -+ total -= nwrote; -+ } -+ -+ close(endpoint_fd); -+ return size; - } - - int Device::Read(int fd, void *buf, int size, int usec) - { -- syslog(LOG_ERR, "error Read: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__); -- return -2; -+ int nwrote, total, r, ep=0, endpoint_fd, i; -+ struct timeval t1, t2; -+ fd_set ready; -+ char *pEndPoint = NULL; -+ int bytes_want = 0; -+ int rlen = 0; -+ int bytes_read = 0; -+ int mili_timeout = usec/10; -+ unsigned char *pbuf_pos = NULL; -+ int total_usec, tmo_usec = usec; -+ -+ if (FD[fd].pHD == NULL) -+ { -+ syslog(LOG_ERR, "invalid Device::Read state: %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ -+ if ((ep = GetInEP(dev, FD[fd].Config, FD[fd].Interface, FD[fd].AltSetting, USB_ENDPOINT_TYPE_BULK)) < 0) -+ { -+ syslog(LOG_ERR, "invalid bulk in endpoint %s %s %d\n", URI, __FILE__, __LINE__); -+ return -1; -+ } -+ -+ /* We only want the address, so mask out the direction bits */ -+ ep = (ep & USB_ENDPOINT_ADDRESS_MASK); -+ /* open endpoint */ -+ /* allocate data for the usb endpoint string */ -+ pEndPoint = (char *)malloc(strlen(dev->filename)+20); -+ if(!pEndPoint) -+ return -1; -+ /* create device endpoint name string */ -+ sprintf(pEndPoint, "%s.%d", dev->filename, ep); -+ -+ /* open the endpoint with read write access */ -+ endpoint_fd = open(pEndPoint, O_RDONLY, 0); -+ if(endpoint_fd < 0) -+ { -+ /* we failed to open the endpoint */ -+ syslog(LOG_ERR, "unable to open bulk in endpoint (%s) %s %s %d\n", pEndPoint, URI, __FILE__, __LINE__); -+ free(pEndPoint); -+ return -1; -+ } -+ free(pEndPoint); -+ -+ /* set short transfer so that we can allow "short" reads since we -+ will don't know exactly -+ what is coming so we can't specify exact byte amounts */ -+ i = 1; -+ if (ioctl(endpoint_fd, USB_SET_SHORT_XFER, &i) < 0) -+ { -+ syslog(LOG_ERR, "USB_SET_SHORT_XFER set failed Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ } -+ -+ /* 0 timeout value will cause us the wait until the device has data -+ available or is disconnected */ -+ if (ioctl(endpoint_fd, USB_SET_TIMEOUT, &mili_timeout) < 0) -+ { -+ syslog(LOG_ERR, "USB_SET_TIMEOUT set failed Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ } -+ -+ gettimeofday (&t1, NULL); /* get start time */ -+ -+ if (FD[fd].ucnt > 0) -+ { -+ /* copy buffered data to storage */ -+ if (size <= FD[fd].ucnt) -+ { -+ memcpy(buf, FD[fd].ubuf, size); -+ FD[fd].uindex += size; -+ FD[fd].ucnt -= size; -+ bytes_read = size; -+ } -+ else -+ { -+ memcpy(buf, FD[fd].ubuf, FD[fd].ucnt); -+ bytes_read += FD[fd].ucnt; -+ FD[fd].ucnt = 0; -+ } -+ } -+ else if (FD[fd].ucnt == 0 && bytes_read < size) -+ { -+ /* reset data buffer */ -+ FD[fd].uindex = 0; -+ /* offset storage to not overwrite data copied from the buffer */ -+ pbuf_pos = (unsigned char *)((long)buf + bytes_read); -+ bytes_want = size - bytes_read; -+ do -+ { -+ if (bytes_want >= BUFFER_SIZE) -+ { -+ /* check to see if the device is ready for a read */ -+ FD_ZERO(&ready); -+ FD_SET(endpoint_fd, &ready); -+ if (!FD_ISSET(endpoint_fd, &ready)) -+ { -+ syslog(LOG_ERR, "timeout Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ errno = ETIMEDOUT; -+ return -1; -+ } -+ /* read directly into storage */ -+ rlen = read(endpoint_fd, pbuf_pos, BUFFER_SIZE); -+ if (rlen < 0) -+ { -+ syslog(LOG_ERR, "error Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ bytes_read += rlen; -+ bytes_want -= rlen; -+ pbuf_pos += rlen; -+ } -+ else if (bytes_want < BUFFER_SIZE) -+ { -+ /* check to see if the device is ready for a read */ -+ FD_ZERO(&ready); -+ FD_SET(endpoint_fd, &ready); -+ if (!FD_ISSET(endpoint_fd, &ready)) -+ { -+ syslog(LOG_ERR, "timeout Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ errno = ETIMEDOUT; -+ return -1; -+ } -+ /* read to buffer */ -+ rlen = read(endpoint_fd, FD[fd].ubuf, BUFFER_SIZE); -+ if (rlen < 0) -+ { -+ syslog(LOG_ERR, "error Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ if (rlen >= bytes_want) -+ { -+ memcpy(pbuf_pos, FD[fd].ubuf, -+ bytes_want); -+ FD[fd].uindex += bytes_want; -+ FD[fd].ucnt = rlen - bytes_want; -+ bytes_read += bytes_want; -+ bytes_want = 0; -+ } -+ else -+ { -+ memcpy(pbuf_pos, FD[fd].ubuf, rlen); -+ bytes_want -= rlen; -+ bytes_read += rlen; -+ pbuf_pos += rlen; -+ } -+ } -+ /* Bulk_read has a timeout, but bulk_read can return zero byte packet(s), so we must use our own timeout here. */ -+ gettimeofday(&t2, NULL); /* get current time */ -+ -+ total_usec = (t2.tv_sec - t1.tv_sec)*1000000; -+ total_usec += (t2.tv_usec > t1.tv_usec) ? t2.tv_usec - t1.tv_usec : t1.tv_usec - t2.tv_usec; -+ if (total_usec > usec) -+ { -+ size = -1; /* timeout */ -+ errno = ETIMEDOUT; -+ break; -+ } -+ tmo_usec = usec - total_usec; /* decrease timeout */ -+ continue; -+ } -+ while (bytes_want > 0); -+ } -+ -+ close(endpoint_fd); -+ return size; - } - - #else diff --git a/print/hplip/files/patch-io_hpiod_dot4.cpp b/print/hplip/files/patch-io_hpiod_dot4.cpp deleted file mode 100644 index 62ebdadeae36..000000000000 --- a/print/hplip/files/patch-io_hpiod_dot4.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- io/hpiod/dot4.cpp.orig Tue May 23 15:30:04 2006 -+++ io/hpiod/dot4.cpp Tue May 23 15:32:37 2006 -@@ -78,6 +78,7 @@ - Dot4Channel *pC=NULL; - int i, len, size; - unsigned char socket; -+ static int cnt=0; - - pCmd = (DOT4Cmd *)buf; - -@@ -130,7 +131,7 @@ - Dot4ForwardReply(fd, (unsigned char *)pCreditReply, sizeof(DOT4CreditReply)); - break; - case DOT4_CREDIT_REQUEST: -- static int cnt=0; -+ cnt=0; - pCreditReq = (DOT4CreditRequest *)buf; - if (cnt++ < 5) - syslog(LOG_ERR, "unexpected DOT4CreditRequest: cmd=%x, hid=%x, pid=%x, maxcredit=%d: %s %d\n", pCreditReq->cmd, diff --git a/print/hplip/files/patch-io_hpiod_mlc.cpp b/print/hplip/files/patch-io_hpiod_mlc.cpp deleted file mode 100644 index a2c186607052..000000000000 --- a/print/hplip/files/patch-io_hpiod_mlc.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- io/hpiod/mlc.cpp.orig Tue May 23 15:27:16 2006 -+++ io/hpiod/mlc.cpp Tue May 23 15:29:40 2006 -@@ -73,6 +73,7 @@ - MLCError *pError; - MlcChannel *pC; - int i, len, size; -+ static int cnt=0; - - pCmd = (MLCCmd *)buf; - -@@ -122,7 +123,7 @@ - MlcForwardReply(fd, (unsigned char *)pCreditReply, sizeof(MLCCreditReply)); - break; - case MLC_CREDIT_REQUEST: -- static int cnt=0; -+ cnt = 0; - pCreditReq = (MLCCreditRequest *)buf; - if (cnt++ < 5) - syslog(LOG_ERR, "unexpected MLCCreditRequest: cmd=%x, hid=%x, pid=%x, credit=%d: %s %d\n", pCreditReq->cmd, diff --git a/print/hplip/files/patch-io_hpiod_system.cpp b/print/hplip/files/patch-io_hpiod_system.cpp deleted file mode 100644 index c8fd116dcd6c..000000000000 --- a/print/hplip/files/patch-io_hpiod_system.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- io/hpiod/system.cpp.orig Mon Jul 23 14:08:51 2007 -+++ io/hpiod/system.cpp Mon Jul 23 14:09:52 2007 -@@ -633,7 +633,7 @@ - list_for_each(p, &head.list) - { - psa = list_entry(p, SessionAttributes, list); -- lstLen += sprintf(lst+lstLen, "t[%d] d[%d] socket=%d\n", (int)psa->tid, psa->descriptor, psa->sockid); -+ lstLen += sprintf(lst+lstLen, "t[%d] d[%d] socket=%d\n", (unsigned long)psa->tid, psa->descriptor, psa->sockid); - } - - len = sprintf(sendBuf, "msg=PStateResult\nresult-code=%d\nlength=%d\ndata:\n%s", R_AOK, lstLen, lst); diff --git a/print/hplip/files/patch-pcard_fat.c b/print/hplip/files/patch-pcard_fat.c deleted file mode 100644 index 805b9ba39d47..000000000000 --- a/print/hplip/files/patch-pcard_fat.c +++ /dev/null @@ -1,14 +0,0 @@ ---- pcard/fat.c.orig Tue May 23 15:25:02 2006 -+++ pcard/fat.c Tue May 23 15:25:54 2006 -@@ -27,7 +27,11 @@ - \*****************************************************************************/ - - #include <stdlib.h> -+#ifdef __FreeBSD__ -+#include <inttypes.h> -+#else - #include <stdint.h> -+#endif - #include <stdio.h> - #include <string.h> - #include <unistd.h> diff --git a/print/hplip/files/patch-pcard_pcardext_pcardext.c b/print/hplip/files/patch-pcard_pcardext_pcardext.c deleted file mode 100644 index 133c6b2c5879..000000000000 --- a/print/hplip/files/patch-pcard_pcardext_pcardext.c +++ /dev/null @@ -1,19 +0,0 @@ ---- pcard/pcardext/pcardext.c.orig Tue May 23 15:43:36 2006 -+++ pcard/pcardext/pcardext.c Tue May 23 15:44:43 2006 -@@ -80,6 +80,7 @@ - - PyObject * pcardext_mount( PyObject * self, PyObject * args ) - { -+ int i; - if( !PyArg_ParseTuple( args, "OO", &readsectorFunc, &writesectorFunc ) ) - { - return Py_BuildValue( "i", 1 ); -@@ -93,7 +94,7 @@ - Py_INCREF( readsectorFunc ); - Py_INCREF( writesectorFunc ); - -- int i = FatInit(); -+ i = FatInit(); - /*char buf[1024]; - sprintf( buf, "print 'FatInit()=%d\n'", i ); - PyRun_SimpleString( buf );*/ diff --git a/print/hplip/files/patch-prnt_hpijs_configure b/print/hplip/files/patch-prnt_hpijs_configure deleted file mode 100644 index 7e6c63c94649..000000000000 --- a/print/hplip/files/patch-prnt_hpijs_configure +++ /dev/null @@ -1,56 +0,0 @@ ---- prnt/hpijs/configure.orig Wed Oct 18 00:58:44 2006 -+++ prnt/hpijs/configure Wed Oct 18 01:04:20 2006 -@@ -8481,7 +8481,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8539,7 +8539,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 - echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 - if test $ac_cv_lib_dl_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" - else - - lt_cv_dlopen="dyld" -@@ -8807,7 +8807,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8865,7 +8865,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 - echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 - if test $ac_cv_lib_dl_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" - else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 - echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -@@ -20319,7 +20319,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20380,7 +20380,7 @@ - cat >>confdefs.h <<\_ACEOF - #define HAVE_LIBDL 1 - _ACEOF -- LIBS="-ldl $LIBS" -+ LIBS="$LIBS" - else - { { echo "$as_me:$LINENO: error: \"cannot find libdl support\"" >&5 - echo "$as_me: error: \"cannot find libdl support\"" >&2;}
\ No newline at end of file diff --git a/print/hplip/files/patch-prnt_hpijs_djgenericvip.h b/print/hplip/files/patch-prnt_hpijs_djgenericvip.h deleted file mode 100644 index b6641350f13a..000000000000 --- a/print/hplip/files/patch-prnt_hpijs_djgenericvip.h +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr hplip-2.7.6.old/prnt/hpijs/djgenericvip.h hplip-2.7.6.new/prnt/hpijs/djgenericvip.h ---- prnt/hpijs/djgenericvip.h.orig 2007-07-06 10:31:25.000000000 -0700 -+++ prnt/hpijs/djgenericvip.h 2007-07-06 10:48:25.000000000 -0700 -@@ -52,6 +52,7 @@ - virtual PHOTOTRAY_STATE PhotoTrayEngaged (BOOL bQueryPrinter); - //! Returns TRUE if a hagaki feed is present in printer. - virtual BOOL HagakiFeedPresent(BOOL bQueryPrinter); -+ virtual DATA_FORMAT GetDataFormat () { return RASTER_STRIP; } - - #ifdef APDK_AUTODUPLEX - //!Returns TRUE if duplexer and hagaki feed (combined) unit is present in printer. diff --git a/print/hplip/files/patch-prnt_hpijs_hpijsfax.cpp b/print/hplip/files/patch-prnt_hpijs_hpijsfax.cpp index 7a3675b9cdba..3f0d49e84a3a 100644 --- a/print/hplip/files/patch-prnt_hpijs_hpijsfax.cpp +++ b/print/hplip/files/patch-prnt_hpijs_hpijsfax.cpp @@ -1,25 +1,11 @@ ---- prnt/hpijs/hpijsfax.cpp.orig Tue Feb 21 13:19:54 2006 -+++ prnt/hpijs/hpijsfax.cpp Fri May 26 11:56:49 2006 -@@ -39,7 +39,11 @@ - #include <string.h> - #include <unistd.h> - #include <fcntl.h> -+#ifdef __FreeBSD__ -+#include <inttypes.h> -+#else - #include <stdint.h> -+#endif - #include <time.h> - #include <sys/time.h> - #include <math.h> -@@ -297,8 +301,8 @@ +--- prnt/hpijs/hpijsfax.cpp.orig Sat Oct 6 11:33:52 2007 ++++ prnt/hpijs/hpijsfax.cpp Sun Oct 7 15:06:23 2007 +@@ -295,7 +295,7 @@ memset (&tv, 0, sizeof (tv)); gettimeofday (&tv, NULL); - cur_time = localtime (&tv.tv_sec); -- memset (hpFileName, 0, 256); -+ cur_time = localtime ((const time_t *)&tv.tv_sec); -+ memset (hpFileName, 0, 256); ++ cur_time = localtime((const time_t *)&tv.tv_sec); + memset (hpFileName, 0, 256); sprintf (hpFileName, "%s/hplipfax%d%d%d%d%d%d.g3", getenv ("TMPDIR"), cur_time->tm_year+1900, cur_time->tm_mon+1, cur_time->tm_mday, - cur_time->tm_hour, cur_time->tm_min, cur_time->tm_sec); diff --git a/print/hplip/files/patch-scan_sane-mfpdtf.c b/print/hplip/files/patch-scan_sane-mfpdtf.c deleted file mode 100644 index 84fb6edefa58..000000000000 --- a/print/hplip/files/patch-scan_sane-mfpdtf.c +++ /dev/null @@ -1,56 +0,0 @@ ---- scan/sane/mfpdtf.c.orig Sat Nov 11 00:22:14 2006 -+++ scan/sane/mfpdtf.c Mon Dec 25 01:43:52 2006 -@@ -157,7 +157,7 @@ - int MfpdtfReadService( Mfpdtf_t mfpdtf ) - { - int result = 0; -- int datalen, blockLength, headerLength; -+ int datalen, blockLength, headerLength, r; - - if( mfpdtf->read.fixedBlockBytesRemaining <= 0 ) - { -@@ -169,7 +169,7 @@ - - //READ( &mfpdtf->read.fixedHeader, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.fixedHeader, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.fixedHeader, datalen ); - - if( r!= datalen ) - { -@@ -207,7 +207,7 @@ - - //READ( mfpdtf->read.pVariantHeader, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)mfpdtf->read.pVariantHeader, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)mfpdtf->read.pVariantHeader, datalen ); - - if( r!= datalen ) - { -@@ -259,7 +259,7 @@ - - //READ( &id, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&id, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&id, datalen ); - - if( r!= datalen ) - { -@@ -296,7 +296,7 @@ - datalen = sizeof( mfpdtf->read.imageStartPageRecord ); - // DBG( 0, "Reading start of page record.\n" ); - // DBG( 0, "********************************** SOP RECORD **********************************.\n" ); -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); - - if( r!= datalen ) - { -@@ -314,7 +314,7 @@ - datalen = sizeof( mfpdtf->read.imageEndPageRecord ); - // DBG( 0, "Reading end of page record.\n" ); - // DBG( 0, "********************************** EOP RECORD **********************************.\n" ); -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); - - if( r!= datalen ) - { diff --git a/print/hplip/files/patch-scan_sane-pml.c b/print/hplip/files/patch-scan_sane-pml.c deleted file mode 100644 index 0bb93d4eb03a..000000000000 --- a/print/hplip/files/patch-scan_sane-pml.c +++ /dev/null @@ -1,20 +0,0 @@ ---- scan/sane/pml.c.orig Tue May 23 15:13:18 2006 -+++ scan/sane/pml.c Tue May 23 15:13:55 2006 -@@ -725,7 +725,7 @@ - IP_IMAGE_TRAITS traits; - IP_XFORM_SPEC xforms[IP_MAX_XFORMS], * pXform = xforms; - int stat = SANE_STATUS_DEVICE_BUSY; -- int i, bsize, state, wResult, index, r; -+ int i, bsize, state, wResult, index, r, mmWidth; - int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0; - - if (hpaio->cmd_channelid < 0) -@@ -919,7 +919,7 @@ - hpaio->scanParameters.lines = MILLIMETERS_TO_PIXELS(hpaio->bryRange.max, hpaio->effectiveResolution); - } - -- int mmWidth = PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effectiveResolution); -+ mmWidth = PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effectiveResolution); - - /* Set up X_CROP xform. */ - pXform->aXformInfo[IP_CROP_LEFT].dword = MILLIMETERS_TO_PIXELS( hpaio->effectiveTlx, hpaio->effectiveResolution ); diff --git a/print/hplip/pkg-install b/print/hplip/pkg-install index 79d5edf4ecf6..e6f2dc26c7ed 100644 --- a/print/hplip/pkg-install +++ b/print/hplip/pkg-install @@ -8,32 +8,10 @@ DLLFILE=${PKG_PREFIX}/etc/sane.d/dll.conf case $2 in POST-INSTALL) - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /nonexistent -s /sbin/nologin -c "HPLIP Server" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi echo "hpaio" >> ${DLLFILE} ;; POST-DEINSTALL) - if pw user show "${USER}" 2>/dev/null; then - if pw userdel ${USER}; then - echo "Removed user \"${USER}\"." - else - echo "Removing user \"${USER}\" failed..." - exit 1 - fi - else - echo "User \"${USER}\" doesn't exist!" - fi cp ${DLLFILE} ${DLLFILE}.orig cat ${DLLFILE}.orig | grep -v hpaio > ${DLLFILE} rm ${DLLFILE}.orig diff --git a/print/hplip/pkg-message b/print/hplip/pkg-message index d310fdf4dc2d..9ebb2c083a13 100644 --- a/print/hplip/pkg-message +++ b/print/hplip/pkg-message @@ -1,15 +1,28 @@ ********************************************************** + +**************** UPGRADE FROM 1.X NOTICE ***************** + +NOTE: If you are upgrading from 1.x you will need to +change your devfs ruleset as hpiod is now gone, so remove +it from you rc.conf. The printer communication now runs +through cupsd. You will need to make the devfs ruleset +changes to allow cups to access the usb bus and ugen +devices so that it can enumerate the printers. You will +also need to update your hplip.conf. See the instructions +below. + +**************** UPGRADE FROM 1.X NOTICE ***************** + Add the following to your rc.conf: -hpiod_enable="YES" hpssd_enable="YES" -The default setup runs hpiod as the hplip user and adds -hplip to the operator group. So all you have to do if you -have a custom ruleset setup is add the following to that -ruleset in devfs.rules: +So all you have to do if you have a custom ruleset setup +is add the following to that ruleset in devfs.rules: -add path 'ugen*' group operator +add path 'usb*' group cups +add path 'usb*' mode 0660 +add path 'ugen*' group cups add path 'ugen*' mode 0660 If you have never setup devfs.rules please read the @@ -23,25 +36,19 @@ ulpt must NOT be loaded as a kernel module. If you are seeing device connection errors restart the printing chain with the following command. NOTE: It MUST be restarted in the stated order. -%%PREFIX%%/etc/rc.d/hpiod restart && \ %%PREFIX%%/etc/rc.d/hpssd restart && \ %%PREFIX%%/etc/rc.d/cupsd restart -If upgrading from version 0.9.11 add the following to -your %%PREFIX%%/etc/hp/hplip.conf: -[dirs] -run=/var/run -home=%%PREFIX%%/share/hplip -ppd=%%PREFIX%%/share/ppd - -Or just copy the hplip.conf.sample config. [Recommended] +If upgrading from a version < 2.7.9 copy the new +hplip.conf.sample config. cp %%PREFIX%%/etc/hp/hplip.conf.sample \ %%PREFIX%%/etc/hp/hplip.conf -If you are having problems check: +If you are still having problems check: http://am-productions.biz/docs/hplip.php -If you still having problems send the relevant part of -your /var/log/messages, console output from the hp-* +If you are still having problems send the relevant part +of your /var/log/messages, console output from the hp-* utility that you are trying to run, and your rc.conf + -devfs.rules files to the maintainer. +devfs.rules files and the output of "ls -l /dev" to the +maintainer. ********************************************************** diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist index c389182eb9c7..634054de5889 100644 --- a/print/hplip/pkg-plist +++ b/print/hplip/pkg-plist @@ -1,4 +1,3 @@ -bin/foomatic-rip bin/hp-align bin/hp-check bin/hp-clean @@ -11,6 +10,7 @@ bin/hp-makecopies bin/hp-makeuri bin/hp-print bin/hp-probe +bin/hp-scan bin/hp-sendfax bin/hp-setup bin/hp-testpage @@ -18,30 +18,32 @@ bin/hp-timedate bin/hp-toolbox bin/hp-unload bin/hpijs +@unexec if cmp -s %D/etc/hp/hplip.conf.sample %D/etc/hp/hplip.conf; then rm -f %D/etc/hp/hplip.conf; fi etc/hp/hplip.conf.sample +@exec if [ ! -f %D/etc/hp/hplip.conf ] ; then cp -p %D/%F %B/hplip.conf; fi lib/libhpip.la lib/libhpip.so lib/libhpip.so.0 -lib/libsane-hpaio.la -lib/libsane-hpaio.so -lib/libsane-hpaio.so.1 +lib/libhpmud.la +lib/libhpmud.so +lib/libhpmud.so.0 %%PYTHON_SITELIBDIR%%/cupsext.la %%PYTHON_SITELIBDIR%%/cupsext.so +%%PYTHON_SITELIBDIR%%/hpmudext.la +%%PYTHON_SITELIBDIR%%/hpmudext.so %%PYTHON_SITELIBDIR%%/pcardext.la %%PYTHON_SITELIBDIR%%/pcardext.so +%%PYTHON_SITELIBDIR%%/scanext.la +%%PYTHON_SITELIBDIR%%/scanext.so +lib/sane/libsane-hpaio.la lib/sane/libsane-hpaio.so lib/sane/libsane-hpaio.so.1 -lib/sane/libsane-hpaio.so.1.0.0 libexec/cups/backend/hp libexec/cups/backend/hpfax -libexec/cups/filter/foomatic-rip -sbin/hpiod sbin/hpssd share/applications/hplip.desktop -share/cups/model/foomatic-ppds -%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING -%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/README_LIBJPG %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/downloads.html @@ -53,25 +55,22 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/io.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/known.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/negative.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/hpaio.desc +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/uninstall.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/back.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/button.png -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/circular.gif %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_model_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_opening.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_printer_model.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/download.png -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon.ico -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon2.ico %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png @@ -207,6 +206,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make_install.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/permissions.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/rpm.html @@ -248,12 +248,34 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/laser.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/mono_laser_mfp.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/photosmart.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/scanjet.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/unsupported.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/system_requirements.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/device_classes.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/hpijs.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/align.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/check.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/clean.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/colorcal.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/fab.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/firmware.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/hpssd.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/install.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/probe.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/scan.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/timedate.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/unload.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/overview.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/page_sizes.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/printable_areas.html @@ -266,13 +288,560 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/io.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/network.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/other.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/printing.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/scanning.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/toolbox.html -%%DATADIR%%/COPYING +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2250.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2280.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2600.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2800.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_3000.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2605.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2700.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2800.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3000.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3800.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4500.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4700.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4730_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5M.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8500.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM1015.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP3505.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP4005.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_1200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_1220.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_1320_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2410.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2420.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2430.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3050.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3052.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3300_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3390.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4050_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4240.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4250.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4345_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4350.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4ML.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4MP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4Si_v2011.110.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4V.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4_Plus.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5200L.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5M.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5MP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si_Mopier.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_6MP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_8000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_8100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_8150_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9040.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9040_9050_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9050.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9055_9065_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M3027_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M3035_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M4345_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M5025_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M5035_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_P2015.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_P3004.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_P3005.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Mopier_240.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Mopier_320.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_1300_series.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_2300.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_3015.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_3020_3030.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_3380.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_4200_Series.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_4300_Series.ppd.gz +share/foomatic/db/source/PPD/HP/hp_business_inkjet_2300.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_2500.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_3700.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4600.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4610.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4650.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_5500.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/hp_officejet_9100_series.ppd.gz +share/foomatic/db/source/driver/hpijs.xml +share/foomatic/db/source/opt/hpijs-Duplex.xml +share/foomatic/db/source/opt/hpijs-InputSlot.xml +share/foomatic/db/source/opt/hpijs-Model.xml +share/foomatic/db/source/opt/hpijs-PageSize.xml +share/foomatic/db/source/opt/hpijs-PrintoutMode.xml +share/foomatic/db/source/opt/hpijs-Quality.xml +share/foomatic/db/source/printer/HP-2000C.xml +share/foomatic/db/source/printer/HP-2500C.xml +share/foomatic/db/source/printer/HP-2500CM.xml +share/foomatic/db/source/printer/HP-910.xml +share/foomatic/db/source/printer/HP-915.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_1000.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_1100.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_1200.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2200.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2230.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2250.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2250TN.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2280.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2300.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2600.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2800.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_3000.xml +share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1160.xml +share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1700.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_2500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3000.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3550.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3600.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3700.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3800.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4550.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4600.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4610.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4650.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4700.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4730_MFP.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5000.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5550.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5M.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_8500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_8550GN.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_9500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_9500_MFP.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_CP3505.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_CP4005.xml +share/foomatic/db/source/printer/HP-DesignJet_ColorPro_CAD.xml +share/foomatic/db/source/printer/HP-DeskJet_1100C.xml +share/foomatic/db/source/printer/HP-DeskJet_1120C.xml +share/foomatic/db/source/printer/HP-DeskJet_1125C.xml +share/foomatic/db/source/printer/HP-DeskJet_1200C.xml +share/foomatic/db/source/printer/HP-DeskJet_1220C.xml +share/foomatic/db/source/printer/HP-DeskJet_1280.xml +share/foomatic/db/source/printer/HP-DeskJet_1600C.xml +share/foomatic/db/source/printer/HP-DeskJet_3320.xml +share/foomatic/db/source/printer/HP-DeskJet_3325.xml +share/foomatic/db/source/printer/HP-DeskJet_3420.xml +share/foomatic/db/source/printer/HP-DeskJet_3425.xml +share/foomatic/db/source/printer/HP-DeskJet_350C.xml +share/foomatic/db/source/printer/HP-DeskJet_3520.xml +share/foomatic/db/source/printer/HP-DeskJet_3528.xml +share/foomatic/db/source/printer/HP-DeskJet_3535.xml +share/foomatic/db/source/printer/HP-DeskJet_3550.xml +share/foomatic/db/source/printer/HP-DeskJet_3558.xml +share/foomatic/db/source/printer/HP-DeskJet_3650.xml +share/foomatic/db/source/printer/HP-DeskJet_3658.xml +share/foomatic/db/source/printer/HP-DeskJet_3668.xml +share/foomatic/db/source/printer/HP-DeskJet_3740.xml +share/foomatic/db/source/printer/HP-DeskJet_3810.xml +share/foomatic/db/source/printer/HP-DeskJet_3816.xml +share/foomatic/db/source/printer/HP-DeskJet_3820.xml +share/foomatic/db/source/printer/HP-DeskJet_3822.xml +share/foomatic/db/source/printer/HP-DeskJet_3840.xml +share/foomatic/db/source/printer/HP-DeskJet_3845.xml +share/foomatic/db/source/printer/HP-DeskJet_3920.xml +share/foomatic/db/source/printer/HP-DeskJet_3940.xml +share/foomatic/db/source/printer/HP-DeskJet_400.xml +share/foomatic/db/source/printer/HP-DeskJet_420C.xml +share/foomatic/db/source/printer/HP-DeskJet_450.xml +share/foomatic/db/source/printer/HP-DeskJet_460.xml +share/foomatic/db/source/printer/HP-DeskJet_500.xml +share/foomatic/db/source/printer/HP-DeskJet_500C.xml +share/foomatic/db/source/printer/HP-DeskJet_505J_Plus.xml +share/foomatic/db/source/printer/HP-DeskJet_510.xml +share/foomatic/db/source/printer/HP-DeskJet_5150.xml +share/foomatic/db/source/printer/HP-DeskJet_5158.xml +share/foomatic/db/source/printer/HP-DeskJet_5160.xml +share/foomatic/db/source/printer/HP-DeskJet_520.xml +share/foomatic/db/source/printer/HP-DeskJet_540C.xml +share/foomatic/db/source/printer/HP-DeskJet_5440.xml +share/foomatic/db/source/printer/HP-DeskJet_550C.xml +share/foomatic/db/source/printer/HP-DeskJet_5550.xml +share/foomatic/db/source/printer/HP-DeskJet_5551.xml +share/foomatic/db/source/printer/HP-DeskJet_560C.xml +share/foomatic/db/source/printer/HP-DeskJet_5650.xml +share/foomatic/db/source/printer/HP-DeskJet_5652.xml +share/foomatic/db/source/printer/HP-DeskJet_5670.xml +share/foomatic/db/source/printer/HP-DeskJet_5740.xml +share/foomatic/db/source/printer/HP-DeskJet_5850.xml +share/foomatic/db/source/printer/HP-DeskJet_5940.xml +share/foomatic/db/source/printer/HP-DeskJet_600.xml +share/foomatic/db/source/printer/HP-DeskJet_610C.xml +share/foomatic/db/source/printer/HP-DeskJet_610CL.xml +share/foomatic/db/source/printer/HP-DeskJet_6122.xml +share/foomatic/db/source/printer/HP-DeskJet_6127.xml +share/foomatic/db/source/printer/HP-DeskJet_612C.xml +share/foomatic/db/source/printer/HP-DeskJet_630C.xml +share/foomatic/db/source/printer/HP-DeskJet_632C.xml +share/foomatic/db/source/printer/HP-DeskJet_640C.xml +share/foomatic/db/source/printer/HP-DeskJet_648C.xml +share/foomatic/db/source/printer/HP-DeskJet_6520.xml +share/foomatic/db/source/printer/HP-DeskJet_6540.xml +share/foomatic/db/source/printer/HP-DeskJet_656C.xml +share/foomatic/db/source/printer/HP-DeskJet_6600.xml +share/foomatic/db/source/printer/HP-DeskJet_660C.xml +share/foomatic/db/source/printer/HP-DeskJet_670C.xml +share/foomatic/db/source/printer/HP-DeskJet_670TV.xml +share/foomatic/db/source/printer/HP-DeskJet_672C.xml +share/foomatic/db/source/printer/HP-DeskJet_6800.xml +share/foomatic/db/source/printer/HP-DeskJet_680C.xml +share/foomatic/db/source/printer/HP-DeskJet_682C.xml +share/foomatic/db/source/printer/HP-DeskJet_6840.xml +share/foomatic/db/source/printer/HP-DeskJet_690C.xml +share/foomatic/db/source/printer/HP-DeskJet_692C.xml +share/foomatic/db/source/printer/HP-DeskJet_693C.xml +share/foomatic/db/source/printer/HP-DeskJet_6940.xml +share/foomatic/db/source/printer/HP-DeskJet_694C.xml +share/foomatic/db/source/printer/HP-DeskJet_695C.xml +share/foomatic/db/source/printer/HP-DeskJet_697C.xml +share/foomatic/db/source/printer/HP-DeskJet_6980.xml +share/foomatic/db/source/printer/HP-DeskJet_810C.xml +share/foomatic/db/source/printer/HP-DeskJet_812C.xml +share/foomatic/db/source/printer/HP-DeskJet_815C.xml +share/foomatic/db/source/printer/HP-DeskJet_816C.xml +share/foomatic/db/source/printer/HP-DeskJet_825C.xml +share/foomatic/db/source/printer/HP-DeskJet_830C.xml +share/foomatic/db/source/printer/HP-DeskJet_832C.xml +share/foomatic/db/source/printer/HP-DeskJet_840C.xml +share/foomatic/db/source/printer/HP-DeskJet_841C.xml +share/foomatic/db/source/printer/HP-DeskJet_842C.xml +share/foomatic/db/source/printer/HP-DeskJet_843C.xml +share/foomatic/db/source/printer/HP-DeskJet_845C.xml +share/foomatic/db/source/printer/HP-DeskJet_850C.xml +share/foomatic/db/source/printer/HP-DeskJet_855C.xml +share/foomatic/db/source/printer/HP-DeskJet_870C.xml +share/foomatic/db/source/printer/HP-DeskJet_880C.xml +share/foomatic/db/source/printer/HP-DeskJet_882C.xml +share/foomatic/db/source/printer/HP-DeskJet_890C.xml +share/foomatic/db/source/printer/HP-DeskJet_895C.xml +share/foomatic/db/source/printer/HP-DeskJet_916C.xml +share/foomatic/db/source/printer/HP-DeskJet_920C.xml +share/foomatic/db/source/printer/HP-DeskJet_9300.xml +share/foomatic/db/source/printer/HP-DeskJet_930C.xml +share/foomatic/db/source/printer/HP-DeskJet_932C.xml +share/foomatic/db/source/printer/HP-DeskJet_933C.xml +share/foomatic/db/source/printer/HP-DeskJet_934C.xml +share/foomatic/db/source/printer/HP-DeskJet_935C.xml +share/foomatic/db/source/printer/HP-DeskJet_940C.xml +share/foomatic/db/source/printer/HP-DeskJet_948C.xml +share/foomatic/db/source/printer/HP-DeskJet_950C.xml +share/foomatic/db/source/printer/HP-DeskJet_952C.xml +share/foomatic/db/source/printer/HP-DeskJet_955C.xml +share/foomatic/db/source/printer/HP-DeskJet_957C.xml +share/foomatic/db/source/printer/HP-DeskJet_959C.xml +share/foomatic/db/source/printer/HP-DeskJet_9600.xml +share/foomatic/db/source/printer/HP-DeskJet_960C.xml +share/foomatic/db/source/printer/HP-DeskJet_970C.xml +share/foomatic/db/source/printer/HP-DeskJet_975C.xml +share/foomatic/db/source/printer/HP-DeskJet_9800.xml +share/foomatic/db/source/printer/HP-DeskJet_980C.xml +share/foomatic/db/source/printer/HP-DeskJet_990C.xml +share/foomatic/db/source/printer/HP-DeskJet_995C.xml +share/foomatic/db/source/printer/HP-DeskJet_D1300.xml +share/foomatic/db/source/printer/HP-DeskJet_D1400.xml +share/foomatic/db/source/printer/HP-DeskJet_D2300.xml +share/foomatic/db/source/printer/HP-DeskJet_D2400.xml +share/foomatic/db/source/printer/HP-DeskJet_D4100.xml +share/foomatic/db/source/printer/HP-DeskJet_D4200.xml +share/foomatic/db/source/printer/HP-DeskJet_F2100.xml +share/foomatic/db/source/printer/HP-DeskJet_F300.xml +share/foomatic/db/source/printer/HP-DeskJet_F4100.xml +share/foomatic/db/source/printer/HP-LaserJet_1010.xml +share/foomatic/db/source/printer/HP-LaserJet_1012.xml +share/foomatic/db/source/printer/HP-LaserJet_1015.xml +share/foomatic/db/source/printer/HP-LaserJet_1022.xml +share/foomatic/db/source/printer/HP-LaserJet_1100.xml +share/foomatic/db/source/printer/HP-LaserJet_1100A.xml +share/foomatic/db/source/printer/HP-LaserJet_1150.xml +share/foomatic/db/source/printer/HP-LaserJet_1160.xml +share/foomatic/db/source/printer/HP-LaserJet_1200.xml +share/foomatic/db/source/printer/HP-LaserJet_1220.xml +share/foomatic/db/source/printer/HP-LaserJet_1300.xml +share/foomatic/db/source/printer/HP-LaserJet_1320.xml +share/foomatic/db/source/printer/HP-LaserJet_2100.xml +share/foomatic/db/source/printer/HP-LaserJet_2100M.xml +share/foomatic/db/source/printer/HP-LaserJet_2200.xml +share/foomatic/db/source/printer/HP-LaserJet_2300.xml +share/foomatic/db/source/printer/HP-LaserJet_2410.xml +share/foomatic/db/source/printer/HP-LaserJet_2420.xml +share/foomatic/db/source/printer/HP-LaserJet_2430.xml +share/foomatic/db/source/printer/HP-LaserJet_3015.xml +share/foomatic/db/source/printer/HP-LaserJet_3020.xml +share/foomatic/db/source/printer/HP-LaserJet_3030.xml +share/foomatic/db/source/printer/HP-LaserJet_3050.xml +share/foomatic/db/source/printer/HP-LaserJet_3052.xml +share/foomatic/db/source/printer/HP-LaserJet_3055.xml +share/foomatic/db/source/printer/HP-LaserJet_3200.xml +share/foomatic/db/source/printer/HP-LaserJet_3200m.xml +share/foomatic/db/source/printer/HP-LaserJet_3200se.xml +share/foomatic/db/source/printer/HP-LaserJet_3300_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3310_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3320N_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3320_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3330_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3380.xml +share/foomatic/db/source/printer/HP-LaserJet_3390.xml +share/foomatic/db/source/printer/HP-LaserJet_3392.xml +share/foomatic/db/source/printer/HP-LaserJet_4.xml +share/foomatic/db/source/printer/HP-LaserJet_4000.xml +share/foomatic/db/source/printer/HP-LaserJet_4050.xml +share/foomatic/db/source/printer/HP-LaserJet_4100.xml +share/foomatic/db/source/printer/HP-LaserJet_4200.xml +share/foomatic/db/source/printer/HP-LaserJet_4240.xml +share/foomatic/db/source/printer/HP-LaserJet_4250.xml +share/foomatic/db/source/printer/HP-LaserJet_4300.xml +share/foomatic/db/source/printer/HP-LaserJet_4345_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_4350.xml +share/foomatic/db/source/printer/HP-LaserJet_4L.xml +share/foomatic/db/source/printer/HP-LaserJet_4M.xml +share/foomatic/db/source/printer/HP-LaserJet_4ML.xml +share/foomatic/db/source/printer/HP-LaserJet_4P.xml +share/foomatic/db/source/printer/HP-LaserJet_4Si.xml +share/foomatic/db/source/printer/HP-LaserJet_4V.xml +share/foomatic/db/source/printer/HP-LaserJet_4V_4LJ_Pro.xml +share/foomatic/db/source/printer/HP-LaserJet_4_Plus.xml +share/foomatic/db/source/printer/HP-LaserJet_5.xml +share/foomatic/db/source/printer/HP-LaserJet_5000.xml +share/foomatic/db/source/printer/HP-LaserJet_5100.xml +share/foomatic/db/source/printer/HP-LaserJet_5200.xml +share/foomatic/db/source/printer/HP-LaserJet_5200L.xml +share/foomatic/db/source/printer/HP-LaserJet_5L.xml +share/foomatic/db/source/printer/HP-LaserJet_5M.xml +share/foomatic/db/source/printer/HP-LaserJet_5MP.xml +share/foomatic/db/source/printer/HP-LaserJet_5P.xml +share/foomatic/db/source/printer/HP-LaserJet_5Si.xml +share/foomatic/db/source/printer/HP-LaserJet_6.xml +share/foomatic/db/source/printer/HP-LaserJet_6L.xml +share/foomatic/db/source/printer/HP-LaserJet_6MP.xml +share/foomatic/db/source/printer/HP-LaserJet_6P.xml +share/foomatic/db/source/printer/HP-LaserJet_8000.xml +share/foomatic/db/source/printer/HP-LaserJet_8100.xml +share/foomatic/db/source/printer/HP-LaserJet_8150.xml +share/foomatic/db/source/printer/HP-LaserJet_9000.xml +share/foomatic/db/source/printer/HP-LaserJet_9000_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9040.xml +share/foomatic/db/source/printer/HP-LaserJet_9040_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9050.xml +share/foomatic/db/source/printer/HP-LaserJet_9050_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9055_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9065_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M3027_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M3035_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M4345_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M5025_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M5035_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_P2010.xml +share/foomatic/db/source/printer/HP-LaserJet_P2015.xml +share/foomatic/db/source/printer/HP-LaserJet_P3004.xml +share/foomatic/db/source/printer/HP-LaserJet_P3005.xml +share/foomatic/db/source/printer/HP-Mopier_240.xml +share/foomatic/db/source/printer/HP-Mopier_320.xml +share/foomatic/db/source/printer/HP-OfficeJet.xml +share/foomatic/db/source/printer/HP-OfficeJet_300.xml +share/foomatic/db/source/printer/HP-OfficeJet_330.xml +share/foomatic/db/source/printer/HP-OfficeJet_350.xml +share/foomatic/db/source/printer/HP-OfficeJet_4100.xml +share/foomatic/db/source/printer/HP-OfficeJet_4105.xml +share/foomatic/db/source/printer/HP-OfficeJet_4110.xml +share/foomatic/db/source/printer/HP-OfficeJet_4115.xml +share/foomatic/db/source/printer/HP-OfficeJet_4200.xml +share/foomatic/db/source/printer/HP-OfficeJet_4300.xml +share/foomatic/db/source/printer/HP-OfficeJet_500.xml +share/foomatic/db/source/printer/HP-OfficeJet_5105.xml +share/foomatic/db/source/printer/HP-OfficeJet_5110.xml +share/foomatic/db/source/printer/HP-OfficeJet_5110xi.xml +share/foomatic/db/source/printer/HP-OfficeJet_520.xml +share/foomatic/db/source/printer/HP-OfficeJet_5500.xml +share/foomatic/db/source/printer/HP-OfficeJet_5600.xml +share/foomatic/db/source/printer/HP-OfficeJet_570.xml +share/foomatic/db/source/printer/HP-OfficeJet_580.xml +share/foomatic/db/source/printer/HP-OfficeJet_590.xml +share/foomatic/db/source/printer/HP-OfficeJet_600.xml +share/foomatic/db/source/printer/HP-OfficeJet_610.xml +share/foomatic/db/source/printer/HP-OfficeJet_6100.xml +share/foomatic/db/source/printer/HP-OfficeJet_6105.xml +share/foomatic/db/source/printer/HP-OfficeJet_6110.xml +share/foomatic/db/source/printer/HP-OfficeJet_6150.xml +share/foomatic/db/source/printer/HP-OfficeJet_6200.xml +share/foomatic/db/source/printer/HP-OfficeJet_625.xml +share/foomatic/db/source/printer/HP-OfficeJet_630.xml +share/foomatic/db/source/printer/HP-OfficeJet_6300.xml +share/foomatic/db/source/printer/HP-OfficeJet_635.xml +share/foomatic/db/source/printer/HP-OfficeJet_700.xml +share/foomatic/db/source/printer/HP-OfficeJet_710.xml +share/foomatic/db/source/printer/HP-OfficeJet_7100.xml +share/foomatic/db/source/printer/HP-OfficeJet_7110.xml +share/foomatic/db/source/printer/HP-OfficeJet_7130.xml +share/foomatic/db/source/printer/HP-OfficeJet_7140.xml +share/foomatic/db/source/printer/HP-OfficeJet_720.xml +share/foomatic/db/source/printer/HP-OfficeJet_7200.xml +share/foomatic/db/source/printer/HP-OfficeJet_725.xml +share/foomatic/db/source/printer/HP-OfficeJet_7300.xml +share/foomatic/db/source/printer/HP-OfficeJet_7400.xml +share/foomatic/db/source/printer/HP-OfficeJet_D125.xml +share/foomatic/db/source/printer/HP-OfficeJet_D135.xml +share/foomatic/db/source/printer/HP-OfficeJet_D145.xml +share/foomatic/db/source/printer/HP-OfficeJet_D155.xml +share/foomatic/db/source/printer/HP-OfficeJet_G55.xml +share/foomatic/db/source/printer/HP-OfficeJet_G85.xml +share/foomatic/db/source/printer/HP-OfficeJet_G95.xml +share/foomatic/db/source/printer/HP-OfficeJet_J3600.xml +share/foomatic/db/source/printer/HP-OfficeJet_J5500.xml +share/foomatic/db/source/printer/HP-OfficeJet_J5700.xml +share/foomatic/db/source/printer/HP-OfficeJet_K60.xml +share/foomatic/db/source/printer/HP-OfficeJet_K60xi.xml +share/foomatic/db/source/printer/HP-OfficeJet_K80.xml +share/foomatic/db/source/printer/HP-OfficeJet_K80xi.xml +share/foomatic/db/source/printer/HP-OfficeJet_LX.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_1150C.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_1170C.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_1175C.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5300.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5400.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K550.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K850.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7300.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7500.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7600.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7700.xml +share/foomatic/db/source/printer/HP-OfficeJet_R40.xml +share/foomatic/db/source/printer/HP-OfficeJet_R45.xml +share/foomatic/db/source/printer/HP-OfficeJet_R60.xml +share/foomatic/db/source/printer/HP-OfficeJet_R65.xml +share/foomatic/db/source/printer/HP-OfficeJet_R80.xml +share/foomatic/db/source/printer/HP-OfficeJet_T45.xml +share/foomatic/db/source/printer/HP-OfficeJet_T65.xml +share/foomatic/db/source/printer/HP-OfficeJet_V40.xml +share/foomatic/db/source/printer/HP-OfficeJet_V40xi.xml +share/foomatic/db/source/printer/HP-Officejet_K7100.xml +share/foomatic/db/source/printer/HP-PSC_1100.xml +share/foomatic/db/source/printer/HP-PSC_1110.xml +share/foomatic/db/source/printer/HP-PSC_1200.xml +share/foomatic/db/source/printer/HP-PSC_1205.xml +share/foomatic/db/source/printer/HP-PSC_1210.xml +share/foomatic/db/source/printer/HP-PSC_1300.xml +share/foomatic/db/source/printer/HP-PSC_1310.xml +share/foomatic/db/source/printer/HP-PSC_1400.xml +share/foomatic/db/source/printer/HP-PSC_1500.xml +share/foomatic/db/source/printer/HP-PSC_1510.xml +share/foomatic/db/source/printer/HP-PSC_1600.xml +share/foomatic/db/source/printer/HP-PSC_2110.xml +share/foomatic/db/source/printer/HP-PSC_2150.xml +share/foomatic/db/source/printer/HP-PSC_2170.xml +share/foomatic/db/source/printer/HP-PSC_2175.xml +share/foomatic/db/source/printer/HP-PSC_2210.xml +share/foomatic/db/source/printer/HP-PSC_2300.xml +share/foomatic/db/source/printer/HP-PSC_2350.xml +share/foomatic/db/source/printer/HP-PSC_2400.xml +share/foomatic/db/source/printer/HP-PSC_2500.xml +share/foomatic/db/source/printer/HP-PSC_370.xml +share/foomatic/db/source/printer/HP-PSC_380.xml +share/foomatic/db/source/printer/HP-PSC_500.xml +share/foomatic/db/source/printer/HP-PSC_750.xml +share/foomatic/db/source/printer/HP-PSC_750xi.xml +share/foomatic/db/source/printer/HP-PSC_950.xml +share/foomatic/db/source/printer/HP-PSC_950xi.xml +share/foomatic/db/source/printer/HP-PhotoSmart_140.xml +share/foomatic/db/source/printer/HP-PhotoSmart_240.xml +share/foomatic/db/source/printer/HP-PhotoSmart_2570.xml +share/foomatic/db/source/printer/HP-PhotoSmart_2600.xml +share/foomatic/db/source/printer/HP-PhotoSmart_2700.xml +share/foomatic/db/source/printer/HP-PhotoSmart_3100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_320.xml +share/foomatic/db/source/printer/HP-PhotoSmart_3200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_330.xml +share/foomatic/db/source/printer/HP-PhotoSmart_3300.xml +share/foomatic/db/source/printer/HP-PhotoSmart_370.xml +share/foomatic/db/source/printer/HP-PhotoSmart_380.xml +share/foomatic/db/source/printer/HP-PhotoSmart_420.xml +share/foomatic/db/source/printer/HP-PhotoSmart_470.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7150.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7260.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7268.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7345.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7350.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7400.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7550.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7660.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7760.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7800.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7960.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8000.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8400.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8700.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A310.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A320.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A430.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A440.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A510.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A520.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A610.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A620.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A710.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A820.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C3100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C4100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C4200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C5100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C5200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C6100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C6200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C7100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C7200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C8100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D5060.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D5100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D5300.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D6100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7300.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7400.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1000.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1115.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1215.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1218.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P130.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1315.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P230.xml +share/foomatic/db/source/printer/HP-PhotoSmart_Pro_B8300.xml +share/foomatic/db/source/printer/HP-e-printer_e20.xml %%DATADIR%%/__init__.py -%%DATADIR%%/align +%%DATADIR%%/align.py %%DATADIR%%/base/__init__.py %%DATADIR%%/base/async.py %%DATADIR%%/base/async_qt.py @@ -295,15 +864,13 @@ share/cups/model/foomatic-ppds %%DATADIR%%/base/slp.py %%DATADIR%%/base/status.py %%DATADIR%%/base/strings.py +%%DATADIR%%/base/tui.py %%DATADIR%%/base/utils.py -%%DATADIR%%/check -%%DATADIR%%/clean -%%DATADIR%%/colorcal +%%DATADIR%%/check.py +%%DATADIR%%/clean.py +%%DATADIR%%/colorcal.py %%DATADIR%%/copier/__init__.py %%DATADIR%%/copier/copier.py -%%DATADIR%%/data/firmware/HP_LaserJet_1018.fw.gz -%%DATADIR%%/data/firmware/HP_LaserJet_1020.fw.gz -%%DATADIR%%/data/hplip.desktop %%DATADIR%%/data/images/120.png %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png %%DATADIR%%/data/images/CP_1700.png @@ -458,7 +1025,6 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/h-kc-3.png %%DATADIR%%/data/images/help.png %%DATADIR%%/data/images/hp-tux-printer.png -%%DATADIR%%/data/images/hp-tux-printer.ppm %%DATADIR%%/data/images/hp_LaserJet_1200.png %%DATADIR%%/data/images/hp_LaserJet_2100.png %%DATADIR%%/data/images/hp_LaserJet_3015.png @@ -519,7 +1085,6 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/ok.png %%DATADIR%%/data/images/ok_small.png %%DATADIR%%/data/images/opensource-75x65.png -%%DATADIR%%/data/images/panel_lcd.xpm %%DATADIR%%/data/images/paper.png %%DATADIR%%/data/images/paper_small.png %%DATADIR%%/data/images/pcard_icon.png @@ -528,6 +1093,7 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/photosmart_7150.png %%DATADIR%%/data/images/photosmart_7900_series.png %%DATADIR%%/data/images/photosmart_a610.png +%%DATADIR%%/data/images/photosmart_a820_series.png %%DATADIR%%/data/images/png.png %%DATADIR%%/data/images/powered_by_python.png %%DATADIR%%/data/images/prev.png @@ -571,6 +1137,13 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/ldl/cbccal_done.ldl.gz %%DATADIR%%/data/ldl/cbcpcal.ldl.gz %%DATADIR%%/data/ldl/cbpcal.ldl.gz +%%DATADIR%%/data/localization/hplip_de.qm +%%DATADIR%%/data/localization/hplip_es.qm +%%DATADIR%%/data/localization/hplip_fr.qm +%%DATADIR%%/data/localization/hplip_it.qm +%%DATADIR%%/data/localization/hplip_pt.qm +%%DATADIR%%/data/localization/hplip_ru.qm +%%DATADIR%%/data/localization/hplip_zh.qm %%DATADIR%%/data/models/models.dat %%DATADIR%%/data/pcl/align1_8xx.pcl.gz %%DATADIR%%/data/pcl/align1_9xx.pcl.gz @@ -592,25 +1165,23 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/pcl/crpcal.pcl.gz %%DATADIR%%/data/ps/clean_page.pdf.gz %%DATADIR%%/data/ps/testpage.ps.gz -%%DATADIR%%/fab +%%DATADIR%%/fab.py %%DATADIR%%/fax/__init__.py -%%DATADIR%%/fax/backend/hpfax %%DATADIR%%/fax/coverpages.py %%DATADIR%%/fax/fax.py -%%DATADIR%%/fax/ppd/HP-Fax-hplip.ppd -%%DATADIR%%/firmware +%%DATADIR%%/firmware.py %%DATADIR%%/hpaio.desc %%DATADIR%%/hplip-install -%%DATADIR%%/hplip.sh %%DATADIR%%/hpssd.py -%%DATADIR%%/info +%%DATADIR%%/info.py %%DATADIR%%/install.py %%DATADIR%%/installer/__init__.py +%%DATADIR%%/installer/core_install.py %%DATADIR%%/installer/dcheck.py -%%DATADIR%%/installer/distros.py -%%DATADIR%%/levels -%%DATADIR%%/makecopies -%%DATADIR%%/makeuri +%%DATADIR%%/installer/distros.dat +%%DATADIR%%/levels.py +%%DATADIR%%/makecopies.py +%%DATADIR%%/makeuri.py %%DATADIR%%/pcard/__init__.py %%DATADIR%%/pcard/photocard.py %%DATADIR%%/plugins/Deskjet_460.py @@ -619,20 +1190,22 @@ share/cups/model/foomatic-ppds %%DATADIR%%/plugins/powersettings.py %%DATADIR%%/plugins/powersettingsdialog.py %%DATADIR%%/plugins/powersettingsdialog_base.py -%%DATADIR%%/print +%%DATADIR%%/print.py %%DATADIR%%/prnt/__init__.py %%DATADIR%%/prnt/colorcal.py %%DATADIR%%/prnt/cups.py %%DATADIR%%/prnt/ldl.py %%DATADIR%%/prnt/pcl.py %%DATADIR%%/prnt/printable_areas.py -%%DATADIR%%/probe +%%DATADIR%%/probe.py +%%DATADIR%%/scan.py %%DATADIR%%/scan/__init__.py -%%DATADIR%%/sendfax -%%DATADIR%%/setup -%%DATADIR%%/testpage -%%DATADIR%%/timedate -%%DATADIR%%/toolbox +%%DATADIR%%/scan/sane.py +%%DATADIR%%/sendfax.py +%%DATADIR%%/setup.py +%%DATADIR%%/testpage.py +%%DATADIR%%/timedate.py +%%DATADIR%%/toolbox.py %%DATADIR%%/ui/__init__.py %%DATADIR%%/ui/aboutdlg.py %%DATADIR%%/ui/aboutdlg_base.py @@ -681,6 +1254,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/nodevicesform_base.py %%DATADIR%%/ui/paperedgealignform.py %%DATADIR%%/ui/paperedgealignform_base.py +%%DATADIR%%/ui/pluginform.py +%%DATADIR%%/ui/pluginform_base.py %%DATADIR%%/ui/printerform.py %%DATADIR%%/ui/scrollcopy.py %%DATADIR%%/ui/scrollfax.py @@ -704,10 +1279,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/unloadform.py %%DATADIR%%/ui/waitform.py %%DATADIR%%/ui/waitform_base.py -%%DATADIR%%/unload +%%DATADIR%%/unload.py share/ppd/HP/HP-2000C-hpijs.ppd.gz share/ppd/HP/HP-2500C-hpijs.ppd.gz share/ppd/HP/HP-2500CM-hpijs.ppd.gz +share/ppd/HP/HP-910-hpijs.ppd.gz +share/ppd/HP/HP-915-hpijs.ppd.gz share/ppd/HP/HP-Business_Inkjet_1000-hpijs.ppd.gz share/ppd/HP/HP-Business_Inkjet_1100-hpijs.ppd.gz share/ppd/HP/HP-Business_Inkjet_1200-hpijs.ppd.gz @@ -745,6 +1322,8 @@ share/ppd/HP/HP-Color_LaserJet_8500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_8550GN-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500_MFP-hpijs.ppd.gz +share/ppd/HP/HP-Color_LaserJet_CM4730_MFP-hpijs.ppd.gz +share/ppd/HP/HP-Color_LaserJet_CP3505-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_CP4005-hpijs.ppd.gz share/ppd/HP/HP-DesignJet_ColorPro_CAD-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_1100C-hpijs.ppd.gz @@ -790,8 +1369,10 @@ share/ppd/HP/HP-DeskJet_5160-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_520-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_540C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5440-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_550C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5550-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5551-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_560C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5650-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5652-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5670-hpijs.ppd.gz @@ -879,6 +1460,7 @@ share/ppd/HP/HP-DeskJet_D4200-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F2100-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F4100-hpijs.ppd.gz +share/ppd/HP/HP-Fax-hplip.ppd.gz share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1015-hpijs.ppd.gz @@ -963,6 +1545,7 @@ share/ppd/HP/HP-LaserJet_M3035_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_M4345_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_M5025_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_M5035_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P2010-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_P2015-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_P3004-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_P3005-hpijs.ppd.gz @@ -1017,6 +1600,8 @@ share/ppd/HP/HP-OfficeJet_D155-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_G55-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_G85-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_G95-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_J3600-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_J5500-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_J5700-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_K60-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_K60xi-hpijs.ppd.gz @@ -1043,6 +1628,7 @@ share/ppd/HP/HP-OfficeJet_T45-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_T65-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_V40-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_V40xi-hpijs.ppd.gz +share/ppd/HP/HP-Officejet_K7100-hpijs.ppd.gz share/ppd/HP/HP-PSC_1100-hpijs.ppd.gz share/ppd/HP/HP-PSC_1110-hpijs.ppd.gz share/ppd/HP/HP-PSC_1200-hpijs.ppd.gz @@ -1101,20 +1687,33 @@ share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A310-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A320-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A440-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A520-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A620-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A820-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C4200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C5100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C5200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C6100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C6200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C7200-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C8100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D5060-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D5100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D5300-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D6100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1000-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1100-hpijs.ppd.gz @@ -1131,7 +1730,6 @@ share/ppd/HP/HP_Business_Inkjet_2280.ppd.gz share/ppd/HP/HP_Business_Inkjet_2600.ppd.gz share/ppd/HP/HP_Business_Inkjet_2800.ppd.gz share/ppd/HP/HP_Business_Inkjet_3000.ppd.gz -share/ppd/HP/HP_CM8050_CM8060_MFP.ppd.gz share/ppd/HP/HP_Color_LaserJet.ppd.gz share/ppd/HP/HP_Color_LaserJet_2550.ppd.gz share/ppd/HP/HP_Color_LaserJet_2605.ppd.gz @@ -1148,6 +1746,8 @@ share/ppd/HP/HP_Color_LaserJet_5M.ppd.gz share/ppd/HP/HP_Color_LaserJet_8500.ppd.gz share/ppd/HP/HP_Color_LaserJet_8550.ppd.gz share/ppd/HP/HP_Color_LaserJet_CM1015.ppd.gz +share/ppd/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz +share/ppd/HP/HP_Color_LaserJet_CP3505.ppd.gz share/ppd/HP/HP_Color_LaserJet_CP4005.ppd.gz share/ppd/HP/HP_LaserJet_1200.ppd.gz share/ppd/HP/HP_LaserJet_1220.ppd.gz @@ -1204,7 +1804,6 @@ share/ppd/HP/HP_LaserJet_P3004.ppd.gz share/ppd/HP/HP_LaserJet_P3005.ppd.gz share/ppd/HP/HP_Mopier_240.ppd.gz share/ppd/HP/HP_Mopier_320.ppd.gz -share/ppd/HP/fax/HP-Fax-hplip.ppd.gz share/ppd/HP/hp_LaserJet_1300_series.ppd.gz share/ppd/HP/hp_LaserJet_2300.ppd.gz share/ppd/HP/hp_LaserJet_3015.ppd.gz @@ -1222,7 +1821,6 @@ share/ppd/HP/hp_color_LaserJet_5500.ppd.gz share/ppd/HP/hp_color_LaserJet_9500.ppd.gz share/ppd/HP/hp_color_LaserJet_9500_MFP.ppd.gz share/ppd/HP/hp_officejet_9100_series.ppd.gz -@dirrm share/ppd/HP/fax @dirrm share/ppd/HP @dirrm share/ppd @unexec rm -f %D/%%DATADIR%%/*/*.pyc 2>/dev/null || true @@ -1232,20 +1830,25 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/pcard @dirrm %%DATADIR%%/installer -@dirrm %%DATADIR%%/fax/ppd -@dirrm %%DATADIR%%/fax/backend @dirrm %%DATADIR%%/fax @dirrm %%DATADIR%%/data/ps @dirrm %%DATADIR%%/data/pcl @dirrm %%DATADIR%%/data/models +@dirrm %%DATADIR%%/data/localization @dirrm %%DATADIR%%/data/ldl @dirrm %%DATADIR%%/data/images -@dirrm %%DATADIR%%/data/firmware @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/base @dirrm %%DATADIR%% -@dirrmtry share/gnome +@dirrm share/foomatic/db/source/printer +@dirrm share/foomatic/db/source/opt +@dirrm share/foomatic/db/source/driver +@dirrm share/foomatic/db/source/PPD/HP +@dirrm share/foomatic/db/source/PPD +@dirrm share/foomatic/db/source +@dirrm share/foomatic/db +@dirrm share/foomatic %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/troubleshooting %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs @@ -1265,6 +1868,6 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%% -%%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%% @dirrmtry share/applications +@dirrmtry share/gnome @dirrmtry etc/hp diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile index a03e22d7eb8e..aaa8cc907bcf 100644 --- a/print/hplip3/Makefile +++ b/print/hplip3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 1.7.4a +PORTVERSION= 2.7.9 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -20,15 +20,22 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ usb:${PORTSDIR}/devel/libusb \ netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp -CONFLICTS= hpijs-* foomatic-filters-* +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \ + foomatic-rip:${PORTSDIR}/print/foomatic-filters + +CONFLICTS= hpijs-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ - --disable-pp-build + --disable-pp-build \ + --enable-foomatic-ppd-install \ + --with-icondir=${LOCALBASE}/share/applications \ + --with-cupsbackenddir=${LOCALBASE}/libexec/cups/backend + USE_LDCONFIG= yes USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes -USE_RC_SUBR= hpiod.sh hpssd.sh +USE_RC_SUBR= hpssd.sh CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" @@ -53,45 +60,55 @@ post-extract: @${RM} -r ${WRKSRC}/data/images/CVS post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/share/cups|${LOCALBASE}/share/cups|g ; \ - s|/usr/lib/cups/backend|${LOCALBASE}/libexec/cups/backend|g ; \ - s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ - ${WRKSRC}/configure ${WRKSRC}/prnt/hpijs/configure - @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g ; \ - s|/usr/lib|${LOCALBASE}/lib|g ; \ - s|/etc/init.d|${LOCALBASE}/etc/rc.d|g ; \ - s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g ; \ - s|/etc/hp|${LOCALBASE}/etc/hp|g' \ - ${WRKSRC}/Makefile.in \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g ; \ - s|/usr/lib|${LOCALBASE}/lib|g' \ - ${WRKSRC}/prnt/hpijs/foomatic-rip - @${REINPLACE_CMD} -e 's|/etc/hp/|${LOCALBASE}/etc/hp/|g ; \ - s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ - ${WRKSRC}/base/g.py \ - ${WRKSRC}/fax/backend/hpfax.py \ - ${WRKSRC}/hpssd.py \ - ${WRKSRC}/io/hpiod/hpiod.h \ - ${WRKSRC}/api/hplip_api.h \ - ${WRKSRC}/prnt/hpijs/configure.in - @${REINPLACE_CMD} -e 's|#!/usr/bin/env python|#!${LOCALBASE}/bin/python|g' \ - ${WRKSRC}/*.py \ - ${WRKSRC}/*/*.py \ - ${WRKSRC}/*/*/*.py - @${REINPLACE_CMD} -e 's|-ldld||g ; \ - s|-ldl||g' \ - ${WRKSRC}/prnt/hpijs/configure \ - ${WRKSRC}/prnt/hpijs/configure.in \ - ${WRKSRC}/prnt/hpijs/Makefile.in \ - ${WRKSRC}/prnt/hpijs/aclocal.m4 - @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/etc/hp|${LOCALBASE}/etc/hp|g ; \ + s|/etc/sane.d|${LOCALBASE}/etc/sane.d|g' \ + ${WRKSRC}/Makefile.am \ + ${WRKSRC}/Makefile.in \ + ${WRKSRC}/check.py \ + ${WRKSRC}/hpssd.py \ + ${WRKSRC}/base/g.py \ + ${WRKSRC}/doc/release_notes.html \ + ${WRKSRC}/doc/tech_docs/man_pages/hpssd.html \ + ${WRKSRC}/fax/backend/hpfax.py \ + ${WRKSRC}/installer/distros.dat \ + ${WRKSRC}/installer/core_install.py \ + ${WRKSRC}/prnt/hpijs/ljzjs.cpp + + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/configure.in .if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|install-data-am: install-docDATA|install-data-am:|g' \ - ${WRKSRC}/prnt/hpijs/Makefile.in - @${REINPLACE_CMD} -e 's|install-dist_xmlDATA install-docDATA|install-dist_xmlDATA|g' \ + @${REINPLACE_CMD} -e 's|install-dist_www7DATA install-docDATA|install-dist_www7DATA|g ; \ + s|install-dist_unrelDATA install-dist_www0DATA|install-dist_unrelDATA|g ; \ + s|install-dist_www1DATA install-dist_www21DATA||g ; \ + s|install-dist_www22DATA install-dist_www23DATA||g ; \ + s|install-dist_www241DATA install-dist_www242DATA||g ; \ + s|install-dist_www243DATA install-dist_www24DATA||g ; \ + s|install-dist_www251DATA install-dist_www252DATA||g ; \ + s|install-dist_www261DATA install-dist_www2DATA||g ; \ + s|install-dist_www3DATA install-dist_www4DATA||g ; \ + s|install-dist_www5DATA install-dist_www61DATA||g ; \ + s|install-dist_www6DATA install-dist_www7DATA||g' \ ${WRKSRC}/Makefile.in .endif + @${REINPLACE_CMD} -e 's|install-dist_prntSCRIPTS install-dist_rulesDATA|install-dist_prntSCRIPTS|g ; \ + s|install-hpPROGRAMS install-hplip_confDATA|install-hpPROGRAMS|g' \ + ${WRKSRC}/Makefile.in +# @${REINPLACE_CMD} -e 's|install-dist_www7DATA install-docDATA|install-dist_www7DATA|g' \ +# ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|-ldld||g ; \ + s|-ldl||g ; \ + s|-dld||g' \ + ${WRKSRC}/configure \ + ${WRKSRC}/configure.in \ + ${WRKSRC}/foomatic-db-hpijs/make_configure \ + ${WRKSRC}/Makefile.in \ + ${WRKSRC}/Makefile.am \ + ${WRKSRC}/aclocal.m4 \ + ${WRKSRC}/foomatic-db-hpijs/configure.ac + + @${REINPLACE_CMD} -e 's|/usr/bin/env python|${LOCALBASE}/bin/python|g' \ + ${WRKSRC}/hpssd.py pre-su-install: @${MKDIR} ${PREFIX}/share/applications @@ -101,13 +118,12 @@ post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd - @${LN} -sf ${PREFIX}/bin/foomatic-rip \ - ${PREFIX}/libexec/cups/filter/foomatic-rip @${MKDIR} ${PREFIX}/etc/hp # Auto-generate sample configuration file - @${ECHO} "home=${PREFIX}/share/hplip" >> ${WRKSRC}/hplip.conf - @${ECHO} "ppd=${PREFIX}/share/ppd" >> ${WRKSRC}/hplip.conf @${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf.sample +.if !exists(${PREFIX}/etc/hp/hplip.conf) + @${INSTALL_DATA} ${WRKSRC}/hplip.conf ${PREFIX}/etc/hp/hplip.conf +.endif @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/print/hplip3/distinfo b/print/hplip3/distinfo index 78bce36380f5..df8f7df03a51 100644 --- a/print/hplip3/distinfo +++ b/print/hplip3/distinfo @@ -1,3 +1,3 @@ -MD5 (hplip-1.7.4a.tar.gz) = 210e948d1f1f376426a2cca0ed9d1e6c -SHA256 (hplip-1.7.4a.tar.gz) = 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e -SIZE (hplip-1.7.4a.tar.gz) = 13566965 +MD5 (hplip-2.7.9.tar.gz) = a05aeb5679c3ce429bea7f3335609aee +SHA256 (hplip-2.7.9.tar.gz) = e8867529434411f6c44ef6224405f92fd6be25f04513946621bf209b2e81baaf +SIZE (hplip-2.7.9.tar.gz) = 14488632 diff --git a/print/hplip3/files/hpiod.sh.in b/print/hplip3/files/hpiod.sh.in deleted file mode 100644 index b24681234b8c..000000000000 --- a/print/hplip3/files/hpiod.sh.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# PROVIDE: hpiod -# REQUIRE: NETWORKING -# KEYWORD: shutdown - -. %%RC_SUBR%% - -name=hpiod -rcvar=${name}_enable - -command="%%PREFIX%%/sbin/${name}" -pidfile="/var/run/${name}.pid" -portfile="/var/run/${name}.port" -hpiod_user=hplip - -start_precmd="hpiod_prestart" - -load_rc_config $name - -: ${hpiod_enable="NO"} - -hpiod_prestart() -{ - touch ${pidfile} - touch ${portfile} - chown ${hpiod_user} ${pidfile} - chown ${hpiod_user} ${portfile} -} - -run_rc_command $* diff --git a/print/hplip3/files/hpssd.sh.in b/print/hplip3/files/hpssd.sh.in index 065bb88badde..105076f0a135 100644 --- a/print/hplip3/files/hpssd.sh.in +++ b/print/hplip3/files/hpssd.sh.in @@ -13,7 +13,6 @@ rcvar=${name}_enable command="%%PREFIX%%/sbin/${name}" command_interpreter="%%PREFIX%%/bin/python" pidfile="/var/run/${name}.pid" -portfile="/var/run/${name}.port" hpssd_user=nobody command_args=">/dev/null" @@ -26,9 +25,7 @@ load_rc_config $name hpssd_prestart() { touch ${pidfile} - touch ${portfile} chown ${hpssd_user} ${pidfile} - chown ${hpssd_user} ${portfile} } run_rc_command $* diff --git a/print/hplip3/files/patch-Makefile.am b/print/hplip3/files/patch-Makefile.am new file mode 100644 index 000000000000..beb9769cde6c --- /dev/null +++ b/print/hplip3/files/patch-Makefile.am @@ -0,0 +1,37 @@ +--- Makefile.am.orig Fri Sep 21 15:36:07 2007 ++++ Makefile.am Tue Oct 9 19:31:35 2007 +@@ -45,7 +45,7 @@ + www243dir = $(docdir)/install/step4/suse + dist_www243_DATA = $(wwwsrc)/install/step4/suse/* + www251dir = $(docdir)/install/manual +-dist_www251_DATA = $(wwwsrc)/install/manual/* ++dist_www251_DATA = $(wwwsrc)/install/manual/*.html + www252dir = $(docdir)/install/manual/distros + dist_www252_DATA = $(wwwsrc)/install/manual/distros/* + www261dir = $(docdir)/install/install +@@ -53,13 +53,13 @@ + www3dir = $(docdir)/styles + dist_www3_DATA = $(wwwsrc)/styles/* + www4dir = $(docdir)/images +-dist_www4_DATA = $(wwwsrc)/images/* ++dist_www4_DATA = $(wwwsrc)/images/*.png + www5dir = $(docdir)/supported_devices + dist_www5_DATA = $(wwwsrc)/supported_devices/* + www6dir = $(docdir)/tech_docs +-dist_www6_DATA = $(wwwsrc)/tech_docs/* ++dist_www6_DATA = $(wwwsrc)/tech_docs/*.html + www61dir = $(docdir)/tech_docs/man_pages +-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/* ++dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html + www7dir = $(docdir)/troubleshooting + dist_www7_DATA = $(wwwsrc)/troubleshooting/* + endif +@@ -131,7 +131,7 @@ + dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz + dist_models_DATA = data/models/models.dat + if GUI_BUILD +-dist_images_DATA = data/images/* ++dist_images_DATA = data/images/*.png + endif + dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ + data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in index add4fc086982..0f340db071ce 100644 --- a/print/hplip3/files/patch-Makefile.in +++ b/print/hplip3/files/patch-Makefile.in @@ -1,143 +1,72 @@ ---- Makefile.in.orig Fri Mar 23 16:39:45 2007 -+++ Makefile.in Wed Apr 18 17:00:46 2007 -@@ -434,7 +434,7 @@ - www243dir = $(docdir)/install/step4/suse - dist_www243_DATA = $(wwwsrc)/install/step4/suse/* - www251dir = $(docdir)/install/manual --dist_www251_DATA = $(wwwsrc)/install/manual/* -+dist_www251_DATA = $(wwwsrc)/install/manual/*.html - www252dir = $(docdir)/install/manual/distros - dist_www252_DATA = $(wwwsrc)/install/manual/distros/* - www261dir = $(docdir)/install/install -@@ -446,12 +446,12 @@ - www5dir = $(docdir)/supported_devices - dist_www5_DATA = $(wwwsrc)/supported_devices/* - www6dir = $(docdir)/tech_docs --dist_www6_DATA = $(wwwsrc)/tech_docs/* -+dist_www6_DATA = $(wwwsrc)/tech_docs/*.html - www61dir = $(docdir)/tech_docs/man_pages --dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/* -+dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html - www7dir = $(docdir)/troubleshooting - dist_www7_DATA = $(wwwsrc)/troubleshooting/* --dist_hplip_DATA = $(doc_DATA) hplip.conf -+dist_hplip_DATA = $(doc_DATA) - dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh install.py hplip-install - cmddir = $(hplipdir) - dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \ -@@ -2884,20 +2884,9 @@ - # - # If scanner build, install sane backend. - if [ "$(scan_build)" = "yes" ]; then \ -- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ -- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ -- touch $(DESTDIR)/etc/sane.d/dll.conf; \ -- fi; \ -- $(mkinstalldirs) $(DESTDIR)$(sanedir); \ -- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SONOVER); \ -- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOSHORT); \ -- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOLONG); \ -- if [ -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ -- if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ -- echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \ -- echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \ -- fi \ -- fi \ -+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SONOVER); \ -+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOSHORT); \ -+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \ - fi - - install-data-hook: install-pcardext install-cupsext -@@ -2945,63 +2934,41 @@ - done - # - # Edit hpiod.conf in destdir. -- echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -- echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -- echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -+ echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(PACKAGE).conf -+ echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(PACKAGE).conf -+ echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(PACKAGE).conf - if [ "$(network_build)" = "yes" ]; then \ -- echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "network-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "network-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(pp_build)" = "yes" ]; then \ -- echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "pp-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "pp-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(gui_build)" = "yes" ]; then \ -- echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "gui-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "gui-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(scan_build)" = "yes" ]; then \ -- echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "scanner-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "scanner-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(fax_build)" = "yes" ]; then \ -- echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "fax-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "fax-build=0" >> $(PACKAGE).conf; \ - fi - if [ "$(cups11_build)" = "yes" ]; then \ -- echo -e "cups11-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -+ echo -e "cups11-build=1" >> $(PACKAGE).conf; \ - else \ -- echo -e "cups11-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ -- fi -- echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf -- echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf --# --# Install hpiod.conf. -- $(mkinstalldirs) $(DESTDIR)/etc/hp -- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp --# --# Create hpiod start/stop script from hpiod.sh in destdir. -- sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \ -- sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \ -- rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp --# --# Install hpiod start/stop script. -- $(mkinstalldirs) $(DESTDIR)/etc/init.d -- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d --# --# Run chkconfig/install_initd if DESTDIR="". -- if [ "$(DESTDIR)" = "" ]; then \ -- if [ "$(INSTALLINITD)" != "" ]; then \ -- $(INSTALLINITD) $(PACKAGE); \ -- elif [ "$(CHKCONFIG)" != "" ]; then \ -- $(CHKCONFIG) $(PACKAGE) reset; \ -- fi \ -+ echo -e "cups11-build=0" >> $(PACKAGE).conf; \ - fi -+ echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf -+ echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf - # - # Install fax support. Let hpijs symlink hpppddir to cupsppddir. - if [ "$(fax_build)" = "yes" ]; then \ -@@ -3032,8 +2999,8 @@ - done - # - # Remove hplip.conf and hplip start/stop script. -- rm -f $(DESTDIR)/etc/hp/$(PACKAGE).conf -- rm -f $(DESTDIR)/etc/init.d/$(PACKAGE) -+ rm -f $(DESTDIR)/usr/local/etc/hp/$(PACKAGE).conf -+ rm -f $(DESTDIR)/usr/local/etc/rc.d/$(PACKAGE) - # - # Remove fax support. - rm -f $(DESTDIR)$(hpfaxdir)/hpfax +--- Makefile.in.orig Fri Sep 28 19:33:08 2007 ++++ Makefile.in Tue Oct 9 21:10:19 2007 +@@ -671,7 +671,7 @@ + dist_faxppdDATA_INSTALL = $(INSTALL_DATA) + am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc + dist_hplipDATA_INSTALL = $(INSTALL_DATA) +-am__dist_images_DATA_DIST = data/images/* ++am__dist_images_DATA_DIST = data/images/*.png + dist_imagesDATA_INSTALL = $(INSTALL_DATA) + am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \ + data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \ +@@ -1610,7 +1610,7 @@ + dist_www242DATA_INSTALL = $(INSTALL_DATA) + am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/* + dist_www243DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/* ++am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*.html + dist_www251DATA_INSTALL = $(INSTALL_DATA) + am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/* + dist_www252DATA_INSTALL = $(INSTALL_DATA) +@@ -1618,13 +1618,13 @@ + dist_www261DATA_INSTALL = $(INSTALL_DATA) + am__dist_www3_DATA_DIST = $(wwwsrc)/styles/* + dist_www3DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www4_DATA_DIST = $(wwwsrc)/images/* ++am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png + dist_www4DATA_INSTALL = $(INSTALL_DATA) + am__dist_www5_DATA_DIST = $(wwwsrc)/supported_devices/* + dist_www5DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/* ++am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*.html + dist_www6DATA_INSTALL = $(INSTALL_DATA) +-am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/* ++am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*.html + dist_www61DATA_INSTALL = $(INSTALL_DATA) + am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/* + dist_www7DATA_INSTALL = $(INSTALL_DATA) +@@ -1840,7 +1840,7 @@ + @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse + @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/* + @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual +-@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/* ++@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*.html + @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros + @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/* + @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install +@@ -1848,13 +1848,13 @@ + @DOC_BUILD_TRUE@www3dir = $(docdir)/styles + @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/* + @DOC_BUILD_TRUE@www4dir = $(docdir)/images +-@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/* ++@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*.png + @DOC_BUILD_TRUE@www5dir = $(docdir)/supported_devices + @DOC_BUILD_TRUE@dist_www5_DATA = $(wwwsrc)/supported_devices/* + @DOC_BUILD_TRUE@www6dir = $(docdir)/tech_docs +-@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/* ++@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*.html + @DOC_BUILD_TRUE@www61dir = $(docdir)/tech_docs/man_pages +-@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/* ++@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html + @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting + @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/* + @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc +@@ -1904,7 +1904,7 @@ + @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization + @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz + @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat +-@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/* ++@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*.png + @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \ + @HPLIP_BUILD_TRUE@ data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \ + @HPLIP_BUILD_TRUE@ data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \ diff --git a/print/hplip3/files/patch-base_utils.py b/print/hplip3/files/patch-base_utils.py new file mode 100644 index 000000000000..92d4757c8cee --- /dev/null +++ b/print/hplip3/files/patch-base_utils.py @@ -0,0 +1,53 @@ +--- base/utils.py.orig Wed Oct 10 00:23:07 2007 ++++ base/utils.py Wed Oct 10 00:27:04 2007 +@@ -54,6 +54,50 @@ + + return callable + ++# For pidfile locking (must be "static" and global to the whole app) ++prv_pidfile = None ++prv_pidfile_name = "" ++ ++def get_pidfile_lock (a_pidfile_name=""): ++ """ Call this to either lock the pidfile, or to update it after a fork() ++ Credit: Henrique M. Holschuh <hmh@debian.org> ++ """ ++ global prv_pidfile ++ global prv_pidfile_name ++ if prv_pidfile_name == "": ++ try: ++ prv_pidfile_name = a_pidfile_name ++ prv_pidfile = os.fdopen(os.open(prv_pidfile_name, os.O_RDWR | os.O_CREAT, 0644), 'r+') ++ fcntl.fcntl(prv_pidfile.fileno(), fcntl.F_SETFD, fcntl.FD_CLOEXEC) ++ while 1: ++ try: ++ fcntl.flock(prv_pidfile.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB) ++ except (OSError, IOError), e: ++ if e.errno == errno.EINTR: ++ continue ++ elif e.errno == errno.EWOULDBLOCK: ++ try: ++ prv_pidfile.seek(0) ++ otherpid = int(prv_pidfile.readline(), 10) ++ sys.stderr.write ("can't lock %s, running daemon's pid may be %d\n" % (prv_pidfile_name, otherpid)) ++ except (OSError, IOError), e: ++ sys.stderr.write ("error reading pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ ++ sys.exit(1) ++ sys.stderr.write ("can't lock %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ sys.exit(1) ++ break ++ except (OSError, IOError), e: ++ sys.stderr.write ("can't open pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ sys.exit(1) ++ try: ++ prv_pidfile.seek(0) ++ prv_pidfile.write("%d\n" % (os.getpid())) ++ prv_pidfile.flush() ++ prv_pidfile.truncate() ++ except (OSError, IOError), e: ++ log.error("can't update pidfile %s: (%d) %s\n" % (prv_pidfile_name, e.errno, e.strerror)) ++ + def daemonize (stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'): + """ + Credit: Jürgen Hermann, Andy Gimblett, and Noah Spurrier diff --git a/print/hplip3/files/patch-configure b/print/hplip3/files/patch-configure deleted file mode 100644 index 22f040c1d5c1..000000000000 --- a/print/hplip3/files/patch-configure +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.bak Fri May 5 10:01:57 2006 -+++ configure Fri May 5 10:03:39 2006 -@@ -22100,29 +22100,9 @@ - echo "$as_me:$LINENO: result: \"using $CUPS_BACKEND_PATH\"" >&5 - echo "${ECHO_T}\"using $CUPS_BACKEND_PATH\"" >&6 - --ICONSEARCHPATH="/usr/lib/menu /usr/share/applications" --ICON="hplip hplip.desktop" -+ICON_PATH="/usr/share/applications" -+ICON_FILE="hplip.desktop" - --echo "$as_me:$LINENO: checking \"for icon directory\"" >&5 --echo $ECHO_N "checking \"for icon directory\"... $ECHO_C" >&6 --ICON_PATH="" --ICON_FILE="" --idx=1 --for i in $ICONSEARCHPATH; do -- if test -d "$i"; then -- ICON_PATH="$i" -- jdx=1 -- for j in $ICON; do -- if test "$jdx" = "$idx"; then -- break -- fi -- jdx=$jdx+1 -- done -- ICON_FILE="$j" -- break -- fi -- idx=$idx+1 --done - if test "$ICON_PATH" != ""; then - echo "$as_me:$LINENO: result: \"using $ICON_PATH/$ICON_FILE\"" >&5 - echo "${ECHO_T}\"using $ICON_PATH/$ICON_FILE\"" >&6 diff --git a/print/hplip3/files/patch-hplip.conf b/print/hplip3/files/patch-hplip.conf deleted file mode 100644 index 82d374200c3f..000000000000 --- a/print/hplip3/files/patch-hplip.conf +++ /dev/null @@ -1,8 +0,0 @@ ---- hplip.conf.orig Mon Aug 7 03:19:37 2006 -+++ hplip.conf Mon Aug 7 03:20:58 2006 -@@ -6,3 +6,5 @@ - [hpssd] - # port=0 (dynamic IP port) - port=2207 (IANA IP port) -+[dirs] -+run=/var/run diff --git a/print/hplip3/files/patch-hpssd.py b/print/hplip3/files/patch-hpssd.py new file mode 100644 index 000000000000..f3e7a9c8b22e --- /dev/null +++ b/print/hplip3/files/patch-hpssd.py @@ -0,0 +1,21 @@ +--- hpssd.py Fri Oct 12 19:42:15 2007 ++++ /usr/local/sbin/hpssd Fri Oct 12 23:59:31 2007 +@@ -664,6 +664,10 @@ + if prop.daemonize: + utils.daemonize() + ++ # Lock pidfile before we muck around with system state ++ # Patch by Henrique M. Holschuh <hmh@debian.org> ++ utils.get_pidfile_lock(os.path.join(sys_cfg.dirs.run, 'hpssd.pid')) ++ + # hpssd server dispatcher object + try: + server = hpssd_server(prop.hpssd_host, prop.hpssd_port) +@@ -688,6 +692,7 @@ + + log.debug("Cleaning up...") + finally: ++ os.remove(os.path.join(sys_cfg.dirs.run, 'hpssd.pid')) + server.close() + return 0 + diff --git a/print/hplip3/files/patch-io_hpiod_device.cpp b/print/hplip3/files/patch-io_hpiod_device.cpp deleted file mode 100644 index 13bd9bb419cd..000000000000 --- a/print/hplip3/files/patch-io_hpiod_device.cpp +++ /dev/null @@ -1,262 +0,0 @@ ---- io/hpiod/device.cpp.orig Thu Jun 15 02:02:11 2006 -+++ io/hpiod/device.cpp Sun Jul 16 16:57:30 2006 -@@ -25,6 +25,9 @@ - \*****************************************************************************/ - - #include "hpiod.h" -+#ifdef __FreeBSD__ -+#include <dev/usb/usb.h> -+#endif - - const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.', - 'p','o','w','e','r',' ','1',';', -@@ -111,21 +114,240 @@ - - #elif defined(__FreeBSD__) - --/* -- * Anish Mistry amistry@am-productions.biz is working on libusb extensions for FreeBSD. His current implementation does not handle device exceptions (ie: paperout). -- * Once this issue is resolved we will be glade to add his code to the project. -- */ -- - int Device::Write(int fd, const void *buf, int size) - { -- syslog(LOG_ERR, "error Write: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__); -- return -1; -+ int nwrote, total, write_len, r, ep, endpoint_fd; -+ void *tmp_buf = (void *)buf; -+ fd_set ready; -+ char *pEndPoint = NULL; -+ -+ if (FD[fd].pHD == NULL) -+ { -+ syslog(LOG_ERR, "invalid Device::Write state: %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ -+ if ((ep = GetOutEP(dev, FD[fd].Config, FD[fd].Interface, FD[fd].AltSetting, USB_ENDPOINT_TYPE_BULK)) < 0) -+ { -+ syslog(LOG_ERR, "invalid bulk out endpoint %s %s %d\n", URI, __FILE__, __LINE__); -+ return -1; -+ } -+ -+ /* We only want the address, so mask out the direction bits */ -+ ep = (ep & USB_ENDPOINT_ADDRESS_MASK); -+ /* open endpoint */ -+ /* allocate data for the usb endpoint string */ -+ pEndPoint = (char *)malloc(strlen(dev->filename)+20); -+ if(!pEndPoint) -+ return -1; -+ /* create device endpoint name string */ -+ sprintf(pEndPoint, "%s.%d", dev->filename, ep); -+ -+ /* open the endpoint with read write access */ -+ endpoint_fd = open(pEndPoint, O_WRONLY, 0); -+ free(pEndPoint); -+ if(endpoint_fd < 0) -+ { -+ /* we failed to open the endpoint */ -+ return -1; -+ } -+ -+ total = size; -+ write_len = size; -+ -+ while (total > 0) -+ { -+ FD_ZERO(&ready); -+ FD_SET(endpoint_fd, &ready); -+ -+ if (!FD_ISSET(endpoint_fd, &ready)) -+ { -+ close(endpoint_fd); -+ return -1; -+ } -+ nwrote = write(endpoint_fd, tmp_buf, write_len); -+ -+ if (nwrote < 0) -+ { -+ close(endpoint_fd); -+ return -1; -+ } -+ -+ write_len -= nwrote; -+ tmp_buf = (void *)((long)tmp_buf + nwrote); -+ total -= nwrote; -+ } -+ -+ close(endpoint_fd); -+ return size; - } - - int Device::Read(int fd, void *buf, int size, int usec) - { -- syslog(LOG_ERR, "error Read: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__); -- return -2; -+ int nwrote, total, r, ep=0, endpoint_fd, i; -+ struct timeval t1, t2; -+ fd_set ready; -+ char *pEndPoint = NULL; -+ int bytes_want = 0; -+ int rlen = 0; -+ int bytes_read = 0; -+ int mili_timeout = usec/10; -+ unsigned char *pbuf_pos = NULL; -+ int total_usec, tmo_usec = usec; -+ -+ if (FD[fd].pHD == NULL) -+ { -+ syslog(LOG_ERR, "invalid Device::Read state: %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ -+ if ((ep = GetInEP(dev, FD[fd].Config, FD[fd].Interface, FD[fd].AltSetting, USB_ENDPOINT_TYPE_BULK)) < 0) -+ { -+ syslog(LOG_ERR, "invalid bulk in endpoint %s %s %d\n", URI, __FILE__, __LINE__); -+ return -1; -+ } -+ -+ /* We only want the address, so mask out the direction bits */ -+ ep = (ep & USB_ENDPOINT_ADDRESS_MASK); -+ /* open endpoint */ -+ /* allocate data for the usb endpoint string */ -+ pEndPoint = (char *)malloc(strlen(dev->filename)+20); -+ if(!pEndPoint) -+ return -1; -+ /* create device endpoint name string */ -+ sprintf(pEndPoint, "%s.%d", dev->filename, ep); -+ -+ /* open the endpoint with read write access */ -+ endpoint_fd = open(pEndPoint, O_RDONLY, 0); -+ if(endpoint_fd < 0) -+ { -+ /* we failed to open the endpoint */ -+ syslog(LOG_ERR, "unable to open bulk in endpoint (%s) %s %s %d\n", pEndPoint, URI, __FILE__, __LINE__); -+ free(pEndPoint); -+ return -1; -+ } -+ free(pEndPoint); -+ -+ /* set short transfer so that we can allow "short" reads since we -+ will don't know exactly -+ what is coming so we can't specify exact byte amounts */ -+ i = 1; -+ if (ioctl(endpoint_fd, USB_SET_SHORT_XFER, &i) < 0) -+ { -+ syslog(LOG_ERR, "USB_SET_SHORT_XFER set failed Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ } -+ -+ /* 0 timeout value will cause us the wait until the device has data -+ available or is disconnected */ -+ if (ioctl(endpoint_fd, USB_SET_TIMEOUT, &mili_timeout) < 0) -+ { -+ syslog(LOG_ERR, "USB_SET_TIMEOUT set failed Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ } -+ -+ gettimeofday (&t1, NULL); /* get start time */ -+ -+ if (FD[fd].ucnt > 0) -+ { -+ /* copy buffered data to storage */ -+ if (size <= FD[fd].ucnt) -+ { -+ memcpy(buf, FD[fd].ubuf, size); -+ FD[fd].uindex += size; -+ FD[fd].ucnt -= size; -+ bytes_read = size; -+ } -+ else -+ { -+ memcpy(buf, FD[fd].ubuf, FD[fd].ucnt); -+ bytes_read += FD[fd].ucnt; -+ FD[fd].ucnt = 0; -+ } -+ } -+ else if (FD[fd].ucnt == 0 && bytes_read < size) -+ { -+ /* reset data buffer */ -+ FD[fd].uindex = 0; -+ /* offset storage to not overwrite data copied from the buffer */ -+ pbuf_pos = (unsigned char *)((long)buf + bytes_read); -+ bytes_want = size - bytes_read; -+ do -+ { -+ if (bytes_want >= BUFFER_SIZE) -+ { -+ /* check to see if the device is ready for a read */ -+ FD_ZERO(&ready); -+ FD_SET(endpoint_fd, &ready); -+ if (!FD_ISSET(endpoint_fd, &ready)) -+ { -+ syslog(LOG_ERR, "timeout Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ errno = ETIMEDOUT; -+ return -1; -+ } -+ /* read directly into storage */ -+ rlen = read(endpoint_fd, pbuf_pos, BUFFER_SIZE); -+ if (rlen < 0) -+ { -+ syslog(LOG_ERR, "error Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ bytes_read += rlen; -+ bytes_want -= rlen; -+ pbuf_pos += rlen; -+ } -+ else if (bytes_want < BUFFER_SIZE) -+ { -+ /* check to see if the device is ready for a read */ -+ FD_ZERO(&ready); -+ FD_SET(endpoint_fd, &ready); -+ if (!FD_ISSET(endpoint_fd, &ready)) -+ { -+ syslog(LOG_ERR, "timeout Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ errno = ETIMEDOUT; -+ return -1; -+ } -+ /* read to buffer */ -+ rlen = read(endpoint_fd, FD[fd].ubuf, BUFFER_SIZE); -+ if (rlen < 0) -+ { -+ syslog(LOG_ERR, "error Device::Read : %s %s %d\n", URI,__FILE__, __LINE__); -+ return -1; -+ } -+ if (rlen >= bytes_want) -+ { -+ memcpy(pbuf_pos, FD[fd].ubuf, -+ bytes_want); -+ FD[fd].uindex += bytes_want; -+ FD[fd].ucnt = rlen - bytes_want; -+ bytes_read += bytes_want; -+ bytes_want = 0; -+ } -+ else -+ { -+ memcpy(pbuf_pos, FD[fd].ubuf, rlen); -+ bytes_want -= rlen; -+ bytes_read += rlen; -+ pbuf_pos += rlen; -+ } -+ } -+ /* Bulk_read has a timeout, but bulk_read can return zero byte packet(s), so we must use our own timeout here. */ -+ gettimeofday(&t2, NULL); /* get current time */ -+ -+ total_usec = (t2.tv_sec - t1.tv_sec)*1000000; -+ total_usec += (t2.tv_usec > t1.tv_usec) ? t2.tv_usec - t1.tv_usec : t1.tv_usec - t2.tv_usec; -+ if (total_usec > usec) -+ { -+ size = -1; /* timeout */ -+ errno = ETIMEDOUT; -+ break; -+ } -+ tmo_usec = usec - total_usec; /* decrease timeout */ -+ continue; -+ } -+ while (bytes_want > 0); -+ } -+ -+ close(endpoint_fd); -+ return size; - } - - #else diff --git a/print/hplip3/files/patch-io_hpiod_dot4.cpp b/print/hplip3/files/patch-io_hpiod_dot4.cpp deleted file mode 100644 index 62ebdadeae36..000000000000 --- a/print/hplip3/files/patch-io_hpiod_dot4.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- io/hpiod/dot4.cpp.orig Tue May 23 15:30:04 2006 -+++ io/hpiod/dot4.cpp Tue May 23 15:32:37 2006 -@@ -78,6 +78,7 @@ - Dot4Channel *pC=NULL; - int i, len, size; - unsigned char socket; -+ static int cnt=0; - - pCmd = (DOT4Cmd *)buf; - -@@ -130,7 +131,7 @@ - Dot4ForwardReply(fd, (unsigned char *)pCreditReply, sizeof(DOT4CreditReply)); - break; - case DOT4_CREDIT_REQUEST: -- static int cnt=0; -+ cnt=0; - pCreditReq = (DOT4CreditRequest *)buf; - if (cnt++ < 5) - syslog(LOG_ERR, "unexpected DOT4CreditRequest: cmd=%x, hid=%x, pid=%x, maxcredit=%d: %s %d\n", pCreditReq->cmd, diff --git a/print/hplip3/files/patch-io_hpiod_mlc.cpp b/print/hplip3/files/patch-io_hpiod_mlc.cpp deleted file mode 100644 index a2c186607052..000000000000 --- a/print/hplip3/files/patch-io_hpiod_mlc.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- io/hpiod/mlc.cpp.orig Tue May 23 15:27:16 2006 -+++ io/hpiod/mlc.cpp Tue May 23 15:29:40 2006 -@@ -73,6 +73,7 @@ - MLCError *pError; - MlcChannel *pC; - int i, len, size; -+ static int cnt=0; - - pCmd = (MLCCmd *)buf; - -@@ -122,7 +123,7 @@ - MlcForwardReply(fd, (unsigned char *)pCreditReply, sizeof(MLCCreditReply)); - break; - case MLC_CREDIT_REQUEST: -- static int cnt=0; -+ cnt = 0; - pCreditReq = (MLCCreditRequest *)buf; - if (cnt++ < 5) - syslog(LOG_ERR, "unexpected MLCCreditRequest: cmd=%x, hid=%x, pid=%x, credit=%d: %s %d\n", pCreditReq->cmd, diff --git a/print/hplip3/files/patch-io_hpiod_system.cpp b/print/hplip3/files/patch-io_hpiod_system.cpp deleted file mode 100644 index c8fd116dcd6c..000000000000 --- a/print/hplip3/files/patch-io_hpiod_system.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- io/hpiod/system.cpp.orig Mon Jul 23 14:08:51 2007 -+++ io/hpiod/system.cpp Mon Jul 23 14:09:52 2007 -@@ -633,7 +633,7 @@ - list_for_each(p, &head.list) - { - psa = list_entry(p, SessionAttributes, list); -- lstLen += sprintf(lst+lstLen, "t[%d] d[%d] socket=%d\n", (int)psa->tid, psa->descriptor, psa->sockid); -+ lstLen += sprintf(lst+lstLen, "t[%d] d[%d] socket=%d\n", (unsigned long)psa->tid, psa->descriptor, psa->sockid); - } - - len = sprintf(sendBuf, "msg=PStateResult\nresult-code=%d\nlength=%d\ndata:\n%s", R_AOK, lstLen, lst); diff --git a/print/hplip3/files/patch-pcard_fat.c b/print/hplip3/files/patch-pcard_fat.c deleted file mode 100644 index 805b9ba39d47..000000000000 --- a/print/hplip3/files/patch-pcard_fat.c +++ /dev/null @@ -1,14 +0,0 @@ ---- pcard/fat.c.orig Tue May 23 15:25:02 2006 -+++ pcard/fat.c Tue May 23 15:25:54 2006 -@@ -27,7 +27,11 @@ - \*****************************************************************************/ - - #include <stdlib.h> -+#ifdef __FreeBSD__ -+#include <inttypes.h> -+#else - #include <stdint.h> -+#endif - #include <stdio.h> - #include <string.h> - #include <unistd.h> diff --git a/print/hplip3/files/patch-pcard_pcardext_pcardext.c b/print/hplip3/files/patch-pcard_pcardext_pcardext.c deleted file mode 100644 index 133c6b2c5879..000000000000 --- a/print/hplip3/files/patch-pcard_pcardext_pcardext.c +++ /dev/null @@ -1,19 +0,0 @@ ---- pcard/pcardext/pcardext.c.orig Tue May 23 15:43:36 2006 -+++ pcard/pcardext/pcardext.c Tue May 23 15:44:43 2006 -@@ -80,6 +80,7 @@ - - PyObject * pcardext_mount( PyObject * self, PyObject * args ) - { -+ int i; - if( !PyArg_ParseTuple( args, "OO", &readsectorFunc, &writesectorFunc ) ) - { - return Py_BuildValue( "i", 1 ); -@@ -93,7 +94,7 @@ - Py_INCREF( readsectorFunc ); - Py_INCREF( writesectorFunc ); - -- int i = FatInit(); -+ i = FatInit(); - /*char buf[1024]; - sprintf( buf, "print 'FatInit()=%d\n'", i ); - PyRun_SimpleString( buf );*/ diff --git a/print/hplip3/files/patch-prnt_hpijs_configure b/print/hplip3/files/patch-prnt_hpijs_configure deleted file mode 100644 index 7e6c63c94649..000000000000 --- a/print/hplip3/files/patch-prnt_hpijs_configure +++ /dev/null @@ -1,56 +0,0 @@ ---- prnt/hpijs/configure.orig Wed Oct 18 00:58:44 2006 -+++ prnt/hpijs/configure Wed Oct 18 01:04:20 2006 -@@ -8481,7 +8481,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8539,7 +8539,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 - echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 - if test $ac_cv_lib_dl_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" - else - - lt_cv_dlopen="dyld" -@@ -8807,7 +8807,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8865,7 +8865,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 - echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 - if test $ac_cv_lib_dl_dlopen = yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="" - else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 - echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -@@ -20319,7 +20319,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -20380,7 +20380,7 @@ - cat >>confdefs.h <<\_ACEOF - #define HAVE_LIBDL 1 - _ACEOF -- LIBS="-ldl $LIBS" -+ LIBS="$LIBS" - else - { { echo "$as_me:$LINENO: error: \"cannot find libdl support\"" >&5 - echo "$as_me: error: \"cannot find libdl support\"" >&2;}
\ No newline at end of file diff --git a/print/hplip3/files/patch-prnt_hpijs_djgenericvip.h b/print/hplip3/files/patch-prnt_hpijs_djgenericvip.h deleted file mode 100644 index b6641350f13a..000000000000 --- a/print/hplip3/files/patch-prnt_hpijs_djgenericvip.h +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr hplip-2.7.6.old/prnt/hpijs/djgenericvip.h hplip-2.7.6.new/prnt/hpijs/djgenericvip.h ---- prnt/hpijs/djgenericvip.h.orig 2007-07-06 10:31:25.000000000 -0700 -+++ prnt/hpijs/djgenericvip.h 2007-07-06 10:48:25.000000000 -0700 -@@ -52,6 +52,7 @@ - virtual PHOTOTRAY_STATE PhotoTrayEngaged (BOOL bQueryPrinter); - //! Returns TRUE if a hagaki feed is present in printer. - virtual BOOL HagakiFeedPresent(BOOL bQueryPrinter); -+ virtual DATA_FORMAT GetDataFormat () { return RASTER_STRIP; } - - #ifdef APDK_AUTODUPLEX - //!Returns TRUE if duplexer and hagaki feed (combined) unit is present in printer. diff --git a/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp b/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp index 7a3675b9cdba..3f0d49e84a3a 100644 --- a/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp +++ b/print/hplip3/files/patch-prnt_hpijs_hpijsfax.cpp @@ -1,25 +1,11 @@ ---- prnt/hpijs/hpijsfax.cpp.orig Tue Feb 21 13:19:54 2006 -+++ prnt/hpijs/hpijsfax.cpp Fri May 26 11:56:49 2006 -@@ -39,7 +39,11 @@ - #include <string.h> - #include <unistd.h> - #include <fcntl.h> -+#ifdef __FreeBSD__ -+#include <inttypes.h> -+#else - #include <stdint.h> -+#endif - #include <time.h> - #include <sys/time.h> - #include <math.h> -@@ -297,8 +301,8 @@ +--- prnt/hpijs/hpijsfax.cpp.orig Sat Oct 6 11:33:52 2007 ++++ prnt/hpijs/hpijsfax.cpp Sun Oct 7 15:06:23 2007 +@@ -295,7 +295,7 @@ memset (&tv, 0, sizeof (tv)); gettimeofday (&tv, NULL); - cur_time = localtime (&tv.tv_sec); -- memset (hpFileName, 0, 256); -+ cur_time = localtime ((const time_t *)&tv.tv_sec); -+ memset (hpFileName, 0, 256); ++ cur_time = localtime((const time_t *)&tv.tv_sec); + memset (hpFileName, 0, 256); sprintf (hpFileName, "%s/hplipfax%d%d%d%d%d%d.g3", getenv ("TMPDIR"), cur_time->tm_year+1900, cur_time->tm_mon+1, cur_time->tm_mday, - cur_time->tm_hour, cur_time->tm_min, cur_time->tm_sec); diff --git a/print/hplip3/files/patch-scan_sane-mfpdtf.c b/print/hplip3/files/patch-scan_sane-mfpdtf.c deleted file mode 100644 index 84fb6edefa58..000000000000 --- a/print/hplip3/files/patch-scan_sane-mfpdtf.c +++ /dev/null @@ -1,56 +0,0 @@ ---- scan/sane/mfpdtf.c.orig Sat Nov 11 00:22:14 2006 -+++ scan/sane/mfpdtf.c Mon Dec 25 01:43:52 2006 -@@ -157,7 +157,7 @@ - int MfpdtfReadService( Mfpdtf_t mfpdtf ) - { - int result = 0; -- int datalen, blockLength, headerLength; -+ int datalen, blockLength, headerLength, r; - - if( mfpdtf->read.fixedBlockBytesRemaining <= 0 ) - { -@@ -169,7 +169,7 @@ - - //READ( &mfpdtf->read.fixedHeader, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.fixedHeader, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.fixedHeader, datalen ); - - if( r!= datalen ) - { -@@ -207,7 +207,7 @@ - - //READ( mfpdtf->read.pVariantHeader, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)mfpdtf->read.pVariantHeader, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)mfpdtf->read.pVariantHeader, datalen ); - - if( r!= datalen ) - { -@@ -259,7 +259,7 @@ - - //READ( &id, datalen ); - -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&id, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&id, datalen ); - - if( r!= datalen ) - { -@@ -296,7 +296,7 @@ - datalen = sizeof( mfpdtf->read.imageStartPageRecord ); - // DBG( 0, "Reading start of page record.\n" ); - // DBG( 0, "********************************** SOP RECORD **********************************.\n" ); -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageStartPageRecord, datalen ); - - if( r!= datalen ) - { -@@ -314,7 +314,7 @@ - datalen = sizeof( mfpdtf->read.imageEndPageRecord ); - // DBG( 0, "Reading end of page record.\n" ); - // DBG( 0, "********************************** EOP RECORD **********************************.\n" ); -- int r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); -+ r = MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.imageEndPageRecord, datalen ); - - if( r!= datalen ) - { diff --git a/print/hplip3/files/patch-scan_sane-pml.c b/print/hplip3/files/patch-scan_sane-pml.c deleted file mode 100644 index 0bb93d4eb03a..000000000000 --- a/print/hplip3/files/patch-scan_sane-pml.c +++ /dev/null @@ -1,20 +0,0 @@ ---- scan/sane/pml.c.orig Tue May 23 15:13:18 2006 -+++ scan/sane/pml.c Tue May 23 15:13:55 2006 -@@ -725,7 +725,7 @@ - IP_IMAGE_TRAITS traits; - IP_XFORM_SPEC xforms[IP_MAX_XFORMS], * pXform = xforms; - int stat = SANE_STATUS_DEVICE_BUSY; -- int i, bsize, state, wResult, index, r; -+ int i, bsize, state, wResult, index, r, mmWidth; - int oldStuff = (hpaio->preDenali || hpaio->fromDenali || hpaio->denali) ? 1 : 0; - - if (hpaio->cmd_channelid < 0) -@@ -919,7 +919,7 @@ - hpaio->scanParameters.lines = MILLIMETERS_TO_PIXELS(hpaio->bryRange.max, hpaio->effectiveResolution); - } - -- int mmWidth = PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effectiveResolution); -+ mmWidth = PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effectiveResolution); - - /* Set up X_CROP xform. */ - pXform->aXformInfo[IP_CROP_LEFT].dword = MILLIMETERS_TO_PIXELS( hpaio->effectiveTlx, hpaio->effectiveResolution ); diff --git a/print/hplip3/pkg-install b/print/hplip3/pkg-install index 79d5edf4ecf6..e6f2dc26c7ed 100644 --- a/print/hplip3/pkg-install +++ b/print/hplip3/pkg-install @@ -8,32 +8,10 @@ DLLFILE=${PKG_PREFIX}/etc/sane.d/dll.conf case $2 in POST-INSTALL) - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /nonexistent -s /sbin/nologin -c "HPLIP Server" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi echo "hpaio" >> ${DLLFILE} ;; POST-DEINSTALL) - if pw user show "${USER}" 2>/dev/null; then - if pw userdel ${USER}; then - echo "Removed user \"${USER}\"." - else - echo "Removing user \"${USER}\" failed..." - exit 1 - fi - else - echo "User \"${USER}\" doesn't exist!" - fi cp ${DLLFILE} ${DLLFILE}.orig cat ${DLLFILE}.orig | grep -v hpaio > ${DLLFILE} rm ${DLLFILE}.orig diff --git a/print/hplip3/pkg-message b/print/hplip3/pkg-message index d310fdf4dc2d..9ebb2c083a13 100644 --- a/print/hplip3/pkg-message +++ b/print/hplip3/pkg-message @@ -1,15 +1,28 @@ ********************************************************** + +**************** UPGRADE FROM 1.X NOTICE ***************** + +NOTE: If you are upgrading from 1.x you will need to +change your devfs ruleset as hpiod is now gone, so remove +it from you rc.conf. The printer communication now runs +through cupsd. You will need to make the devfs ruleset +changes to allow cups to access the usb bus and ugen +devices so that it can enumerate the printers. You will +also need to update your hplip.conf. See the instructions +below. + +**************** UPGRADE FROM 1.X NOTICE ***************** + Add the following to your rc.conf: -hpiod_enable="YES" hpssd_enable="YES" -The default setup runs hpiod as the hplip user and adds -hplip to the operator group. So all you have to do if you -have a custom ruleset setup is add the following to that -ruleset in devfs.rules: +So all you have to do if you have a custom ruleset setup +is add the following to that ruleset in devfs.rules: -add path 'ugen*' group operator +add path 'usb*' group cups +add path 'usb*' mode 0660 +add path 'ugen*' group cups add path 'ugen*' mode 0660 If you have never setup devfs.rules please read the @@ -23,25 +36,19 @@ ulpt must NOT be loaded as a kernel module. If you are seeing device connection errors restart the printing chain with the following command. NOTE: It MUST be restarted in the stated order. -%%PREFIX%%/etc/rc.d/hpiod restart && \ %%PREFIX%%/etc/rc.d/hpssd restart && \ %%PREFIX%%/etc/rc.d/cupsd restart -If upgrading from version 0.9.11 add the following to -your %%PREFIX%%/etc/hp/hplip.conf: -[dirs] -run=/var/run -home=%%PREFIX%%/share/hplip -ppd=%%PREFIX%%/share/ppd - -Or just copy the hplip.conf.sample config. [Recommended] +If upgrading from a version < 2.7.9 copy the new +hplip.conf.sample config. cp %%PREFIX%%/etc/hp/hplip.conf.sample \ %%PREFIX%%/etc/hp/hplip.conf -If you are having problems check: +If you are still having problems check: http://am-productions.biz/docs/hplip.php -If you still having problems send the relevant part of -your /var/log/messages, console output from the hp-* +If you are still having problems send the relevant part +of your /var/log/messages, console output from the hp-* utility that you are trying to run, and your rc.conf + -devfs.rules files to the maintainer. +devfs.rules files and the output of "ls -l /dev" to the +maintainer. ********************************************************** diff --git a/print/hplip3/pkg-plist b/print/hplip3/pkg-plist index c389182eb9c7..634054de5889 100644 --- a/print/hplip3/pkg-plist +++ b/print/hplip3/pkg-plist @@ -1,4 +1,3 @@ -bin/foomatic-rip bin/hp-align bin/hp-check bin/hp-clean @@ -11,6 +10,7 @@ bin/hp-makecopies bin/hp-makeuri bin/hp-print bin/hp-probe +bin/hp-scan bin/hp-sendfax bin/hp-setup bin/hp-testpage @@ -18,30 +18,32 @@ bin/hp-timedate bin/hp-toolbox bin/hp-unload bin/hpijs +@unexec if cmp -s %D/etc/hp/hplip.conf.sample %D/etc/hp/hplip.conf; then rm -f %D/etc/hp/hplip.conf; fi etc/hp/hplip.conf.sample +@exec if [ ! -f %D/etc/hp/hplip.conf ] ; then cp -p %D/%F %B/hplip.conf; fi lib/libhpip.la lib/libhpip.so lib/libhpip.so.0 -lib/libsane-hpaio.la -lib/libsane-hpaio.so -lib/libsane-hpaio.so.1 +lib/libhpmud.la +lib/libhpmud.so +lib/libhpmud.so.0 %%PYTHON_SITELIBDIR%%/cupsext.la %%PYTHON_SITELIBDIR%%/cupsext.so +%%PYTHON_SITELIBDIR%%/hpmudext.la +%%PYTHON_SITELIBDIR%%/hpmudext.so %%PYTHON_SITELIBDIR%%/pcardext.la %%PYTHON_SITELIBDIR%%/pcardext.so +%%PYTHON_SITELIBDIR%%/scanext.la +%%PYTHON_SITELIBDIR%%/scanext.so +lib/sane/libsane-hpaio.la lib/sane/libsane-hpaio.so lib/sane/libsane-hpaio.so.1 -lib/sane/libsane-hpaio.so.1.0.0 libexec/cups/backend/hp libexec/cups/backend/hpfax -libexec/cups/filter/foomatic-rip -sbin/hpiod sbin/hpssd share/applications/hplip.desktop -share/cups/model/foomatic-ppds -%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING -%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/README_LIBJPG %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/downloads.html @@ -53,25 +55,22 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/install.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/io.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/known.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/negative.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/hpaio.desc +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/uninstall.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/back.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/button.png -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/circular.gif %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_model_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_opening.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_printer_model.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/download.png -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon.ico -%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/favicon2.ico %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png @@ -207,6 +206,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/make_install.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/manual/permissions.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/rpm.html @@ -248,12 +248,34 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/laser.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/mono_laser_mfp.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/photosmart.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/scanjet.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/unsupported.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/system_requirements.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/device_classes.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/hpijs.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/align.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/check.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/clean.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/colorcal.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/fab.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/firmware.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/hpssd.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/index.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/install.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/probe.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/scan.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/timedate.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/unload.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/overview.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/page_sizes.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/printable_areas.html @@ -266,13 +288,560 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/io.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/network.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/other.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/parallel.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/printing.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/scanning.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/troubleshooting/toolbox.html -%%DATADIR%%/COPYING +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2250.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2280.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2600.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_2800.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Business_Inkjet_3000.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2605.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2700.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_2800.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3000.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_3800.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4500.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4700.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_4730_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_5M.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8500.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_8550.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM1015.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP3505.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Color_LaserJet_CP4005.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_1200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_1220.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_1320_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2410.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2420.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_2430.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3050.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3052.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3300_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_3390.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4050_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4240.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4250.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4345_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4350.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4ML.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4MP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4Si_v2011.110.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4V.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_4_Plus.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5200.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5200L.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5M.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5MP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_5Si_Mopier.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_6MP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_8000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_8100_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_8150_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9000_Series.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9040.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9040_9050_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9050.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_9055_9065_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M3027_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M3035_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M4345_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M5025_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_M5035_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_P2015.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_P3004.ppd.gz +share/foomatic/db/source/PPD/HP/HP_LaserJet_P3005.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Mopier_240.ppd.gz +share/foomatic/db/source/PPD/HP/HP_Mopier_320.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_1300_series.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_2300.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_3015.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_3020_3030.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_3380.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_4200_Series.ppd.gz +share/foomatic/db/source/PPD/HP/hp_LaserJet_4300_Series.ppd.gz +share/foomatic/db/source/PPD/HP/hp_business_inkjet_2300.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_2500.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_3700.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4600.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4610.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_4650.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_5500.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500.ppd.gz +share/foomatic/db/source/PPD/HP/hp_color_LaserJet_9500_MFP.ppd.gz +share/foomatic/db/source/PPD/HP/hp_officejet_9100_series.ppd.gz +share/foomatic/db/source/driver/hpijs.xml +share/foomatic/db/source/opt/hpijs-Duplex.xml +share/foomatic/db/source/opt/hpijs-InputSlot.xml +share/foomatic/db/source/opt/hpijs-Model.xml +share/foomatic/db/source/opt/hpijs-PageSize.xml +share/foomatic/db/source/opt/hpijs-PrintoutMode.xml +share/foomatic/db/source/opt/hpijs-Quality.xml +share/foomatic/db/source/printer/HP-2000C.xml +share/foomatic/db/source/printer/HP-2500C.xml +share/foomatic/db/source/printer/HP-2500CM.xml +share/foomatic/db/source/printer/HP-910.xml +share/foomatic/db/source/printer/HP-915.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_1000.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_1100.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_1200.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2200.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2230.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2250.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2250TN.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2280.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2300.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2600.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_2800.xml +share/foomatic/db/source/printer/HP-Business_Inkjet_3000.xml +share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1160.xml +share/foomatic/db/source/printer/HP-Color_Inkjet_Printer_CP1700.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_2500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3000.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3550.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3600.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3700.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_3800.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4550.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4600.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4610.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4650.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4700.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_4730_MFP.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5000.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5550.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_5M.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_8500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_8550GN.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_9500.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_9500_MFP.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_CP3505.xml +share/foomatic/db/source/printer/HP-Color_LaserJet_CP4005.xml +share/foomatic/db/source/printer/HP-DesignJet_ColorPro_CAD.xml +share/foomatic/db/source/printer/HP-DeskJet_1100C.xml +share/foomatic/db/source/printer/HP-DeskJet_1120C.xml +share/foomatic/db/source/printer/HP-DeskJet_1125C.xml +share/foomatic/db/source/printer/HP-DeskJet_1200C.xml +share/foomatic/db/source/printer/HP-DeskJet_1220C.xml +share/foomatic/db/source/printer/HP-DeskJet_1280.xml +share/foomatic/db/source/printer/HP-DeskJet_1600C.xml +share/foomatic/db/source/printer/HP-DeskJet_3320.xml +share/foomatic/db/source/printer/HP-DeskJet_3325.xml +share/foomatic/db/source/printer/HP-DeskJet_3420.xml +share/foomatic/db/source/printer/HP-DeskJet_3425.xml +share/foomatic/db/source/printer/HP-DeskJet_350C.xml +share/foomatic/db/source/printer/HP-DeskJet_3520.xml +share/foomatic/db/source/printer/HP-DeskJet_3528.xml +share/foomatic/db/source/printer/HP-DeskJet_3535.xml +share/foomatic/db/source/printer/HP-DeskJet_3550.xml +share/foomatic/db/source/printer/HP-DeskJet_3558.xml +share/foomatic/db/source/printer/HP-DeskJet_3650.xml +share/foomatic/db/source/printer/HP-DeskJet_3658.xml +share/foomatic/db/source/printer/HP-DeskJet_3668.xml +share/foomatic/db/source/printer/HP-DeskJet_3740.xml +share/foomatic/db/source/printer/HP-DeskJet_3810.xml +share/foomatic/db/source/printer/HP-DeskJet_3816.xml +share/foomatic/db/source/printer/HP-DeskJet_3820.xml +share/foomatic/db/source/printer/HP-DeskJet_3822.xml +share/foomatic/db/source/printer/HP-DeskJet_3840.xml +share/foomatic/db/source/printer/HP-DeskJet_3845.xml +share/foomatic/db/source/printer/HP-DeskJet_3920.xml +share/foomatic/db/source/printer/HP-DeskJet_3940.xml +share/foomatic/db/source/printer/HP-DeskJet_400.xml +share/foomatic/db/source/printer/HP-DeskJet_420C.xml +share/foomatic/db/source/printer/HP-DeskJet_450.xml +share/foomatic/db/source/printer/HP-DeskJet_460.xml +share/foomatic/db/source/printer/HP-DeskJet_500.xml +share/foomatic/db/source/printer/HP-DeskJet_500C.xml +share/foomatic/db/source/printer/HP-DeskJet_505J_Plus.xml +share/foomatic/db/source/printer/HP-DeskJet_510.xml +share/foomatic/db/source/printer/HP-DeskJet_5150.xml +share/foomatic/db/source/printer/HP-DeskJet_5158.xml +share/foomatic/db/source/printer/HP-DeskJet_5160.xml +share/foomatic/db/source/printer/HP-DeskJet_520.xml +share/foomatic/db/source/printer/HP-DeskJet_540C.xml +share/foomatic/db/source/printer/HP-DeskJet_5440.xml +share/foomatic/db/source/printer/HP-DeskJet_550C.xml +share/foomatic/db/source/printer/HP-DeskJet_5550.xml +share/foomatic/db/source/printer/HP-DeskJet_5551.xml +share/foomatic/db/source/printer/HP-DeskJet_560C.xml +share/foomatic/db/source/printer/HP-DeskJet_5650.xml +share/foomatic/db/source/printer/HP-DeskJet_5652.xml +share/foomatic/db/source/printer/HP-DeskJet_5670.xml +share/foomatic/db/source/printer/HP-DeskJet_5740.xml +share/foomatic/db/source/printer/HP-DeskJet_5850.xml +share/foomatic/db/source/printer/HP-DeskJet_5940.xml +share/foomatic/db/source/printer/HP-DeskJet_600.xml +share/foomatic/db/source/printer/HP-DeskJet_610C.xml +share/foomatic/db/source/printer/HP-DeskJet_610CL.xml +share/foomatic/db/source/printer/HP-DeskJet_6122.xml +share/foomatic/db/source/printer/HP-DeskJet_6127.xml +share/foomatic/db/source/printer/HP-DeskJet_612C.xml +share/foomatic/db/source/printer/HP-DeskJet_630C.xml +share/foomatic/db/source/printer/HP-DeskJet_632C.xml +share/foomatic/db/source/printer/HP-DeskJet_640C.xml +share/foomatic/db/source/printer/HP-DeskJet_648C.xml +share/foomatic/db/source/printer/HP-DeskJet_6520.xml +share/foomatic/db/source/printer/HP-DeskJet_6540.xml +share/foomatic/db/source/printer/HP-DeskJet_656C.xml +share/foomatic/db/source/printer/HP-DeskJet_6600.xml +share/foomatic/db/source/printer/HP-DeskJet_660C.xml +share/foomatic/db/source/printer/HP-DeskJet_670C.xml +share/foomatic/db/source/printer/HP-DeskJet_670TV.xml +share/foomatic/db/source/printer/HP-DeskJet_672C.xml +share/foomatic/db/source/printer/HP-DeskJet_6800.xml +share/foomatic/db/source/printer/HP-DeskJet_680C.xml +share/foomatic/db/source/printer/HP-DeskJet_682C.xml +share/foomatic/db/source/printer/HP-DeskJet_6840.xml +share/foomatic/db/source/printer/HP-DeskJet_690C.xml +share/foomatic/db/source/printer/HP-DeskJet_692C.xml +share/foomatic/db/source/printer/HP-DeskJet_693C.xml +share/foomatic/db/source/printer/HP-DeskJet_6940.xml +share/foomatic/db/source/printer/HP-DeskJet_694C.xml +share/foomatic/db/source/printer/HP-DeskJet_695C.xml +share/foomatic/db/source/printer/HP-DeskJet_697C.xml +share/foomatic/db/source/printer/HP-DeskJet_6980.xml +share/foomatic/db/source/printer/HP-DeskJet_810C.xml +share/foomatic/db/source/printer/HP-DeskJet_812C.xml +share/foomatic/db/source/printer/HP-DeskJet_815C.xml +share/foomatic/db/source/printer/HP-DeskJet_816C.xml +share/foomatic/db/source/printer/HP-DeskJet_825C.xml +share/foomatic/db/source/printer/HP-DeskJet_830C.xml +share/foomatic/db/source/printer/HP-DeskJet_832C.xml +share/foomatic/db/source/printer/HP-DeskJet_840C.xml +share/foomatic/db/source/printer/HP-DeskJet_841C.xml +share/foomatic/db/source/printer/HP-DeskJet_842C.xml +share/foomatic/db/source/printer/HP-DeskJet_843C.xml +share/foomatic/db/source/printer/HP-DeskJet_845C.xml +share/foomatic/db/source/printer/HP-DeskJet_850C.xml +share/foomatic/db/source/printer/HP-DeskJet_855C.xml +share/foomatic/db/source/printer/HP-DeskJet_870C.xml +share/foomatic/db/source/printer/HP-DeskJet_880C.xml +share/foomatic/db/source/printer/HP-DeskJet_882C.xml +share/foomatic/db/source/printer/HP-DeskJet_890C.xml +share/foomatic/db/source/printer/HP-DeskJet_895C.xml +share/foomatic/db/source/printer/HP-DeskJet_916C.xml +share/foomatic/db/source/printer/HP-DeskJet_920C.xml +share/foomatic/db/source/printer/HP-DeskJet_9300.xml +share/foomatic/db/source/printer/HP-DeskJet_930C.xml +share/foomatic/db/source/printer/HP-DeskJet_932C.xml +share/foomatic/db/source/printer/HP-DeskJet_933C.xml +share/foomatic/db/source/printer/HP-DeskJet_934C.xml +share/foomatic/db/source/printer/HP-DeskJet_935C.xml +share/foomatic/db/source/printer/HP-DeskJet_940C.xml +share/foomatic/db/source/printer/HP-DeskJet_948C.xml +share/foomatic/db/source/printer/HP-DeskJet_950C.xml +share/foomatic/db/source/printer/HP-DeskJet_952C.xml +share/foomatic/db/source/printer/HP-DeskJet_955C.xml +share/foomatic/db/source/printer/HP-DeskJet_957C.xml +share/foomatic/db/source/printer/HP-DeskJet_959C.xml +share/foomatic/db/source/printer/HP-DeskJet_9600.xml +share/foomatic/db/source/printer/HP-DeskJet_960C.xml +share/foomatic/db/source/printer/HP-DeskJet_970C.xml +share/foomatic/db/source/printer/HP-DeskJet_975C.xml +share/foomatic/db/source/printer/HP-DeskJet_9800.xml +share/foomatic/db/source/printer/HP-DeskJet_980C.xml +share/foomatic/db/source/printer/HP-DeskJet_990C.xml +share/foomatic/db/source/printer/HP-DeskJet_995C.xml +share/foomatic/db/source/printer/HP-DeskJet_D1300.xml +share/foomatic/db/source/printer/HP-DeskJet_D1400.xml +share/foomatic/db/source/printer/HP-DeskJet_D2300.xml +share/foomatic/db/source/printer/HP-DeskJet_D2400.xml +share/foomatic/db/source/printer/HP-DeskJet_D4100.xml +share/foomatic/db/source/printer/HP-DeskJet_D4200.xml +share/foomatic/db/source/printer/HP-DeskJet_F2100.xml +share/foomatic/db/source/printer/HP-DeskJet_F300.xml +share/foomatic/db/source/printer/HP-DeskJet_F4100.xml +share/foomatic/db/source/printer/HP-LaserJet_1010.xml +share/foomatic/db/source/printer/HP-LaserJet_1012.xml +share/foomatic/db/source/printer/HP-LaserJet_1015.xml +share/foomatic/db/source/printer/HP-LaserJet_1022.xml +share/foomatic/db/source/printer/HP-LaserJet_1100.xml +share/foomatic/db/source/printer/HP-LaserJet_1100A.xml +share/foomatic/db/source/printer/HP-LaserJet_1150.xml +share/foomatic/db/source/printer/HP-LaserJet_1160.xml +share/foomatic/db/source/printer/HP-LaserJet_1200.xml +share/foomatic/db/source/printer/HP-LaserJet_1220.xml +share/foomatic/db/source/printer/HP-LaserJet_1300.xml +share/foomatic/db/source/printer/HP-LaserJet_1320.xml +share/foomatic/db/source/printer/HP-LaserJet_2100.xml +share/foomatic/db/source/printer/HP-LaserJet_2100M.xml +share/foomatic/db/source/printer/HP-LaserJet_2200.xml +share/foomatic/db/source/printer/HP-LaserJet_2300.xml +share/foomatic/db/source/printer/HP-LaserJet_2410.xml +share/foomatic/db/source/printer/HP-LaserJet_2420.xml +share/foomatic/db/source/printer/HP-LaserJet_2430.xml +share/foomatic/db/source/printer/HP-LaserJet_3015.xml +share/foomatic/db/source/printer/HP-LaserJet_3020.xml +share/foomatic/db/source/printer/HP-LaserJet_3030.xml +share/foomatic/db/source/printer/HP-LaserJet_3050.xml +share/foomatic/db/source/printer/HP-LaserJet_3052.xml +share/foomatic/db/source/printer/HP-LaserJet_3055.xml +share/foomatic/db/source/printer/HP-LaserJet_3200.xml +share/foomatic/db/source/printer/HP-LaserJet_3200m.xml +share/foomatic/db/source/printer/HP-LaserJet_3200se.xml +share/foomatic/db/source/printer/HP-LaserJet_3300_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3310_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3320N_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3320_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3330_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_3380.xml +share/foomatic/db/source/printer/HP-LaserJet_3390.xml +share/foomatic/db/source/printer/HP-LaserJet_3392.xml +share/foomatic/db/source/printer/HP-LaserJet_4.xml +share/foomatic/db/source/printer/HP-LaserJet_4000.xml +share/foomatic/db/source/printer/HP-LaserJet_4050.xml +share/foomatic/db/source/printer/HP-LaserJet_4100.xml +share/foomatic/db/source/printer/HP-LaserJet_4200.xml +share/foomatic/db/source/printer/HP-LaserJet_4240.xml +share/foomatic/db/source/printer/HP-LaserJet_4250.xml +share/foomatic/db/source/printer/HP-LaserJet_4300.xml +share/foomatic/db/source/printer/HP-LaserJet_4345_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_4350.xml +share/foomatic/db/source/printer/HP-LaserJet_4L.xml +share/foomatic/db/source/printer/HP-LaserJet_4M.xml +share/foomatic/db/source/printer/HP-LaserJet_4ML.xml +share/foomatic/db/source/printer/HP-LaserJet_4P.xml +share/foomatic/db/source/printer/HP-LaserJet_4Si.xml +share/foomatic/db/source/printer/HP-LaserJet_4V.xml +share/foomatic/db/source/printer/HP-LaserJet_4V_4LJ_Pro.xml +share/foomatic/db/source/printer/HP-LaserJet_4_Plus.xml +share/foomatic/db/source/printer/HP-LaserJet_5.xml +share/foomatic/db/source/printer/HP-LaserJet_5000.xml +share/foomatic/db/source/printer/HP-LaserJet_5100.xml +share/foomatic/db/source/printer/HP-LaserJet_5200.xml +share/foomatic/db/source/printer/HP-LaserJet_5200L.xml +share/foomatic/db/source/printer/HP-LaserJet_5L.xml +share/foomatic/db/source/printer/HP-LaserJet_5M.xml +share/foomatic/db/source/printer/HP-LaserJet_5MP.xml +share/foomatic/db/source/printer/HP-LaserJet_5P.xml +share/foomatic/db/source/printer/HP-LaserJet_5Si.xml +share/foomatic/db/source/printer/HP-LaserJet_6.xml +share/foomatic/db/source/printer/HP-LaserJet_6L.xml +share/foomatic/db/source/printer/HP-LaserJet_6MP.xml +share/foomatic/db/source/printer/HP-LaserJet_6P.xml +share/foomatic/db/source/printer/HP-LaserJet_8000.xml +share/foomatic/db/source/printer/HP-LaserJet_8100.xml +share/foomatic/db/source/printer/HP-LaserJet_8150.xml +share/foomatic/db/source/printer/HP-LaserJet_9000.xml +share/foomatic/db/source/printer/HP-LaserJet_9000_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9040.xml +share/foomatic/db/source/printer/HP-LaserJet_9040_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9050.xml +share/foomatic/db/source/printer/HP-LaserJet_9050_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9055_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_9065_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M3027_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M3035_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M4345_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M5025_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_M5035_MFP.xml +share/foomatic/db/source/printer/HP-LaserJet_P2010.xml +share/foomatic/db/source/printer/HP-LaserJet_P2015.xml +share/foomatic/db/source/printer/HP-LaserJet_P3004.xml +share/foomatic/db/source/printer/HP-LaserJet_P3005.xml +share/foomatic/db/source/printer/HP-Mopier_240.xml +share/foomatic/db/source/printer/HP-Mopier_320.xml +share/foomatic/db/source/printer/HP-OfficeJet.xml +share/foomatic/db/source/printer/HP-OfficeJet_300.xml +share/foomatic/db/source/printer/HP-OfficeJet_330.xml +share/foomatic/db/source/printer/HP-OfficeJet_350.xml +share/foomatic/db/source/printer/HP-OfficeJet_4100.xml +share/foomatic/db/source/printer/HP-OfficeJet_4105.xml +share/foomatic/db/source/printer/HP-OfficeJet_4110.xml +share/foomatic/db/source/printer/HP-OfficeJet_4115.xml +share/foomatic/db/source/printer/HP-OfficeJet_4200.xml +share/foomatic/db/source/printer/HP-OfficeJet_4300.xml +share/foomatic/db/source/printer/HP-OfficeJet_500.xml +share/foomatic/db/source/printer/HP-OfficeJet_5105.xml +share/foomatic/db/source/printer/HP-OfficeJet_5110.xml +share/foomatic/db/source/printer/HP-OfficeJet_5110xi.xml +share/foomatic/db/source/printer/HP-OfficeJet_520.xml +share/foomatic/db/source/printer/HP-OfficeJet_5500.xml +share/foomatic/db/source/printer/HP-OfficeJet_5600.xml +share/foomatic/db/source/printer/HP-OfficeJet_570.xml +share/foomatic/db/source/printer/HP-OfficeJet_580.xml +share/foomatic/db/source/printer/HP-OfficeJet_590.xml +share/foomatic/db/source/printer/HP-OfficeJet_600.xml +share/foomatic/db/source/printer/HP-OfficeJet_610.xml +share/foomatic/db/source/printer/HP-OfficeJet_6100.xml +share/foomatic/db/source/printer/HP-OfficeJet_6105.xml +share/foomatic/db/source/printer/HP-OfficeJet_6110.xml +share/foomatic/db/source/printer/HP-OfficeJet_6150.xml +share/foomatic/db/source/printer/HP-OfficeJet_6200.xml +share/foomatic/db/source/printer/HP-OfficeJet_625.xml +share/foomatic/db/source/printer/HP-OfficeJet_630.xml +share/foomatic/db/source/printer/HP-OfficeJet_6300.xml +share/foomatic/db/source/printer/HP-OfficeJet_635.xml +share/foomatic/db/source/printer/HP-OfficeJet_700.xml +share/foomatic/db/source/printer/HP-OfficeJet_710.xml +share/foomatic/db/source/printer/HP-OfficeJet_7100.xml +share/foomatic/db/source/printer/HP-OfficeJet_7110.xml +share/foomatic/db/source/printer/HP-OfficeJet_7130.xml +share/foomatic/db/source/printer/HP-OfficeJet_7140.xml +share/foomatic/db/source/printer/HP-OfficeJet_720.xml +share/foomatic/db/source/printer/HP-OfficeJet_7200.xml +share/foomatic/db/source/printer/HP-OfficeJet_725.xml +share/foomatic/db/source/printer/HP-OfficeJet_7300.xml +share/foomatic/db/source/printer/HP-OfficeJet_7400.xml +share/foomatic/db/source/printer/HP-OfficeJet_D125.xml +share/foomatic/db/source/printer/HP-OfficeJet_D135.xml +share/foomatic/db/source/printer/HP-OfficeJet_D145.xml +share/foomatic/db/source/printer/HP-OfficeJet_D155.xml +share/foomatic/db/source/printer/HP-OfficeJet_G55.xml +share/foomatic/db/source/printer/HP-OfficeJet_G85.xml +share/foomatic/db/source/printer/HP-OfficeJet_G95.xml +share/foomatic/db/source/printer/HP-OfficeJet_J3600.xml +share/foomatic/db/source/printer/HP-OfficeJet_J5500.xml +share/foomatic/db/source/printer/HP-OfficeJet_J5700.xml +share/foomatic/db/source/printer/HP-OfficeJet_K60.xml +share/foomatic/db/source/printer/HP-OfficeJet_K60xi.xml +share/foomatic/db/source/printer/HP-OfficeJet_K80.xml +share/foomatic/db/source/printer/HP-OfficeJet_K80xi.xml +share/foomatic/db/source/printer/HP-OfficeJet_LX.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_1150C.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_1170C.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_1175C.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5300.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K5400.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K550.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_K850.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7300.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7500.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7600.xml +share/foomatic/db/source/printer/HP-OfficeJet_Pro_L7700.xml +share/foomatic/db/source/printer/HP-OfficeJet_R40.xml +share/foomatic/db/source/printer/HP-OfficeJet_R45.xml +share/foomatic/db/source/printer/HP-OfficeJet_R60.xml +share/foomatic/db/source/printer/HP-OfficeJet_R65.xml +share/foomatic/db/source/printer/HP-OfficeJet_R80.xml +share/foomatic/db/source/printer/HP-OfficeJet_T45.xml +share/foomatic/db/source/printer/HP-OfficeJet_T65.xml +share/foomatic/db/source/printer/HP-OfficeJet_V40.xml +share/foomatic/db/source/printer/HP-OfficeJet_V40xi.xml +share/foomatic/db/source/printer/HP-Officejet_K7100.xml +share/foomatic/db/source/printer/HP-PSC_1100.xml +share/foomatic/db/source/printer/HP-PSC_1110.xml +share/foomatic/db/source/printer/HP-PSC_1200.xml +share/foomatic/db/source/printer/HP-PSC_1205.xml +share/foomatic/db/source/printer/HP-PSC_1210.xml +share/foomatic/db/source/printer/HP-PSC_1300.xml +share/foomatic/db/source/printer/HP-PSC_1310.xml +share/foomatic/db/source/printer/HP-PSC_1400.xml +share/foomatic/db/source/printer/HP-PSC_1500.xml +share/foomatic/db/source/printer/HP-PSC_1510.xml +share/foomatic/db/source/printer/HP-PSC_1600.xml +share/foomatic/db/source/printer/HP-PSC_2110.xml +share/foomatic/db/source/printer/HP-PSC_2150.xml +share/foomatic/db/source/printer/HP-PSC_2170.xml +share/foomatic/db/source/printer/HP-PSC_2175.xml +share/foomatic/db/source/printer/HP-PSC_2210.xml +share/foomatic/db/source/printer/HP-PSC_2300.xml +share/foomatic/db/source/printer/HP-PSC_2350.xml +share/foomatic/db/source/printer/HP-PSC_2400.xml +share/foomatic/db/source/printer/HP-PSC_2500.xml +share/foomatic/db/source/printer/HP-PSC_370.xml +share/foomatic/db/source/printer/HP-PSC_380.xml +share/foomatic/db/source/printer/HP-PSC_500.xml +share/foomatic/db/source/printer/HP-PSC_750.xml +share/foomatic/db/source/printer/HP-PSC_750xi.xml +share/foomatic/db/source/printer/HP-PSC_950.xml +share/foomatic/db/source/printer/HP-PSC_950xi.xml +share/foomatic/db/source/printer/HP-PhotoSmart_140.xml +share/foomatic/db/source/printer/HP-PhotoSmart_240.xml +share/foomatic/db/source/printer/HP-PhotoSmart_2570.xml +share/foomatic/db/source/printer/HP-PhotoSmart_2600.xml +share/foomatic/db/source/printer/HP-PhotoSmart_2700.xml +share/foomatic/db/source/printer/HP-PhotoSmart_3100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_320.xml +share/foomatic/db/source/printer/HP-PhotoSmart_3200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_330.xml +share/foomatic/db/source/printer/HP-PhotoSmart_3300.xml +share/foomatic/db/source/printer/HP-PhotoSmart_370.xml +share/foomatic/db/source/printer/HP-PhotoSmart_380.xml +share/foomatic/db/source/printer/HP-PhotoSmart_420.xml +share/foomatic/db/source/printer/HP-PhotoSmart_470.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7150.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7260.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7268.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7345.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7350.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7400.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7550.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7660.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7760.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7800.xml +share/foomatic/db/source/printer/HP-PhotoSmart_7960.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8000.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8400.xml +share/foomatic/db/source/printer/HP-PhotoSmart_8700.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A310.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A320.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A430.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A440.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A510.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A520.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A610.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A620.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A710.xml +share/foomatic/db/source/printer/HP-PhotoSmart_A820.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C3100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C4100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C4200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C5100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C5200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C6100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C6200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C7100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C7200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_C8100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D5060.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D5100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D5300.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D6100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7200.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7300.xml +share/foomatic/db/source/printer/HP-PhotoSmart_D7400.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1000.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1100.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1115.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1215.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1218.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P130.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P1315.xml +share/foomatic/db/source/printer/HP-PhotoSmart_P230.xml +share/foomatic/db/source/printer/HP-PhotoSmart_Pro_B8300.xml +share/foomatic/db/source/printer/HP-e-printer_e20.xml %%DATADIR%%/__init__.py -%%DATADIR%%/align +%%DATADIR%%/align.py %%DATADIR%%/base/__init__.py %%DATADIR%%/base/async.py %%DATADIR%%/base/async_qt.py @@ -295,15 +864,13 @@ share/cups/model/foomatic-ppds %%DATADIR%%/base/slp.py %%DATADIR%%/base/status.py %%DATADIR%%/base/strings.py +%%DATADIR%%/base/tui.py %%DATADIR%%/base/utils.py -%%DATADIR%%/check -%%DATADIR%%/clean -%%DATADIR%%/colorcal +%%DATADIR%%/check.py +%%DATADIR%%/clean.py +%%DATADIR%%/colorcal.py %%DATADIR%%/copier/__init__.py %%DATADIR%%/copier/copier.py -%%DATADIR%%/data/firmware/HP_LaserJet_1018.fw.gz -%%DATADIR%%/data/firmware/HP_LaserJet_1020.fw.gz -%%DATADIR%%/data/hplip.desktop %%DATADIR%%/data/images/120.png %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png %%DATADIR%%/data/images/CP_1700.png @@ -458,7 +1025,6 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/h-kc-3.png %%DATADIR%%/data/images/help.png %%DATADIR%%/data/images/hp-tux-printer.png -%%DATADIR%%/data/images/hp-tux-printer.ppm %%DATADIR%%/data/images/hp_LaserJet_1200.png %%DATADIR%%/data/images/hp_LaserJet_2100.png %%DATADIR%%/data/images/hp_LaserJet_3015.png @@ -519,7 +1085,6 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/ok.png %%DATADIR%%/data/images/ok_small.png %%DATADIR%%/data/images/opensource-75x65.png -%%DATADIR%%/data/images/panel_lcd.xpm %%DATADIR%%/data/images/paper.png %%DATADIR%%/data/images/paper_small.png %%DATADIR%%/data/images/pcard_icon.png @@ -528,6 +1093,7 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/images/photosmart_7150.png %%DATADIR%%/data/images/photosmart_7900_series.png %%DATADIR%%/data/images/photosmart_a610.png +%%DATADIR%%/data/images/photosmart_a820_series.png %%DATADIR%%/data/images/png.png %%DATADIR%%/data/images/powered_by_python.png %%DATADIR%%/data/images/prev.png @@ -571,6 +1137,13 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/ldl/cbccal_done.ldl.gz %%DATADIR%%/data/ldl/cbcpcal.ldl.gz %%DATADIR%%/data/ldl/cbpcal.ldl.gz +%%DATADIR%%/data/localization/hplip_de.qm +%%DATADIR%%/data/localization/hplip_es.qm +%%DATADIR%%/data/localization/hplip_fr.qm +%%DATADIR%%/data/localization/hplip_it.qm +%%DATADIR%%/data/localization/hplip_pt.qm +%%DATADIR%%/data/localization/hplip_ru.qm +%%DATADIR%%/data/localization/hplip_zh.qm %%DATADIR%%/data/models/models.dat %%DATADIR%%/data/pcl/align1_8xx.pcl.gz %%DATADIR%%/data/pcl/align1_9xx.pcl.gz @@ -592,25 +1165,23 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/pcl/crpcal.pcl.gz %%DATADIR%%/data/ps/clean_page.pdf.gz %%DATADIR%%/data/ps/testpage.ps.gz -%%DATADIR%%/fab +%%DATADIR%%/fab.py %%DATADIR%%/fax/__init__.py -%%DATADIR%%/fax/backend/hpfax %%DATADIR%%/fax/coverpages.py %%DATADIR%%/fax/fax.py -%%DATADIR%%/fax/ppd/HP-Fax-hplip.ppd -%%DATADIR%%/firmware +%%DATADIR%%/firmware.py %%DATADIR%%/hpaio.desc %%DATADIR%%/hplip-install -%%DATADIR%%/hplip.sh %%DATADIR%%/hpssd.py -%%DATADIR%%/info +%%DATADIR%%/info.py %%DATADIR%%/install.py %%DATADIR%%/installer/__init__.py +%%DATADIR%%/installer/core_install.py %%DATADIR%%/installer/dcheck.py -%%DATADIR%%/installer/distros.py -%%DATADIR%%/levels -%%DATADIR%%/makecopies -%%DATADIR%%/makeuri +%%DATADIR%%/installer/distros.dat +%%DATADIR%%/levels.py +%%DATADIR%%/makecopies.py +%%DATADIR%%/makeuri.py %%DATADIR%%/pcard/__init__.py %%DATADIR%%/pcard/photocard.py %%DATADIR%%/plugins/Deskjet_460.py @@ -619,20 +1190,22 @@ share/cups/model/foomatic-ppds %%DATADIR%%/plugins/powersettings.py %%DATADIR%%/plugins/powersettingsdialog.py %%DATADIR%%/plugins/powersettingsdialog_base.py -%%DATADIR%%/print +%%DATADIR%%/print.py %%DATADIR%%/prnt/__init__.py %%DATADIR%%/prnt/colorcal.py %%DATADIR%%/prnt/cups.py %%DATADIR%%/prnt/ldl.py %%DATADIR%%/prnt/pcl.py %%DATADIR%%/prnt/printable_areas.py -%%DATADIR%%/probe +%%DATADIR%%/probe.py +%%DATADIR%%/scan.py %%DATADIR%%/scan/__init__.py -%%DATADIR%%/sendfax -%%DATADIR%%/setup -%%DATADIR%%/testpage -%%DATADIR%%/timedate -%%DATADIR%%/toolbox +%%DATADIR%%/scan/sane.py +%%DATADIR%%/sendfax.py +%%DATADIR%%/setup.py +%%DATADIR%%/testpage.py +%%DATADIR%%/timedate.py +%%DATADIR%%/toolbox.py %%DATADIR%%/ui/__init__.py %%DATADIR%%/ui/aboutdlg.py %%DATADIR%%/ui/aboutdlg_base.py @@ -681,6 +1254,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/nodevicesform_base.py %%DATADIR%%/ui/paperedgealignform.py %%DATADIR%%/ui/paperedgealignform_base.py +%%DATADIR%%/ui/pluginform.py +%%DATADIR%%/ui/pluginform_base.py %%DATADIR%%/ui/printerform.py %%DATADIR%%/ui/scrollcopy.py %%DATADIR%%/ui/scrollfax.py @@ -704,10 +1279,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/unloadform.py %%DATADIR%%/ui/waitform.py %%DATADIR%%/ui/waitform_base.py -%%DATADIR%%/unload +%%DATADIR%%/unload.py share/ppd/HP/HP-2000C-hpijs.ppd.gz share/ppd/HP/HP-2500C-hpijs.ppd.gz share/ppd/HP/HP-2500CM-hpijs.ppd.gz +share/ppd/HP/HP-910-hpijs.ppd.gz +share/ppd/HP/HP-915-hpijs.ppd.gz share/ppd/HP/HP-Business_Inkjet_1000-hpijs.ppd.gz share/ppd/HP/HP-Business_Inkjet_1100-hpijs.ppd.gz share/ppd/HP/HP-Business_Inkjet_1200-hpijs.ppd.gz @@ -745,6 +1322,8 @@ share/ppd/HP/HP-Color_LaserJet_8500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_8550GN-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_9500_MFP-hpijs.ppd.gz +share/ppd/HP/HP-Color_LaserJet_CM4730_MFP-hpijs.ppd.gz +share/ppd/HP/HP-Color_LaserJet_CP3505-hpijs.ppd.gz share/ppd/HP/HP-Color_LaserJet_CP4005-hpijs.ppd.gz share/ppd/HP/HP-DesignJet_ColorPro_CAD-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_1100C-hpijs.ppd.gz @@ -790,8 +1369,10 @@ share/ppd/HP/HP-DeskJet_5160-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_520-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_540C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5440-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_550C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5550-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5551-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_560C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5650-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5652-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_5670-hpijs.ppd.gz @@ -879,6 +1460,7 @@ share/ppd/HP/HP-DeskJet_D4200-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F2100-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F4100-hpijs.ppd.gz +share/ppd/HP/HP-Fax-hplip.ppd.gz share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1015-hpijs.ppd.gz @@ -963,6 +1545,7 @@ share/ppd/HP/HP-LaserJet_M3035_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_M4345_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_M5025_MFP-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_M5035_MFP-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_P2010-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_P2015-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_P3004-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_P3005-hpijs.ppd.gz @@ -1017,6 +1600,8 @@ share/ppd/HP/HP-OfficeJet_D155-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_G55-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_G85-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_G95-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_J3600-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_J5500-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_J5700-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_K60-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_K60xi-hpijs.ppd.gz @@ -1043,6 +1628,7 @@ share/ppd/HP/HP-OfficeJet_T45-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_T65-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_V40-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_V40xi-hpijs.ppd.gz +share/ppd/HP/HP-Officejet_K7100-hpijs.ppd.gz share/ppd/HP/HP-PSC_1100-hpijs.ppd.gz share/ppd/HP/HP-PSC_1110-hpijs.ppd.gz share/ppd/HP/HP-PSC_1200-hpijs.ppd.gz @@ -1101,20 +1687,33 @@ share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A310-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A320-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A440-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A520-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A620-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A820-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C4200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C5100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C5200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C6100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C6200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_C7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C7200-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_C8100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D5060-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D5100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D5300-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D6100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7200-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7400-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P100-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1000-hpijs.ppd.gz share/ppd/HP/HP-PhotoSmart_P1100-hpijs.ppd.gz @@ -1131,7 +1730,6 @@ share/ppd/HP/HP_Business_Inkjet_2280.ppd.gz share/ppd/HP/HP_Business_Inkjet_2600.ppd.gz share/ppd/HP/HP_Business_Inkjet_2800.ppd.gz share/ppd/HP/HP_Business_Inkjet_3000.ppd.gz -share/ppd/HP/HP_CM8050_CM8060_MFP.ppd.gz share/ppd/HP/HP_Color_LaserJet.ppd.gz share/ppd/HP/HP_Color_LaserJet_2550.ppd.gz share/ppd/HP/HP_Color_LaserJet_2605.ppd.gz @@ -1148,6 +1746,8 @@ share/ppd/HP/HP_Color_LaserJet_5M.ppd.gz share/ppd/HP/HP_Color_LaserJet_8500.ppd.gz share/ppd/HP/HP_Color_LaserJet_8550.ppd.gz share/ppd/HP/HP_Color_LaserJet_CM1015.ppd.gz +share/ppd/HP/HP_Color_LaserJet_CM4730_MFP.ppd.gz +share/ppd/HP/HP_Color_LaserJet_CP3505.ppd.gz share/ppd/HP/HP_Color_LaserJet_CP4005.ppd.gz share/ppd/HP/HP_LaserJet_1200.ppd.gz share/ppd/HP/HP_LaserJet_1220.ppd.gz @@ -1204,7 +1804,6 @@ share/ppd/HP/HP_LaserJet_P3004.ppd.gz share/ppd/HP/HP_LaserJet_P3005.ppd.gz share/ppd/HP/HP_Mopier_240.ppd.gz share/ppd/HP/HP_Mopier_320.ppd.gz -share/ppd/HP/fax/HP-Fax-hplip.ppd.gz share/ppd/HP/hp_LaserJet_1300_series.ppd.gz share/ppd/HP/hp_LaserJet_2300.ppd.gz share/ppd/HP/hp_LaserJet_3015.ppd.gz @@ -1222,7 +1821,6 @@ share/ppd/HP/hp_color_LaserJet_5500.ppd.gz share/ppd/HP/hp_color_LaserJet_9500.ppd.gz share/ppd/HP/hp_color_LaserJet_9500_MFP.ppd.gz share/ppd/HP/hp_officejet_9100_series.ppd.gz -@dirrm share/ppd/HP/fax @dirrm share/ppd/HP @dirrm share/ppd @unexec rm -f %D/%%DATADIR%%/*/*.pyc 2>/dev/null || true @@ -1232,20 +1830,25 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz @dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/pcard @dirrm %%DATADIR%%/installer -@dirrm %%DATADIR%%/fax/ppd -@dirrm %%DATADIR%%/fax/backend @dirrm %%DATADIR%%/fax @dirrm %%DATADIR%%/data/ps @dirrm %%DATADIR%%/data/pcl @dirrm %%DATADIR%%/data/models +@dirrm %%DATADIR%%/data/localization @dirrm %%DATADIR%%/data/ldl @dirrm %%DATADIR%%/data/images -@dirrm %%DATADIR%%/data/firmware @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/base @dirrm %%DATADIR%% -@dirrmtry share/gnome +@dirrm share/foomatic/db/source/printer +@dirrm share/foomatic/db/source/opt +@dirrm share/foomatic/db/source/driver +@dirrm share/foomatic/db/source/PPD/HP +@dirrm share/foomatic/db/source/PPD +@dirrm share/foomatic/db/source +@dirrm share/foomatic/db +@dirrm share/foomatic %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/troubleshooting %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/tech_docs @@ -1265,6 +1868,6 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/images %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%% -%%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%% @dirrmtry share/applications +@dirrmtry share/gnome @dirrmtry etc/hp |