Update to hplip-3.20.9.

print/hplip/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.181 2020/08/13 13:55:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.182 2020/10/03 13:39:31 ajacoutot Exp $
 
 PORTROACH=		skipv:${V}_py2.5
 
@@ -9,11 +9,7 @@ COMMENT-hpcups=		HP native CUPS driver
 COMMENT-hpijs=		HP ghostscript driver (spooler independent)
 COMMENT-gui=		HPLIP graphical tools
 
-REVISION-main=		1
+V=			3.20.9
-REVISION-gui=		0
-REVISION-hpaio=		0
-
-V=			3.20.6
 DISTNAME=		hplip-${V}
 SUBST_VARS=		V
 
@@ -68,7 +64,7 @@ WANTLIB-main += ${cWANTLIB}
 WANTLIB-main += avahi-client avahi-common cups dbus-1 hpmud netsnmp
 WANTLIB-main += ffi gmp gnutls hogweed nettle p11-kit tasn1 usb-1.0 z
 WANTLIB-main += hpdiscovery hpipp idn2 iconv intl unistring
-WANTLIB-main += ${COMPILER_LIBCXX} c
+WANTLIB-main += ${COMPILER_LIBCXX} c avahi-core
 
 LIB_DEPENDS-main=	print/cups,-libs \
 			print/hplip,-common
@@ -86,10 +82,12 @@ RUN_DEPENDS-main=	${MODPY_RUN_DEPENDS} \
 RUN_DEPENDS-main +=	print/cups
 
 ### -common
-WANTLIB-common += ${cWANTLIB} netsnmp usb-1.0
+WANTLIB-common += ${cWANTLIB} netsnmp usb-1.0 avahi-client
+WANTLIB-common += avahi-common avahi-core dbus-1 iconv intl
 
-LIB_DEPENDS-common= 	net/net-snmp \
+LIB_DEPENDS-common= 	devel/libusb1 \
-			devel/libusb1
+			net/avahi \
+			net/net-snmp
 
 RUN_DEPENDS-common=	# empty
 
@@ -98,7 +96,7 @@ WANTLIB-hpaio += ${cWANTLIB}
 WANTLIB-hpaio += avahi-client avahi-common cups dbus-1 ffi gmp gnutls
 WANTLIB-hpaio += hogweed hpip hpipp hpmud netsnmp nettle p11-kit idn2
 WANTLIB-hpaio += sane tasn1 usb-1.0 z hpdiscovery iconv intl unistring
-WANTLIB-hpaio += lzma xml2
+WANTLIB-hpaio += lzma xml2 avahi-core
 
 LIB_DEPENDS-hpaio=	print/hplip,-common \
 			print/cups,-libs \
@@ -111,7 +109,7 @@ WANTLIB-hpcups += ${cWANTLIB} z netsnmp hpdiscovery iconv intl
 WANTLIB-hpcups += c jpeg ${COMPILER_LIBCXX} hpip cups cupsimage dbus-1 idn2
 WANTLIB-hpcups += z usb-1.0 avahi-client avahi-common hpmud
 WANTLIB-hpcups += ffi gmp gnutls hogweed nettle p11-kit tasn1
-WANTLIB-hpcups += unistring
+WANTLIB-hpcups += unistring avahi-core
 
 LIB_DEPENDS-hpcups=	graphics/jpeg \
 			print/hplip,-common \
@@ -121,8 +119,9 @@ LIB_DEPENDS-hpcups=	graphics/jpeg \
 RUN_DEPENDS-hpcups=	# empty
 
 ### -hpijs
-WANTLIB-hpijs += ${cWANTLIB} hpip usb-1.0 hpdiscovery
+WANTLIB-hpijs += ${cWANTLIB} hpip usb-1.0 hpdiscovery avahi-core
 WANTLIB-hpijs += c jpeg netsnmp ${COMPILER_LIBCXX} dbus-1 hpmud
+WANTLIB-hpijs += avahi-client avahi-common iconv intl
 
 LIB_DEPENDS-hpijs=	print/hplip,-common \
 			graphics/jpeg \

print/hplip/distinfo

