svn commit: r526253 - in head/graphics/sane-backends: . files

Tobias Kortkamp tobik at FreeBSD.org
Sun Feb 16 06:16:01 UTC 2020 

Author: tobik
Date: Sun Feb 16 06:15:58 2020
New Revision: 526253
URL: https://svnweb.freebsd.org/changeset/ports/526253

Log:
  graphics/sane-backends: Update to 1.0.29
  
  - Rename legacy patches
  - Clean up post-patch
  - Pet portfmt/portclippy
  
  Changes:	https://gitlab.com/sane-project/backends/-/tags/1.0.29

Added:
  head/graphics/sane-backends/files/patch-backend_Makefile.in
     - copied, changed from r526252, head/graphics/sane-backends/files/patch-backend__Makefile.in
  head/graphics/sane-backends/files/patch-backend_genesys_low.cpp   (contents, props changed)
  head/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c   (contents, props changed)
  head/graphics/sane-backends/files/patch-backend_v4l.c
     - copied unchanged from r526252, head/graphics/sane-backends/files/patch-backend__v4l.c
  head/graphics/sane-backends/files/patch-configure   (contents, props changed)
  head/graphics/sane-backends/files/patch-tools_sane-config.in   (contents, props changed)
Deleted:
  head/graphics/sane-backends/files/patch-backend__Makefile.in
  head/graphics/sane-backends/files/patch-backend__v4l.c
Modified:
  head/graphics/sane-backends/Makefile
  head/graphics/sane-backends/distinfo
  head/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
  head/graphics/sane-backends/files/patch-tools_sane-desc.c
  head/graphics/sane-backends/pkg-plist

Modified: head/graphics/sane-backends/Makefile
==============================================================================
--- head/graphics/sane-backends/Makefile	Sun Feb 16 06:05:22 2020	(r526252)
+++ head/graphics/sane-backends/Makefile	Sun Feb 16 06:15:58 2020	(r526253)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.28
+PORTVERSION=	1.0.29
 CATEGORIES=	graphics
-MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/9e718daff347826f4cfe21126c8d5091/
+MASTER_SITES=	https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/
 
 MAINTAINER=	tobik at FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
@@ -15,8 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		compiler:c++11-lang gmake jpeg libtool localbase pathfix \
+USES=		compiler:c++11-lang gmake gnome jpeg libtool localbase pathfix \
 		pkgconfig
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	saned
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-locking \
@@ -24,49 +27,37 @@ CONFIGURE_ARGS=	--disable-locking \
 		--without-api-spec \
 		--without-systemd
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	saned
 
 SUB_FILES=	pkg-message
 
 USERS=		saned
 GROUPS=		saned
 
+PLIST_SUB=	SOVERSION=${PORTVERSION}
+
 OPTIONS_DEFINE=		AVAHI DOCS GPHOTO IEEE1284 IPV6 NLS SNMP USB V4L
 OPTIONS_DEFAULT=	USB
 OPTIONS_SUB=		yes
 
-IEEE1284_DESC=		Parallel port support via libieee1284
-USB_DESC=		USB support
+IEEE1284_DESC=	Parallel port support via libieee1284
+USB_DESC=	USB support
 
-AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
-AVAHI_CONFIGURE_ENABLE=	avahi
-GPHOTO_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
-GPHOTO_CONFIGURE_OFF=	--with-gphoto2=no
-IEEE1284_LIB_DEPENDS=	libieee1284.so:sysutils/libieee1284
+AVAHI_LIB_DEPENDS=		libavahi-client.so:net/avahi-app \
+				libcurl.so:ftp/curl
+AVAHI_CONFIGURE_ENABLE=		avahi
+AVAHI_CONFIGURE_WITH=		libcurl
+GPHOTO_LIB_DEPENDS=		libgphoto2.so:graphics/libgphoto2
+GPHOTO_CONFIGURE_OFF=		--with-gphoto2=no
+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_ON=	--with-usb
-USB_CONFIGURE_OFF=	--with-usb=no
-V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
-V4L_CONFIGURE_WITH=	v4l
-
-post-patch:
-	@${REINPLACE_CMD} -e '/for ac_header in/s|libc.h|sys/endian.h| ; \
-		 s|"$${have_linux_ioctl_defines}"|"$${have_libv4l1}"| ; \
-		 /pthread_t[[:space:]]k;[[:space:]]/s|pthread_t[[:space:]]k;[[:space:]]k[[:space:]]\*[[:space:]]1|pthread_t k; k = (pthread_t) -1|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^dist_doc_DATA/s|COPYING||' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|HAVE_LIBC_H|HAVE_SYS_ENDIAN_H|' \
-		${WRKSRC}/include/sane/config.h.in
-	@${REINPLACE_CMD} -e '/^pkgconfigdir/s|@libdir@|@prefix@/libdata|' \
-		${WRKSRC}/tools/Makefile.in
-	@${REINPLACE_CMD} -e '/^export PKG_CONFIG_LIBDIR=/s|@libdir@|@prefix@/libdata|' \
-		${WRKSRC}/tools/sane-config.in
+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_OFF=		--with-usb=no
+USB_CONFIGURE_ON=		--with-usb
+V4L_LIB_DEPENDS=		libv4l1.so:multimedia/libv4l
+V4L_CONFIGURE_WITH=		v4l
 
 .include <bsd.port.mk>

