- Update to 2.7.9 (breaks out foomatic integration, all access is done via

  libusb now)

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

1 files changed, 72 insertions, 143 deletions

diff --git a/print/hplip/files/patch-Makefile.in b/print/hplip/files/patch-Makefile.in
index add4fc0..0f340db 100644
--- a/print/hplip/files/patch-Makefile.in
+++ b/print/hplip/files/patch-Makefile.in
@@ -1,143 +1,72 @@
---- Makefile.in.orig	Fri Mar 23 16:39:45 2007
-+++ Makefile.in	Wed Apr 18 17:00:46 2007
-@@ -434,7 +434,7 @@
- www243dir = $(docdir)/install/step4/suse
- dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
- www251dir = $(docdir)/install/manual
--dist_www251_DATA = $(wwwsrc)/install/manual/*
-+dist_www251_DATA = $(wwwsrc)/install/manual/*.html
- www252dir = $(docdir)/install/manual/distros
- dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
- www261dir = $(docdir)/install/install
-@@ -446,12 +446,12 @@
- 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
-+dist_hplip_DATA = $(doc_DATA)
- dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh install.py hplip-install
- 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 \
-@@ -2884,20 +2884,9 @@
- #
- #       If scanner build, install sane backend.
- 	if [ "$(scan_build)" = "yes" ]; then \
--	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
--	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
--	      touch $(DESTDIR)/etc/sane.d/dll.conf; \
--	   fi; \
--	   $(mkinstalldirs) $(DESTDIR)$(sanedir); \
--	   ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SONOVER); \
--	   ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOSHORT); \
--	   ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOLONG); \
--	   if [ -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
--	      if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
--	         echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
--	         echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
--	      fi \
--	   fi \
-+	   ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SONOVER); \
-+	   ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOSHORT); \
-+	   ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \
- 	fi
- 
- install-data-hook: install-pcardext install-cupsext
-@@ -2945,63 +2934,41 @@
- 	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)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
--	echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-+	echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(PACKAGE).conf
-+	echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(PACKAGE).conf
-+	echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(PACKAGE).conf
- 	if [ "$(network_build)" = "yes" ]; then \
--	   echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "network-build=1" >> $(PACKAGE).conf; \
- 	else \
--	   echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "network-build=0" >> $(PACKAGE).conf; \
- 	fi
- 	if [ "$(pp_build)" = "yes" ]; then \
--	   echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "pp-build=1" >> $(PACKAGE).conf; \
- 	else \
--	   echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "pp-build=0" >> $(PACKAGE).conf; \
- 	fi
- 	if [ "$(gui_build)" = "yes" ]; then \
--	   echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "gui-build=1" >> $(PACKAGE).conf; \
- 	else \
--	   echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "gui-build=0" >> $(PACKAGE).conf; \
- 	fi
- 	if [ "$(scan_build)" = "yes" ]; then \
--	   echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "scanner-build=1" >> $(PACKAGE).conf; \
- 	else \
--	   echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "scanner-build=0" >> $(PACKAGE).conf; \
- 	fi
- 	if [ "$(fax_build)" = "yes" ]; then \
--	   echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "fax-build=1" >> $(PACKAGE).conf; \
- 	else \
--	   echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "fax-build=0" >> $(PACKAGE).conf; \
- 	fi
- 	if [ "$(cups11_build)" = "yes" ]; then \
--	   echo -e "cups11-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
-+	   echo -e "cups11-build=1" >> $(PACKAGE).conf; \
- 	else \
--	   echo -e "cups11-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
--	fi
--	echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
--	echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
--#
--#       Install hpiod.conf. 
--	$(mkinstalldirs) $(DESTDIR)/etc/hp
--	$(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp
--#
--#       Create hpiod start/stop script from hpiod.sh in destdir.
--	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
--#
--#       Install hpiod start/stop script.
--	$(mkinstalldirs) $(DESTDIR)/etc/init.d
--	$(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d
--#
--#       Run chkconfig/install_initd if DESTDIR="". 
--	if [ "$(DESTDIR)" = "" ]; then \
--	   if [ "$(INSTALLINITD)" != "" ]; then \
--	      $(INSTALLINITD) $(PACKAGE); \
--	   elif [ "$(CHKCONFIG)" != "" ]; then  \
--	      $(CHKCONFIG) $(PACKAGE) reset; \
--	   fi \
-+	   echo -e "cups11-build=0" >> $(PACKAGE).conf; \
- 	fi
-+	echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf
-+	echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf
- #
- #       Install fax support. Let hpijs symlink hpppddir to cupsppddir.
- 	if [ "$(fax_build)" = "yes" ]; then \
-@@ -3032,8 +2999,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 
+--- Makefile.in.orig	Fri Sep 28 19:33:08 2007
++++ Makefile.in	Tue Oct  9 21:10:19 2007
+@@ -671,7 +671,7 @@
+ dist_faxppdDATA_INSTALL = $(INSTALL_DATA)
+ am__dist_hplip_DATA_DIST = scan/sane/hpaio.desc
+ dist_hplipDATA_INSTALL = $(INSTALL_DATA)
+-am__dist_images_DATA_DIST = data/images/*
++am__dist_images_DATA_DIST = data/images/*.png
+ dist_imagesDATA_INSTALL = $(INSTALL_DATA)
+ am__dist_ldl_DATA_DIST = data/ldl/cb2pcal.ldl.gz \
+ 	data/ldl/cb2pcal_done.ldl.gz data/ldl/cbbcal.ldl.gz \
+@@ -1610,7 +1610,7 @@
+ dist_www242DATA_INSTALL = $(INSTALL_DATA)
+ am__dist_www243_DATA_DIST = $(wwwsrc)/install/step4/suse/*
+ dist_www243DATA_INSTALL = $(INSTALL_DATA)
+-am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*
++am__dist_www251_DATA_DIST = $(wwwsrc)/install/manual/*.html
+ dist_www251DATA_INSTALL = $(INSTALL_DATA)
+ am__dist_www252_DATA_DIST = $(wwwsrc)/install/manual/distros/*
+ dist_www252DATA_INSTALL = $(INSTALL_DATA)
+@@ -1618,13 +1618,13 @@
+ dist_www261DATA_INSTALL = $(INSTALL_DATA)
+ am__dist_www3_DATA_DIST = $(wwwsrc)/styles/*
+ dist_www3DATA_INSTALL = $(INSTALL_DATA)
+-am__dist_www4_DATA_DIST = $(wwwsrc)/images/*
++am__dist_www4_DATA_DIST = $(wwwsrc)/images/*.png
+ dist_www4DATA_INSTALL = $(INSTALL_DATA)
+ am__dist_www5_DATA_DIST = $(wwwsrc)/supported_devices/*
+ dist_www5DATA_INSTALL = $(INSTALL_DATA)
+-am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*
++am__dist_www6_DATA_DIST = $(wwwsrc)/tech_docs/*.html
+ dist_www6DATA_INSTALL = $(INSTALL_DATA)
+-am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*
++am__dist_www61_DATA_DIST = $(wwwsrc)/tech_docs/man_pages/*.html
+ dist_www61DATA_INSTALL = $(INSTALL_DATA)
+ am__dist_www7_DATA_DIST = $(wwwsrc)/troubleshooting/*
+ dist_www7DATA_INSTALL = $(INSTALL_DATA)
+@@ -1840,7 +1840,7 @@
+ @DOC_BUILD_TRUE@www243dir = $(docdir)/install/step4/suse
+ @DOC_BUILD_TRUE@dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
+ @DOC_BUILD_TRUE@www251dir = $(docdir)/install/manual
+-@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*
++@DOC_BUILD_TRUE@dist_www251_DATA = $(wwwsrc)/install/manual/*.html
+ @DOC_BUILD_TRUE@www252dir = $(docdir)/install/manual/distros
+ @DOC_BUILD_TRUE@dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
+ @DOC_BUILD_TRUE@www261dir = $(docdir)/install/install
+@@ -1848,13 +1848,13 @@
+ @DOC_BUILD_TRUE@www3dir = $(docdir)/styles
+ @DOC_BUILD_TRUE@dist_www3_DATA = $(wwwsrc)/styles/*
+ @DOC_BUILD_TRUE@www4dir = $(docdir)/images
+-@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*
++@DOC_BUILD_TRUE@dist_www4_DATA = $(wwwsrc)/images/*.png
+ @DOC_BUILD_TRUE@www5dir = $(docdir)/supported_devices
+ @DOC_BUILD_TRUE@dist_www5_DATA = $(wwwsrc)/supported_devices/*
+ @DOC_BUILD_TRUE@www6dir = $(docdir)/tech_docs
+-@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*
++@DOC_BUILD_TRUE@dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
+ @DOC_BUILD_TRUE@www61dir = $(docdir)/tech_docs/man_pages
+-@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
++@DOC_BUILD_TRUE@dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
+ @DOC_BUILD_TRUE@www7dir = $(docdir)/troubleshooting
+ @DOC_BUILD_TRUE@dist_www7_DATA = $(wwwsrc)/troubleshooting/*
+ @HPLIP_BUILD_TRUE@dist_hplip_DATA = scan/sane/hpaio.desc
+@@ -1904,7 +1904,7 @@
+ @HPLIP_BUILD_TRUE@localzdir = $(hplipdir)/data/localization
+ @HPLIP_BUILD_TRUE@dist_postscript_DATA = data/ps/testpage.ps.gz data/ps/clean_page.pdf.gz
+ @HPLIP_BUILD_TRUE@dist_models_DATA = data/models/models.dat
+-@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*
++@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_images_DATA = data/images/*.png
+ @HPLIP_BUILD_TRUE@dist_pcl_DATA = data/pcl/align1_8xx.pcl.gz data/pcl/align1_9xx.pcl.gz data/pcl/align2_8xx.pcl.gz data/pcl/align3_8xx.pcl.gz data/pcl/align4_8xx.pcl.gz \
+ @HPLIP_BUILD_TRUE@	data/pcl/align5_8xx.pcl.gz data/pcl/align2_9xx.pcl.gz data/pcl/align3_9xx.pcl.gz data/pcl/align4_450.pcl.gz data/pcl/align6_450.pcl.gz \
+ @HPLIP_BUILD_TRUE@	data/pcl/colorcal1_450.pcl.gz data/pcl/colorcal2_450.pcl.gz data/pcl/crbcal.pcl.gz data/pcl/crcaldone.pcl.gz data/pcl/crcbcal.pcl.gz data/pcl/crccal.pcl.gz \