Don't try to install libImageProcessor-x86_64.so and libImageProcessor-i386.so,

it doesn't seems to be required.
Fixes install/package

2 files changed, 29 insertions, 15 deletions

diff --git a/print/hplip/distinfo b/print/hplip/distinfo
index 9ad2a484693..0a838b6b566 100644
--- a/print/hplip/distinfo
+++ b/print/hplip/distinfo
@@ -1,11 +1,11 @@
-$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
diff --git a/print/hplip/patches/patch-ae b/print/hplip/patches/patch-ae
index 920137e3310..38605e2ba93 100644
--- a/print/hplip/patches/patch-ae
+++ b/print/hplip/patches/patch-ae
@@ -1,4 +1,4 @@
-$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
@@ -8,9 +8,9 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
 # 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
-@@ -8,7 +8,7 @@ CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
+--- Makefile.am.orig	2019-12-10 06:00:36.000000000 +0100
++++ Makefile.am	2021-03-18 15:14:51.942673859 +0100
+@@ -8,7 +8,7 @@
  CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
  
  hplipdir = $(datadir)/hplip
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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
@@ -27,7 +27,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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
  
@@ -56,7 +56,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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
@@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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
@@ -79,7 +79,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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 
@@ -87,7 +87,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  endif
  endif #!HPLIP_CLASS_DRIVER
  # ui (qt3)
-@@ -448,9 +450,9 @@ endif
+@@ -448,9 +450,9 @@
  endif #HPLIP_CLASS_DRIVER
  # PolicyKit
  if POLICYKIT_INSTALL
@@ -99,7 +99,7 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  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)
@@ -108,7 +108,21 @@ $NetBSD: patch-ae,v 1.11 2020/01/04 04:24:12 khorben Exp $
  #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 \