From 546e863132792b16e8e5775ff769631ca6b5ba93 Mon Sep 17 00:00:00 2001 From: Boris Samorodov Date: Wed, 27 Sep 2006 23:00:09 +0000 Subject: - update from 0.9.11 to 1.6.7; - enhanced pkg-message. PR: 100413 Submitted by: Anish Mistry (maintainer) --- print/hplip3/Makefile | 11 +- print/hplip3/distinfo | 6 +- print/hplip3/files/patch-0.9.11-2-official | 276 --------------------------- print/hplip3/files/patch-Makefile.in | 65 +++++-- print/hplip3/files/patch-hplip.conf | 8 + print/hplip3/files/patch-io_hpiod | 24 --- print/hplip3/files/patch-io_hpiod_device.cpp | 47 ++--- print/hplip3/files/patch-io_hpiod_device.h | 12 -- print/hplip3/pkg-message | 32 ++++ print/hplip3/pkg-plist | 63 ++++-- 10 files changed, 175 insertions(+), 369 deletions(-) delete mode 100644 print/hplip3/files/patch-0.9.11-2-official create mode 100644 print/hplip3/files/patch-hplip.conf delete mode 100644 print/hplip3/files/patch-io_hpiod delete mode 100644 print/hplip3/files/patch-io_hpiod_device.h (limited to 'print/hplip3') diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile index f2d136778fb3..523ff9f3f575 100644 --- a/print/hplip3/Makefile +++ b/print/hplip3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= hplip -PORTVERSION= 0.9.11 +PORTVERSION= 1.6.7 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -40,7 +40,7 @@ PKGDEINSTALL= ${PKGINSTALL} OPTIONS= GUI "build with Python QT" on -PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.1.10 +PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.7 .include @@ -100,6 +100,11 @@ post-install: @${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd @${LN} -sf ${PREFIX}/bin/foomatic-rip \ ${PREFIX}/libexec/cups/filter/foomatic-rip - @${CAT} ${PKGMESSAGE} + @${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 + @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE} .include diff --git a/print/hplip3/distinfo b/print/hplip3/distinfo index b33909556b95..9964581354e5 100644 --- a/print/hplip3/distinfo +++ b/print/hplip3/distinfo @@ -1,3 +1,3 @@ -MD5 (hplip-0.9.11.tar.gz) = 5cf362c972d5b1733af4fb8e2ade92e4 -SHA256 (hplip-0.9.11.tar.gz) = 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42 -SIZE (hplip-0.9.11.tar.gz) = 9924094 +MD5 (hplip-1.6.7.tar.gz) = b1e814c7f5ef2a5033e4c3e5162ac694 +SHA256 (hplip-1.6.7.tar.gz) = 27b3703a0d6470e03e1574b481d6d05d652c787a793854f2f0e06d06c998a601 +SIZE (hplip-1.6.7.tar.gz) = 9984016 diff --git a/print/hplip3/files/patch-0.9.11-2-official b/print/hplip3/files/patch-0.9.11-2-official deleted file mode 100644 index f991bdbf8fcf..000000000000 --- a/print/hplip3/files/patch-0.9.11-2-official +++ /dev/null @@ -1,276 +0,0 @@ -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 @@ - - - -+ -+ 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; -+ PSC_900_Series.png -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 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; -+ PSC_900_Series.png -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 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; -+ PSC_900_Series.png -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - psc_2300_series.png -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 - #include - -+#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 --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in index db2e6271d52b..87a92ec30122 100644 --- a/print/hplip3/files/patch-Makefile.in +++ b/print/hplip3/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue May 9 14:18:36 2006 -+++ Makefile.in Sun May 21 14:32:27 2006 -@@ -377,9 +377,9 @@ +--- Makefile.in.orig Tue Aug 1 16:41:16 2006 ++++ Makefile.in Wed Sep 27 17:13:29 2006 +@@ -390,12 +390,12 @@ www5dir = $(docdir)/supported_devices dist_www5_DATA = $(wwwsrc)/supported_devices/* www6dir = $(docdir)/tech_docs @@ -11,8 +11,12 @@ +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 @@ +-dist_hplip_DATA = $(doc_DATA) hplip.conf ++dist_hplip_DATA = $(doc_DATA) + dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh + 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 \ +@@ -2415,15 +2415,9 @@ # # Do full install if not rpm_install. if [ "$(rpm_install)" = "no" ]; then \ @@ -30,8 +34,8 @@ + ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \ fi - install-data-hook: test-destdir -@@ -2414,7 +2408,7 @@ + install-data-hook: test-destdir install-pcardext install-cupsext +@@ -2466,7 +2460,7 @@ newname=$${i%.*}; \ mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \ if [ "$(rpm_install)" = "no" ]; then \ @@ -40,10 +44,15 @@ fi \ done # -@@ -2449,16 +2443,6 @@ - if [ "$(rpm_install)" = "no" ]; then \ - $(mkinstalldirs) $(DESTDIR)/etc/hp; \ - $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \ +@@ -2501,22 +2495,7 @@ + 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 +-# +-# Do full install if not rpm_install. Also only run chkconfig/install_initd if DESTDIR="". +- if [ "$(rpm_install)" = "no" ]; then \ +- $(mkinstalldirs) $(DESTDIR)/etc/hp; \ +- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \ - if [ -d $(DESTDIR)/etc/init.d ]; then \ - $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d; \ - if [ "$(DESTDIR)" = "" ]; then \ @@ -54,6 +63,38 @@ - fi \ - fi \ - fi \ - fi +- fi ++ # # For internal testing. + if [ "$(SHADOW)" != "" ]; then \ +@@ -2548,8 +2527,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 +@@ -2560,13 +2539,13 @@ + # Add prerequisites for testing (or building?) "make install DESTDIR=/build". + test-destdir: + if [ "$(DESTDIR)" != "" ]; then \ +- $(mkinstalldirs) $(DESTDIR)/etc/init.d; \ +- $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ +- if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \ +- touch $(DESTDIR)/etc/sane.d/dll.conf; \ ++ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/rc.d; \ ++ $(mkinstalldirs) $(DESTDIR)/usr/local/etc/sane.d; \ ++ if [ ! -f $(DESTDIR)/usr/local/etc/sane.d/dll.conf ]; then \ ++ touch $(DESTDIR)/usr/local/etc/sane.d/dll.conf; \ + fi; \ + $(mkinstalldirs) $(DESTDIR)$(sanedir); \ +- $(mkinstalldirs) $(DESTDIR)/usr/share/applications; \ ++ $(mkinstalldirs) $(DESTDIR)/usr/local/share/applications; \ + $(mkinstalldirs) $(DESTDIR)/usr/bin; \ + fi + diff --git a/print/hplip3/files/patch-hplip.conf b/print/hplip3/files/patch-hplip.conf new file mode 100644 index 000000000000..82d374200c3f --- /dev/null +++ b/print/hplip3/files/patch-hplip.conf @@ -0,0 +1,8 @@ +--- 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-io_hpiod b/print/hplip3/files/patch-io_hpiod deleted file mode 100644 index eea8422eed52..000000000000 --- a/print/hplip3/files/patch-io_hpiod +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN io/hpiod.orig/usbext.c io/hpiod/usbext.c ---- io/hpiod.orig/usbext.c Sat Apr 1 16:11:45 2006 -+++ io/hpiod/usbext.c Sat Apr 1 16:10:29 2006 -@@ -33,7 +33,7 @@ - int fd; - }; - --#if defined(__APPLE__) && defined(__MACH__) -+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) - - #else - -diff -ruN io/hpiod.orig/usbext.h io/hpiod/usbext.h ---- io/hpiod.orig/usbext.h Sat Apr 1 16:11:45 2006 -+++ io/hpiod/usbext.h Sat Apr 1 16:05:57 2006 -@@ -32,7 +32,7 @@ - #include - #include - --#if defined(__APPLE__) && defined(__MACH__) -+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) - #else - #include - diff --git a/print/hplip3/files/patch-io_hpiod_device.cpp b/print/hplip3/files/patch-io_hpiod_device.cpp index 288b8be0ab04..13bd9bb419cd 100644 --- a/print/hplip3/files/patch-io_hpiod_device.cpp +++ b/print/hplip3/files/patch-io_hpiod_device.cpp @@ -1,5 +1,5 @@ ---- io/hpiod/device.cpp.orig Fri Mar 3 00:07:26 2006 -+++ io/hpiod/device.cpp Wed Apr 5 02:57:32 2006 +--- 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 @@ \*****************************************************************************/ @@ -10,14 +10,19 @@ const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.', 'p','o','w','e','r',' ','1',';', -@@ -109,6 +112,244 @@ - return -2; - } +@@ -111,21 +114,240 @@ -+#elif defined(__FreeBSD__) -+ -+int Device::Write(int fd, const void *buf, int size) -+{ + #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; @@ -82,10 +87,12 @@ + + close(endpoint_fd); + return size; -+} -+ -+int Device::Read(int fd, void *buf, int size, int usec) -+{ + } + + 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; @@ -250,18 +257,6 @@ + + close(endpoint_fd); + return size; -+} -+ - #else - - /* -@@ -589,7 +830,8 @@ + } - if (FD[fd].urb_write_active) - { --#if defined(__APPLE__) && defined(__MACH__) -+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__) -+ 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 \ No newline at end of file diff --git a/print/hplip3/files/patch-io_hpiod_device.h b/print/hplip3/files/patch-io_hpiod_device.h deleted file mode 100644 index de0796b353ee..000000000000 --- a/print/hplip3/files/patch-io_hpiod_device.h +++ /dev/null @@ -1,12 +0,0 @@ ---- io/hpiod/device.h.orig Tue Feb 28 19:40:55 2006 -+++ io/hpiod/device.h Sun Apr 2 23:38:58 2006 -@@ -72,6 +72,9 @@ - int AltSetting; - int urb_write_active; /* 0=no, 1=yes */ - #if defined(__APPLE__) && defined(__MACH__) -+ -+#elif defined(__FreeBSD__) -+ - #else - struct usbdevfs_urb urb_write; /* host to device */ - struct usbdevfs_urb urb_read; /* device to host */ diff --git a/print/hplip3/pkg-message b/print/hplip3/pkg-message index af13f704bccc..d310fdf4dc2d 100644 --- a/print/hplip3/pkg-message +++ b/print/hplip3/pkg-message @@ -12,4 +12,36 @@ ruleset in devfs.rules: add path 'ugen*' group operator add path 'ugen*' mode 0660 +If you have never setup devfs.rules please read the +manpage and see: +http://am-productions.biz/docs/devfs.rules.php + +The printer MUST attach as a ugen(4) device. This means +that you must NOT have "device ulpt" in your kernel and +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] +cp %%PREFIX%%/etc/hp/hplip.conf.sample \ + %%PREFIX%%/etc/hp/hplip.conf + +If you are 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-* +utility that you are trying to run, and your rc.conf + +devfs.rules files to the maintainer. ********************************************************** diff --git a/print/hplip3/pkg-plist b/print/hplip3/pkg-plist index ce172cdf8ea1..7ff9ac370349 100644 --- a/print/hplip3/pkg-plist +++ b/print/hplip3/pkg-plist @@ -6,8 +6,8 @@ bin/hp-colorcal bin/hp-fab bin/hp-info bin/hp-levels +bin/hp-makecopies bin/hp-makeuri -bin/hp-photo bin/hp-print bin/hp-sendfax bin/hp-setup @@ -15,21 +15,21 @@ bin/hp-testpage bin/hp-toolbox bin/hp-unload bin/hpijs -etc/hp/hplip.conf +etc/hp/hplip.conf.sample lib/libhpip.la lib/libhpip.so lib/libhpip.so.0 lib/libsane-hpaio.la lib/libsane-hpaio.so lib/libsane-hpaio.so.1 +%%PYTHON_SITELIBDIR%%/cupsext.so +%%PYTHON_SITELIBDIR%%/pcardext.so 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 -%%PYTHON_SITELIBDIR%%/pcardext.so -%%PYTHON_SITELIBDIR%%/cupsext.so sbin/hpiod sbin/hpssd share/applications/hplip.desktop @@ -37,6 +37,7 @@ 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%%/about.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/faqs.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/features.html @@ -48,8 +49,10 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/redhat.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/hpaio.desc %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagePrint.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-1.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-2.png @@ -62,17 +65,27 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagerSend_Fax.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/Screenshot-xsane.png %%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/fullbleed_1.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_4.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/gs_hpijs.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp-tux-printer.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp_invent_logo.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_device_manager.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hplip_overview.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_appssocket.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_list.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_device_uri.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/network_model_list.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/sflogo.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_hardware.png %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_opening_hw.png @@ -92,6 +105,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu606.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step3/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/local.html @@ -104,6 +118,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/legal.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/license.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/mailing_lists.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/other_support.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/release_notes.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/screenshots.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/styles/default.css @@ -111,6 +126,7 @@ share/cups/model/foomatic-ppds %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/support_statement.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/color_laser.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/color_laser_mfp.html +%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/combined.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/index.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/inkjet.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/supported_devices/inkjet_aio.html @@ -131,9 +147,10 @@ share/cups/model/foomatic-ppds %%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/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/photo.html %%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.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/toolbox.html @@ -174,11 +191,12 @@ share/cups/model/foomatic-ppds %%DATADIR%%/base/slp.py %%DATADIR%%/base/status.py %%DATADIR%%/base/strings.py -%%DATADIR%%/base/subproc.py %%DATADIR%%/base/utils.py %%DATADIR%%/check %%DATADIR%%/clean %%DATADIR%%/colorcal +%%DATADIR%%/copier/__init__.py +%%DATADIR%%/copier/copier.py %%DATADIR%%/data/hplip.desktop %%DATADIR%%/data/images/120.png %%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png @@ -236,10 +254,10 @@ share/cups/model/foomatic-ppds %%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_Series_300.png %%DATADIR%%/data/images/Officejet_6150_Series.png %%DATADIR%%/data/images/Officejet_6200_series.png %%DATADIR%%/data/images/Officejet_7200_series.png @@ -300,6 +318,7 @@ 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 @@ -429,6 +448,9 @@ share/cups/model/foomatic-ppds %%DATADIR%%/data/xml/HPLIP-02-2006.xml %%DATADIR%%/data/xml/HPLIP-03-2006.xml %%DATADIR%%/data/xml/HPLIP-05-2006.xml +%%DATADIR%%/data/xml/HPLIP-06-2006.xml +%%DATADIR%%/data/xml/HPLIP-07-2006.xml +%%DATADIR%%/data/xml/HPLIP-08-2006.xml %%DATADIR%%/data/xml/models.xml %%DATADIR%%/data/xml/unsupported.xml %%DATADIR%%/fab @@ -437,16 +459,17 @@ share/cups/model/foomatic-ppds %%DATADIR%%/fax/coverpages.py %%DATADIR%%/fax/fax.py %%DATADIR%%/fax/ppd/HP-Fax-hplip.ppd +%%DATADIR%%/hpaio.desc %%DATADIR%%/hplip %%DATADIR%%/hplip.conf %%DATADIR%%/hplip.sh %%DATADIR%%/hpssd.py %%DATADIR%%/info %%DATADIR%%/levels +%%DATADIR%%/makecopies %%DATADIR%%/makeuri %%DATADIR%%/pcard/__init__.py %%DATADIR%%/pcard/photocard.py -%%DATADIR%%/photo %%DATADIR%%/plugins/Deskjet_460.py %%DATADIR%%/plugins/__init__.py %%DATADIR%%/plugins/dj450.py @@ -459,6 +482,7 @@ share/cups/model/foomatic-ppds %%DATADIR%%/prnt/cups.py %%DATADIR%%/prnt/ldl.py %%DATADIR%%/prnt/pcl.py +%%DATADIR%%/prnt/printable_areas.py %%DATADIR%%/scan/__init__.py %%DATADIR%%/sendfax %%DATADIR%%/setup @@ -510,6 +534,8 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/informationform_base.py %%DATADIR%%/ui/loadpaperform.py %%DATADIR%%/ui/loadpaperform_base.py +%%DATADIR%%/ui/makecopiesform.py +%%DATADIR%%/ui/makecopiesform_base.py %%DATADIR%%/ui/nodevicesform.py %%DATADIR%%/ui/nodevicesform_base.py %%DATADIR%%/ui/paperedgealignform.py @@ -519,8 +545,6 @@ share/cups/model/foomatic-ppds %%DATADIR%%/ui/printerform_base.ui %%DATADIR%%/ui/settingsdialog.py %%DATADIR%%/ui/settingsdialog_base.py -%%DATADIR%%/ui/supportform.py -%%DATADIR%%/ui/supportform_base.py %%DATADIR%%/ui/unloadform.py %%DATADIR%%/ui/unloadform_base.py %%DATADIR%%/ui/waitform.py @@ -691,6 +715,9 @@ share/ppd/HP/HP-DeskJet_9800-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_980C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_990C-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_995C-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_D1300-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_D2300-hpijs.ppd.gz +share/ppd/HP/HP-DeskJet_D4100-hpijs.ppd.gz share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz @@ -783,7 +810,6 @@ 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 @@ -803,6 +829,7 @@ share/ppd/HP/HP-OfficeJet_6150-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_6200-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_625-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_630-hpijs.ppd.gz +share/ppd/HP/HP-OfficeJet_6300-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_635-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_700-hpijs.ppd.gz share/ppd/HP/HP-OfficeJet_710-hpijs.ppd.gz @@ -898,6 +925,15 @@ share/ppd/HP/HP-PhotoSmart_8100-hpijs.ppd.gz 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_A430-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_A710-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_D6100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7100-hpijs.ppd.gz +share/ppd/HP/HP-PhotoSmart_D7300-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 @@ -992,7 +1028,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 -@dirrmtry share/applications @dirrm share/ppd/HP/fax @dirrm share/ppd/HP @dirrm share/ppd @@ -1011,6 +1046,7 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz @dirrm %%DATADIR%%/data/ldl @dirrm %%DATADIR%%/data/images @dirrm %%DATADIR%%/data +@dirrm %%DATADIR%%/copier @dirrm %%DATADIR%%/base @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/troubleshooting @@ -1030,4 +1066,5 @@ share/ppd/HP/hp_officejet_9100_series.ppd.gz %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos %%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%% %%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%% -@dirrm etc/hp +@dirrmtry share/applications +@dirrmtry etc/hp -- cgit v1.2.3