Attachment #68272 for bug #100413

View | Details | Raw Unified | Return to bug 100413
Collapse All | Expand All




#

PORTNAME=	hplip
PORTVERSION=	1.6.6a
CATEGORIES=	print
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	hplip


OPTIONS=	GUI "build with Python QT" on

PLIST_SUB+=	PORTVERSION=${PORTVERSION} IJSVER=2.6.6a

.include <bsd.port.pre.mk>


	@${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd
	@${LN} -sf ${PREFIX}/bin/foomatic-rip \
		${PREFIX}/libexec/cups/filter/foomatic-rip
	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)hplip/distinfo (-3 / +3 lines)
1	MD5 (hplip-0.9.11.tar.gz) = 5cf362c972d5b1733af4fb8e2ade92e4	1	MD5 (hplip-1.6.6a.tar.gz) = 606704fc8b2fe344e49190b592b438e0
2	SHA256 (hplip-0.9.11.tar.gz) = 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42	2	SHA256 (hplip-1.6.6a.tar.gz) = e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d
3	SIZE (hplip-0.9.11.tar.gz) = 9924094	3	SIZE (hplip-1.6.6a.tar.gz) = 10447071




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 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 <sys/time.h>
 #include <usb.h>
 
-#if defined(__APPLE__) && defined(__MACH__)
+#if defined(__APPLE__) && defined(__MACH__) || defined(__FreeBSD__)
 #else
 #include <linux/usbdevice_fs.h>
 




--- 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 @@
 \*****************************************************************************/
 

 
 const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.',
         'p','o','w','e','r',' ','1',';',
@@ -111,21 +114,240 @@
    return -2;
 }
 
 #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;