@@ -1,4 +1,4 @@
 SHA256 (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = r1AFXMXXdB126in1K8leeXVFYiAyI2bu1XXb05gulrc=
-SHA256 (hplip-3.20.6.tar.gz) = l0aWr21APRPi7uKV/sqHsw0hBXagJVqiMRisikQ8s2Y=
+SHA256 (hplip-3.20.9.tar.gz) = NiURiaqcw0n2o+rLt6w8T9JvyfCHyfdc7gUQEMhdLd8=
 SIZE (0026-Call-QMessageBox-constructors-of-PyQT5-with-the-corr.patch) = 21964
-SIZE (hplip-3.20.6.tar.gz) = 25909290
+SIZE (hplip-3.20.9.tar.gz) = 26141198

print/hplip/patches/patch-Makefile_in

@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.59 2020/06/17 07:35:05 ajacoutot Exp $
+$OpenBSD: patch-Makefile_in,v 1.60 2020/10/03 13:39:31 ajacoutot Exp $
 
 https://sources.debian.org/src/hplip/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch/
 
@@ -31,7 +31,7 @@ Index: Makefile.in
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@am__append_21 = ui/colorcalform2_base.ui ui/settingsdialog_base.ui ui/aligntype6form1_base.ui \
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@	ui/aboutdlg_base.ui ui/imagepropertiesdlg_base.ui ui/paperedgealignform_base.ui ui/aligntype6form2_base.ui \
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@@QT3_INSTALL_TRUE@	ui/nodevicesform_base.ui ui/cleaningform_base.ui ui/colorcalform_base.ui ui/devmgr4_base.ui ui/loadpaperform_base.ui \
-@@ -728,8 +728,7 @@ am__dist_locatedriver_DATA_DIST = locatedriver
+@@ -732,8 +732,7 @@ am__dist_locatedriver_DATA_DIST = locatedriver
  am__dist_models_DATA_DIST = data/models/models.dat
  am__dist_noinst_DATA_DIST = prnt/drv/hpijs.drv.in.template \
  	prnt/drv/hpcups.drv.in.template \
@@ -41,7 +41,7 @@ Index: Makefile.in
  	installer/text_install.py data/localization/hplip_de.ts \
  	data/localization/hplip_es.ts data/localization/hplip_fr.ts \
  	data/localization/hplip_it.ts data/localization/hplip_pt.ts \
-@@ -4457,7 +4456,7 @@ dist_unrel_DATA = 
+@@ -4475,7 +4474,7 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	scan/sane/orblitei.h scan/sane/orblite.h scan/sane/orblite.c \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	scan/sane/OrbliteScan/LinuxCommon.h scan/sane/OrbliteScan/MacCommon.h
  
@@ -50,7 +50,7 @@ Index: Makefile.in
  @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation -version-info 1:0:0
  # The following is a interlibrary dependency that must be compiled first.
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la \
-@@ -4465,7 +4464,6 @@ dist_unrel_DATA = 
+@@ -4483,7 +4482,6 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	libhpipp.la \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	$(DBUS_LIBS) \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	-lcups \
@@ -58,7 +58,7 @@ Index: Makefile.in
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@	$(am__append_1)
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) \
-@@ -4486,7 +4484,6 @@ dist_unrel_DATA = 
+@@ -4505,7 +4503,6 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@libhpmud_la_LDFLAGS =  \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	-version-info \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	0:6:0 -lpthread \
@@ -66,7 +66,7 @@ Index: Makefile.in
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	$(am__append_6) \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	$(am__append_9) \
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@	$(am__append_11)
-@@ -4540,7 +4537,7 @@ dist_unrel_DATA = 
+@@ -4559,7 +4556,7 @@ dist_unrel_DATA = 
  @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@pstotiff_SCRIPTS = fax/filters/pstotiff
  
  # hplip.state
