 @@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.38 2020/05/14 19:01:47 joerg Exp $
+$NetBSD: distinfo,v 1.39 2021/03/18 16:44:01 bouyer Exp $
 SHA1 (hplip-3.19.12.tar.gz) = 3d3cffb0808900ab4134df2acc246f22fb39aad7
 RMD160 (hplip-3.19.12.tar.gz) = c9e24b31dd51b2f1759e4f70c1c8617b49ace7c7
 SHA512 (hplip-3.19.12.tar.gz) = 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
 Size (hplip-3.19.12.tar.gz) = 25676247 bytes
 SHA1 (patch-ab) = 82b8ab80f778a6a31c1031688d9a16dbd4c55462
-SHA1 (patch-ae) = a15426c555b47806b47eb40e22c4ca6862d6ba18
+SHA1 (patch-ae) = c67ea6d640175a1f0518640f41b5fb58241430f1
 SHA1 (patch-configure.in) = d6e20d8d4f0b1042a32149eeca45d2ddc319f65f
 SHA1 (patch-diagnose_queues.py) = 385c694642248818b28375711df244f12e63fdb4
 SHA1 (patch-installer_dcheck.py) = 9e8e6b552f935d2ed5a61060cc0a4541095e2751
 SHA1 (patch-io_hpmud_musb.h) = ad634f5a1f426877e1c88916b6468fcdb7598555
 SHA1 (patch-prnt_hpcups_HPCupsFilter.cpp) = 19a26044ce24433b0188c243925b4028bc388f1a
 SHA1 (patch-prnt_hpijs_context2.cpp) = f81148c1c334a9074453b27ac055833cd1669bd0
 SHA1 (patch-prnt_hpijs_foomatic-rip-hplip) = c37ed4beda5a84fac65484d11af55bf80b3f9f7c
 SHA1 (patch-prnt_hpijs_hjzjscolor.cpp) = 5ca9c828ba4aff17a54a803d79c2dc169975d50c
 SHA1 (patch-prnt_hpps_hppsfilter.c) = 5a3e7f3f5504fb88d58cf2b79fa138066859aa00
 SHA1 (patch-protocol_discovery_mdns.c) = e2ca43f6ab13fe2124a38bcc0eff292a57b34b06
 SHA1 (patch-scan.py) = b58ffdd4811b8b20973a07f3b9f60174a96beed4

 @@ -1,124 +1,138 @@
-$NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
+$NetBSD: patch-ae,v 1.12 2021/03/18 16:44:02 bouyer Exp $
 # Conform to autoconf's standard variable usage, making it easier
 # to install on pkgsrc platforms
 # reported upstream as https://bugs.launchpad.net/hplip/+bug/726218
 # still needs to handle the buildlink path for libusb-1.0 :(
 # schnoebe -- Fri May 24 14:55:57 CDT 2013
---- Makefile.am.orig	2019-12-10 05:00:36.000000000 +0000
+--- Makefile.am.orig	2019-12-10 06:00:36.000000000 +0100
-+++ Makefile.am
++++ Makefile.am	2021-03-18 15:14:51.942673859 +0100
-@@ -8,7 +8,7 @@ CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
+@@ -8,7 +8,7 @@
  CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
  hplipdir = $(datadir)/hplip
 -apparmordir = /etc/apparmor.d
 +apparmordir = $(sysconfdir)/apparmor.d
  docdir = $(hpdocdir)
  htmldir = $(hphtmldir)
  doc_DATA = COPYING copyright prnt/hpijs/README_LIBJPG
-@@ -110,6 +110,7 @@ libhpmud_la_LDFLAGS += -lusb
+@@ -110,6 +110,7 @@
  else
  libhpmud_la_SOURCES += io/hpmud/musb.c
  libhpmud_la_CFLAGS  += -I/usr/include/libusb-1.0
 +libhpmud_la_CFLAGS  += -I$(prefix)/include/libusb-1.0
  libhpmud_la_LDFLAGS += -lusb-1.0
  endif
