graphics/sane-backends: update to 1.3.1

New with 1.3.1 (released 2024-05-22):
https://gitlab.com/sane-project/backends/-/releases/1.3.1

While here update patches with makepatch (portlint warning).

6 files changed, 25 insertions, 19 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index c642b840847f..e71e1baba7e8 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	sane-backends
-DISTVERSION=	1.2.1
-PORTREVISION=	6
+DISTVERSION=	1.3.1
 CATEGORIES=	graphics
-MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/
+MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/83bdbb6c9a115184c2d48f1fdc6847db/
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	API for accessing scanners, digital cameras, frame grabbers, etc
@@ -37,8 +36,8 @@ OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
 OPTIONS_DEFAULT=	AVAHI GPHOTO USB
 OPTIONS_SUB=		yes
 
-IEEE1284_DESC=	Parallel port support via libieee1284 (for i386 only)
-USB_DESC=	USB support
+IEEE1284_DESC=		Parallel port support via libieee1284 (for i386 only)
+USB_DESC=		USB support
 
 AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app \
 				libcurl.so:ftp/curl \
@@ -50,7 +49,7 @@ GPHOTO_CONFIGURE_WITH=		gphoto2
 IEEE1284_LIB_DEPENDS=		libieee1284.so:sysutils/libieee1284
 IEEE1284_CONFIGURE_ENV_OFF=	sane_cv_use_libieee1284=no
 IPV6_CONFIGURE_ENABLE=		ipv6
-NLS_USES=			gettext
+NLS_USES=			gettext-tools
 NLS_CONFIGURE_ENABLE=		nls
 SNMP_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=		snmp
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index bea099c6c95d..13cc38a21e30 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1683137196
-SHA256 (sane-backends-1.2.1.tar.gz) = f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524
-SIZE (sane-backends-1.2.1.tar.gz) = 7308040
+TIMESTAMP = 1716563691
+SHA256 (sane-backends-1.3.1.tar.gz) = aa82f76f409b88f8ea9793d4771fce01254d9b6549ec84d6295b8f59a3879a0c
+SIZE (sane-backends-1.3.1.tar.gz) = 7432184
diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in
index 1d9c624263d6..5b356c6cd268 100644
--- a/graphics/sane-backends/files/patch-backend_Makefile.in
+++ b/graphics/sane-backends/files/patch-backend_Makefile.in
@@ -1,6 +1,6 @@
---- backend/Makefile.in.orig	2020-08-23 12:27:20 UTC
+--- backend/Makefile.in.orig	2024-05-24 15:39:35 UTC
 +++ backend/Makefile.in
-@@ -1704,7 +1704,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+@@ -1720,7 +1720,7 @@ AM_V_at = $(am__v_at_@AM_V@)
  am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
  am__v_at_0 = @
  am__v_at_1 = 
@@ -9,7 +9,7 @@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__maybe_remake_depfiles = depfiles
  am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
-@@ -8220,7 +8220,7 @@ install-becfg: becfg
+@@ -8281,7 +8281,7 @@ install-becfg: becfg
  	@# installed library in $(execsanelibdir) to libsane.*, which
  	@# causes a conflict with the actual libsane.* in $(libdir).
  	-rm -f $(DESTDIR)$(execsanelibdir)/libsane.*
@@ -18,7 +18,7 @@
  	test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d"
  	@list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \
  	  if test ! -r $${cfg}; then continue; fi; \
-@@ -8228,7 +8228,7 @@ install-becfg: becfg
+@@ -8289,7 +8289,7 @@ install-becfg: becfg
  	  echo NOT overwriting $${cfg} in $(configdir)...; \
  	  else \
  	  echo installing $${cfg} in $(configdir)/$${cfg}...; \
diff --git a/graphics/sane-backends/files/patch-configure b/graphics/sane-backends/files/patch-configure
index 2a520414d916..943c11e284b3 100644
--- a/graphics/sane-backends/files/patch-configure
+++ b/graphics/sane-backends/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig
+--- configure.orig	2024-05-23 05:45:25 UTC
 +++ configure