Modified: head/graphics/sane-backends/distinfo
==============================================================================
--- head/graphics/sane-backends/distinfo	Sun Feb 16 06:05:22 2020	(r526252)
+++ head/graphics/sane-backends/distinfo	Sun Feb 16 06:15:58 2020	(r526253)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569562258
-SHA256 (sane-backends-1.0.28.tar.gz) = 31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03
-SIZE (sane-backends-1.0.28.tar.gz) = 6753880
+TIMESTAMP = 1580719476
+SHA256 (sane-backends-1.0.29.tar.gz) = aa027b4e5f59849cd41b8c26d54584cf31fffd986049019be6ad4140e11ea8ed
+SIZE (sane-backends-1.0.29.tar.gz) = 7201950

Copied and modified: head/graphics/sane-backends/files/patch-backend_Makefile.in (from r526252, head/graphics/sane-backends/files/patch-backend__Makefile.in)
==============================================================================
--- head/graphics/sane-backends/files/patch-backend__Makefile.in	Sun Feb 16 06:05:22 2020	(r526252, copy source)
+++ head/graphics/sane-backends/files/patch-backend_Makefile.in	Sun Feb 16 06:15:58 2020	(r526253)
@@ -1,16 +1,25 @@
---- backend/Makefile.in.orig	2018-08-28 15:10:08 UTC
+--- backend/Makefile.in.orig	2020-02-03 08:54:00 UTC
 +++ backend/Makefile.in
-@@ -1518,7 +1518,7 @@ AM_V_at = $(am__v_at_ at AM_V@)
+@@ -1645,7 +1645,7 @@ AM_V_at = $(am__v_at_ at AM_V@)
  am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
  am__v_at_0 = @
  am__v_at_1 = 
 -DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/include/sane
 +DEFAULT_INCLUDES = -I$(top_builddir)/include/sane -I$(top_builddir)/include -I. at am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
-@@ -5609,7 +5609,7 @@ install-becfg:
- 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.  
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
+@@ -3270,7 +3270,7 @@ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
+ libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_LIBS) $(DL_LIBS) $(XML_LIBS)
+ 
+ # WARNING: Automake is getting this wrong so have to do it ourselves.
+-libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
++libsane_la_DEPENDENCIES = ../lib/liblib.la $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+@@ -7174,7 +7174,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.*
 -	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
@@ -18,7 +27,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; \
-@@ -5617,7 +5617,7 @@ install-becfg:
+@@ -7182,7 +7182,7 @@ install-becfg: becfg
  	  echo NOT overwriting $${cfg} in $(configdir)...; \
  	  else \
  	  echo installing $${cfg} in $(configdir)/$${cfg}...; \