-@@ -131,12 +132,12 @@ libhpip_la_SOURCES = ip/xconvolve.c ip/x
+@@ -131,12 +132,12 @@
  	ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h
  #hpmud rules data dir
 -rulessystemdir=/usr/lib/systemd/system
 +rulessystemdir=$(sysconfdir)/systemd/system
  dist_rulessystem_DATA =data/rules/hplip-printer@.service
  # hpmud.rules
  if !HPLIP_CLASS_DRIVER
 -rulesdir = /etc/udev/rules.d
 +rulesdir = $(sysconfdir)/udev/rules.d
  if UDEV_SYSFS_RULES
  dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
  else
-@@ -144,11 +145,11 @@ dist_rules_DATA = data/rules/56-hpmud.ru
+@@ -144,11 +145,11 @@
  endif
  endif #HPLIP_CLASS_DRIVER
 -halpredir = /usr/share/hal/fdi/preprobe/10osvendor
 +halpredir = $(datadir)/hal/fdi/preprobe/10osvendor
  dist_halpre_DATA = data/rules/20-hplip-devices.fdi
  # hplip.conf
 -hplip_confdir = /etc/hp
 +hplip_confdir = $(sysconfdir)/hp
  hplip_conf_DATA = hplip.conf
  if !HPLIP_CLASS_DRIVER
-@@ -158,7 +159,7 @@ pstotiff_SCRIPTS = fax/filters/pstotiff
+@@ -158,7 +159,7 @@
  endif #HPLIP_CLASS_DRIVER
  # hplip.state
 -hplip_statedir = /var/lib/hp
 +hplip_statedir = $(localstatedir)/lib/hp
  dist_hplip_state_DATA =
  if FULL_BUILD
-@@ -233,11 +234,11 @@ endif # FAX_BUILD
+@@ -233,11 +234,11 @@
  if !HPLIP_CLASS_DRIVER
  # AppArmor Changes
  if APPARMOR_BUILD
 -apparmor_profiledir = /etc/apparmor.d
 +apparmor_profiledir = $(sysconfdir)/apparmor.d
  apparmor_profile_DATA = apparmor/usr.share.hplip
  dist_apparmor_profile_DATA = apparmor/usr.share.hplip
 -apparmor_abstractiondir = /etc/apparmor.d/abstractions
 +apparmor_abstractiondir = $(sysconfdir)/apparmor.d/abstractions
  apparmor_abstraction_DATA = apparmor/abstractions/hplip
  dist_apparmor_abstraction_DATA = apparmor/abstractions/hplip
-@@ -363,6 +364,7 @@ endif
+@@ -363,6 +364,7 @@
  if !LIBUSB01_BUILD
  hpmudext_la_CFLAGS +=-I/usr/include/libusb-1.0
 +hpmudext_la_CFLAGS +=-I$(prefix)/include/libusb-1.0
  endif
  endif #!HPLIP_CLASS_DRIVER
  # ui (qt3)
-@@ -448,9 +450,9 @@ endif
+@@ -448,9 +450,9 @@
  endif #HPLIP_CLASS_DRIVER
  # PolicyKit
  if POLICYKIT_INSTALL
 -policykit_dbus_etcdir = /etc/dbus-1/system.d
 +policykit_dbus_etcdir = $(sysconfdir)/dbus-1/system.d
  dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf
 -policykit_dbus_sharedir = /usr/share/dbus-1/system-services
 +policykit_dbus_sharedir = $(datadir)/dbus-1/system-services
  dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
  policykit_policydir = $(policykit_dir)
  dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
-@@ -594,7 +596,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
+@@ -594,7 +596,7 @@
  	prnt/hpcups/ImageProcessor.h
  hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
 -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
 +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
  #else
  #hpcupsdir = $(cupsfilterdir)
  #hpcups_PROGRAMS = hpcups
-@@ -697,13 +699,13 @@ if HPLIP_BUILD
+@@ -683,27 +685,17 @@
  endif #HPLIP_CLASS_DRIVER
  install-data-hook:
  if HPLIP_BUILD
 -	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
 -		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
 -		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
 -		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
 -	fi; \
 -	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
 -		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
 -		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
 -		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
 -	fi
  if !HPLIP_CLASS_DRIVER
  #	   If scanner build, add hpaio entry to sane dll.conf.
  	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; \
 +	   $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/sane.d; \
 +	   if [ ! -f $(DESTDIR)$(sysconfdir)/sane.d/dll.conf ]; then \
 +		  touch $(DESTDIR)$(sysconfdir)/sane.d/dll.conf; \
  	   fi; \
 -	   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 ; \