diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,8 +1,7 @@ PORTNAME= sane-backends -DISTVERSION= 1.1.1 -PORTREVISION= 14 +DISTVERSION= 1.2.1 CATEGORIES= graphics -MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/ +MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/ MAINTAINER= vvd@FreeBSD.org COMMENT= API for accessing scanners, digital cameras, frame grabbers, etc diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643041643 -SHA256 (sane-backends-1.1.1.tar.gz) = dd4b04c37a42f14c4619e8eea6a957f4c7c617fe59e32ae2872b373940a8b603 -SIZE (sane-backends-1.1.1.tar.gz) = 7447569 +TIMESTAMP = 1683137196 +SHA256 (sane-backends-1.2.1.tar.gz) = f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524 +SIZE (sane-backends-1.2.1.tar.gz) = 7308040 diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in --- 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 -@@ -1667,7 +1667,7 @@ AM_V_at = $(am__v_at_@AM_V@) +@@ -1704,7 +1704,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,16 +9,16 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \ -@@ -7276,7 +7276,7 @@ install-becfg: becfg - @# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*. - @# Having two libsane's can cause issues so get rid of it. - -rm -f $(DESTDIR)$(sanelibdir)/libsane.* +@@ -8220,7 +8220,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.* - test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" + test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist" 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; \ -@@ -7284,7 +7284,7 @@ install-becfg: becfg +@@ -8228,7 +8228,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-frontend_jpegtopdf.c b/graphics/sane-backends/files/patch-frontend_jpegtopdf.c deleted file mode 100644 --- a/graphics/sane-backends/files/patch-frontend_jpegtopdf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- frontend/jpegtopdf.c.orig 2022-01-19 16:38:00 UTC -+++ frontend/jpegtopdf.c -@@ -201,7 +201,11 @@ static SANE_Int _get_current_time( struct tm *pt, SANE - goto EXIT; - } - /* get time difference ( OHH'mm' ) */ -+#ifdef __FreeBSD__ -+ tz = -pt->tm_gmtoff; -+#else - tz = timezone; -+#endif - if ( tz > 0 ) { - *sign_c = '-'; - } diff --git a/graphics/sane-backends/files/patch-frontend_scanimage.c b/graphics/sane-backends/files/patch-frontend_scanimage.c deleted file mode 100644 --- a/graphics/sane-backends/files/patch-frontend_scanimage.c +++ /dev/null @@ -1,12 +0,0 @@ ---- frontend/scanimage.c.orig 2022-01-19 16:38:00 UTC -+++ frontend/scanimage.c -@@ -39,6 +39,9 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - - #include - #include