Added: head/graphics/sane-backends/files/patch-backend_genesys_low.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend_genesys_low.cpp	Sun Feb 16 06:15:58 2020	(r526253)
@@ -0,0 +1,19 @@
+Fix build on big endian archs:
+
+genesys/low.cpp:544:9: error: 'depth' was not declared in this scope, see
+
+https://gitlab.com/sane-project/backends/-/merge_requests/329
+
+Obtained from:	OpenBSD
+
+--- backend/genesys/low.cpp.orig	2020-02-02 11:58:09 UTC
++++ backend/genesys/low.cpp
+@@ -539,7 +539,7 @@ Image read_unshuffled_image_from_scanner(Genesys_Devic
+     }
+ 
+ #ifdef WORDS_BIGENDIAN
+-    if (depth == 16) {
++    if (session.params.depth == 16) {
+         dev->pipeline.push_node<ImagePipelineNodeSwap16BitEndian>();
+     }
+ #endif

Added: head/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend_pixma_pixma__bjnp.c	Sun Feb 16 06:15:58 2020	(r526253)
@@ -0,0 +1,21 @@
+--- backend/pixma/pixma_bjnp.c.orig	2020-02-03 09:33:57 UTC
++++ backend/pixma/pixma_bjnp.c
+@@ -72,6 +72,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#include <sys/param.h>
+ 
+ /*
+  * networking stuff
+@@ -1990,8 +1991,8 @@ sanei_bjnp_find_devices (const char **conf_devices,
+   fd_set fdset;
+   fd_set active_fdset;
+   struct timeval timeout;
+-  char scanner_host[HOST_NAME_MAX];
+-  char uri[HOST_NAME_MAX + 32];
++  char scanner_host[MAXHOSTNAMELEN];
++  char uri[MAXHOSTNAMELEN + 32];
+   int dev_no;
+   int port;
+   int auto_detect = 1;

Modified: head/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c
==============================================================================
--- head/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c	Sun Feb 16 06:05:22 2020	(r526252)
+++ head/graphics/sane-backends/files/patch-backend_ricoh2__buffer.c	Sun Feb 16 06:15:58 2020	(r526253)
@@ -1,11 +1,11 @@
---- backend/ricoh2_buffer.c.orig	2019-10-09 14:45:51 UTC
+--- backend/ricoh2_buffer.c.orig	2020-02-02 11:58:09 UTC
 +++ backend/ricoh2_buffer.c
-@@ -46,7 +46,7 @@
- 
- #include <memory.h>
- #include <assert.h>
+@@ -50,7 +50,7 @@
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <malloc/malloc.h>
+ #else
 -#include <malloc.h>
 +#include <stdlib.h>
+ #endif
  
  #include "../include/sane/sanei_debug.h"
- 

Copied: head/graphics/sane-backends/files/patch-backend_v4l.c (from r526252, head/graphics/sane-backends/files/patch-backend__v4l.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-backend_v4l.c	Sun Feb 16 06:15:58 2020	(r526253, copy of r526252, head/graphics/sane-backends/files/patch-backend__v4l.c)
@@ -0,0 +1,22 @@
+--- backend/v4l.c.orig	2016-10-06 00:02:57 UTC
++++ backend/v4l.c
+@@ -72,7 +72,10 @@
+ #include "../include/sane/saneopts.h"
+ 
+ #include <sys/ioctl.h>
++
++#ifdef HAVE_ASM_TYPES_H
+ #include <asm/types.h>		/* XXX glibc */
++#endif
+ 
+ #define BACKEND_NAME v4l
+ #include "../include/sane/sanei_backend.h"
+@@ -1046,7 +1049,7 @@ sane_start (SANE_Handle handle)
+   /* v4l1 actually returns BGR when we ask for RGB, so convert it */
+   if (s->pict.palette == VIDEO_PALETTE_RGB24)
+     {
+-      __u32 loop;
++      uint32_t loop;
+       DBG (3, "sane_start: converting from BGR to RGB\n");
+       for (loop = 0; loop < (s->window.width * s->window.height * 3); loop += 3)
+         {

Added: head/graphics/sane-backends/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-configure	Sun Feb 16 06:15:58 2020	(r526253)
@@ -0,0 +1,29 @@
+--- configure.orig	2020-02-02 11:58:46 UTC
++++ configure
+@@ -22138,7 +22138,7 @@ $as_echo_n "checking whether pthread_t is integer... "
+ int
+ main ()
+ {
+-pthread_t k; k * 1;
++pthread_t k; k = (pthread_t) -1;
+   ;
+   return 0;
+ }
+@@ -26130,7 +26130,7 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     v4l)
+-    if test "${have_linux_ioctl_defines}" != "yes" \
++    if test "${have_libv4l1}" != "yes" \
+       || test "${have_libv4l1}" != "yes"; then
+       echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
+       backend_supported="no"
+@@ -26339,7 +26339,7 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     v4l)
+-    if test "${have_linux_ioctl_defines}" != "yes" \
++    if test "${have_libv4l1}" != "yes" \
+       || test "${have_libv4l1}" != "yes"; then
+       echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
+       backend_supported="no"

Added: head/graphics/sane-backends/files/patch-tools_sane-config.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/sane-backends/files/patch-tools_sane-config.in	Sun Feb 16 06:15:58 2020	(r526253)
@@ -0,0 +1,11 @@
+--- tools/sane-config.in.orig	2020-02-02 11:58:09 UTC
++++ tools/sane-config.in
+@@ -11,7 +11,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ # using our installed *.pc only - neither default nor user paths
+-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
++export PKG_CONFIG_LIBDIR="@prefix@/libdata/pkgconfig"
+ export PKG_CONFIG_PATH=""
+ 
+ pkgconfig_package=sane-backends

Modified: head/graphics/sane-backends/files/patch-tools_sane-desc.c
==============================================================================
--- head/graphics/sane-backends/files/patch-tools_sane-desc.c	Sun Feb 16 06:05:22 2020	(r526252)
+++ head/graphics/sane-backends/files/patch-tools_sane-desc.c	Sun Feb 16 06:15:58 2020	(r526253)
@@ -1,8 +1,8 @@
---- tools/sane-desc.c.orig	2015-09-01 00:31:54 UTC
+--- tools/sane-desc.c.orig	2020-02-02 11:58:09 UTC
 +++ tools/sane-desc.c
 @@ -2816,8 +2816,8 @@ html_print_footer (void)
       "<address>\n"
-      "<a href=\"http://www.sane-project.org/imprint.html\"\n"
+      "<a href=\"imprint.html\"\n"
       ">Contact</a>\n" "</address>\n" "<font size=-1>\n");
 -  printf ("This page was last updated on %s by sane-desc %s from %s\n",
 -	  asctime (localtime (&current_time)), SANE_DESC_VERSION, PACKAGE_STRING);

