- Move print/hplip3 to print/hplip

Approved by:	Anish Mistry <amistry@am-productions.biz> (old maintainer)

9 files changed, 0 insertions, 222 deletions

diff --git a/print/hplip3/files/hpssd.in b/print/hplip3/files/hpssd.in
deleted file mode 100644
index 3cedb3ad051f..000000000000
--- a/print/hplip3/files/hpssd.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: hpssd
-# BEFORE:  cupsd
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name=hpssd
-rcvar=${name}_enable
-
-command="%%PREFIX%%/sbin/${name}"
-command_interpreter="%%PREFIX%%/bin/python"
-pidfile="/var/run/${name}.pid"
-hpssd_user=nobody
-command_args=">/dev/null"
-
-start_precmd="hpssd_prestart"
-
-load_rc_config $name
-
-: ${hpssd_enable="NO"}
-
-hpssd_prestart()
-{
-	touch ${pidfile}
-	chown ${hpssd_user} ${pidfile}
-}
-
-run_rc_command $*
diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in
deleted file mode 100644
index 353440779da1..000000000000
--- a/print/hplip3/files/patch-Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.in.old	2010-03-28 15:07:10.000000000 -0600
-+++ Makefile.in	2010-03-28 15:08:01.000000000 -0600
-@@ -89,8 +89,8 @@
- # ip library
- @HPLIP_BUILD_TRUE@am__append_1 = libhpmud.la libhpip.la
- @HPLIP_BUILD_TRUE@hp_mkuri_PROGRAMS = hp-mkuri$(EXEEXT)
--@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
--@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
-+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_TRUE@am__append_2 = data/rules/40-hplip.rules
-+#@HPLIP_BUILD_TRUE@@UDEV_ACL_RULES_FALSE@am__append_3 = data/rules/55-hpmud.rules
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@am__append_4 =  \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	scan/sane/hpaio.desc \
- @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@	prnt/drv/hpijs.drv.in.template \
-@@ -2041,8 +2041,8 @@
- 	ppd/hpcups/hp-psc_950vr.ppd.gz ppd/hpcups/hp-psc_950xi.ppd.gz
- am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
- 	prnt/pcl.py prnt/colorcal.py
--am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
--	data/rules/40-hplip.rules data/rules/55-hpmud.rules
-+#am__dist_rules_DATA_DIST = data/rules/56-hpmud_support.rules \
-+#	data/rules/40-hplip.rules data/rules/55-hpmud.rules
- am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
- am__dist_ui_DATA_DIST = ui/alignform.py ui/colorcalform_base.py \
- 	ui/colorcalform.py ui/coloradjform_base.py ui/coloradjform.py \
-@@ -3777,11 +3777,11 @@
- @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
- 
- # hpmud.rules
--@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
--@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
--@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
--@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
--@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
-+#@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
-+#@HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
-+#@HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
-+#@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
-+#@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
- 
- # hplip.conf
- @HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
diff --git a/print/hplip3/files/patch-check.py b/print/hplip3/files/patch-check.py
deleted file mode 100644
index 554e1ac5d836..000000000000
--- a/print/hplip3/files/patch-check.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- check.py.bak	2009-07-31 05:33:11.000000000 -0500
-+++ check.py	2009-07-31 05:34:36.000000000 -0500
-@@ -337,7 +337,7 @@
-             num_errors += 1
- 
-     if cups_ok:
--        cups_conf = '/etc/cups/cupsd.conf'
-+        cups_conf = '/usr/local/etc/cups/cupsd.conf'
- 
-         try:
-             f = file(cups_conf, 'r')
-@@ -600,7 +600,7 @@
-                 #log.info("Installed in HPLIP?: %s" % x)
-                 log.info("Device URI: %s" % device_uri)
- 
--                ppd = os.path.join('/etc/cups/ppd', printer_name + '.ppd')
-+                ppd = os.path.join('/usr/local/etc/cups/ppd', printer_name + '.ppd')
- 
-                 if os.path.exists(ppd):
-                     log.info("PPD: %s" % ppd)
diff --git a/print/hplip3/files/patch-core_install.py b/print/hplip3/files/patch-core_install.py
deleted file mode 100644
index 41cba9d9edcf..000000000000
--- a/print/hplip3/files/patch-core_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- installer/core_install.py.old	2010-04-30 05:23:48.000000000 -0500
-+++ installer/core_install.py	2010-04-30 05:24:07.000000000 -0500
-@@ -897,7 +897,7 @@
- 
- 
-     def check_sane_devel(self):
--        return len(locate_file_contains("sane.h", '/usr/include', 'extern SANE_Status sane_init'))
-+        return len(locate_file_contains("sane.h", '/usr/local/include/sane', 'extern SANE_Status sane_init'))
- 
- 
-     def check_xsane(self):
diff --git a/print/hplip3/files/patch-cups.py b/print/hplip3/files/patch-cups.py
deleted file mode 100644
index a04535bff76a..000000000000
--- a/print/hplip3/files/patch-cups.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- prnt/cups.py.bak	2009-07-31 05:28:04.000000000 -0500
-+++ prnt/cups.py	2009-07-31 05:29:26.000000000 -0500
-@@ -202,9 +202,9 @@
- 
- def getAllowableMIMETypes():
-     """
--        Scan all /etc/cups/*.convs files for allowable file formats.
-+        Scan all /usr/local/etc/cups/*.convs files for allowable file formats.
-     """
--    files = glob.glob("/etc/cups/*.convs")
-+    files = glob.glob("/usr/local/etc/cups/*.convs")
- 
-     allowable_mime_types = []
- 
-@@ -527,7 +527,7 @@
- 
- 
- def getErrorLogLevel():
--    cups_conf = '/etc/cups/cupsd.conf'
-+    cups_conf = '/usr/local/etc/cups/cupsd.conf'
-     try:
-         f = file(cups_conf, 'r')
-     except OSError:
diff --git a/print/hplip3/files/patch-dcheck.py b/print/hplip3/files/patch-dcheck.py
deleted file mode 100644
index d46ab1eba5ba..000000000000
--- a/print/hplip3/files/patch-dcheck.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- installer/dcheck.py.orig	2009-08-05 09:37:17.000000000 +1200
-+++ installer/dcheck.py	2009-11-27 18:53:56.000000000 +1300
-@@ -46,7 +46,7 @@
- def update_ld_output():
-     # For library checks
-     global ld_output
--    status, ld_output = utils.run('%s -p' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
-+    status, ld_output = utils.run('%s -r' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False)
- 
-     if status != 0:
-         log.debug("ldconfig failed.")
diff --git a/print/hplip3/files/patch-io-hpmud-musb.c b/print/hplip3/files/patch-io-hpmud-musb.c
deleted file mode 100644
index 8d87a88df271..000000000000
--- a/print/hplip3/files/patch-io-hpmud-musb.c
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: io/hpmud/musb.c
-@@ -122,10 +122,16 @@
-    {
-       ret = usb_control_msg(dev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + index, 
-                0x409, tbuf, sizeof(tbuf), LIBUSB_CONTROL_REQ_TIMEOUT);
--      if (ret==0)
-+      if (ret==0
-+#ifdef __FreeBSD__
-+       || ret == -EIO
-+#endif
-+       )
-       {
--         /* This retry is necessary for lj1000 and lj1005. des 12/12/07 */
--         BUG("get_string_descriptor zero result, retrying...");
-+         /* This retry is necessary for lj1000 and lj1005. des 12/12/07
-+         Also HP Photosmart 42xx seems to suffer transient errors with serial id */
-+         BUG("get_string_descriptor error result %d, retrying in 2 secs...", ret);
-+         sleep(2);
-          continue;
-       }
-       break;
diff --git a/print/hplip3/files/patch-prnt__hpcups__ErnieFilter.cpp b/print/hplip3/files/patch-prnt__hpcups__ErnieFilter.cpp
deleted file mode 100644
index d595776fd745..000000000000
--- a/print/hplip3/files/patch-prnt__hpcups__ErnieFilter.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./prnt/hpcups/ErnieFilter.cpp.orig	2010-02-25 02:04:09.000000000 +0300
-+++ ./prnt/hpcups/ErnieFilter.cpp	2010-04-18 10:49:13.471529924 +0400
-@@ -50,7 +50,7 @@
- #include "ErnieFilter.h"
- 
- 
--#if defined(__APPLE__) || defined(__linux)
-+#if defined(__APPLE__) || defined(__linux) || (__FreeBSD__)
- #include <math.h>
- #endif
- 
diff --git a/print/hplip3/files/pkg-message.in b/print/hplip3/files/pkg-message.in
deleted file mode 100644
index 63524932c62c..000000000000
--- a/print/hplip3/files/pkg-message.in
+++ /dev/null
@@ -1,54 +0,0 @@
-**********************************************************
-
-**************** UPGRADE FROM 1.X NOTICE *****************
-
-NOTE: If you are upgrading from 1.x you will need to
-change your devfs ruleset as hpiod is now gone, so remove
-it from you rc.conf.  The printer communication now runs
-through cupsd.  You will need to make the devfs ruleset
-changes to allow cups to access the usb bus and ugen
-devices so that it can enumerate the printers.  You will
-also need to update your hplip.conf.  See the instructions
-below.
-
-**************** UPGRADE FROM 1.X NOTICE *****************
-
-*Please note, the new version does not need a rc.d startup file
-hplip now has it's own toolbox icon which gets started,
-during system startup.
-
-So all you have to do if you have a custom ruleset setup
-is add the following to that ruleset in devfs.rules:
-
-add path 'usb*' group cups
-add path 'usb*' mode 0660
-add path 'ugen*' group cups
-add path 'ugen*' mode 0660
-
-If you have never setup devfs.rules please read the
-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/hpssd restart && \
-%%PREFIX%%/etc/rc.d/cupsd restart
-
-If upgrading from a version < 2.7.9 copy the new
-hplip.conf.sample config.
-cp %%PREFIX%%/etc/hp/hplip.conf.sample \
-   %%PREFIX%%/etc/hp/hplip.conf
-
-If you are still having problems check:
-http://am-productions.biz/docs/hplip.php
-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 and the output of "ls -l /dev" to the
-maintainer.
-**********************************************************