-@@ -22378,7 +22378,7 @@
+@@ -22074,7 +22074,7 @@ $as_echo_n "checking whether pthread_t is integer... "
  int
  main ()
  {
@@ -9,7 +9,7 @@
    ;
    return 0;
  }
-@@ -26520,7 +26520,7 @@
+@@ -26203,7 +26203,7 @@ for be in ${BACKENDS}; do
      ;;
  
      v4l)
@@ -18,7 +18,7 @@
        || test "${have_libv4l1}" != "yes"; then
        echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
        backend_supported="no"
-@@ -26734,7 +26734,7 @@
+@@ -26417,7 +26417,7 @@ for be in ${BACKENDS}; do
      ;;
  
      v4l)
diff --git a/graphics/sane-backends/files/patch-sanei_sanei__pa4s2.c b/graphics/sane-backends/files/patch-sanei_sanei__pa4s2.c
index 124906e0eb3d..c380988e0107 100644
--- a/graphics/sane-backends/files/patch-sanei_sanei__pa4s2.c
+++ b/graphics/sane-backends/files/patch-sanei_sanei__pa4s2.c
@@ -1,6 +1,6 @@
---- sanei/sanei_pa4s2.c.orig	2017-05-15 01:19:11 UTC
+--- sanei/sanei_pa4s2.c.orig	2024-05-23 05:45:00 UTC
 +++ sanei/sanei_pa4s2.c
-@@ -112,6 +112,12 @@ inb (u_long port)
+@@ -74,6 +74,12 @@
  
  #endif /* HAVE_LIBIEEE1284 */
  
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index e1206a080170..0cf244d17c13 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -46,6 +46,7 @@ bin/umax_pp
 @sample etc/sane.d/dist/kvs1025.conf etc/sane.d/kvs1025.conf
 @sample etc/sane.d/dist/leo.conf etc/sane.d/leo.conf
 @sample etc/sane.d/dist/lexmark.conf etc/sane.d/lexmark.conf
+@sample etc/sane.d/dist/lexmark_x2600.conf etc/sane.d/lexmark_x2600.conf
 @sample etc/sane.d/dist/ma1509.conf etc/sane.d/ma1509.conf
 @sample etc/sane.d/dist/magicolor.conf etc/sane.d/magicolor.conf
 @sample etc/sane.d/dist/matsushita.conf etc/sane.d/matsushita.conf
@@ -236,6 +237,9 @@ lib/sane/libsane-leo.so.%%SOVERSION%%
 lib/sane/libsane-lexmark.so
 lib/sane/libsane-lexmark.so.1
 lib/sane/libsane-lexmark.so.%%SOVERSION%%
+lib/sane/libsane-lexmark_x2600.so
+lib/sane/libsane-lexmark_x2600.so.1
+lib/sane/libsane-lexmark_x2600.so.%%SOVERSION%%
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
 lib/sane/libsane-ma1509.so.%%SOVERSION%%
@@ -412,6 +416,7 @@ share/man/man5/sane-kvs20xx.5.gz
 share/man/man5/sane-kvs40xx.5.gz
 share/man/man5/sane-leo.5.gz
 share/man/man5/sane-lexmark.5.gz
+share/man/man5/sane-lexmark_x2600.5.gz
 share/man/man5/sane-ma1509.5.gz
 share/man/man5/sane-magicolor.5.gz
 share/man/man5/sane-matsushita.5.gz
@@ -533,6 +538,7 @@ sbin/saned
 %%PORTDOCS%%%%DOCSDIR%%/sane-backends.html
 %%PORTDOCS%%%%DOCSDIR%%/sane-mfgs-external.html
 %%PORTDOCS%%%%DOCSDIR%%/sane-mfgs.html
+%%PORTDOCS%%%%DOCSDIR%%/saned/saned.install.md
 %%PORTDOCS%%%%DOCSDIR%%/sceptre/s1200.txt
 %%PORTDOCS%%%%DOCSDIR%%/teco/teco1.txt
 %%PORTDOCS%%%%DOCSDIR%%/teco/teco2.txt
@@ -584,6 +590,7 @@ sbin/saned
 %%NLS%%share/locale/hu/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/sane-backends.mo