Modified: head/graphics/sane-backends/pkg-plist
==============================================================================
--- head/graphics/sane-backends/pkg-plist	Sun Feb 16 06:05:22 2020	(r526252)
+++ head/graphics/sane-backends/pkg-plist	Sun Feb 16 06:15:58 2020	(r526253)
@@ -28,6 +28,7 @@ bin/umax_pp
 @sample etc/sane.d/dist/epson.conf etc/sane.d/epson.conf
 @sample etc/sane.d/dist/epson2.conf etc/sane.d/epson2.conf
 @sample etc/sane.d/dist/epsonds.conf etc/sane.d/epsonds.conf
+%%AVAHI%%@sample etc/sane.d/dist/escl.conf etc/sane.d/escl.conf
 @sample etc/sane.d/dist/fujitsu.conf etc/sane.d/fujitsu.conf
 @sample etc/sane.d/dist/genesys.conf etc/sane.d/genesys.conf
 %%GPHOTO%%@sample etc/sane.d/dist/gphoto2.conf etc/sane.d/gphoto2.conf
@@ -86,271 +87,274 @@ include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.so
 lib/libsane.so.1
-lib/libsane.so.1.0.28
+lib/libsane.so.%%SOVERSION%%
 lib/sane/libsane-abaton.so
 lib/sane/libsane-abaton.so.1
-lib/sane/libsane-abaton.so.1.0.28
+lib/sane/libsane-abaton.so.%%SOVERSION%%
 lib/sane/libsane-agfafocus.so
 lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-agfafocus.so.1.0.28
+lib/sane/libsane-agfafocus.so.%%SOVERSION%%
 lib/sane/libsane-apple.so
 lib/sane/libsane-apple.so.1
-lib/sane/libsane-apple.so.1.0.28
+lib/sane/libsane-apple.so.%%SOVERSION%%
 lib/sane/libsane-artec.so
 lib/sane/libsane-artec.so.1
-lib/sane/libsane-artec.so.1.0.28
+lib/sane/libsane-artec.so.%%SOVERSION%%
 lib/sane/libsane-artec_eplus48u.so
 lib/sane/libsane-artec_eplus48u.so.1
-lib/sane/libsane-artec_eplus48u.so.1.0.28
+lib/sane/libsane-artec_eplus48u.so.%%SOVERSION%%
 lib/sane/libsane-as6e.so
 lib/sane/libsane-as6e.so.1
-lib/sane/libsane-as6e.so.1.0.28
+lib/sane/libsane-as6e.so.%%SOVERSION%%
 lib/sane/libsane-avision.so
 lib/sane/libsane-avision.so.1
-lib/sane/libsane-avision.so.1.0.28
+lib/sane/libsane-avision.so.%%SOVERSION%%
 lib/sane/libsane-bh.so
 lib/sane/libsane-bh.so.1
-lib/sane/libsane-bh.so.1.0.28
+lib/sane/libsane-bh.so.%%SOVERSION%%
 lib/sane/libsane-canon.so
 lib/sane/libsane-canon.so.1
-lib/sane/libsane-canon.so.1.0.28
+lib/sane/libsane-canon.so.%%SOVERSION%%
 lib/sane/libsane-canon630u.so
 lib/sane/libsane-canon630u.so.1
-lib/sane/libsane-canon630u.so.1.0.28
+lib/sane/libsane-canon630u.so.%%SOVERSION%%
 lib/sane/libsane-canon_dr.so
 lib/sane/libsane-canon_dr.so.1