+
+	close(endpoint_fd);
+	return size;
 }
 
 int Device::Read(int fd, void *buf, int size, int usec)
 {
-   syslog(LOG_ERR, "error Read: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__);
-   return -2;
+	int nwrote, total, r, ep=0, endpoint_fd, i;
+	struct timeval t1, t2;
+	fd_set ready;

+
+	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




--- 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 */




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 error 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 you are still having problems send the relevant part of
your /var/log/messages, console output from the hp-*
utility that you are trying to run, and your rc.conf +
devfs.rules files to the maintainer.
**********************************************************




bin/hp-info
bin/hp-levels
bin/hp-makeuri
bin/hp-photo
bin/hp-print
bin/hp-sendfax
bin/hp-setup

bin/hp-toolbox
bin/hp-unload
bin/hpijs
bin/hp-makecopies
lib/libhpip.la
lib/libhpip.so
lib/libhpip.so.0

%%PYTHON_SITELIBDIR%%/cupsext.so
sbin/hpiod
sbin/hpssd
share/applications/hplip.desktop
share/cups/model/foomatic-ppds
%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING
%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/faqs.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/features.html

%%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

%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_kind.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_printer.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.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/hp_invent_logo.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html

%%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

%%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

%%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/makeuri.html
%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.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

%%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/xml/HPLIP-06-2006.xml
%%DATADIR%%/hpaio.desc
%%DATADIR%%/makecopies
%%DATADIR%%/data/images/120.png
%%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png
%%DATADIR%%/data/images/CP_1700.png

%%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

%%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

%%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

%%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

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

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_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

@dirrm %%DATADIR%%/fax/ppd
@dirrm %%DATADIR%%/fax/backend
@dirrm %%DATADIR%%/fax
@dirrm %%DATADIR%%/copier
@dirrm %%DATADIR%%/data/ps
@dirrm %%DATADIR%%/data/pcl
@dirrm %%DATADIR%%/data/ldl
@dirrm %%DATADIR%%/data/images
@dirrm %%DATADIR%%/data/xml
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%/base
@dirrm %%DATADIR%%

%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos
%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%
%%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%%
@dirrm etc/hp

Return to bug 100413

Lines 6-12 Link Here

(-)hplip/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= hplip	8	PORTNAME= hplip
9	PORTVERSION= 0.9.11	9	PORTVERSION= 1.6.6a
10	CATEGORIES= print	10	CATEGORIES= print
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= hplip	12	MASTER_SITE_SUBDIR= hplip
Lines 40-46 Link Here
40		40
41	OPTIONS= GUI "build with Python QT" on	41	OPTIONS= GUI "build with Python QT" on
42		42
43	PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.1.10	43	PLIST_SUB+= PORTVERSION=${PORTVERSION} IJSVER=2.6.6a
44		44
45	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
46		46
Lines 100-105 Link Here
100	@${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd	100	@${LN} -sf ${PREFIX}/share/hplip/hpssd.py ${PREFIX}/sbin/hpssd
101	@${LN} -sf ${PREFIX}/bin/foomatic-rip \	101	@${LN} -sf ${PREFIX}/bin/foomatic-rip \
102	${PREFIX}/libexec/cups/filter/foomatic-rip	102	${PREFIX}/libexec/cups/filter/foomatic-rip
103	@${CAT} ${PKGMESSAGE}	103	@${SED} -e "s\|%%PREFIX%%\|${PREFIX}\|" ${PKGMESSAGE}
104		104
105	.include <bsd.port.post.mk>	105	.include <bsd.port.post.mk>

Lines 1-276 Link Here

(-)hplip/files/patch-0.9.11-2-official (-276 lines)
1	diff -uNr hplip-0.9.11.old/data/xml/models.xml data/xml/models.xml
2	--- hplip-0.9.11.old/data/xml/models.xml 2006-05-08 12:27:06.000000000 -0700
3	+++ data/xml/models.xml 2006-05-12 15:30:54.754891424 -0700
4	@@ -7797,6 +7797,84 @@
5	</r0>
6	</model>
7
8	+<model name="PSC_950">
9	+ <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>
10	+ <icon>PSC_900_Series.png</icon>
11	+ <support type="2"/>
12	+ <case-model>
13	+ </case-model>
14	+ <io support="2" mode="1" control="0" mfp-mode="2" scan-port="0"/>
15	+ <align type="9"/>
16	+ <clean type="3"/>
17	+ <color-cal type="0"/>
18	+ <status type="1"/>
19	+ <scan type="1"/>
20	+ <fax type="0"/>
21	+ <pcard type="1"/>
22	+ <copy type="0"/>
23	+ <tech class="DJ9xx" type="2"/>
24	+ <embedded-server type="0"/>
25	+ <panel-check type="1"/>
26	+ <linefeed-cal type="0"/>
27	+ <pq-diag type="0"/>
28	+ <r0>
29	+ <agent1 kind="3" type="1" sku="15 (C6615DN)"/>
30	+ <agent2 kind="3" type="2" sku="78 (C6578AN / C6578DN)"/>
31	+ </r0>
32	+</model>
33	+
34	+<model name="PSC_950vr">
35	+ <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>
36	+ <icon>PSC_900_Series.png</icon>
37	+ <support type="2"/>
38	+ <case-model>
39	+ </case-model>
40	+ <io support="2" mode="1" control="0" mfp-mode="2" scan-port="0"/>
41	+ <align type="9"/>
42	+ <clean type="3"/>
43	+ <color-cal type="0"/>
44	+ <status type="1"/>
45	+ <scan type="1"/>
46	+ <fax type="0"/>
47	+ <pcard type="1"/>
48	+ <copy type="0"/>
49	+ <tech class="DJ9xx" type="2"/>
50	+ <embedded-server type="0"/>
51	+ <panel-check type="1"/>
52	+ <linefeed-cal type="0"/>
53	+ <pq-diag type="0"/>
54	+ <r0>
55	+ <agent1 kind="3" type="1" sku="15 (C6615DN)"/>
56	+ <agent2 kind="3" type="2" sku="78 (C6578AN / C6578DN)"/>
57	+ </r0>
58	+</model>
59	+
60	+<model name="PSC_950xi">
61	+ <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>
62	+ <icon>PSC_900_Series.png</icon>
63	+ <support type="2"/>
64	+ <case-model>
65	+ </case-model>
66	+ <io support="2" mode="1" control="0" mfp-mode="2" scan-port="0"/>
67	+ <align type="9"/>
68	+ <clean type="3"/>
69	+ <color-cal type="0"/>
70	+ <status type="1"/>
71	+ <scan type="1"/>
72	+ <fax type="0"/>
73	+ <pcard type="1"/>
74	+ <copy type="0"/>
75	+ <tech class="DJ9xx" type="2"/>
76	+ <embedded-server type="0"/>
77	+ <panel-check type="1"/>
78	+ <linefeed-cal type="0"/>
79	+ <pq-diag type="0"/>
80	+ <r0>
81	+ <agent1 kind="3" type="1" sku="15 (C6615DN)"/>
82	+ <agent2 kind="3" type="2" sku="78 (C6578AN / C6578DN)"/>
83	+ </r0>
84	+</model>
85	+
86	<model name="Photosmart_2570_series">
87	<id></id>
88	<icon>psc_2300_series.png</icon>
89	diff -uNr hplip-0.9.11.old/prnt/hpijs/colormatch.cpp prnt/hpijs/colormatch.cpp
90	--- hplip-0.9.11.old/prnt/hpijs/colormatch.cpp 2006-05-09 11:04:30.000000000 -0700
91	+++ prnt/hpijs/colormatch.cpp 2006-05-11 16:17:17.000000000 -0700
92	@@ -221,15 +221,21 @@
93	{
94	for (unsigned int r = 0; r < 9; r++)
95	{
96	+#ifndef NDEBUG
97	unsigned long ul_RedMapPtr = r * 9 * 9;
98	+#endif
99	for (unsigned int g = 0; g < 9; g++)
100	{
101	+#ifndef NDEBUG
102	unsigned long ul_GreenMapPtr = g * 9;
103	+#endif
104	for (unsigned int b = 0; b < 9; b++)
105	{
106	unsigned long mapptr = b + (g * 9) + (r * 9 * 9); // get address in map
107	+#ifndef NDEBUG
108	unsigned long ul_MapPtr = b + ul_GreenMapPtr + ul_RedMapPtr;
109	ASSERT(mapptr == ul_MapPtr);
110	+#endif
111	// put r,g,b in monitor range
112	unsigned int oldR = r * 255 >> 3;
113	unsigned int oldG = g * 255 >> 3;
114	diff -uNr hplip-0.9.11.old/prnt/hpijs/hpijs.cpp prnt/hpijs/hpijs.cpp
115	--- hplip-0.9.11.old/prnt/hpijs/hpijs.cpp 2006-02-23 14:31:17.000000000 -0800
116	+++ prnt/hpijs/hpijs.cpp 2006-05-12 15:44:27.509333968 -0700
117	@@ -177,7 +177,7 @@
118	char *tail;
119	int status = 0;
120	char svalue[IJS_MAX_PARAM+1];
121	- float w, h;
122	+ float w, h, dx, dy;
123
124	/* Sanity check input value. */
125	if (value_size > IJS_MAX_PARAM)
126	@@ -256,8 +256,12 @@
127	}
128	else
129	{
130	+
131	+ dx = w > pSS->PaperWidth ? w - pSS->PaperWidth : pSS->PaperWidth - w;
132	+ dy = h > pSS->PaperHeight ? h - pSS->PaperHeight : pSS->PaperHeight - h;
133	+
134	/* Middle of print Job, ignore paper size if same. */
135	- if (!(w == pSS->PaperWidth && h == pSS->PaperHeight))
136	+ if ((dx > 0.03) \|\| (dy > 0.03))
137	{
138	pSS->FirstRaster = 1; /* force new Job */
139	pSS->PaperWidth = w; /* set new paper size */
140	@@ -272,19 +276,19 @@
141	}
142	else if (!strcmp (key, "Quality:Quality"))
143	{
144	- pSS->Quality = strtol(svalue, &tail, 10);
145	+ pSS->Quality = (QUALITY_MODE) strtol(svalue, &tail, 10);
146	}
147	else if (!strcmp (key, "Quality:MediaType"))
148	{
149	- pSS->MediaType = strtol(svalue, &tail, 10);
150	+ pSS->MediaType = (MEDIATYPE) strtol(svalue, &tail, 10);
151	}
152	else if (!strcmp (key, "Quality:ColorMode"))
153	{
154	- pSS->ColorMode = strtol(svalue, &tail, 10);
155	+ pSS->ColorMode = (COLORMODE) strtol(svalue, &tail, 10);
156	}
157	else if (!strcmp (key, "Quality:PenSet"))
158	{
159	- pSS->PenSet = strtol(svalue, &tail, 10);
160	+ pSS->PenSet = (PEN_TYPE) strtol(svalue, &tail, 10);
161	}
162	else if (!strcmp (key, "Quality:FullBleed"))
163	{
164	diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp prnt/hpijs/ljfastraster.cpp
165	--- hplip-0.9.11.old/prnt/hpijs/ljfastraster.cpp 2006-05-09 11:04:30.000000000 -0700
166	+++ prnt/hpijs/ljfastraster.cpp 2006-05-11 16:34:57.000000000 -0700
167	@@ -1215,7 +1215,7 @@
168
169	m_compressedsize = 2 * inputsize * INDY_STRIP_HEIGHT;
170	BOOL bRet = Compress (compressBuf,
171	- (uint32_t *) &m_compressedsize,
172	+ &m_compressedsize,
173	pbyInputImageBuffer,
174	inputsize,
175	m_lCurrCDRasterRow,
176	diff -uNr hplip-0.9.11.old/prnt/hpijs/ljfastraster.h prnt/hpijs/ljfastraster.h
177	--- hplip-0.9.11.old/prnt/hpijs/ljfastraster.h 2006-05-09 11:04:30.000000000 -0700
178	+++ prnt/hpijs/ljfastraster.h 2006-05-11 16:34:57.000000000 -0700
179	@@ -32,6 +32,7 @@
180	#ifndef APDK_LJFASTRASTER_H
181	#define APDK_LJFASTRASTER_H
182
183	+#include "global_types.h"
184
185	APDK_BEGIN_NAMESPACE
186	/*!
187	@@ -136,7 +137,7 @@
188	long m_lCurrBlockHeight;
189	long m_lPrinterRasterRow; // Current printer raster row.
190
191	- unsigned long m_compressedsize;
192	+ uint32_t m_compressedsize;
193	BOOL m_bCompressed;
194	float m_fRatio;
195	HPUInt8 *pbySeedRow;
196	diff -uNr hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp prnt/hpijs/ljjetready.cpp
197	--- hplip-0.9.11.old/prnt/hpijs/ljjetready.cpp 2006-05-09 11:04:30.000000000 -0700
198	+++ prnt/hpijs/ljjetready.cpp 2006-05-11 15:49:52.000000000 -0700
199	@@ -473,7 +473,7 @@
200	//-----------------------------------------------------------------------------
201	DRIVER_ERROR HeaderLJJetReady::MapPCLMediaTypeToString (MEDIATYPE eM)
202	{
203	- DRIVER_ERROR err;
204	+ DRIVER_ERROR err = SYSTEM_ERROR;
205	BYTE szPlain[] = {"\xC8\xC1\x05\x00Plain\xF8\x27"};
206	BYTE szPhoto[] = {"\xC8\xC1\x05\x00Gloss\xF8\x27"};
207
208	diff -uNr hplip-0.9.11.old/prnt/hpijs/services.cpp prnt/hpijs/services.cpp
209	--- hplip-0.9.11.old/prnt/hpijs/services.cpp 2006-02-23 14:31:47.000000000 -0800
210	+++ prnt/hpijs/services.cpp 2006-05-12 15:44:44.645728840 -0700
211	@@ -46,6 +46,12 @@
212
213	int UXServices::InitDuplexBuffer()
214	{
215	+ /* Free buffer if new page size in middle of print job. */
216	+ if (RastersOnPage)
217	+ delete [] RastersOnPage;
218	+ if (KRastersOnPage)
219	+ delete [] KRastersOnPage;
220	+
221	/* Calculate duplex page buffer */
222	CurrentRaster = ph.height - 1; /* Height = physical page in pixels */
223	RastersOnPage = (BYTE *) new BYTE[(ph.height) sizeof (BYTE *)];
224	@@ -270,12 +276,13 @@
225	}
226	}
227
228	- Quality = 0; /* normal */
229	- MediaType = 0; /* plain */
230	- ColorMode = 2; /* color */
231	+ Quality = QUALITY_NORMAL;
232	+ MediaType = MEDIA_PLAIN;
233	+ ColorMode = COLOR;
234	PenSet = DUMMY_PEN;
235
236	RastersOnPage = 0;
237	+ KRastersOnPage = 0;
238	pPC = NULL;
239	pJob = NULL;
240	Duplex = 0;
241	@@ -294,6 +301,8 @@
242	{
243	if (RastersOnPage)
244	delete [] RastersOnPage;
245	+ if (KRastersOnPage)
246	+ delete [] KRastersOnPage;
247	if (hpFD >= 0)
248	hplip_CloseHP(hpFD);
249	hplip_Exit();
250	diff -uNr hplip-0.9.11.old/prnt/hpijs/services.h prnt/hpijs/services.h
251	--- hplip-0.9.11.old/prnt/hpijs/services.h 2005-09-14 10:19:08.000000000 -0700
252	+++ prnt/hpijs/services.h 2006-05-12 15:44:40.360380312 -0700
253	@@ -35,6 +35,8 @@
254	#include <stdio.h>
255	#include <math.h>
256
257	+#include "global_types.h"
258	+
259	APDK_USING_NAMESPACE
260
261	class UXServices:public SystemServices
262	@@ -123,10 +125,10 @@
263	const float *Margin;
264	int Model; /* selected device: -1=no, 1=yes */
265	int OutputPath; /* open file descriptor */
266	- int Quality; /* 0=normal, 1=draft, 2=best */
267	- int MediaType; /* 0=plain, 1=premium, 2=photo */
268	- int ColorMode; /* 0=grey_k, 1=grey_cmy, 2=color */
269	- int PenSet; /* 0=black_pen, 1=color_pen, 2=both_pens, 3=mdl_pen, 4=mdl_both */
270	+ QUALITY_MODE Quality;
271	+ MEDIATYPE MediaType;
272	+ COLORMODE ColorMode;
273	+ PEN_TYPE PenSet;
274	int MediaPosition;
275	float PaperWidth; /* physical width in inches */
276	float PaperHeight; /* physical height in inches */

Lines 1-24 Link Here

(-)hplip/files/patch-io_hpiod (-24 lines)
1	diff -ruN io/hpiod.orig/usbext.c io/hpiod/usbext.c
2	--- io/hpiod.orig/usbext.c Sat Apr 1 16:11:45 2006
3	+++ io/hpiod/usbext.c Sat Apr 1 16:10:29 2006
4	@@ -33,7 +33,7 @@
5	int fd;
6	};
7
8	-#if defined(__APPLE__) && defined(__MACH__)
9	+#if defined(__APPLE__) && defined(__MACH__) \|\| defined(__FreeBSD__)
10
11	#else
12
13	diff -ruN io/hpiod.orig/usbext.h io/hpiod/usbext.h
14	--- io/hpiod.orig/usbext.h Sat Apr 1 16:11:45 2006
15	+++ io/hpiod/usbext.h Sat Apr 1 16:05:57 2006
16	@@ -32,7 +32,7 @@
17	#include <sys/time.h>
18	#include <usb.h>
19
20	-#if defined(__APPLE__) && defined(__MACH__)
21	+#if defined(__APPLE__) && defined(__MACH__) \|\| defined(__FreeBSD__)
22	#else
23	#include <linux/usbdevice_fs.h>
24

Lines 1-5 Link Here

(-)hplip/files/patch-io_hpiod_device.cpp (-26 / +21 lines)
1	--- io/hpiod/device.cpp.orig Fri Mar 3 00:07:26 2006	1	--- io/hpiod/device.cpp.orig Thu Jun 15 02:02:11 2006
2	+++ io/hpiod/device.cpp Wed Apr 5 02:57:32 2006	2	+++ io/hpiod/device.cpp Sun Jul 16 16:57:30 2006
3	@@ -25,6 +25,9 @@	3	@@ -25,6 +25,9 @@
4	\*****************************************************************************/	4	\*****************************************************************************/
5		5
Lines 10-23 Link Here
10		10
11	const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.',	11	const unsigned char Venice_Power_On[] = {0x1b, '%','P','u','i','f','p','.',
12	'p','o','w','e','r',' ','1',';',	12	'p','o','w','e','r',' ','1',';',
13	@@ -109,6 +112,244 @@	13	@@ -111,21 +114,240 @@
14	return -2;
15	}
16		14
17	+#elif defined(__FreeBSD__)	15	#elif defined(__FreeBSD__)
18	+	16
19	+int Device::Write(int fd, const void *buf, int size)	17	-/*
20	+{	18	- * Anish Mistry amistry@am-productions.biz is working on libusb extensions for FreeBSD. His current implementation does not handle device exceptions (ie: paperout).
		19	- * Once this issue is resolved we will be glade to add his code to the project.
		20	- */
		21	-
		22	int Device::Write(int fd, const void *buf, int size)
		23	{
		24	- syslog(LOG_ERR, "error Write: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__);
		25	- return -1;
21	+ int nwrote, total, write_len, r, ep, endpoint_fd;	26	+ int nwrote, total, write_len, r, ep, endpoint_fd;
22	+ void tmp_buf = (void )buf;	27	+ void tmp_buf = (void )buf;
23	+ fd_set ready;	28	+ fd_set ready;
Lines 82-91 Link Here
82	+	87	+
83	+ close(endpoint_fd);	88	+ close(endpoint_fd);
84	+ return size;	89	+ return size;
85	+}	90	}
86	+	91
87	+int Device::Read(int fd, void *buf, int size, int usec)	92	int Device::Read(int fd, void *buf, int size, int usec)
88	+{	93	{
		94	- syslog(LOG_ERR, "error Read: unimplemented (freebsd) %s %s %d\n", URI, __FILE__, __LINE__);
		95	- return -2;
89	+ int nwrote, total, r, ep=0, endpoint_fd, i;	96	+ int nwrote, total, r, ep=0, endpoint_fd, i;
90	+ struct timeval t1, t2;	97	+ struct timeval t1, t2;
91	+ fd_set ready;	98	+ fd_set ready;
Lines 250-267 Link Here
250	+	257	+
251	+ close(endpoint_fd);	258	+ close(endpoint_fd);
252	+ return size;	259	+ return size;
253	+}	260	}
254	+
255	#else
256
257	/*
258	@@ -589,7 +830,8 @@
259		261
260	if (FD[fd].urb_write_active)
261	{
262	-#if defined(__APPLE__) && defined(__MACH__)
263	+#if defined(__APPLE__) && defined(__MACH__) \|\| defined(__FreeBSD__)
264	+ syslog(LOG_ERR, "danger! Device::ReleaseInterface, releasing an interface with an active write %s: %s %d\n", URI, __FILE__, __LINE__);
265	#else	262	#else
266	usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write);
267	#endif

Lines 1-12 Link Here

(-)hplip/files/patch-io_hpiod_device.h (-12 lines)
1	--- io/hpiod/device.h.orig Tue Feb 28 19:40:55 2006
2	+++ io/hpiod/device.h Sun Apr 2 23:38:58 2006
3	@@ -72,6 +72,9 @@
4	int AltSetting;
5	int urb_write_active; /* 0=no, 1=yes */
6	#if defined(__APPLE__) && defined(__MACH__)
7	+
8	+#elif defined(__FreeBSD__)
9	+
10	#else
11	struct usbdevfs_urb urb_write; /* host to device */
12	struct usbdevfs_urb urb_read; /* device to host */

Lines 12-15 Link Here

(-)hplip/pkg-message (+19 lines)
12	add path 'ugen*' group operator	12	add path 'ugen*' group operator
13	add path 'ugen*' mode 0660	13	add path 'ugen*' mode 0660
14		14
		15	If you have never setup devfs.rules please read the
		16	manpage and see:
		17	http://am-productions.biz/docs/devfs.rules.php
		18
		19	The printer MUST attach as a ugen(4) device. This means
		20	that you must NOT have "device ulpt" in your kernel and
		21	ulpt must NOT be loaded as a kernel module.
		22
		23	If you are seeing device connection error restart the
		24	printing chain with the following command. NOTE: It MUST
		25	be restarted in the stated order.
		26	%%PREFIX%%/etc/rc.d/hpiod restart && \
		27	%%PREFIX%%/etc/rc.d/hpssd restart && \
		28	%%PREFIX%%/etc/rc.d/cupsd restart
		29
		30	If you are still having problems send the relevant part of
		31	your /var/log/messages, console output from the hp-*
		32	utility that you are trying to run, and your rc.conf +
		33	devfs.rules files to the maintainer.
15	**********************************************************	34	**********************************************************

Lines 7-13 Link Here

(-)hplip/pkg-plist (-9 / +38 lines)
7	bin/hp-info	7	bin/hp-info
8	bin/hp-levels	8	bin/hp-levels
9	bin/hp-makeuri	9	bin/hp-makeuri
10	bin/hp-photo
11	bin/hp-print	10	bin/hp-print
12	bin/hp-sendfax	11	bin/hp-sendfax
13	bin/hp-setup	12	bin/hp-setup
Lines 15-21 Link Here
15	bin/hp-toolbox	14	bin/hp-toolbox
16	bin/hp-unload	15	bin/hp-unload
17	bin/hpijs	16	bin/hpijs
18	etc/hp/hplip.conf	17	bin/hp-makecopies
19	lib/libhpip.la	18	lib/libhpip.la
20	lib/libhpip.so	19	lib/libhpip.so
21	lib/libhpip.so.0	20	lib/libhpip.so.0
Lines 32-42 Link Here
32	%%PYTHON_SITELIBDIR%%/cupsext.so	31	%%PYTHON_SITELIBDIR%%/cupsext.so
33	sbin/hpiod	32	sbin/hpiod
34	sbin/hpssd	33	sbin/hpssd
35	share/applications/hplip.desktop
36	share/cups/model/foomatic-ppds	34	share/cups/model/foomatic-ppds
37	%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING	35	%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/COPYING
38	%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG	36	%%PORTDOCS%%share/doc/hpijs-%%IJSVER%%/README_LIBJPG
39	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING	37	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/COPYING
		38	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/about.html
40	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html	39	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/contacts.html
41	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/faqs.html	40	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/faqs.html
42	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/features.html	41	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/features.html
Lines 48-55 Link Here
48	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html	47	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/other.html
49	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html	48	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/pcard.html
50	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html	49	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/printing.html
		50	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/redhat.html
51	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html	51	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/scanning.html
52	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html	52	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/howtos/toolbox.html
		53	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/hpaio.desc
53	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagePrint.png	54	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManagePrint.png
54	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-1.png	55	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-1.png
55	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-2.png	56	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/HP_Device_ManageSend_Fax-2.png
Lines 80-85 Link Here
80	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_kind.png	81	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_kind.png
81	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_printer.png	82	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_other_printer.png
82	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png	83	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/yast_printer_model.png
		84	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/cups_left.png
		85	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_1.png
		86	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_2.png
		87	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_3.png
		88	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/fullbleed_4.png
		89	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/hp_invent_logo.png
		90	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/linux_printing_logo.png
		91	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/osi_certified.png
		92	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/python-logo.png
		93	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/images/rest2web.png
83	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html	94	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/index.html
84	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html	95	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/index.html
85	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html	96	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step1/apt.html
Lines 92-97 Link Here
92	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html	103	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/other.html
93	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html	104	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/suse10.html
94	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html	105	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu510.html
		106	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step2/ubuntu606.html
95	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step3/index.html	107	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step3/index.html
96	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/index.html	108	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/index.html
97	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/local.html	109	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/install/step4/cups/local.html
Lines 104-109 Link Here
104	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/legal.html	116	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/legal.html
105	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/license.html	117	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/license.html
106	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/mailing_lists.html	118	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/mailing_lists.html
		119	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/other_support.html
107	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/release_notes.html	120	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/release_notes.html
108	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/screenshots.html	121	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/screenshots.html
109	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/styles/default.css	122	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/styles/default.css
Lines 132-139 Link Here
132	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html	145	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/info.html
133	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html	146	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/levels.html
134	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html	147	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makeuri.html
		148	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/makecopies.html
135	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/photo.html	149	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/photo.html
136	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html	150	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/print.html
		151	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/sendfax.html
137	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html	152	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/setup.html
138	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html	153	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/testpage.html
139	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html	154	%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/tech_docs/man_pages/toolbox.html
Lines 174-185 Link Here
174	%%DATADIR%%/base/slp.py	189	%%DATADIR%%/base/slp.py
175	%%DATADIR%%/base/status.py	190	%%DATADIR%%/base/status.py
176	%%DATADIR%%/base/strings.py	191	%%DATADIR%%/base/strings.py
177	%%DATADIR%%/base/subproc.py
178	%%DATADIR%%/base/utils.py	192	%%DATADIR%%/base/utils.py
179	%%DATADIR%%/check	193	%%DATADIR%%/check
180	%%DATADIR%%/clean	194	%%DATADIR%%/clean
181	%%DATADIR%%/colorcal	195	%%DATADIR%%/colorcal
		196	%%DATADIR%%/copier/__init__.py
		197	%%DATADIR%%/copier/copier.py
182	%%DATADIR%%/data/hplip.desktop	198	%%DATADIR%%/data/hplip.desktop
		199	%%DATADIR%%/data/xml/HPLIP-06-2006.xml
		200	%%DATADIR%%/hpaio.desc
		201	%%DATADIR%%/makecopies
183	%%DATADIR%%/data/images/120.png	202	%%DATADIR%%/data/images/120.png
184	%%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png	203	%%DATADIR%%/data/images/COLOR_INKJET_PRINTER_CP1700.png
185	%%DATADIR%%/data/images/CP_1700.png	204	%%DATADIR%%/data/images/CP_1700.png
Lines 446-452 Link Here
446	%%DATADIR%%/makeuri	465	%%DATADIR%%/makeuri
447	%%DATADIR%%/pcard/__init__.py	466	%%DATADIR%%/pcard/__init__.py
448	%%DATADIR%%/pcard/photocard.py	467	%%DATADIR%%/pcard/photocard.py
449	%%DATADIR%%/photo
450	%%DATADIR%%/plugins/Deskjet_460.py	468	%%DATADIR%%/plugins/Deskjet_460.py
451	%%DATADIR%%/plugins/__init__.py	469	%%DATADIR%%/plugins/__init__.py
452	%%DATADIR%%/plugins/dj450.py	470	%%DATADIR%%/plugins/dj450.py
Lines 459-464 Link Here
459	%%DATADIR%%/prnt/cups.py	477	%%DATADIR%%/prnt/cups.py
460	%%DATADIR%%/prnt/ldl.py	478	%%DATADIR%%/prnt/ldl.py
461	%%DATADIR%%/prnt/pcl.py	479	%%DATADIR%%/prnt/pcl.py
		480	%%DATADIR%%/prnt/printable_areas.py
462	%%DATADIR%%/scan/__init__.py	481	%%DATADIR%%/scan/__init__.py
463	%%DATADIR%%/sendfax	482	%%DATADIR%%/sendfax
464	%%DATADIR%%/setup	483	%%DATADIR%%/setup
Lines 510-515 Link Here
510	%%DATADIR%%/ui/informationform_base.py	529	%%DATADIR%%/ui/informationform_base.py
511	%%DATADIR%%/ui/loadpaperform.py	530	%%DATADIR%%/ui/loadpaperform.py
512	%%DATADIR%%/ui/loadpaperform_base.py	531	%%DATADIR%%/ui/loadpaperform_base.py
		532	%%DATADIR%%/ui/makecopiesform.py
		533	%%DATADIR%%/ui/makecopiesform_base.py
513	%%DATADIR%%/ui/nodevicesform.py	534	%%DATADIR%%/ui/nodevicesform.py
514	%%DATADIR%%/ui/nodevicesform_base.py	535	%%DATADIR%%/ui/nodevicesform_base.py
515	%%DATADIR%%/ui/paperedgealignform.py	536	%%DATADIR%%/ui/paperedgealignform.py
Lines 519-526 Link Here
519	%%DATADIR%%/ui/printerform_base.ui	540	%%DATADIR%%/ui/printerform_base.ui
520	%%DATADIR%%/ui/settingsdialog.py	541	%%DATADIR%%/ui/settingsdialog.py
521	%%DATADIR%%/ui/settingsdialog_base.py	542	%%DATADIR%%/ui/settingsdialog_base.py
522	%%DATADIR%%/ui/supportform.py
523	%%DATADIR%%/ui/supportform_base.py
524	%%DATADIR%%/ui/unloadform.py	543	%%DATADIR%%/ui/unloadform.py
525	%%DATADIR%%/ui/unloadform_base.py	544	%%DATADIR%%/ui/unloadform_base.py
526	%%DATADIR%%/ui/waitform.py	545	%%DATADIR%%/ui/waitform.py
Lines 691-696 Link Here
691	share/ppd/HP/HP-DeskJet_980C-hpijs.ppd.gz	710	share/ppd/HP/HP-DeskJet_980C-hpijs.ppd.gz
692	share/ppd/HP/HP-DeskJet_990C-hpijs.ppd.gz	711	share/ppd/HP/HP-DeskJet_990C-hpijs.ppd.gz
693	share/ppd/HP/HP-DeskJet_995C-hpijs.ppd.gz	712	share/ppd/HP/HP-DeskJet_995C-hpijs.ppd.gz
		713	share/ppd/HP/HP-DeskJet_D1300-hpijs.ppd.gz
		714	share/ppd/HP/HP-DeskJet_D2300-hpijs.ppd.gz
		715	share/ppd/HP/HP-DeskJet_D4100-hpijs.ppd.gz
694	share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz	716	share/ppd/HP/HP-DeskJet_F300-hpijs.ppd.gz
695	share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz	717	share/ppd/HP/HP-LaserJet_1010-hpijs.ppd.gz
696	share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz	718	share/ppd/HP/HP-LaserJet_1012-hpijs.ppd.gz
Lines 898-903 Link Here
898	share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz	920	share/ppd/HP/HP-PhotoSmart_8200-hpijs.ppd.gz
899	share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz	921	share/ppd/HP/HP-PhotoSmart_8400-hpijs.ppd.gz
900	share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz	922	share/ppd/HP/HP-PhotoSmart_8700-hpijs.ppd.gz
		923	share/ppd/HP/HP-PhotoSmart_A430-hpijs.ppd.gz
		924	share/ppd/HP/HP-PhotoSmart_A510-hpijs.ppd.gz
		925	share/ppd/HP/HP-PhotoSmart_A610-hpijs.ppd.gz
		926	share/ppd/HP/HP-PhotoSmart_A710-hpijs.ppd.gz
		927	share/ppd/HP/HP-PhotoSmart_C3100-hpijs.ppd.gz
		928	share/ppd/HP/HP-PhotoSmart_C4100-hpijs.ppd.gz
		929	share/ppd/HP/HP-PhotoSmart_D7300-hpijs.ppd.gz
901	share/ppd/HP/HP-PhotoSmart_P100-hpijs.ppd.gz	930	share/ppd/HP/HP-PhotoSmart_P100-hpijs.ppd.gz
902	share/ppd/HP/HP-PhotoSmart_P1000-hpijs.ppd.gz	931	share/ppd/HP/HP-PhotoSmart_P1000-hpijs.ppd.gz
903	share/ppd/HP/HP-PhotoSmart_P1100-hpijs.ppd.gz	932	share/ppd/HP/HP-PhotoSmart_P1100-hpijs.ppd.gz
Lines 1005-1015 Link Here
1005	@dirrm %%DATADIR%%/fax/ppd	1034	@dirrm %%DATADIR%%/fax/ppd
1006	@dirrm %%DATADIR%%/fax/backend	1035	@dirrm %%DATADIR%%/fax/backend
1007	@dirrm %%DATADIR%%/fax	1036	@dirrm %%DATADIR%%/fax
1008	@dirrm %%DATADIR%%/data/xml	1037	@dirrm %%DATADIR%%/copier
1009	@dirrm %%DATADIR%%/data/ps	1038	@dirrm %%DATADIR%%/data/ps
1010	@dirrm %%DATADIR%%/data/pcl	1039	@dirrm %%DATADIR%%/data/pcl
1011	@dirrm %%DATADIR%%/data/ldl	1040	@dirrm %%DATADIR%%/data/ldl
1012	@dirrm %%DATADIR%%/data/images	1041	@dirrm %%DATADIR%%/data/images
		1042	@dirrm %%DATADIR%%/data/xml
1013	@dirrm %%DATADIR%%/data	1043	@dirrm %%DATADIR%%/data
1014	@dirrm %%DATADIR%%/base	1044	@dirrm %%DATADIR%%/base
1015	@dirrm %%DATADIR%%	1045	@dirrm %%DATADIR%%
Lines 1030-1033 Link Here
1030	%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos	1060	%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%/howtos
1031	%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%	1061	%%PORTDOCS%%@dirrm %%DOCSDIR%%-%%PORTVERSION%%
1032	%%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%%	1062	%%PORTDOCS%%@dirrm share/doc/hpijs-%%IJSVER%%
1033	@dirrm etc/hp