@@ -75,7 +75,7 @@ Index: Makefile.in
  @HPLIP_BUILD_TRUE@dist_hplip_state_DATA = 
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
-@@ -4740,7 +4737,7 @@ dist_unrel_DATA = 
+@@ -4759,7 +4756,7 @@ dist_unrel_DATA = 
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_SOURCES = prnt/hpijs/PrinterProperties.cpp prnt/hpijs/PrinterProperties.h prnt/hpijs/bug.h
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@hppgsz_CFLAGS = $(libapdk_la_CFLAGS)
@@ -84,7 +84,7 @@ Index: Makefile.in
  
  # hplip.desktop
  @FULL_BUILD_TRUE@@GUI_BUILD_TRUE@@HPLIP_BUILD_TRUE@hplip_desktopdir = $(icondir)
-@@ -4809,8 +4806,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4828,8 +4825,8 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  
  @HPIJS_INSTALL_TRUE@hpijs_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  @HPIJS_INSTALL_TRUE@hpijs_CFLAGS = $(libapdk_la_CFLAGS)
@@ -95,7 +95,7 @@ Index: Makefile.in
  
  # hpcups
  #if NEW_HPCUPS
-@@ -4854,7 +4851,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4873,7 +4870,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  @HPCUPS_INSTALL_TRUE@	prnt/hpcups/ImageProcessor.h
  
  @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@@ -104,7 +104,7 @@ Index: Makefile.in
  #else
  #hpcupsdir = $(cupsfilterdir)
  #hpcups_PROGRAMS = hpcups
-@@ -4862,15 +4859,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
+@@ -4881,15 +4878,15 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpij
  #hpcups_CXXFLAGS = $(libapdk_la_CXXFLAGS)
  #hpcups_CFLAGS = $(libapdk_la_CFLAGS)
  #if HPCUPS_ONLY_BUILD
@@ -123,7 +123,7 @@ Index: Makefile.in
  dat2drvdir = $(hplipdir)
  dat2drv_SOURCES = Common.h  Dat2drv.cpp  Dat2drv.h Normalize.cpp  Normalize.h
  @GCC_GE_47_TRUE@dat2drv_CXXFLAGS = -std=c++11
-@@ -9625,16 +9622,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
+@@ -9644,16 +9641,6 @@ uninstall-am: uninstall-apparmor_abstractionDATA \
  
  
  install-data-hook:

print/hplip/patches/patch-installer_core_install_py

@@ -1,4 +1,4 @@
-$OpenBSD: patch-installer_core_install_py,v 1.31 2020/06/17 07:35:05 ajacoutot Exp $
+$OpenBSD: patch-installer_core_install_py,v 1.32 2020/10/03 13:39:31 ajacoutot Exp $
 
 Index: installer/core_install.py
 --- installer/core_install.py.orig
@@ -12,7 +12,7 @@ Index: installer/core_install.py
  
  
  # end
-@@ -243,7 +243,7 @@ class CoreInstall(object):
+@@ -244,7 +244,7 @@ class CoreInstall(object):
          self.endian = utils.LITTLE_ENDIAN
          self.distro, self.distro_name, self.distro_version = DISTRO_UNKNOWN, '', DISTRO_VER_UNKNOWN
          self.distro_version_supported = False
@@ -21,7 +21,7 @@ Index: installer/core_install.py
          self.hplip_present = False
          self.have_dependencies = {}
          self.native_cups = True