-lib/sane/libsane-canon_dr.so.1.0.28
+lib/sane/libsane-canon_dr.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-canon_pp.so
 %%IEEE1284%%lib/sane/libsane-canon_pp.so.1
-%%IEEE1284%%lib/sane/libsane-canon_pp.so.1.0.28
+%%IEEE1284%%lib/sane/libsane-canon_pp.so.%%SOVERSION%%
 lib/sane/libsane-cardscan.so
 lib/sane/libsane-cardscan.so.1
-lib/sane/libsane-cardscan.so.1.0.28
+lib/sane/libsane-cardscan.so.%%SOVERSION%%
 lib/sane/libsane-coolscan.so
 lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-coolscan.so.1.0.28
+lib/sane/libsane-coolscan.so.%%SOVERSION%%
 lib/sane/libsane-coolscan2.so
 lib/sane/libsane-coolscan2.so.1
-lib/sane/libsane-coolscan2.so.1.0.28
+lib/sane/libsane-coolscan2.so.%%SOVERSION%%
 lib/sane/libsane-coolscan3.so
 lib/sane/libsane-coolscan3.so.1
-lib/sane/libsane-coolscan3.so.1.0.28
+lib/sane/libsane-coolscan3.so.%%SOVERSION%%
 lib/sane/libsane-dc210.so
 lib/sane/libsane-dc210.so.1
-lib/sane/libsane-dc210.so.1.0.28
+lib/sane/libsane-dc210.so.%%SOVERSION%%
 lib/sane/libsane-dc240.so
 lib/sane/libsane-dc240.so.1
-lib/sane/libsane-dc240.so.1.0.28
+lib/sane/libsane-dc240.so.%%SOVERSION%%
 lib/sane/libsane-dc25.so
 lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dc25.so.1.0.28
+lib/sane/libsane-dc25.so.%%SOVERSION%%
 lib/sane/libsane-dell1600n_net.so
 lib/sane/libsane-dell1600n_net.so.1
-lib/sane/libsane-dell1600n_net.so.1.0.28
+lib/sane/libsane-dell1600n_net.so.%%SOVERSION%%
 lib/sane/libsane-dll.so
 lib/sane/libsane-dll.so.1
-lib/sane/libsane-dll.so.1.0.28
+lib/sane/libsane-dll.so.%%SOVERSION%%
 lib/sane/libsane-dmc.so
 lib/sane/libsane-dmc.so.1
-lib/sane/libsane-dmc.so.1.0.28
+lib/sane/libsane-dmc.so.%%SOVERSION%%
 lib/sane/libsane-epjitsu.so
 lib/sane/libsane-epjitsu.so.1
-lib/sane/libsane-epjitsu.so.1.0.28
+lib/sane/libsane-epjitsu.so.%%SOVERSION%%
 lib/sane/libsane-epson.so
 lib/sane/libsane-epson.so.1
-lib/sane/libsane-epson.so.1.0.28
+lib/sane/libsane-epson.so.%%SOVERSION%%
 lib/sane/libsane-epson2.so
 lib/sane/libsane-epson2.so.1
-lib/sane/libsane-epson2.so.1.0.28
+lib/sane/libsane-epson2.so.%%SOVERSION%%
 lib/sane/libsane-epsonds.so
 lib/sane/libsane-epsonds.so.1
-lib/sane/libsane-epsonds.so.1.0.28
+lib/sane/libsane-epsonds.so.%%SOVERSION%%
+%%AVAHI%%lib/sane/libsane-escl.so
+%%AVAHI%%lib/sane/libsane-escl.so.1
+%%AVAHI%%lib/sane/libsane-escl.so.%%SOVERSION%%
 lib/sane/libsane-fujitsu.so
 lib/sane/libsane-fujitsu.so.1
-lib/sane/libsane-fujitsu.so.1.0.28
+lib/sane/libsane-fujitsu.so.%%SOVERSION%%
 lib/sane/libsane-genesys.so
 lib/sane/libsane-genesys.so.1
-lib/sane/libsane-genesys.so.1.0.28
+lib/sane/libsane-genesys.so.%%SOVERSION%%
 %%GPHOTO%%lib/sane/libsane-gphoto2.so
 %%GPHOTO%%lib/sane/libsane-gphoto2.so.1
-%%GPHOTO%%lib/sane/libsane-gphoto2.so.1.0.28
+%%GPHOTO%%lib/sane/libsane-gphoto2.so.%%SOVERSION%%
 lib/sane/libsane-gt68xx.so
 lib/sane/libsane-gt68xx.so.1
