Date: Mon, 22 May 2006 18:50:14 -0400 From: "Anish Mistry" <amistry@am-productions.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/97661: Update print/hplip to 0.9.11 Message-ID: <1148338214.29982@bigguy.am-productions.biz> Resent-Message-ID: <200605222250.k4MMoN9i083910@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97661
>Category: ports
>Synopsis: Update print/hplip to 0.9.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon May 22 22:50:23 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Anish Mistry
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
AM Productions
>Environment:
System: FreeBSD 6.1-RELEASE #0: Wed May 10 01:44:17 EDT 2006
amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY
>Description:
Update to 0.9.11. Add WITH_GUI option so that the port can be built without the py-qt dependency. Fix incorrect broken for 4.x check.
>How-To-Repeat:
>Fix:
--- hplip-0.9.11.patch begins here ---
diff -ruN hplip.orig/Makefile hplip/Makefile
--- hplip.orig/Makefile Mon May 22 16:04:43 2006
+++ hplip/Makefile Mon May 22 15:47:04 2006
@@ -2,11 +2,11 @@
# Date created: 1 April 2006
# Whom: amistry@am-productions.biz
#
-# $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 $
#
PORTNAME= hplip
-PORTVERSION= 0.9.10
+PORTVERSION= 0.9.11
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= hplip
@@ -19,7 +19,6 @@
cups.2:${PORTSDIR}/print/cups-base \
usb:${PORTSDIR}/devel/libusb \
netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS= pylupdate:${PORTSDIR}/x11-toolkits/py-qt
CONFLITS= hpijs-* foomatic-filters-*
@@ -39,12 +38,22 @@
PKGDEINSTALL= ${PKGINSTALL}
+OPTIONS= GUI "build with Python QT" on
+
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 5000000
+.if ${OSVERSION} < 500000
BROKEN= does not compile
.endif
+.if exists(${LOCALBASE}/bin/pylupdate)
+WITH_GUI= yes
+.endif
+
+.if defined(WITH_GUI)
+RUN_DEPENDS+= pylupdate:${PORTSDIR}/x11-toolkits/py-qt
+.endif
+
post-extract:
@${RM} -r ${WRKSRC}/data/images/CVS
@@ -63,7 +72,6 @@
s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \
${WRKSRC}/base/g.py \
${WRKSRC}/fax/backend/hpfax.py \
- ${WRKSRC}/hplip_readme.html \
${WRKSRC}/hpssd.py \
${WRKSRC}/io/hpiod/hpiod.h \
${WRKSRC}/prnt/hpijs/hplip_api.h \
diff -ruN hplip.orig/distinfo hplip/distinfo
--- hplip.orig/distinfo Sun May 21 13:46:22 2006
+++ hplip/distinfo Sun May 21 13:58:16 2006
@@ -1,3 +1,3 @@
-MD5 (hplip-0.9.10.tar.gz) = 349489b10fb44d1bf105b04ff5352551
-SHA256 (hplip-0.9.10.tar.gz) = a6a6247b396aba173d0cd7b2aadffc5467d0f82d5aa037503222b98b8d5fe8b1
-SIZE (hplip-0.9.10.tar.gz) = 9296866
+MD5 (hplip-0.9.11.tar.gz) = 5cf362c972d5b1733af4fb8e2ade92e4
+SHA256 (hplip-0.9.11.tar.gz) = 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42
+SIZE (hplip-0.9.11.tar.gz) = 9924094
diff -ruN hplip.orig/files/patch-0.9.11-2-official hplip/files/patch-0.9.11-2-official
--- 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 -0700
++++ data/xml/models.xml 2006-05-12 15:30:54.754891424 -0700
+@@ -7797,6 +7797,84 @@
+ </r0>
+ </model>
+
++<model name="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;1284.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,NR,KP066,CP095;AiO:00;DW-PCL;</id>
++ <icon>PSC_900_Series.png</icon>
++ <support type="2"/>
++ <case-model>
++ </case-model>
++ <io support="2" mode="1" control="0" mfp-mode="2" scan-port="0"/>
++ <align type="9"/>
++ <clean type="3"/>
++ <color-cal type="0"/>
++ <status type="1"/>
++ <scan type="1"/>
++ <fax type="0"/>
++ <pcard type="1"/>
++ <copy type="0"/>
++ <tech class="DJ9xx" type="2"/>
++ <embedded-server type="0"/>
++ <panel-check type="1"/>
++ <linefeed-cal type="0"/>
++ <pq-diag type="0"/>
++ <r0>
++ <agent1 kind="3" type="1" sku="15 (C6615DN)"/>
++ <agent2 kind="3" type="2" sku="78 (C6578AN / C6578DN)"/>
++ </r0>
++</model>
++
++<model name="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;1284.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,NR,KP066,CP095;AiO:00;DW-PCL;</id>
++ <icon>PSC_900_Series.png</icon>
++ <support type="2"/>
++ <case-model>
++ </case-model>
++ <io support="2" mode="1" control="0" mfp-mode="2" scan-port="0"/>
++ <align type="9"/>
++ <clean type="3"/>
++ <color-cal type="0"/>
++ <status type="1"/>
++ <scan type="1"/>
++ <fax type="0"/>
++ <pcard type="1"/>
++ <copy type="0"/>
++ <tech class="DJ9xx" type="2"/>
++ <embedded-server type="0"/>
++ <panel-check type="1"/>
++ <linefeed-cal type="0"/>
++ <pq-diag type="0"/>
++ <r0>
++ <agent1 kind="3" type="1" sku="15 (C6615DN)"/>
++ <agent2 kind="3" type="2" sku="78 (C6578AN / C6578DN)"/>
++ </r0>
++</model>
++
++<model name="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;1284.4DL:4d,4e,1;SERN:MY15U31143WP;VSTATUS:$AU0$AU0,ff,DN,PENF,CUT,K0,C0,SM,NR,KP066,CP095;AiO:00;DW-PCL;</id>
++ <icon>PSC_900_Series.png</icon>
++ <support type="2"/>
++ <case-model>
++ </case-model>
++ <io support="2" mode="1" control="0" mfp-mode="2" scan-port="0"/>
++ <align type="9"/>
++ <clean type="3"/>
++ <color-cal type="0"/>
++ <status type="1"/>
++ <scan type="1"/>
++ <fax type="0"/>
++ <pcard type="1"/>
++ <copy type="0"/>
++ <tech class="DJ9xx" type="2"/>
++ <embedded-server type="0"/>
++ <panel-check type="1"/>
++ <linefeed-cal type="0"/>
++ <pq-diag type="0"/>
++ <r0>
++ <agent1 kind="3" type="1" sku="15 (C6615DN)"/>
++ <agent2 kind="3" type="2" sku="78 (C6578AN / C6578DN)"/>
++ </r0>
++</model>
++
+ <model name="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.cpp
+--- hplip-0.9.11.old/prnt/hpijs/colormatch.cpp 2006-05-09 11:04:30.000000000 -0700
++++ prnt/hpijs/colormatch.cpp 2006-05-11 16:17:17.000000000 -0700
+@@ -221,15 +221,21 @@
+ {
+ for (unsigned int r = 0; r < 9; r++)
+ {
++#ifndef NDEBUG
+ unsigned long ul_RedMapPtr = r * 9 * 9;
++#endif
+ for (unsigned int g = 0; g < 9; g++)
+ {
++#ifndef NDEBUG
+ unsigned long ul_GreenMapPtr = g * 9;
++#endif
+ for (unsigned int b = 0; b < 9; b++)
+ {
+ unsigned long mapptr = b + (g * 9) + (r * 9 * 9); // get address in map
++#ifndef NDEBUG
+ unsigned long ul_MapPtr = b + ul_GreenMapPtr + ul_RedMapPtr;
+ ASSERT(mapptr == ul_MapPtr);
++#endif
+ // put r,g,b in monitor range
+ unsigned int oldR = r * 255 >> 3;
+ unsigned int oldG = 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 -0800
++++ prnt/hpijs/hpijs.cpp 2006-05-12 15:44:27.509333968 -0700
+@@ -177,7 +177,7 @@
+ char *tail;
+ int status = 0;
+ char svalue[IJS_MAX_PARAM+1];
+- float w, h;
++ float w, h, dx, dy;
+
+ /* Sanity check input value. */
+ if (value_size > IJS_MAX_PARAM)
+@@ -256,8 +256,12 @@
+ }
+ else
+ {
++
++ dx = w > pSS->PaperWidth ? w - pSS->PaperWidth : pSS->PaperWidth - w;
++ dy = h > pSS->PaperHeight ? h - pSS->PaperHeight : pSS->PaperHeight - h;
++
+ /* Middle of print Job, ignore paper size if same. */
+- if (!(w == pSS->PaperWidth && h == pSS->PaperHeight))
++ if ((dx > 0.03) || (dy > 0.03))
+ {
+ pSS->FirstRaster = 1; /* force new Job */
+ pSS->PaperWidth = w; /* set new paper size */
+@@ -272,19 +276,19 @@
+ }
+ else if (!strcmp (key, "Quality:Quality"))
+ {
+- pSS->Quality = strtol(svalue, &tail, 10);
++ pSS->Quality = (QUALITY_MODE) strtol(svalue, &tail, 10);
+ }
+ else if (!strcmp (key, "Quality:MediaType"))
+ {
+- pSS->MediaType = strtol(svalue, &tail, 10);
++ pSS->MediaType = (MEDIATYPE) strtol(svalue, &tail, 10);
+ }
+ else if (!strcmp (key, "Quality:ColorMode"))
+ {
+- pSS->ColorMode = strtol(svalue, &tail, 10);
++ pSS->ColorMode = (COLORMODE) strtol(svalue, &tail, 10);
+ }
+ else if (!strcmp (key, "Quality:PenSet"))
+ {
+- pSS->PenSet = strtol(svalue, &tail, 10);
++ pSS->PenSet = (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/ljfastraster.cpp
+--- hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp 2006-05-09 11:04:30.000000000 -0700
++++ prnt/hpijs/ljfastraster.cpp 2006-05-11 16:34:57.000000000 -0700
+@@ -1215,7 +1215,7 @@
+
+ m_compressedsize = 2 * inputsize * INDY_STRIP_HEIGHT;
+ BOOL bRet = Compress (compressBuf,
+- (uint32_t *) &m_compressedsize,
++ &m_compressedsize,
+ pbyInputImageBuffer,
+ inputsize,
+ m_lCurrCDRasterRow,
+diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.h prnt/hpijs/ljfastraster.h
+--- hplip-0.9.11.old/prnt/hpijs/ljfastraster.h 2006-05-09 11:04:30.000000000 -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
+
++#include "global_types.h"
+
+ APDK_BEGIN_NAMESPACE
+ /*!
+@@ -136,7 +137,7 @@
+ long m_lCurrBlockHeight;
+ long m_lPrinterRasterRow; // Current printer raster row.
+
+- 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.cpp
+--- hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp 2006-05-09 11:04:30.000000000 -0700
++++ prnt/hpijs/ljjetready.cpp 2006-05-11 15:49:52.000000000 -0700
+@@ -473,7 +473,7 @@
+ //-----------------------------------------------------------------------------
+ DRIVER_ERROR HeaderLJJetReady::MapPCLMediaTypeToString (MEDIATYPE eM)
+ {
+- DRIVER_ERROR err;
++ DRIVER_ERROR err = SYSTEM_ERROR;
+ BYTE szPlain[] = {"\xC8\xC1\x05\x00Plain\xF8\x27"};
+ BYTE szPhoto[] = {"\xC8\xC1\x05\x00Gloss\xF8\x27"};
+
+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 @@
+
+ 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 = ph.height - 1; /* Height = physical page in pixels */
+ RastersOnPage = (BYTE **) new BYTE[(ph.height) * sizeof (BYTE *)];
+@@ -270,12 +276,13 @@
+ }
+ }
+
+- Quality = 0; /* normal */
+- MediaType = 0; /* plain */
+- ColorMode = 2; /* color */
++ Quality = QUALITY_NORMAL;
++ MediaType = MEDIA_PLAIN;
++ ColorMode = COLOR;
+ PenSet = DUMMY_PEN;
+
+ RastersOnPage = 0;
++ KRastersOnPage = 0;
+ pPC = NULL;
+ pJob = NULL;
+ Duplex = 0;
+@@ -294,6 +301,8 @@
+ {
+ if (RastersOnPage)
+ delete [] RastersOnPage;
++ if (KRastersOnPage)
++ delete [] KRastersOnPage;
+ if (hpFD >= 0)
+ hplip_CloseHP(hpFD);
+ hplip_Exit();
+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>
+
++#include "global_types.h"
++
+ APDK_USING_NAMESPACE
+
+ class UXServices:public SystemServices
+@@ -123,10 +125,10 @@
+ const float *Margin;
+ int Model; /* selected device: -1=no, 1=yes */
+ int OutputPath; /* open file descriptor */
+- int Quality; /* 0=normal, 1=draft, 2=best */
+- int MediaType; /* 0=plain, 1=premium, 2=photo */
+- int ColorMode; /* 0=grey_k, 1=grey_cmy, 2=color */
+- int PenSet; /* 0=black_pen, 1=color_pen, 2=both_pens, 3=mdl_pen, 4=mdl_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
--- 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 @@
---- Makefile.in.orig Thu Mar 23 22:35:33 2006
-+++ Makefile.in Mon Apr 24 09:15:54 2006
-@@ -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 = $(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
+@@ -2348,15 +2348,9 @@
#
# Do full install if not rpm_install.
if [ "$(rpm_install)" = "no" ]; then \
@@ -19,7 +31,7 @@
fi
install-data-hook: test-destdir
-@@ -2039,30 +2033,31 @@
+@@ -2414,7 +2408,7 @@
newname=$${i%.*}; \
mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \
if [ "$(rpm_install)" = "no" ]; then \
@@ -28,39 +40,7 @@
fi \
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)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-- echo -ne "# Following values are determined at configure time and cannot be changed.\n[configure]\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+ echo "# Following values are determined at configure time and cannot be changed." >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+ echo "[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- if [ "$(rpm_install)" = "yes" ]; then \
-- echo -ne "rpm-install=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+ echo "rpm-install=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- else \
-- echo -ne "rpm-install=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+ echo "rpm-install=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- fi
- if [ "$(network_build)" = "yes" ]; then \
-- echo -ne "network-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+ echo "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- else \
-- echo -ne "network-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+ echo "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- fi
- if [ "$(pp_build)" = "yes" ]; then \
-- echo -ne "pp-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+ echo "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- else \
-- echo -ne "pp-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+ echo "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- fi
-- echo -ne "internal-tag=$(PACKAGE_BUGREPORT)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
-+ echo "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
-
- #
- # Edit hpiod.sh in destdir.
-@@ -2074,16 +2069,6 @@
+@@ -2449,16 +2443,6 @@
if [ "$(rpm_install)" = "no" ]; then \
$(mkinstalldirs) $(DESTDIR)/etc/hp; \
$(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \
diff -ruN hplip.orig/files/patch-io_hpiod_device.cpp hplip/files/patch-io_hpiod_device.cpp
--- 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 interface with an active write %s: %s %d\n", URI, __FILE__, __LINE__);
#else
usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write);
- #endif
-@@ -913,7 +1155,7 @@
- /* Make sure uri model still matches device id model. */
- pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
- pSys->GetModel(ID, model, sizeof(model));
-- if (strcmp(uriModel, model) != 0)
-+ if (strcasecmp(uriModel, model) != 0)
- {
- *result = R_INVALID_DEVICE_NODE; /* found different device plugged in */
- syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
+ #endif
\ No newline at end of file
diff -ruN hplip.orig/pkg-plist hplip/pkg-plist
--- 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
-bin/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
-%%PORTDOCS%%share/doc/hpijs-2.1.9/COPYING
-%%PORTDOCS%%share/doc/hpijs-2.1.9/README_LIBJPG
-%%PORTDOCS%%share/doc/hpijs-2.1.9/gs_hpijs.png
-%%PORTDOCS%%share/doc/hpijs-2.1.9/hpijs_readme.html
-%%PORTDOCS%%share/doc/hplip-0.9.10/COPYING
-%%PORTDOCS%%share/doc/hplip-0.9.10/hplip_overview.png
-%%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
-%%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
-%%DATADIR%%/hplip_overview.png
-%%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
-share/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%%
-%%PORTDOCS%%@dirrm share/doc/hplip-0.9.10
-%%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
--- hplip-0.9.11.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1148338214.29982>