-@@ -364,7 +364,7 @@ class CoreInstall(object):
+@@ -366,7 +366,7 @@ class CoreInstall(object):
              'cups-devel':       (True,  ['base', 'prnt'], CUPS_DEV_STR, self.check_cups_devel, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
              'cups-image':       (True,  ['base', 'prnt'], CUPS_IMG_STR, self.check_cups_image, DEPENDENCY_COMPILE_TIME, '-', 'cups-config --version', GENERALDEP),
              'gcc':             (True,  ['base', 'prnt'], GCC_STR, self.check_gcc, DEPENDENCY_COMPILE_TIME, '-', 'gcc --version', COMPILEDEP),
@@ -30,7 +30,7 @@ Index: installer/core_install.py
              'libpthread':      (True,  ['base', 'prnt'], THREAD_STR, self.check_libpthread, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libpthread_version', GENERALDEP),
              'gs':               (True,  ['base', 'prnt'], GS_STR, self.check_gs, DEPENDENCY_RUN_TIME, '7.05', 'gs --version', EXTERNALDEP),
              'libusb':           (True,  ['base'], USB_STR, self.check_libusb, DEPENDENCY_RUN_AND_COMPILE_TIME, '-', 'FUNC#get_libusb_version', GENERALDEP),
-@@ -402,7 +402,7 @@ class CoreInstall(object):
+@@ -405,7 +405,7 @@ class CoreInstall(object):
          }
  
          python2_dep = {
@@ -39,7 +39,7 @@ Index: installer/core_install.py
              #'setuptools':      (False, ['scan'], SETUPTOOLS_STR, self.check_setuptools, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
              #'pip':          (True, ['scan'], PIP_STR, self.check_pip, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
              #'pypdf2':          (True, ['scan'], PYPDF2_STR, self.check_pypdf2, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
-@@ -418,7 +418,7 @@ class CoreInstall(object):
+@@ -421,7 +421,7 @@ class CoreInstall(object):
              'pyqt5':            (True,  ['gui_qt5'], QT5_STR, self.check_pyqt5, DEPENDENCY_RUN_TIME, '5.0', 'FUNC#get_pyQt5_version', GENERALDEP),
              'python-dbus':      (True,  ['fax'], PYDBUS_STR, self.check_python_dbus, DEPENDENCY_RUN_TIME, '0.80.0', 'FUNC#get_python_dbus_ver', GENERALDEP),
              'python-xml':     (True,  ['base'], PYXML_STR, self.check_python_xml, DEPENDENCY_RUN_TIME, '-', 'FUNC#get_python_xml_version', GENERALDEP),
@@ -48,7 +48,7 @@ Index: installer/core_install.py
              'pil':              (False, ['scan'], PIL_STR, self.check_pil, DEPENDENCY_RUN_TIME, '-', 'FUNC#get_pil_version', GENERALDEP),
              #'imutils':          (True, ['scan'], IMUTILS_STR, self.check_imutils, DEPENDENCY_RUN_TIME, '-', None, GENERALDEP),
              # Optional fax packages
-@@ -952,7 +952,7 @@ class CoreInstall(object):
+@@ -955,7 +955,7 @@ class CoreInstall(object):
          return check_tool('gcc --version', 0) and check_tool('g++ --version', 0)
  
      def check_make(self):
@@ -57,7 +57,7 @@ Index: installer/core_install.py
  
      def check_libusb(self):
          Is_libusb01_enabled = self.get_distro_ver_data('libusb01', False)
-@@ -960,14 +960,14 @@ class CoreInstall(object):
+@@ -963,14 +963,14 @@ class CoreInstall(object):
              if not check_lib('libusb'):
                  return False
              if self.distro_name != "rhel":
@@ -74,7 +74,7 @@ Index: installer/core_install.py
              else:
                  return True
  
-@@ -981,10 +981,10 @@ class CoreInstall(object):
+@@ -984,10 +984,10 @@ class CoreInstall(object):
          return check_lib("libjpeg") and check_file("jpeglib.h")
  
      def check_libcrypto(self):
@@ -87,7 +87,7 @@ Index: installer/core_install.py
  
      def check_libnetsnmp(self):
          return check_lib("libnetsnmp") and check_file("net-snmp-config.h")
-@@ -1024,7 +1024,7 @@ class CoreInstall(object):
+@@ -1027,7 +1027,7 @@ class CoreInstall(object):
          return check_lib('libsane')
  
      def check_sane_devel(self):
@@ -96,7 +96,7 @@ Index: installer/core_install.py
  
      def check_xsane(self):
          if os.getenv('DISPLAY'):
-@@ -1099,7 +1099,7 @@ class CoreInstall(object):
+@@ -1102,7 +1102,7 @@ class CoreInstall(object):
              return False
  
      def check_python_devel(self):
@@ -105,7 +105,7 @@ Index: installer/core_install.py
          Found = False
          for p in dir_list:
              if check_file('Python.h', dir=p):
-@@ -1151,13 +1151,8 @@ class CoreInstall(object):
+@@ -1154,13 +1154,8 @@ class CoreInstall(object):
              return False
  
      def check_dbus(self):
@@ -121,7 +121,7 @@ Index: installer/core_install.py
  
      def check_cups_devel(self):
          return check_file('cups.h') and bool(utils.which('lpr'))
-@@ -1172,11 +1167,11 @@ class CoreInstall(object):
+@@ -1175,11 +1170,11 @@ class CoreInstall(object):
              return True
  
      def check_cups_image(self):
@@ -135,16 +135,16 @@ Index: installer/core_install.py
  
      def check_libtool(self):
          log.debug("Checking for libtool...")
-@@ -1243,7 +1238,7 @@ class CoreInstall(object):
+@@ -1246,7 +1241,7 @@ class CoreInstall(object):
      def check_cupsddk(self):
          log.debug("Checking for cups-ddk...")
          # TODO: Compute these paths some way or another...
 -        return check_file('media.defs', "/usr/share/cups/ppdc/")
 +        return check_file('media.defs', "${LOCALBASE}/share/cups/ppdc/")
  
-     def check_policykit(self):
+     def check_libavahi_dev(self):
-         log.debug("Checking for PolicyKit...")
+         log.debug("Checking for libavahi-dev")
-@@ -1293,7 +1288,7 @@ class CoreInstall(object):
+@@ -1301,7 +1296,7 @@ class CoreInstall(object):
  
      def check_hpaio(self):
          found = False
@@ -153,7 +153,7 @@ Index: installer/core_install.py
              log.debug("'Checking for hpaio' in '%s'..." % path)
              try:
                  f = open(path, 'r')
-@@ -1322,13 +1317,13 @@ class CoreInstall(object):
+@@ -1330,13 +1325,13 @@ class CoreInstall(object):
          if pat.match(home_dir) is not None:
              usrlib_dir = pat.match(home_dir).group(1) + "lib/"
              if os.path.exists(usrlib_dir + 'sane/libsane-hpaio.so.1'):
@@ -171,7 +171,7 @@ Index: installer/core_install.py
                      log.debug("cmd=%s" % cmd)
                      utils.run(cmd, self.passwordObj)
                  else:
-@@ -1341,20 +1336,20 @@ class CoreInstall(object):
+@@ -1349,20 +1344,20 @@ class CoreInstall(object):
                      f.close()
  
                  if not found:
@@ -197,7 +197,7 @@ Index: installer/core_install.py
                      cmd = self.passwordObj.getAuthCmd() % cmd
                      log.debug("cmd=%s" % cmd)
                      utils.run(cmd, self.passwordObj)
-@@ -1820,11 +1815,14 @@ class CoreInstall(object):
+@@ -1828,11 +1823,14 @@ class CoreInstall(object):
          return num_opt_missing
  
      def check_wget(self):
@@ -216,7 +216,7 @@ Index: installer/core_install.py
  
      def check_avahi_utils(self):
          if utils.which("avahi-browse"):
-@@ -1931,7 +1929,7 @@ class CoreInstall(object):
+@@ -1958,7 +1956,7 @@ class CoreInstall(object):
          cmds = []
          if self.get_distro_ver_data('fix_ppd_symlink', False, distro_ver):
              cmds.append(self.passwordObj.getAuthCmd() %

print/hplip/patches/patch-prnt_cupsext_cupsext_c

@@ -1,10 +1,11 @@
-$OpenBSD: patch-prnt_cupsext_cupsext_c,v 1.5 2015/04/17 04:18:13 ajacoutot Exp $
+$OpenBSD: patch-prnt_cupsext_cupsext_c,v 1.6 2020/10/03 13:39:31 ajacoutot Exp $
 
 Backwards memcpy, triggered by changing default page size in hp-toolbox
 
---- prnt/cupsext/cupsext.c.orig	Tue Apr 14 11:52:35 2015
+Index: prnt/cupsext/cupsext.c
-+++ prnt/cupsext/cupsext.c	Fri Apr 17 05:53:22 2015
+--- prnt/cupsext/cupsext.c.orig
-@@ -1163,7 +1163,7 @@ PyObject * removeOption( PyObject * self, PyObject * a
++++ prnt/cupsext/cupsext.c
+@@ -1164,7 +1164,7 @@ PyObject * removeOption( PyObject * self, PyObject * a
  
              if ( j < g_num_options )
              {

print/hplip/patches/patch-protocol_discovery_mdns_c

@@ -1,24 +0,0 @@
-$OpenBSD: patch-protocol_discovery_mdns_c,v 1.2 2018/10/31 14:14:30 ajacoutot Exp $
-
-Index: protocol/discovery/mdns.c
---- protocol/discovery/mdns.c.orig
-+++ protocol/discovery/mdns.c
-@@ -24,13 +24,17 @@
-  Author: Sanjay Kumar
-  \*****************************************************************************/
- 
--//#include <stdio.h>
-+#include <stdio.h> /* sprintf */
-+#include <stdlib.h> /* malloc */
- #include <string.h>
- #include <syslog.h>
-+#include <sys/select.h> /* fd_set */
- #include <sys/socket.h>
-+#include <unistd.h> /* close */
- #include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <ctype.h> /* tolower */
- #include "mdns.h"
- 
- /* Convert "www.google.com" to "3www6google3com". */

print/hplip/patches/patch-scan_sane_hpaio_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-scan_sane_hpaio_c,v 1.3 2020/05/23 07:58:58 ajacoutot Exp $
+$OpenBSD: patch-scan_sane_hpaio_c,v 1.4 2020/10/03 13:39:31 ajacoutot Exp $
 
 scan/sane/hpaio.c:555:8: error: void function 'sane_hpaio_cancel' should not return a value [-Wreturn-type]
        return orblite_cancel(handle)
@@ -6,7 +6,7 @@ scan/sane/hpaio.c:555:8: error: void function 'sane_hpaio_cancel' should not ret
 Index: scan/sane/hpaio.c
 --- scan/sane/hpaio.c.orig
 +++ scan/sane/hpaio.c
-@@ -419,7 +419,7 @@ extern void sane_hpaio_close(SANE_Handle handle)
+@@ -425,7 +425,7 @@ extern void sane_hpaio_close(SANE_Handle handle)
      if (strcmp(*((char **)handle), "ESCL") == 0)
         return escl_close(handle);
      if (strcmp(*((char **)handle), "ORBLITE") == 0)
@@ -15,7 +15,7 @@ Index: scan/sane/hpaio.c
  }  /* sane_hpaio_close() */
  
  extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Handle handle, SANE_Int option)
-@@ -552,7 +552,7 @@ extern void sane_hpaio_cancel( SANE_Handle handle )
+@@ -558,7 +558,7 @@ extern void sane_hpaio_cancel( SANE_Handle handle )
      if (strcmp(*((char **)handle), "ESCL") == 0)
         return escl_cancel(handle);
      if (strcmp(*((char **)handle), "ORBLITE") == 0)

print/hplip/pkg/PLIST-hpijs

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-hpijs,v 1.64 2020/06/17 07:35:05 ajacoutot Exp $
+@comment $OpenBSD: PLIST-hpijs,v 1.65 2020/10/03 13:39:31 ajacoutot Exp $
 @conflict hplip-libs-<=3.9.8
 @conflict hpcups-<=3.2.11
 @pkgpath print/hpijs
@@ -164,13 +164,16 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5520_series-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp5520_series-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-pcl3.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_cp6015-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_e55040-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_e65050_e65060-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_e67550_e67560-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_e67650_e67660-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_e75245-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_e85055-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_e57540-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_mfp_m680-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_flow_mfp_m880-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_flowmfp_m578-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_flowmfp_m776-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m153-m154-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m155-m156-ps.ppd.gz
@@ -182,12 +185,15 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_m452-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m452d-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m552-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m553-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_m554-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_m555-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m651-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m652_m653-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m750-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m751-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m855-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_m856-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_e57540-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_e77422-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_e77428-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_e78223-ps.ppd.gz
@@ -197,6 +203,7 @@ share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m178-m181-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m274-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m278-m281-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m577-ps.ppd.gz
+share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m578-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m680-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m681_m682-ps.ppd.gz
 share/foomatic/db/source/PPD/HP/hp-color_laserjet_mfp_m776-ps.ppd.gz