-lib/sane/libsane-gt68xx.so.1.0.28
+lib/sane/libsane-gt68xx.so.%%SOVERSION%%
 lib/sane/libsane-hp.so
 lib/sane/libsane-hp.so.1
-lib/sane/libsane-hp.so.1.0.28
+lib/sane/libsane-hp.so.%%SOVERSION%%
 lib/sane/libsane-hp3500.so
 lib/sane/libsane-hp3500.so.1
-lib/sane/libsane-hp3500.so.1.0.28
+lib/sane/libsane-hp3500.so.%%SOVERSION%%
 lib/sane/libsane-hp3900.so
 lib/sane/libsane-hp3900.so.1
-lib/sane/libsane-hp3900.so.1.0.28
+lib/sane/libsane-hp3900.so.%%SOVERSION%%
 lib/sane/libsane-hp4200.so
 lib/sane/libsane-hp4200.so.1
-lib/sane/libsane-hp4200.so.1.0.28
+lib/sane/libsane-hp4200.so.%%SOVERSION%%
 lib/sane/libsane-hp5400.so
 lib/sane/libsane-hp5400.so.1
-lib/sane/libsane-hp5400.so.1.0.28
+lib/sane/libsane-hp5400.so.%%SOVERSION%%
 lib/sane/libsane-hp5590.so
 lib/sane/libsane-hp5590.so.1
-lib/sane/libsane-hp5590.so.1.0.28
+lib/sane/libsane-hp5590.so.%%SOVERSION%%
 lib/sane/libsane-hpljm1005.so
 lib/sane/libsane-hpljm1005.so.1
-lib/sane/libsane-hpljm1005.so.1.0.28
+lib/sane/libsane-hpljm1005.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-hpsj5s.so
 %%IEEE1284%%lib/sane/libsane-hpsj5s.so.1
-%%IEEE1284%%lib/sane/libsane-hpsj5s.so.1.0.28
+%%IEEE1284%%lib/sane/libsane-hpsj5s.so.%%SOVERSION%%
 lib/sane/libsane-hs2p.so
 lib/sane/libsane-hs2p.so.1
-lib/sane/libsane-hs2p.so.1.0.28
+lib/sane/libsane-hs2p.so.%%SOVERSION%%
 lib/sane/libsane-ibm.so
 lib/sane/libsane-ibm.so.1
-lib/sane/libsane-ibm.so.1.0.28
+lib/sane/libsane-ibm.so.%%SOVERSION%%
 lib/sane/libsane-kodak.so
 lib/sane/libsane-kodak.so.1
-lib/sane/libsane-kodak.so.1.0.28
+lib/sane/libsane-kodak.so.%%SOVERSION%%
 lib/sane/libsane-kodakaio.so
 lib/sane/libsane-kodakaio.so.1
-lib/sane/libsane-kodakaio.so.1.0.28
+lib/sane/libsane-kodakaio.so.%%SOVERSION%%
 lib/sane/libsane-kvs1025.so
 lib/sane/libsane-kvs1025.so.1
-lib/sane/libsane-kvs1025.so.1.0.28
+lib/sane/libsane-kvs1025.so.%%SOVERSION%%
 lib/sane/libsane-kvs20xx.so
 lib/sane/libsane-kvs20xx.so.1
-lib/sane/libsane-kvs20xx.so.1.0.28
+lib/sane/libsane-kvs20xx.so.%%SOVERSION%%
 lib/sane/libsane-kvs40xx.so
 lib/sane/libsane-kvs40xx.so.1
-lib/sane/libsane-kvs40xx.so.1.0.28
+lib/sane/libsane-kvs40xx.so.%%SOVERSION%%
 lib/sane/libsane-leo.so
 lib/sane/libsane-leo.so.1
-lib/sane/libsane-leo.so.1.0.28
+lib/sane/libsane-leo.so.%%SOVERSION%%
 lib/sane/libsane-lexmark.so
 lib/sane/libsane-lexmark.so.1
-lib/sane/libsane-lexmark.so.1.0.28
+lib/sane/libsane-lexmark.so.%%SOVERSION%%
 lib/sane/libsane-ma1509.so
 lib/sane/libsane-ma1509.so.1
-lib/sane/libsane-ma1509.so.1.0.28
+lib/sane/libsane-ma1509.so.%%SOVERSION%%
 lib/sane/libsane-magicolor.so
 lib/sane/libsane-magicolor.so.1
-lib/sane/libsane-magicolor.so.1.0.28
+lib/sane/libsane-magicolor.so.%%SOVERSION%%
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-matsushita.so.1
-lib/sane/libsane-matsushita.so.1.0.28
+lib/sane/libsane-matsushita.so.%%SOVERSION%%
 lib/sane/libsane-microtek.so
 lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek.so.1.0.28
