diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index d4ecda8fcc3e..95c17a4bbc6c 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,61 +1,60 @@ 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 WWW= http://www.sane-project.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff USES= compiler:c++11-lang gmake gnome jpeg libtool localbase:ldflags \ pathfix pkgconfig python:build USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= saned GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-locking \ --enable-pthread \ --without-systemd INSTALL_TARGET= install-strip SUB_FILES= pkg-message USERS= saned GROUPS= saned PLIST_SUB= SOVERSION=${DISTVERSION} 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 AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app \ libcurl.so:ftp/curl \ libpoppler-glib.so:graphics/poppler-glib AVAHI_USE= GNOME=cairo,glib20 AVAHI_CONFIGURE_WITH= avahi libcurl poppler-glib GPHOTO_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 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_CONFIGURE_ENABLE= nls SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp SNMP_CONFIGURE_WITH= snmp USB_CONFIGURE_WITH= usb V4L_LIB_DEPENDS= libv4l1.so:multimedia/libv4l V4L_CONFIGURE_WITH= v4l .include diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index c33b16c65b9b..bea099c6c95d 100644 --- 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 index 203efcc1d2ed..1d9c624263d6 100644 --- a/graphics/sane-backends/files/patch-backend_Makefile.in +++ b/graphics/sane-backends/files/patch-backend_Makefile.in @@ -1,29 +1,29 @@ --- 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 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/sane +DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I.@am__isrc@ 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}...; \ - $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/$${cfg} \ + $(INSTALL_DATA) $${cfg} $(DESTDIR)$(configdir)/dist/$${cfg} \ || exit 1; \ fi; \ done diff --git a/graphics/sane-backends/files/patch-frontend_jpegtopdf.c b/graphics/sane-backends/files/patch-frontend_jpegtopdf.c deleted file mode 100644 index f6e4be53ca79..000000000000 --- 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 index cd7a92a0be01..000000000000 --- 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