From the PR:

1. Update to version 0.9.11, the latest from HP.
2. Add WITH_GUI option so that the port can be built without the
py-qt dependency.
3. Fix incorrect broken for 4.x check.

On my own:
4. Tune up the rc.d startup scripts to look more like the example
in the Porter's Handbook, including removal of the spurious
FreeBSD KEYWORD.

PR:		ports/97661
Submitted by:	"Anish Mistry" <amistry@am-productions.biz> (maintainer)

4 files changed, 33 insertions, 64 deletions

diff --git a/print/hplip3/files/hpiod.sh.in b/print/hplip3/files/hpiod.sh.in
index 8e2bee4637e9..4852d2568d98 100644
--- a/print/hplip3/files/hpiod.sh.in
+++ b/print/hplip3/files/hpiod.sh.in
@@ -2,25 +2,24 @@
 
 # PROVIDE: hpiod
 # REQUIRE: NETWORKING
-# KEYWORD: FreeBSD shutdown
-
-[ -z "${hpiod_enable}" ] && hpiod_enable="NO"
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-prefix=%%PREFIX%%
-
 name=hpiod
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 portfile="/var/run/${name}.port"
 hpiod_user=hplip
-command="${prefix}/sbin/${name}"
-start_precmd="hpiod_prestart"
 
-rcvar=`set_rcvar`
+start_precmd="hpiod_prestart"
 
 load_rc_config $name
 
+: ${hpiod_enable="NO"}
+
 hpiod_prestart()
 {
 	touch ${pidfile}
diff --git a/print/hplip3/files/hpssd.sh.in b/print/hplip3/files/hpssd.sh.in
index 4e7dc15f11b0..3b0303e7afe9 100644
--- a/print/hplip3/files/hpssd.sh.in
+++ b/print/hplip3/files/hpssd.sh.in
@@ -3,27 +3,26 @@
 # PROVIDE: hpssd
 # REQUIRE: hpiod
 # BEFORE:  cupsd
-# KEYWORD: FreeBSD shutdown
-
-[ -z "${hpssd_enable}" ] && hpssd_enable="NO"
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-prefix=%%PREFIX%%
-
 name=hpssd
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
+command_interpreter="%%PREFIX%%/bin/python"
 pidfile="/var/run/${name}.pid"
 portfile="/var/run/${name}.port"
 hpssd_user=nobody
-command="${prefix}/sbin/${name}"
-command_interpreter="$prefix/bin/python"
 command_args=">/dev/null"
-start_precmd="hpssd_prestart"
 
-rcvar=`set_rcvar`
+start_precmd="hpssd_prestart"
 
 load_rc_config $name
 
+: ${hpssd_enable="NO"}
+
 hpssd_prestart()
 {
 	touch ${pidfile}
diff --git a/print/hplip3/files/patch-Makefile.in b/print/hplip3/files/patch-Makefile.in
index b96eda6ffb3e..db2e6271d52b 100644
--- a/print/hplip3/files/patch-Makefile.in
+++ b/print/hplip3/files/patch-Makefile.in
@@ -1,6 +1,18 @@
---- Makefile.in.orig	Thu Mar 23 22:35:33 2006
-+++ Makefile.in	Mon Apr 24 09:15:54 2006
-@@ -1973,15 +1973,9 @@
+--- Makefile.in.orig	Tue May  9 14:18:36 2006
++++ Makefile.in	Sun May 21 14:32:27 2006
+@@ -377,9 +377,9 @@
+ www5dir = $(docdir)/supported_devices
+ dist_www5_DATA = $(wwwsrc)/supported_devices/*
+ www6dir = $(docdir)/tech_docs
+-dist_www6_DATA = $(wwwsrc)/tech_docs/*
++dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
+ www61dir = $(docdir)/tech_docs/man_pages
+-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
++dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
+ www7dir = $(docdir)/troubleshooting
+ dist_www7_DATA = $(wwwsrc)/troubleshooting/*
+ dist_hplip_DATA = $(doc_DATA) hplip.conf
+@@ -2348,15 +2348,9 @@
  #
  #       Do full install if not rpm_install.
  	if [ "$(rpm_install)" = "no" ]; then \
@@ -19,7 +31,7 @@
  	fi
  
  install-data-hook: test-destdir
-@@ -2039,30 +2033,31 @@
+@@ -2414,7 +2408,7 @@
  	    newname=$${i%.*}; \
  	    mv $(DESTDIR)$(hplipdir)/$$i $(DESTDIR)$(hplipdir)/$$newname; \
  	    if [ "$(rpm_install)" = "no" ]; then \
@@ -28,39 +40,7 @@
  	    fi \
  	done
  #
- #       Edit hpiod.conf in destdir.
- 	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- 	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
--	echo -ne "# Following values are determined at configure time and cannot be changed.\n[configure]\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo "# Following values are determined at configure time and cannot be changed." >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo "[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- 	if [ "$(rpm_install)" = "yes" ]; then \
--	   echo -ne "rpm-install=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "rpm-install=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "rpm-install=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "rpm-install=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi 
- 	if [ "$(network_build)" = "yes" ]; then \
--	   echo -ne "network-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "network-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi
- 	if [ "$(pp_build)" = "yes" ]; then \
--	   echo -ne "pp-build=1\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	else \
--	   echo -ne "pp-build=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- 	fi
--	echo -ne "internal-tag=$(PACKAGE_BUGREPORT)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
-+	echo "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
- 
- #
- #       Edit hpiod.sh in destdir.
-@@ -2074,16 +2069,6 @@
+@@ -2449,16 +2443,6 @@
  	if [ "$(rpm_install)" = "no" ]; then \
  	   $(mkinstalldirs) $(DESTDIR)/etc/hp; \
  	   $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp; \
diff --git a/print/hplip3/files/patch-io_hpiod_device.cpp b/print/hplip3/files/patch-io_hpiod_device.cpp
index 1a9b2ead672d..288b8be0ab04 100644
--- a/print/hplip3/files/patch-io_hpiod_device.cpp
+++ b/print/hplip3/files/patch-io_hpiod_device.cpp
@@ -264,13 +264,4 @@
 +	syslog(LOG_ERR, "danger! Device::ReleaseInterface, releasing an interface with an active write %s: %s %d\n", URI, __FILE__, __LINE__);
  #else
        usb_reap_urb_ex(FD[fd].pHD, &FD[fd].urb_write);
- #endif
-@@ -913,7 +1155,7 @@
-    /* Make sure uri model still matches device id model. */
-    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
-    pSys->GetModel(ID, model, sizeof(model));
--   if (strcmp(uriModel, model) != 0)
-+   if (strcasecmp(uriModel, model) != 0)
-    {
-       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
-       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);
+ #endif
\ No newline at end of file