+lib/sane/libsane-microtek.so.%%SOVERSION%%
 lib/sane/libsane-microtek2.so
 lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-microtek2.so.1.0.28
+lib/sane/libsane-microtek2.so.%%SOVERSION%%
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek.so.1.0.28
+lib/sane/libsane-mustek.so.%%SOVERSION%%
 %%IEEE1284%%lib/sane/libsane-mustek_pp.so
 %%IEEE1284%%lib/sane/libsane-mustek_pp.so.1
-%%IEEE1284%%lib/sane/libsane-mustek_pp.so.1.0.28
+%%IEEE1284%%lib/sane/libsane-mustek_pp.so.%%SOVERSION%%
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
-lib/sane/libsane-mustek_usb.so.1.0.28
+lib/sane/libsane-mustek_usb.so.%%SOVERSION%%
 lib/sane/libsane-mustek_usb2.so
 lib/sane/libsane-mustek_usb2.so.1
-lib/sane/libsane-mustek_usb2.so.1.0.28
+lib/sane/libsane-mustek_usb2.so.%%SOVERSION%%
 lib/sane/libsane-nec.so
 lib/sane/libsane-nec.so.1
-lib/sane/libsane-nec.so.1.0.28
+lib/sane/libsane-nec.so.%%SOVERSION%%
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
-lib/sane/libsane-net.so.1.0.28
+lib/sane/libsane-net.so.%%SOVERSION%%
 lib/sane/libsane-niash.so
 lib/sane/libsane-niash.so.1
-lib/sane/libsane-niash.so.1.0.28
+lib/sane/libsane-niash.so.%%SOVERSION%%
 lib/sane/libsane-p5.so
 lib/sane/libsane-p5.so.1
-lib/sane/libsane-p5.so.1.0.28
+lib/sane/libsane-p5.so.%%SOVERSION%%
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
-lib/sane/libsane-pie.so.1.0.28
+lib/sane/libsane-pie.so.%%SOVERSION%%
 lib/sane/libsane-pieusb.so
 lib/sane/libsane-pieusb.so.1
-lib/sane/libsane-pieusb.so.1.0.28
+lib/sane/libsane-pieusb.so.%%SOVERSION%%
 lib/sane/libsane-pixma.so
 lib/sane/libsane-pixma.so.1
-lib/sane/libsane-pixma.so.1.0.28
+lib/sane/libsane-pixma.so.%%SOVERSION%%
 lib/sane/libsane-plustek.so
 lib/sane/libsane-plustek.so.1
-lib/sane/libsane-plustek.so.1.0.28
+lib/sane/libsane-plustek.so.%%SOVERSION%%
 lib/sane/libsane-plustek_pp.so
 lib/sane/libsane-plustek_pp.so.1
-lib/sane/libsane-plustek_pp.so.1.0.28
+lib/sane/libsane-plustek_pp.so.%%SOVERSION%%
 lib/sane/libsane-ricoh.so
 lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-ricoh.so.1.0.28
+lib/sane/libsane-ricoh.so.%%SOVERSION%%
 lib/sane/libsane-ricoh2.so
 lib/sane/libsane-ricoh2.so.1
-lib/sane/libsane-ricoh2.so.1.0.28
+lib/sane/libsane-ricoh2.so.%%SOVERSION%%
 lib/sane/libsane-rts8891.so
 lib/sane/libsane-rts8891.so.1
-lib/sane/libsane-rts8891.so.1.0.28
+lib/sane/libsane-rts8891.so.%%SOVERSION%%
 lib/sane/libsane-s9036.so
 lib/sane/libsane-s9036.so.1
-lib/sane/libsane-s9036.so.1.0.28
+lib/sane/libsane-s9036.so.%%SOVERSION%%
 lib/sane/libsane-sceptre.so
 lib/sane/libsane-sceptre.so.1
-lib/sane/libsane-sceptre.so.1.0.28
+lib/sane/libsane-sceptre.so.%%SOVERSION%%
 lib/sane/libsane-sharp.so
 lib/sane/libsane-sharp.so.1
-lib/sane/libsane-sharp.so.1.0.28
+lib/sane/libsane-sharp.so.%%SOVERSION%%
 lib/sane/libsane-sm3600.so
 lib/sane/libsane-sm3600.so.1
-lib/sane/libsane-sm3600.so.1.0.28
+lib/sane/libsane-sm3600.so.%%SOVERSION%%
 lib/sane/libsane-sm3840.so
 lib/sane/libsane-sm3840.so.1
