Date: Tue, 23 May 2006 21:50:24 GMT From: Anish Mistry <amistry@am-productions.biz> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/97661: Update print/hplip to 0.9.11 Message-ID: <200605232150.k4NLoOjQ083857@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/97661; it has been noted by GNATS. From: Anish Mistry <amistry@am-productions.biz> To: bug-followup@freebsd.org, amistry@am-productions.biz Cc: Subject: Re: ports/97661: Update print/hplip to 0.9.11 Date: Tue, 23 May 2006 17:46:23 -0400 --nextPart11189462.XssEE0eop0 Content-Type: multipart/mixed; boundary="Boundary-01=_wK4cEIhZeeZ6K/A" Content-Transfer-Encoding: 7bit Content-Disposition: inline --Boundary-01=_wK4cEIhZeeZ6K/A Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I've attached an updated version of the previous update here and=20 attached. http://am-productions.biz/docs/hplip-0.9.11-4.x-fix.patch It fixes the build on 4.11. I wasn't able to test if it actually=20 worked since the last 4.x system I have is at a remote location. It=20 also was only tested without the GUI options. This will most likely=20 be the only release to support 4.x. The reasons for this are that=20 there are only 6 months until 4.x is EOL'd and my 4.11 box will=20 probably be a 6.x system by the time HP releases the next update. =2D-=20 Anish Mistry amistry@am-productions.biz AM Productions http://am-productions.biz/ --Boundary-01=_wK4cEIhZeeZ6K/A Content-Type: text/x-diff; charset="us-ascii"; name="hplip-0.9.11-4.x-fix.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="hplip-0.9.11-4.x-fix.patch" diff -ruN hplip.orig/Makefile hplip/Makefile =2D-- hplip.orig/Makefile Mon May 22 16:04:43 2006 +++ hplip/Makefile Tue May 23 17:25:46 2006 @@ -2,11 +2,11 @@ # Date created: 1 April 2006 # Whom: amistry@am-productions.biz # =2D# $FreeBSD: /repoman/r/pcvs/ports/print/hplip/Makefile,v 1.2 2006/05/21 = 18:54:52 pav Exp $ +# $FreeBSD: ports/print/hplip/Makefile,v 1.2 2006/05/21 18:54:52 pav Exp $ # =20 PORTNAME=3D hplip =2DPORTVERSION=3D 0.9.10 +PORTVERSION=3D 0.9.11 CATEGORIES=3D print MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=3D hplip @@ -19,7 +19,6 @@ cups.2:${PORTSDIR}/print/cups-base \ usb:${PORTSDIR}/devel/libusb \ netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp =2DRUN_DEPENDS=3D pylupdate:${PORTSDIR}/x11-toolkits/py-qt =20 CONFLITS=3D hpijs-* foomatic-filters-* =20 @@ -39,10 +38,20 @@ =20 PKGDEINSTALL=3D ${PKGINSTALL} =20 +OPTIONS=3D GUI "build with Python QT" on + .include <bsd.port.pre.mk> =20 =2D.if ${OSVERSION} < 5000000 =2DBROKEN=3D does not compile +.if ${OSVERSION} < 500000 +USE_AUTOTOOLS=3D automake:19:env autoconf:259:env aclocal:19:env +.endif + +.if exists(${LOCALBASE}/bin/pylupdate) +WITH_GUI=3D yes +.endif + +.if defined(WITH_GUI) +RUN_DEPENDS+=3D pylupdate:${PORTSDIR}/x11-toolkits/py-qt .endif =20 post-extract: @@ -63,7 +72,6 @@ s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \ ${WRKSRC}/base/g.py \ ${WRKSRC}/fax/backend/hpfax.py \ =2D ${WRKSRC}/hplip_readme.html \ ${WRKSRC}/hpssd.py \ ${WRKSRC}/io/hpiod/hpiod.h \ ${WRKSRC}/prnt/hpijs/hplip_api.h \ @@ -72,6 +80,8 @@ ${WRKSRC}/*.py \ ${WRKSRC}/*/*.py \ ${WRKSRC}/*/*/*.py + @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure + .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's|install-data-am: install-docDATA|install-data-am:= |g' \ ${WRKSRC}/prnt/hpijs/Makefile.in diff -ruN hplip.orig/distinfo hplip/distinfo =2D-- hplip.orig/distinfo Sun May 21 13:46:22 2006 +++ hplip/distinfo Sun May 21 13:58:16 2006 @@ -1,3 +1,3 @@ =2DMD5 (hplip-0.9.10.tar.gz) =3D 349489b10fb44d1bf105b04ff5352551 =2DSHA256 (hplip-0.9.10.tar.gz) =3D a6a6247b396aba173d0cd7b2aadffc5467d0f82= d5aa037503222b98b8d5fe8b1 =2DSIZE (hplip-0.9.10.tar.gz) =3D 9296866 +MD5 (hplip-0.9.11.tar.gz) =3D 5cf362c972d5b1733af4fb8e2ade92e4 +SHA256 (hplip-0.9.11.tar.gz) =3D 9c6f39863280d74a72bdce632f2453fa5bbbfffd2= 86b1fd0535cfba76dcf5b42 +SIZE (hplip-0.9.11.tar.gz) =3D 9924094 diff -ruN hplip.orig/files/patch-0.9.11-2-official hplip/files/patch-0.9.11= =2D2-official =2D-- hplip.orig/files/patch-0.9.11-2-official Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-0.9.11-2-official Sun May 21 13:57:58 2006 @@ -0,0 +1,276 @@ +diff -uNr hplip-0.9.11.old/data/xml/models.xml data/xml/models.xml +--- hplip-0.9.11.old/data/xml/models.xml 2006-05-08 12:27:06.000000000 -07= 00 ++++ data/xml/models.xml 2006-05-12 15:30:54.754891424 -0700 +@@ -7797,6 +7797,84 @@ + </r0> + </model> +=20 ++<model name=3D"PSC_950"> ++ <id>MFG:Hewlett-Packard;MDL:PSC 900 Series;SKU:PSC 950;CMD:2,PCL,PML;= CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PSC 900 Series;1284.3M:f7f,f7f;12= 84.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,N= R,KP066,CP095;AiO:00;DW-PCL;</id> ++ <icon>PSC_900_Series.png</icon> ++ <support type=3D"2"/> ++ <case-model> ++ </case-model> ++ <io support=3D"2" mode=3D"1" control=3D"0" mfp-mode=3D"2" scan-port= =3D"0"/> ++ <align type=3D"9"/> ++ <clean type=3D"3"/> ++ <color-cal type=3D"0"/> ++ <status type=3D"1"/> ++ <scan type=3D"1"/> ++ <fax type=3D"0"/> ++ <pcard type=3D"1"/> ++ <copy type=3D"0"/> ++ <tech class=3D"DJ9xx" type=3D"2"/> ++ <embedded-server type=3D"0"/> ++ <panel-check type=3D"1"/> ++ <linefeed-cal type=3D"0"/> ++ <pq-diag type=3D"0"/> ++ <r0> ++ <agent1 kind=3D"3" type=3D"1" sku=3D"15 (C6615DN)"/> ++ <agent2 kind=3D"3" type=3D"2" sku=3D"78 (C6578AN / C6578DN)"/> ++ </r0> ++</model> ++ ++<model name=3D"PSC_950vr"> ++ <id>MFG:Hewlett-Packard;MDL:PSC 900 Series;SKU:PSC 950;CMD:2,PCL,PML;= CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PSC 900 Series;1284.3M:f7f,f7f;12= 84.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,N= R,KP066,CP095;AiO:00;DW-PCL;</id> ++ <icon>PSC_900_Series.png</icon> ++ <support type=3D"2"/> ++ <case-model> ++ </case-model> ++ <io support=3D"2" mode=3D"1" control=3D"0" mfp-mode=3D"2" scan-port= =3D"0"/> ++ <align type=3D"9"/> ++ <clean type=3D"3"/> ++ <color-cal type=3D"0"/> ++ <status type=3D"1"/> ++ <scan type=3D"1"/> ++ <fax type=3D"0"/> ++ <pcard type=3D"1"/> ++ <copy type=3D"0"/> ++ <tech class=3D"DJ9xx" type=3D"2"/> ++ <embedded-server type=3D"0"/> ++ <panel-check type=3D"1"/> ++ <linefeed-cal type=3D"0"/> ++ <pq-diag type=3D"0"/> ++ <r0> ++ <agent1 kind=3D"3" type=3D"1" sku=3D"15 (C6615DN)"/> ++ <agent2 kind=3D"3" type=3D"2" sku=3D"78 (C6578AN / C6578DN)"/> ++ </r0> ++</model> ++ ++<model name=3D"PSC_950xi"> ++ <id>MFG:Hewlett-Packard;MDL:PSC 900 Series;SKU:PSC 950;CMD:2,PCL,PML;= CLASS:PRINTER;DESCRIPTION:Hewlett-Packard PSC 900 Series;1284.3M:f7f,f7f;12= 84.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,N= R,KP066,CP095;AiO:00;DW-PCL;</id> ++ <icon>PSC_900_Series.png</icon> ++ <support type=3D"2"/> ++ <case-model> ++ </case-model> ++ <io support=3D"2" mode=3D"1" control=3D"0" mfp-mode=3D"2" scan-port= =3D"0"/> ++ <align type=3D"9"/> ++ <clean type=3D"3"/> ++ <color-cal type=3D"0"/> ++ <status type=3D"1"/> ++ <scan type=3D"1"/> ++ <fax type=3D"0"/> ++ <pcard type=3D"1"/> ++ <copy type=3D"0"/> ++ <tech class=3D"DJ9xx" type=3D"2"/> ++ <embedded-server type=3D"0"/> ++ <panel-check type=3D"1"/> ++ <linefeed-cal type=3D"0"/> ++ <pq-diag type=3D"0"/> ++ <r0> ++ <agent1 kind=3D"3" type=3D"1" sku=3D"15 (C6615DN)"/> ++ <agent2 kind=3D"3" type=3D"2" sku=3D"78 (C6578AN / C6578DN)"/> ++ </r0> ++</model> ++ + <model name=3D"Photosmart_2570_series"> + <id></id> + <icon>psc_2300_series.png</icon> +diff -uNr hplip-0.9.11.old/prnt/hpijs/colormatch.cpp prnt/hpijs/colormatch= =2Ecpp +--- hplip-0.9.11.old/prnt/hpijs/colormatch.cpp 2006-05-09 11:04:30.0000000= 00 -0700 ++++ prnt/hpijs/colormatch.cpp 2006-05-11 16:17:17.000000000 -0700 +@@ -221,15 +221,21 @@ + { + for (unsigned int r =3D 0; r < 9; r++) + { ++#ifndef NDEBUG + unsigned long ul_RedMapPtr =3D r * 9 * 9; ++#endif + for (unsigned int g =3D 0; g < 9; g++) + { ++#ifndef NDEBUG + unsigned long ul_GreenMapPtr =3D g * 9; ++#endif + for (unsigned int b =3D 0; b < 9; b++) + { + unsigned long mapptr =3D b + (g * 9) + (r * 9 * 9); = // get address in map ++#ifndef NDEBUG + unsigned long ul_MapPtr =3D b + ul_GreenMapPtr + ul_RedMa= pPtr; + ASSERT(mapptr =3D=3D ul_MapPtr); ++#endif + // put r,g,b in monitor range + unsigned int oldR =3D r * 255 >> 3; + unsigned int oldG =3D g * 255 >> 3; +diff -uNr hplip-0.9.11.old/prnt/hpijs/hpijs.cpp prnt/hpijs/hpijs.cpp +--- hplip-0.9.11.old/prnt/hpijs/hpijs.cpp 2006-02-23 14:31:17.000000000 -0= 800 ++++ prnt/hpijs/hpijs.cpp 2006-05-12 15:44:27.509333968 -0700 +@@ -177,7 +177,7 @@ + char *tail; + int status =3D 0; + char svalue[IJS_MAX_PARAM+1]; =20 +- float w, h; ++ float w, h, dx, dy; +=20 + /* Sanity check input value. */ + if (value_size > IJS_MAX_PARAM) +@@ -256,8 +256,12 @@ + } + else + { ++ ++ dx =3D w > pSS->PaperWidth ? w - pSS->PaperWidth : pSS->PaperWid= th - w; ++ dy =3D h > pSS->PaperHeight ? h - pSS->PaperHeight : pSS->Paper= Height - h; ++ + /* Middle of print Job, ignore paper size if same. */ +- if (!(w =3D=3D pSS->PaperWidth && h =3D=3D pSS->PaperHeight)) ++ if ((dx > 0.03) || (dy > 0.03)) + { + pSS->FirstRaster =3D 1; /* force new Job */ + pSS->PaperWidth =3D w; /* set new paper size */ +@@ -272,19 +276,19 @@ + } + else if (!strcmp (key, "Quality:Quality")) + { +- pSS->Quality =3D strtol(svalue, &tail, 10); ++ pSS->Quality =3D (QUALITY_MODE) strtol(svalue, &tail, 10); + } + else if (!strcmp (key, "Quality:MediaType")) + { +- pSS->MediaType =3D strtol(svalue, &tail, 10); ++ pSS->MediaType =3D (MEDIATYPE) strtol(svalue, &tail, 10); + } + else if (!strcmp (key, "Quality:ColorMode")) + { +- pSS->ColorMode =3D strtol(svalue, &tail, 10); ++ pSS->ColorMode =3D (COLORMODE) strtol(svalue, &tail, 10); + } + else if (!strcmp (key, "Quality:PenSet")) + { +- pSS->PenSet =3D strtol(svalue, &tail, 10); ++ pSS->PenSet =3D (PEN_TYPE) strtol(svalue, &tail, 10); + } + else if (!strcmp (key, "Quality:FullBleed")) + { +diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp prnt/hpijs/ljfastra= ster.cpp +--- hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp 2006-05-09 11:04:30.00000= 0000 -0700 ++++ prnt/hpijs/ljfastraster.cpp 2006-05-11 16:34:57.000000000 -0700 +@@ -1215,7 +1215,7 @@ +=20 + m_compressedsize =3D 2 * inputsize * INDY_STRIP_HEIGHT; + BOOL bRet =3D Compress (compressBuf,=20 +- (uint32_t *) &m_compressedsize, ++ &m_compressedsize, + pbyInputImageBuffer, + inputsize, + m_lCurrCDRasterRow, +diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.h prnt/hpijs/ljfastrast= er.h +--- hplip-0.9.11.old/prnt/hpijs/ljfastraster.h 2006-05-09 11:04:30.0000000= 00 -0700 ++++ prnt/hpijs/ljfastraster.h 2006-05-11 16:34:57.000000000 -0700 +@@ -32,6 +32,7 @@ + #ifndef APDK_LJFASTRASTER_H + #define APDK_LJFASTRASTER_H +=20 ++#include "global_types.h" +=20 + APDK_BEGIN_NAMESPACE + /*! +@@ -136,7 +137,7 @@ + long m_lCurrBlockHeight; + long m_lPrinterRasterRow; // Current printer raster r= ow. +=20 +- unsigned long m_compressedsize; ++ uint32_t m_compressedsize; + BOOL m_bCompressed; + float m_fRatio; + HPUInt8 *pbySeedRow; +diff -uNr hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp prnt/hpijs/ljjetready= =2Ecpp +--- hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp 2006-05-09 11:04:30.0000000= 00 -0700 ++++ prnt/hpijs/ljjetready.cpp 2006-05-11 15:49:52.000000000 -0700 +@@ -473,7 +473,7 @@ + //-----------------------------------------------------------------------= =2D----- + DRIVER_ERROR HeaderLJJetReady::MapPCLMediaTypeToString (MEDIATYPE eM) + { +- DRIVER_ERROR err; ++ DRIVER_ERROR err =3D SYSTEM_ERROR; + BYTE szPlain[] =3D {"\xC8\xC1\x05\x00Plain\xF8\x27"}; + BYTE szPhoto[] =3D {"\xC8\xC1\x05\x00Gloss\xF8\x27"}; +=20 +diff -uNr hplip-0.9.11.old/prnt/hpijs/services.cpp prnt/hpijs/services.cpp +--- hplip-0.9.11.old/prnt/hpijs/services.cpp 2006-02-23 14:31:47.000000000= -0800 ++++ prnt/hpijs/services.cpp 2006-05-12 15:44:44.645728840 -0700 +@@ -46,6 +46,12 @@ +=20 + int UXServices::InitDuplexBuffer() + { ++ /* Free buffer if new page size in middle of print job. */ ++ if (RastersOnPage) ++ delete [] RastersOnPage; ++ if (KRastersOnPage) ++ delete [] KRastersOnPage; ++ + /* Calculate duplex page buffer */ + CurrentRaster =3D ph.height - 1; /* Height =3D physical page in pixe= ls */ + RastersOnPage =3D (BYTE **) new BYTE[(ph.height) * sizeof (BYTE *)]; +@@ -270,12 +276,13 @@ + } + } +=20 +- Quality =3D 0; /* normal */ +- MediaType =3D 0; /* plain */ +- ColorMode =3D 2; /* color */ ++ Quality =3D QUALITY_NORMAL; ++ MediaType =3D MEDIA_PLAIN; ++ ColorMode =3D COLOR; + PenSet =3D DUMMY_PEN; + =20 + RastersOnPage =3D 0; ++ KRastersOnPage =3D 0; + pPC =3D NULL; + pJob =3D NULL; + Duplex =3D 0; +@@ -294,6 +301,8 @@ + { + if (RastersOnPage) + delete [] RastersOnPage; ++ if (KRastersOnPage) ++ delete [] KRastersOnPage; + if (hpFD >=3D 0) + hplip_CloseHP(hpFD); =20 + hplip_Exit();=20 +diff -uNr hplip-0.9.11.old/prnt/hpijs/services.h prnt/hpijs/services.h +--- hplip-0.9.11.old/prnt/hpijs/services.h 2005-09-14 10:19:08.000000000 -= 0700 ++++ prnt/hpijs/services.h 2006-05-12 15:44:40.360380312 -0700 +@@ -35,6 +35,8 @@ + #include <stdio.h> + #include <math.h> +=20 ++#include "global_types.h" ++ + APDK_USING_NAMESPACE +=20 + class UXServices:public SystemServices +@@ -123,10 +125,10 @@ + const float *Margin; + int Model; /* selected device: -1=3Dno, 1=3Dyes */ + int OutputPath; /* open file descriptor */ +- int Quality; /* 0=3Dnormal, 1=3Ddraft, 2=3Dbest */ +- int MediaType; /* 0=3Dplain, 1=3Dpremium, 2=3Dphoto */ +- int ColorMode; /* 0=3Dgrey_k, 1=3Dgrey_cmy, 2=3Dcolor */ +- int PenSet; /* 0=3Dblack_pen, 1=3Dcolor_pen, 2=3Dboth_pens, 3=3D= mdl_pen, 4=3Dmdl_both */ ++ QUALITY_MODE Quality; ++ MEDIATYPE MediaType; ++ COLORMODE ColorMode; ++ PEN_TYPE PenSet; + int MediaPosition; + float PaperWidth; /* physical width in inches */ + float PaperHeight; /* physical height in inches */ diff -ruN hplip.orig/files/patch-Makefile.in hplip/files/patch-Makefile.in =2D-- hplip.orig/files/patch-Makefile.in Sun May 21 13:46:22 2006 +++ hplip/files/patch-Makefile.in Sun May 21 14:32:52 2006 @@ -1,6 +1,18 @@ =2D--- Makefile.in.orig Thu Mar 23 22:35:33 2006 =2D+++ Makefile.in Mon Apr 24 09:15:54 2006 =2D@@ -1973,15 +1973,9 @@ +--- Makefile.in.orig Tue May 9 14:18:36 2006 ++++ Makefile.in Sun May 21 14:32:27 2006 +@@ -377,9 +377,9 @@ + www5dir =3D $(docdir)/supported_devices + dist_www5_DATA =3D $(wwwsrc)/supported_devices/* + www6dir =3D $(docdir)/tech_docs +-dist_www6_DATA =3D $(wwwsrc)/tech_docs/* ++dist_www6_DATA =3D $(wwwsrc)/tech_docs/*.html + www61dir =3D $(docdir)/tech_docs/man_pages +-dist_www61_DATA =3D $(wwwsrc)/tech_docs/man_pages/* ++dist_www61_DATA =3D $(wwwsrc)/tech_docs/man_pages/*.html + www7dir =3D $(docdir)/troubleshooting + dist_www7_DATA =3D $(wwwsrc)/troubleshooting/* + dist_hplip_DATA =3D $(doc_DATA) hplip.conf +@@ -2348,15 +2348,9 @@ # # Do full install if not rpm_install. if [ "$(rpm_install)" =3D "no" ]; then \ @@ -19,7 +31,7 @@ fi =20 install-data-hook: test-destdir =2D@@ -2039,30 +2033,31 @@ +@@ -2414,7 +2408,7 @@ newname=3D$${i%.*}; \ mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \ if [ "$(rpm_install)" =3D "no" ]; then \ @@ -28,39 +40,7 @@ fi \ done # =2D # Edit hpiod.conf in destdir. =2D echo -e "\n[$(PACKAGE)]\nversion=3D$(VERSION)\njdprobe=3D0\n" >> $(DES= TDIR)$(hplipdir)/$(PACKAGE).conf =2D echo -e "[dirs]\nhome=3D$(hplipdir)\nrun=3D$(rundir)\nppd=3D$(hpppddir= )\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf =2D- echo -ne "# Following values are determined at configure time and cann= ot be changed.\n[configure]\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf =2D+ echo "# Following values are determined at configure time and cannot b= e changed." >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf =2D+ echo "[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf =2D if [ "$(rpm_install)" =3D "yes" ]; then \ =2D- echo -ne "rpm-install=3D1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).co= nf; \ =2D+ echo "rpm-install=3D1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ =2D else \ =2D- echo -ne "rpm-install=3D0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).co= nf; \ =2D+ echo "rpm-install=3D0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ =2D fi=20 =2D if [ "$(network_build)" =3D "yes" ]; then \ =2D- echo -ne "network-build=3D1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).= conf; \ =2D+ echo "network-build=3D1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ =2D else \ =2D- echo -ne "network-build=3D0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).= conf; \ =2D+ echo "network-build=3D0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ =2D fi =2D if [ "$(pp_build)" =3D "yes" ]; then \ =2D- echo -ne "pp-build=3D1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;= \ =2D+ echo "pp-build=3D1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ =2D else \ =2D- echo -ne "pp-build=3D0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;= \ =2D+ echo "pp-build=3D0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \ =2D fi =2D- echo -ne "internal-tag=3D$(PACKAGE_BUGREPORT)\n" >> $(DESTDIR)$(hplipd= ir)/$(PACKAGE).conf; =2D+ echo "internal-tag=3D$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(= PACKAGE).conf; =2D=20 =2D # =2D # Edit hpiod.sh in destdir. =2D@@ -2074,16 +2069,6 @@ +@@ -2449,16 +2443,6 @@ if [ "$(rpm_install)" =3D "no" ]; then \ $(mkinstalldirs) $(DESTDIR)/etc/hp; \ $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/= hp; \ diff -ruN hplip.orig/files/patch-backend_hp_hp.c hplip/files/patch-backend_= hp_hp.c =2D-- hplip.orig/files/patch-backend_hp_hp.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-backend_hp_hp.c Tue May 23 15:20:42 2006 @@ -0,0 +1,19 @@ +--- backend/hp/hp.c.orig Tue May 23 15:18:48 2006 ++++ backend/hp/hp.c Tue May 23 15:19:33 2006 +@@ -427,6 +427,7 @@ + int len, vstatus, cnt; + char buf[BUFFER_SIZE+HEADER_SIZE]; + MsgAttributes ma; ++ int hd=3D-1, channel=3D-1, n, total, retry=3D0, size; +=20 + if (argc > 1) + { +@@ -474,8 +475,6 @@ + } + copies =3D atoi(argv[4]); + } +- +- int hd=3D-1, channel=3D-1, n, total, retry=3D0, size; +=20 + hplip_Init(); +=20 diff -ruN hplip.orig/files/patch-io_hpiod_device.cpp hplip/files/patch-io_h= piod_device.cpp =2D-- hplip.orig/files/patch-io_hpiod_device.cpp Sun May 21 13:46:22 2006 +++ hplip/files/patch-io_hpiod_device.cpp Sun May 21 14:09:05 2006 @@ -264,13 +264,4 @@ + syslog(LOG_ERR, "danger! Device::ReleaseInterface, releasing an interfac= e with an active write %s: %s %d\n", URI, __FILE__, __LINE__); #else usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write); =2D #endif =2D@@ -913,7 +1155,7 @@ =2D /* Make sure uri model still matches device id model. */ =2D pSys->GetURIModel(URI, uriModel, sizeof(uriModel)); =2D pSys->GetModel(ID, model, sizeof(model)); =2D- if (strcmp(uriModel, model) !=3D 0) =2D+ if (strcasecmp(uriModel, model) !=3D 0) =2D { =2D *result =3D R_INVALID_DEVICE_NODE; /* found different device plu= gged in */ =20 =2D syslog(LOG_ERR, "invalid model %s !=3D %s Device::Open %s %d\n", = uriModel, model, __FILE__, __LINE__); + #endif \ No newline at end of file diff -ruN hplip.orig/files/patch-io_hpiod_dot4.cpp hplip/files/patch-io_hpi= od_dot4.cpp =2D-- hplip.orig/files/patch-io_hpiod_dot4.cpp Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-io_hpiod_dot4.cpp Tue May 23 15:33:25 2006 @@ -0,0 +1,19 @@ +--- 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=3DNULL; + int i, len, size; + unsigned char socket; ++ static int cnt=3D0; +=20 + pCmd =3D (DOT4Cmd *)buf; +=20 +@@ -130,7 +131,7 @@ + Dot4ForwardReply(fd, (unsigned char *)pCreditReply, sizeof(DOT4C= reditReply));=20 + break; + case DOT4_CREDIT_REQUEST: +- static int cnt=3D0; ++ cnt=3D0; + pCreditReq =3D (DOT4CreditRequest *)buf; + if (cnt++ < 5) =20 + syslog(LOG_ERR, "unexpected DOT4CreditRequest: cmd=3D%x, hid= =3D%x, pid=3D%x, maxcredit=3D%d: %s %d\n", pCreditReq->cmd, diff -ruN hplip.orig/files/patch-io_hpiod_mlc.cpp hplip/files/patch-io_hpio= d_mlc.cpp =2D-- hplip.orig/files/patch-io_hpiod_mlc.cpp Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-io_hpiod_mlc.cpp Tue May 23 15:31:34 2006 @@ -0,0 +1,19 @@ +--- 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=3D0; +=20 + pCmd =3D (MLCCmd *)buf; +=20 +@@ -122,7 +123,7 @@ + MlcForwardReply(fd, (unsigned char *)pCreditReply, sizeof(MLCCre= ditReply));=20 + break; + case MLC_CREDIT_REQUEST: +- static int cnt=3D0; ++ cnt =3D 0; + pCreditReq =3D (MLCCreditRequest *)buf; + if (cnt++ < 5) =20 + syslog(LOG_ERR, "unexpected MLCCreditRequest: cmd=3D%x, hid= =3D%x, pid=3D%x, credit=3D%d: %s %d\n", pCreditReq->cmd, diff -ruN hplip.orig/files/patch-pcard_fat.c hplip/files/patch-pcard_fat.c =2D-- hplip.orig/files/patch-pcard_fat.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-pcard_fat.c Tue May 23 15:26:58 2006 @@ -0,0 +1,14 @@ +--- 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 @@ + \************************************************************************= *****/ +=20 + #include <stdlib.h> ++#ifdef __FreeBSD__ ++#include <inttypes.h> ++#else + #include <stdint.h> ++#endif + #include <stdio.h> + #include <string.h> + #include <unistd.h> diff -ruN hplip.orig/files/patch-pcard_pcardext_pcardext.c hplip/files/patc= h-pcard_pcardext_pcardext.c =2D-- hplip.orig/files/patch-pcard_pcardext_pcardext.c Wed Dec 31 19:00:00 = 1969 +++ hplip/files/patch-pcard_pcardext_pcardext.c Tue May 23 15:45:30 2006 @@ -0,0 +1,29 @@ +--- 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 @@ +=20 + PyObject * pcardext_mount( PyObject * self, PyObject * args )=20 + { ++ int i; + if( !PyArg_ParseTuple( args, "OO", &readsectorFunc, &writesectorFunc = ) ) + { + return Py_BuildValue( "i", 1 ); +@@ -93,7 +94,7 @@ + Py_INCREF( readsectorFunc ); + Py_INCREF( writesectorFunc ); +=20 +- int i =3D FatInit(); ++ i =3D FatInit(); + /*char buf[1024]; + sprintf( buf, "print 'FatInit()=3D%d\n'", i ); + PyRun_SimpleString( buf );*/ +@@ -111,8 +112,8 @@ + PyObject * pcardext_ls( PyObject * self, PyObject * args )=20 + { + PyObject * file_list; +- file_list =3D PyList_New(0); + FILE_ATTRIBUTES fa; ++ file_list =3D PyList_New(0); +=20 + FatDirBegin( &fa ); + =20 diff -ruN hplip.orig/files/patch-prnt_cupsext_cupsext.c hplip/files/patch-p= rnt_cupsext_cupsext.c =2D-- hplip.orig/files/patch-prnt_cupsext_cupsext.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-prnt_cupsext_cupsext.c Tue May 23 15:50:35 2006 @@ -0,0 +1,95 @@ +--- prnt/cupsext/cupsext.c.orig Tue May 23 15:45:57 2006 ++++ prnt/cupsext/cupsext.c Tue May 23 15:49:34 2006 +@@ -253,11 +253,23 @@ +=20 + PyObject * getPrinters( PyObject * self, PyObject * args ) + { ++ int max_count; ++ char * device_uri; ++ char * printer_uri; ++ char * info; ++ char * location; ++ char * make_model; ++ char * name; ++ /*char * ppd_name;*/ ++ cups_ptype_t type; ++ ipp_pstate_t state; ++ int i =3D 0; + http_t *http=3DNULL; /* HTTP object */ + ipp_t *request=3DNULL; /* IPP request object */ + ipp_t *response=3DNULL; /* IPP response object */ + ipp_attribute_t *attr; /* Current IPP attribute */ + PyObject * printer_list; ++ printer_Object * printer; + cups_lang_t * language; + static const char * attrs[] =3D /* Requested attributes */ + { +@@ -300,7 +312,7 @@ + goto abort; + } +=20 +- int max_count =3D 0; ++ max_count =3D 0; +=20 + for ( attr =3D ippFindAttribute(response, "printer-name", IPP_TAG_NAM= E), + max_count =3D 0; +@@ -311,16 +323,7 @@ +=20 + printer_list =3D PyList_New( max_count ); +=20 +- char * device_uri; +- char * printer_uri; +- char * info; +- char * location; +- char * make_model; +- char * name; +- /*char * ppd_name;*/ +- cups_ptype_t type; +- ipp_pstate_t state; +- int i =3D 0; ++ i =3D 0; +=20 + for (attr =3D response->attrs; attr !=3D NULL; attr =3D attr->next) + { +@@ -392,7 +395,6 @@ + continue; + } +=20 +- printer_Object * printer; + printer =3D (printer_Object *)_newPrinter( device_uri, name, prin= ter_uri, location, make_model, + info, state/*, ppd_name*= / ); + PyList_SET_ITEM( printer_list, i, (PyObject *)printer ); +@@ -925,13 +927,13 @@ + PyObject * getPPD( PyObject * self, PyObject * args ) + { + char * printer; ++ const char * ppd; +=20 + if ( !PyArg_ParseTuple( args, "z", &printer ) ) + { + return Py_BuildValue( "" ); // None + } +=20 +- const char * ppd; + ppd =3D cupsGetPPD( (const char *)printer ); +=20 + return Py_BuildValue( "s", ppd );=20 +@@ -941,16 +943,16 @@ +=20 + PyObject * getPPDOption( PyObject * self, PyObject * args ) + { ++ char * option; ++ ppd_choice_t * marked_choice; + if( ppd_file !=3D NULL ) + { +- char * option; +=20 + if ( !PyArg_ParseTuple( args, "z", &option ) ) + { + return Py_BuildValue( "" ); // None + } +=20 +- ppd_choice_t * marked_choice; + marked_choice =3D ppdFindMarkedChoice( ppd_file, option ); +=20 + if (marked_choice =3D=3D NULL ) diff -ruN hplip.orig/files/patch-prnt_hpijs_hpijsfax.cpp hplip/files/patch-= prnt_hpijs_hpijsfax.cpp =2D-- hplip.orig/files/patch-prnt_hpijs_hpijsfax.cpp Sun May 21 13:46:22 20= 06 +++ hplip/files/patch-prnt_hpijs_hpijsfax.cpp Tue May 23 16:34:02 2006 @@ -1,6 +1,18 @@ =2D--- prnt/hpijs/hpijsfax.cpp.orig Sat Apr 1 16:35:53 2006 =2D+++ prnt/hpijs/hpijsfax.cpp Sat Apr 1 16:37:36 2006 =2D@@ -297,8 +297,8 @@ +--- prnt/hpijs/hpijsfax.cpp.orig Tue May 23 16:33:48 2006 ++++ prnt/hpijs/hpijsfax.cpp Tue May 23 16:33:10 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 @@ =20 memset (&tv, 0, sizeof (tv)); gettimeofday (&tv, NULL); diff -ruN hplip.orig/files/patch-scan_sane-mfpdtf.c hplip/files/patch-scan_= sane-mfpdtf.c =2D-- hplip.orig/files/patch-scan_sane-mfpdtf.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-scan_sane-mfpdtf.c Tue May 23 15:12:15 2006 @@ -0,0 +1,70 @@ +--- scan/sane/mfpdtf.c.orig Tue May 23 15:07:49 2006 ++++ scan/sane/mfpdtf.c Tue May 23 15:10:30 2006 +@@ -156,10 +156,10 @@ +=20 + int MfpdtfReadService( Mfpdtf_t mfpdtf ) + { +- DBG( 0, "MfpdtfReadService() ______________________________ deviceid= =3D%d, channelid=3D%d ______________________________\n", mfpdtf->deviceid, = mfpdtf->channelid ); +- =20 + int result =3D 0; +- int datalen, blockLength, headerLength; ++ int datalen, blockLength, headerLength, r; ++ ++ DBG( 0, "MfpdtfReadService() ______________________________ deviceid= =3D%d, channelid=3D%d ______________________________\n", mfpdtf->deviceid, = mfpdtf->channelid ); +=20 + if( mfpdtf->read.fixedBlockBytesRemaining <=3D 0 ) + { +@@ -171,7 +171,7 @@ + =20 + //READ( &mfpdtf->read.fixedHeader, datalen ); + =20 +- int r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->re= ad.fixedHeader, datalen ); ++ r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf->read.f= ixedHeader, datalen ); +=20 + if( r!=3D datalen ) + { +@@ -209,7 +209,7 @@ + =20 + //READ( mfpdtf->read.pVariantHeader, datalen ); + =20 +- int r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)mfpdtf-= >read.pVariantHeader, datalen ); ++ r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)mfpdtf->rea= d.pVariantHeader, datalen ); + =20 + if( r!=3D datalen ) + { +@@ -261,7 +261,7 @@ + =20 + //READ( &id, datalen ); + =20 +- int r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&id, da= talen ); ++ r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&id, datale= n ); + =20 + if( r!=3D datalen ) + { +@@ -280,7 +280,7 @@ + DBG( 0, "********************************** RASTER RECORD= **********************************.\n" ); + //READ( &mfpdtf->read.imageRasterDataHeader, datalen ); + =20 +- int r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mf= pdtf->read.imageRasterDataHeader, datalen ); ++ r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf= =2D>read.imageRasterDataHeader, datalen ); + =20 + if( r!=3D datalen ) + { +@@ -302,7 +302,7 @@ + DBG( 0, "********************************** SOP RECORD **= ********************************.\n" ); + //READ( &mfpdtf->read.imageStartPageRecord, datalen ); +=20 +- int r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mf= pdtf->read.imageStartPageRecord, datalen ); ++ r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf= =2D>read.imageStartPageRecord, datalen ); + =20 + if( r!=3D datalen ) + { +@@ -322,7 +322,7 @@ + DBG( 0, "********************************** EOP RECORD **= ********************************.\n" ); + //READ( &mfpdtf->read.imageEndPageRecord, datalen ); + =20 +- int r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mf= pdtf->read.imageEndPageRecord, datalen ); ++ r =3D MfpdtfReadGeneric( mfpdtf, (unsigned char *)&mfpdtf= =2D>read.imageEndPageRecord, datalen ); + =20 + if( r!=3D datalen ) + { diff -ruN hplip.orig/files/patch-scan_sane-pml.c hplip/files/patch-scan_san= e-pml.c =2D-- hplip.orig/files/patch-scan_sane-pml.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-scan_sane-pml.c Tue May 23 15:14:51 2006 @@ -0,0 +1,20 @@ +--- 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 =3D xforms; + int stat =3D SANE_STATUS_DEVICE_BUSY; +- int i, bsize, state, wResult, index, r; ++ int i, bsize, state, wResult, index, r, mmWidth; + int oldStuff =3D (hpaio->preDenali || hpaio->fromDenali || hpaio->dena= li) ? 1 : 0; +=20 + if (hpaio->cmd_channelid < 0) +@@ -919,7 +919,7 @@ + hpaio->scanParameters.lines =3D MILLIMETERS_TO_PIXELS(hpaio->bryRan= ge.max, hpaio->effectiveResolution); + } +=20 +- int mmWidth =3D PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->eff= ectiveResolution); ++ mmWidth =3D PIXELS_TO_MILLIMETERS(traits.iPixelsPerRow, hpaio->effecti= veResolution); +=20 + /* Set up X_CROP xform. */ + pXform->aXformInfo[IP_CROP_LEFT].dword =3D MILLIMETERS_TO_PIXELS( hpai= o->effectiveTlx, hpaio->effectiveResolution ); diff -ruN hplip.orig/files/patch-scan_sane_hpaio.c hplip/files/patch-scan_s= ane_hpaio.c =2D-- hplip.orig/files/patch-scan_sane_hpaio.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-scan_sane_hpaio.c Tue May 23 15:41:31 2006 @@ -0,0 +1,63 @@ +--- scan/sane/hpaio.c.orig Tue May 23 15:40:36 2006 ++++ scan/sane/hpaio.c Tue May 23 15:08:07 2006 +@@ -1632,10 +1632,11 @@ + extern SANE_Status sane_hpaio_get_parameters( SANE_Handle handle, + SANE_Parameters * pParams ) + { +- DBG( 0, "\nhpaio: sane_hpaio_get_parameters()\n" ); +- =20 + hpaioScanner_t hpaio =3D ( hpaioScanner_t ) handle; + char * s =3D ""; ++ ++ DBG( 0, "\nhpaio: sane_hpaio_get_parameters()\n" ); ++ + if( !hpaio->hJob ) + { + *pParams =3D hpaio->prescanParameters; +@@ -2100,8 +2101,6 @@ + extern SANE_Status sane_hpaio_open( SANE_String_Const devicename, + SANE_Handle * pHandle ) + { +- DBG( 0, "\nhpaio:sane_hpaio_open(%s) *******************************= ************************************************************\n", devicename= ); +- =20 + SANE_Status retcode =3D SANE_STATUS_INVAL; + hpaioScanner_t hpaio =3D 0; + int r; +@@ -2114,6 +2113,7 @@ + char devname[256]; + MsgAttributes ma; +=20 ++ DBG( 0, "\nhpaio:sane_hpaio_open(%s) *******************************= ************************************************************\n", devicename= ); + hpaio =3D hpaioFindScanner( devicename ); + =20 + if( hpaio ) +@@ -2878,6 +2878,8 @@ + IP_IMAGE_TRAITS traits; + IP_XFORM_SPEC xforms[IP_MAX_XFORMS], * pXform =3D xforms; + WORD wResult; ++ int lines, pixelsPerLine; ++ int log_output; + =20 + DBG( 0, "\nhpaio: sane_hpaio_start() *******************************= ************************************************************ \n" ); + =20 +@@ -2953,8 +2955,6 @@ +=20 + // if( hpaio->scannerType =3D=3D SCANNER_TYPE_SCL ) + // { +- int lines, pixelsPerLine; +- + /* Inquire exact image dimensions. */ + if( SclInquire( hpaio->deviceid, hpaio->scan_channelid, SCL_CMD_I= NQUIRE_DEVICE_PARAMETER, SCL_INQ_NUMBER_OF_SCAN_LINES, + &lines, 0, 0 ) =3D=3D SANE_STATUS_GOOD ) +@@ -2979,9 +2979,9 @@ + MfpdtfReadStart( hpaio->mfpdtf ); /* inits mfpdtf */ + =20 + #ifdef HPAIO_DEBUG +- int log_output=3D1; ++ log_output=3D1; + #else +- int log_output=3D0; ++ log_output=3D0; + #endif =20 +=20 + if( log_output ) diff -ruN hplip.orig/files/patch-scan_sane_io.c hplip/files/patch-scan_sane= _io.c =2D-- hplip.orig/files/patch-scan_sane_io.c Wed Dec 31 19:00:00 1969 +++ hplip/files/patch-scan_sane_io.c Tue May 23 15:18:34 2006 @@ -0,0 +1,38 @@ +--- scan/sane/io.c.orig Tue May 23 15:15:04 2006 ++++ scan/sane/io.c Tue May 23 15:17:40 2006 +@@ -210,6 +210,13 @@ + { + char message[ BUFFER_SIZE ]; + MsgAttributes ma; ++ int remaining; ++ char *p; ++ int state =3D 0; ++ int d =3D 0; ++ char * uri =3D NULL;=20 ++ char * mdl =3D NULL; =20 ++ +=20 + int len =3D sprintf( message, "msg=3DProbeDevicesFiltered\nbus=3D%s\n= filter=3Dscan\nformat=3Ddefault\n",=20 + "usb,cups,par" ); +@@ -228,18 +235,14 @@ +=20 + hplip_ParseMsg( message, len, &ma ); +=20 +- int d =3D 0; +- char * uri =3D NULL; +- char * mdl =3D NULL; +- =20 + if( ma.ndevice > 0 ) + { + *devices =3D malloc( sizeof( SANE_Device * ) * ( ma.ndevice + 1 )= ); +=20 +- int remaining =3D ma.length; +- char *p =3D (char *)ma.data; ++ remaining =3D ma.length; ++ p =3D (char *)ma.data; +=20 +- int state =3D 0; ++ state =3D 0; +=20 + while( remaining > 0 && *p !=3D '\0' && d < ma.ndevice ) + { diff -ruN hplip.orig/pkg-plist hplip/pkg-plist =2D-- hplip.orig/pkg-plist Sun May 21 13:46:22 2006 +++ hplip/pkg-plist Sun May 21 15:12:24 2006 @@ -15,7 +15,6 @@ bin/hp-toolbox bin/hp-unload bin/hpijs =2Dbin/hppgsz etc/hp/hplip.conf lib/libhpip.la lib/libhpip.so @@ -35,13 +34,124 @@ sbin/hpssd share/applications/hplip.desktop share/cups/model/foomatic-ppds =2D%%PORTDOCS%%share/doc/hpijs-2.1.9/COPYING =2D%%PORTDOCS%%share/doc/hpijs-2.1.9/README_LIBJPG =2D%%PORTDOCS%%share/doc/hpijs-2.1.9/gs_hpijs.png =2D%%PORTDOCS%%share/doc/hpijs-2.1.9/hpijs_readme.html =2D%%PORTDOCS%%share/doc/hplip-0.9.10/COPYING =2D%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_overview.png =2D%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_readme.html +%%PORTDOCS%%share/doc/hpijs-2.1.10/COPYING +%%PORTDOCS%%share/doc/hpijs-2.1.10/README_LIBJPG +%%PORTDOCS%%share/doc/hplip-0.9.11/COPYING +%%PORTDOCS%%share/doc/hplip-0.9.11/contacts.html +%%PORTDOCS%%share/doc/hplip-0.9.11/faqs.html +%%PORTDOCS%%share/doc/hplip-0.9.11/features.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/build.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/faxing.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/install.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/io.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/other.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/pcard.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/printing.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/scanning.html +%%PORTDOCS%%share/doc/hplip-0.9.11/howtos/toolbox.html +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagePrint.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManageSend_Fax-1.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManageSend_Fax-2.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-1.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-2.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-3.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager-4.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_Manager.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagerPhoto_Card.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/HP_Device_ManagerSend_Fax.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/Screenshot-xsane.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_device_list.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_model_list.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_opening.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/cups_printer_model.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/gs_hpijs.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/hp-tux-printer.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/hplip_device_manager.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/hplip_overview.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_appssocket.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_device_list.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_device_uri.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/network_model_list.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/sflogo.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_hardware.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_opening_hw.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_configure.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_kind.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_other_printer.png +%%PORTDOCS%%share/doc/hplip-0.9.11/images/yast_printer_model.png +%%PORTDOCS%%share/doc/hplip-0.9.11/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/apt.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step1/rpm.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/debian.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/fc4.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/mandriva06.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/other.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/suse10.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step2/ubuntu510.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step3/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/local.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/cups/net.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/local.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/setup/net.html +%%PORTDOCS%%share/doc/hplip-0.9.11/install/step4/suse/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/legal.html +%%PORTDOCS%%share/doc/hplip-0.9.11/license.html +%%PORTDOCS%%share/doc/hplip-0.9.11/mailing_lists.html +%%PORTDOCS%%share/doc/hplip-0.9.11/release_notes.html +%%PORTDOCS%%share/doc/hplip-0.9.11/screenshots.html +%%PORTDOCS%%share/doc/hplip-0.9.11/styles/default.css +%%PORTDOCS%%share/doc/hplip-0.9.11/styles/rest.css +%%PORTDOCS%%share/doc/hplip-0.9.11/support_statement.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/color_laser.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/color_laser_mfp.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/inkjet.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/inkjet_aio.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/laser.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/mono_laser_mfp.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/photosmart.html +%%PORTDOCS%%share/doc/hplip-0.9.11/supported_devices/unsupported.html +%%PORTDOCS%%share/doc/hplip-0.9.11/system_requirements.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/device_classes.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/hpijs.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/align.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/check.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/clean.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/colorcal.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/fab.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/hpssd.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/info.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/levels.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/makeuri.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/photo.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/print.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/setup.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/testpage.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/toolbox.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/man_pages/unload.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/overview.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/page_sizes.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/printable_areas.html +%%PORTDOCS%%share/doc/hplip-0.9.11/tech_docs/tarball_install.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/build.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/faxing.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/index.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/install.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/io.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/other.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/pcard.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/printing.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/scanning.html +%%PORTDOCS%%share/doc/hplip-0.9.11/troubleshooting/toolbox.html %%DATADIR%%/COPYING %%DATADIR%%/__init__.py %%DATADIR%%/align @@ -88,17 +198,20 @@ %%DATADIR%%/data/images/DESKJET_970C.png %%DATADIR%%/data/images/DESKJET_990C.png %%DATADIR%%/data/images/DESKJET_995C.png =2D%%DATADIR%%/data/images/Deskjet_350.png %%DATADIR%%/data/images/Deskjet_3740.png +%%DATADIR%%/data/images/Deskjet_5400_series.png %%DATADIR%%/data/images/Deskjet_5700.png +%%DATADIR%%/data/images/Deskjet_5900_series.png %%DATADIR%%/data/images/Deskjet_6500.png %%DATADIR%%/data/images/Deskjet_6800.png %%DATADIR%%/data/images/HP_2000C.png +%%DATADIR%%/data/images/HP_2500C.png %%DATADIR%%/data/images/HP_BI_3000.png %%DATADIR%%/data/images/HP_Business_Inkjet_1200.png %%DATADIR%%/data/images/HP_Color_LaserJet_1500.png %%DATADIR%%/data/images/HP_Color_LaserJet_2840.png %%DATADIR%%/data/images/HP_Color_LaserJet_4500.png +%%DATADIR%%/data/images/HP_Color_LaserJet_4730mfp.png %%DATADIR%%/data/images/HP_Color_LaserJet_8550.png %%DATADIR%%/data/images/HP_LJ1xxx.png %%DATADIR%%/data/images/HP_LaserJet_1012.png @@ -108,6 +221,8 @@ %%DATADIR%%/data/images/HP_LaserJet_4000.png %%DATADIR%%/data/images/HP_LaserJet_4100_MFP.png %%DATADIR%%/data/images/HP_LaserJet_4M.png +%%DATADIR%%/data/images/HP_LaserJet_5Si.png +%%DATADIR%%/data/images/HP_LaserJet_6MP.png %%DATADIR%%/data/images/HP_LaserJet_8100_Series.png %%DATADIR%%/data/images/HP_LaserJet_9000_MFP.png %%DATADIR%%/data/images/HP_LaserJet_9040_MFP.png @@ -120,10 +235,15 @@ %%DATADIR%%/data/images/LASERJET_5500dtn.png %%DATADIR%%/data/images/LASERJET_5550.png %%DATADIR%%/data/images/LASERJET_5550DTN.png +%%DATADIR%%/data/images/OFFICEJET_PRO_1150C.png +%%DATADIR%%/data/images/OfficeJet_Series_300.png +%%DATADIR%%/data/images/OfficeJet_5105.png %%DATADIR%%/data/images/OfficeJet_6100_Series.png %%DATADIR%%/data/images/OfficeJet_G85.png %%DATADIR%%/data/images/Officejet_6150_Series.png +%%DATADIR%%/data/images/Officejet_6200_series.png %%DATADIR%%/data/images/Officejet_7200_series.png +%%DATADIR%%/data/images/Officejet_9100_series.png %%DATADIR%%/data/images/PHOTOSMART_100.png %%DATADIR%%/data/images/PHOTOSMART_1218.png %%DATADIR%%/data/images/PHOTOSMART_1315.png @@ -168,6 +288,7 @@ %%DATADIR%%/data/images/deskjet_5552.png %%DATADIR%%/data/images/deskjet_5600.png %%DATADIR%%/data/images/deskjet_6120.png +%%DATADIR%%/data/images/dj350.png %%DATADIR%%/data/images/dj450.png %%DATADIR%%/data/images/down.png %%DATADIR%%/data/images/error.png @@ -240,11 +361,13 @@ %%DATADIR%%/data/images/next.png %%DATADIR%%/data/images/officejet_4200_series.png %%DATADIR%%/data/images/officejet_500.png +%%DATADIR%%/data/images/officejet_5500_series.png %%DATADIR%%/data/images/officejet_5600.png %%DATADIR%%/data/images/officejet_k550.png %%DATADIR%%/data/images/officejet_k80.png %%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 @@ -252,6 +375,7 @@ %%DATADIR%%/data/images/photosmart_7150.png %%DATADIR%%/data/images/photosmart_7900_series.png %%DATADIR%%/data/images/png.png +%%DATADIR%%/data/images/powered_by_python.png %%DATADIR%%/data/images/prev.png %%DATADIR%%/data/images/psc_1100_series.png %%DATADIR%%/data/images/psc_2300_series.png @@ -304,6 +428,7 @@ %%DATADIR%%/data/xml/HPLIP-0.9.7.xml %%DATADIR%%/data/xml/HPLIP-02-2006.xml %%DATADIR%%/data/xml/HPLIP-03-2006.xml +%%DATADIR%%/data/xml/HPLIP-05-2006.xml %%DATADIR%%/data/xml/models.xml %%DATADIR%%/data/xml/unsupported.xml %%DATADIR%%/fab @@ -315,8 +440,6 @@ %%DATADIR%%/hplip %%DATADIR%%/hplip.conf %%DATADIR%%/hplip.sh =2D%%DATADIR%%/hplip_overview.png =2D%%DATADIR%%/hplip_readme.html %%DATADIR%%/hpssd.py %%DATADIR%%/info %%DATADIR%%/levels @@ -375,6 +498,8 @@ %%DATADIR%%/ui/faxaddrbookform_base.py %%DATADIR%%/ui/faxaddrbookgroupeditform_base.py %%DATADIR%%/ui/faxaddrbookgroupsform_base.py +%%DATADIR%%/ui/faxallowabletypesdlg.py +%%DATADIR%%/ui/faxallowabletypesdlg_base.py %%DATADIR%%/ui/faxsendjobform.py %%DATADIR%%/ui/faxsendjobform_base.py %%DATADIR%%/ui/faxsettingsform.py @@ -624,6 +749,8 @@ share/ppd/HP/HP-LaserJet_5-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_5000-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_5100-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_5200-hpijs.ppd.gz +share/ppd/HP/HP-LaserJet_5200L-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_5L-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_5M-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_5MP-hpijs.ppd.gz @@ -655,6 +782,8 @@ share/ppd/HP/HP-OfficeJet_4110-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_4115-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_4200-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_4300-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_6300-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_500-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_5105-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_5110-hpijs.ppd.gz @@ -686,7 +815,6 @@ share/ppd/HP/HP-OfficeJet_725-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_7300-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_7400-hpijs.ppd.gz =2Dshare/ppd/HP/HP-OfficeJet_9100-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_D125-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_D135-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_D145-hpijs.ppd.gz @@ -787,6 +915,7 @@ share/ppd/HP/HP_Business_Inkjet_3000.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 share/ppd/HP/HP_Color_LaserJet_2800.ppd.gz share/ppd/HP/HP_Color_LaserJet_3000.ppd.gz share/ppd/HP/HP_Color_LaserJet_3800.ppd.gz @@ -827,6 +956,8 @@ share/ppd/HP/HP_LaserJet_4_Plus.ppd.gz share/ppd/HP/HP_LaserJet_5000_Series.ppd.gz share/ppd/HP/HP_LaserJet_5100_Series.ppd.gz +share/ppd/HP/HP_LaserJet_5200.ppd.gz +share/ppd/HP/HP_LaserJet_5200L.ppd.gz share/ppd/HP/HP_LaserJet_5M.ppd.gz share/ppd/HP/HP_LaserJet_5MP.ppd.gz share/ppd/HP/HP_LaserJet_5Si.ppd.gz @@ -882,6 +1013,21 @@ @dirrm %%DATADIR%%/data @dirrm %%DATADIR%%/base @dirrm %%DATADIR%% =2D%%PORTDOCS%%@dirrm share/doc/hplip-0.9.10 =2D%%PORTDOCS%%@dirrm share/doc/hpijs-2.1.9 +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/troubleshooting +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/tech_docs/man_pages +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/tech_docs +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/supported_devices +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/styles +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/suse +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/setup +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4/cups +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step4 +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step3 +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step2 +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install/step1 +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/install +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/images +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11/howtos +%%PORTDOCS%%@dirrm share/doc/hplip-0.9.11 +%%PORTDOCS%%@dirrm share/doc/hpijs-2.1.10 @dirrm etc/hp --Boundary-01=_wK4cEIhZeeZ6K/A-- --nextPart11189462.XssEE0eop0 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (FreeBSD) iD8DBQBEc4LAxqA5ziudZT0RAhlwAKDOhrYfIIb5EzsPz9rGUZJcHAbvHACdHevc UROArqN9ibfkoqAdBDc92b8= =HK+P -----END PGP SIGNATURE----- --nextPart11189462.XssEE0eop0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605232150.k4NLoOjQ083857>