-lib/sane/libsane-sm3840.so.1.0.28
+lib/sane/libsane-sm3840.so.%%SOVERSION%%
 lib/sane/libsane-snapscan.so
 lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-snapscan.so.1.0.28
+lib/sane/libsane-snapscan.so.%%SOVERSION%%
 lib/sane/libsane-sp15c.so
 lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-sp15c.so.1.0.28
+lib/sane/libsane-sp15c.so.%%SOVERSION%%
 lib/sane/libsane-st400.so
 lib/sane/libsane-st400.so.1
-lib/sane/libsane-st400.so.1.0.28
+lib/sane/libsane-st400.so.%%SOVERSION%%
 lib/sane/libsane-stv680.so
 lib/sane/libsane-stv680.so.1
-lib/sane/libsane-stv680.so.1.0.28
+lib/sane/libsane-stv680.so.%%SOVERSION%%
 lib/sane/libsane-tamarack.so
 lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-tamarack.so.1.0.28
+lib/sane/libsane-tamarack.so.%%SOVERSION%%
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco1.so.1
-lib/sane/libsane-teco1.so.1.0.28
+lib/sane/libsane-teco1.so.%%SOVERSION%%
 lib/sane/libsane-teco2.so
 lib/sane/libsane-teco2.so.1
-lib/sane/libsane-teco2.so.1.0.28
+lib/sane/libsane-teco2.so.%%SOVERSION%%
 lib/sane/libsane-teco3.so
 lib/sane/libsane-teco3.so.1
-lib/sane/libsane-teco3.so.1.0.28
+lib/sane/libsane-teco3.so.%%SOVERSION%%
 lib/sane/libsane-test.so
 lib/sane/libsane-test.so.1
-lib/sane/libsane-test.so.1.0.28
+lib/sane/libsane-test.so.%%SOVERSION%%
 lib/sane/libsane-u12.so
 lib/sane/libsane-u12.so.1
-lib/sane/libsane-u12.so.1.0.28
+lib/sane/libsane-u12.so.%%SOVERSION%%
 lib/sane/libsane-umax.so
 lib/sane/libsane-umax.so.1
-lib/sane/libsane-umax.so.1.0.28
+lib/sane/libsane-umax.so.%%SOVERSION%%
 lib/sane/libsane-umax1220u.so
 lib/sane/libsane-umax1220u.so.1
-lib/sane/libsane-umax1220u.so.1.0.28
+lib/sane/libsane-umax1220u.so.%%SOVERSION%%
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.1
-lib/sane/libsane-umax_pp.so.1.0.28
+lib/sane/libsane-umax_pp.so.%%SOVERSION%%
 %%V4L%%lib/sane/libsane-v4l.so
 %%V4L%%lib/sane/libsane-v4l.so.1
-%%V4L%%lib/sane/libsane-v4l.so.1.0.28
+%%V4L%%lib/sane/libsane-v4l.so.%%SOVERSION%%
 lib/sane/libsane-xerox_mfp.so
 lib/sane/libsane-xerox_mfp.so.1
-lib/sane/libsane-xerox_mfp.so.1.0.28
+lib/sane/libsane-xerox_mfp.so.%%SOVERSION%%
 libdata/pkgconfig/sane-backends.pc
 man/man1/gamma4scanimage.1.gz
 man/man1/sane-config.1.gz
@@ -381,6 +385,7 @@ man/man5/sane-epjitsu.5.gz
 man/man5/sane-epson.5.gz
 man/man5/sane-epson2.5.gz
 man/man5/sane-epsonds.5.gz
+%%AVAHI%%man/man5/sane-escl.5.gz
 man/man5/sane-fujitsu.5.gz
 man/man5/sane-genesys.5.gz
 %%GPHOTO%%man/man5/sane-gphoto2.5.gz
@@ -421,6 +426,7 @@ man/man5/sane-pixma.5.gz
 man/man5/sane-plustek.5.gz
 man/man5/sane-plustek_pp.5.gz
 man/man5/sane-ricoh.5.gz
+man/man5/sane-ricoh2.5.gz
 man/man5/sane-rts8891.5.gz
 man/man5/sane-s9036.5.gz
 man/man5/sane-sceptre.5.gz
@@ -449,6 +455,35 @@ man/man8/saned.8.gz
 sbin/saned
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.0
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.10
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.11
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.12
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.13
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.14
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.15
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.16
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.17
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.18
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.19
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.2
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.20
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.21
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.22
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.23
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.24
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.25
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.27
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.28
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.3
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.4
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.5
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.6
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.7
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.8
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLogs/ChangeLog-1.0.9
+ at comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS

More information about the svn-ports-all mailing list