Update to version 1.0.15

PR:		ports/73732
Submitted by:	Ports Fury

5 files changed, 23 insertions, 25 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index c0ccb7668619..89d8747655e9 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sane-backends
-PORTVERSION=	1.0.14
-PORTREVISION=	1
+PORTVERSION=	1.0.15
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
@@ -23,7 +22,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_GNOME=	gnometarget lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS} \
diff --git a/graphics/sane-backends/Makefile.man b/graphics/sane-backends/Makefile.man
index 8866e514ee1c..aba23719e1e6 100644
--- a/graphics/sane-backends/Makefile.man
+++ b/graphics/sane-backends/Makefile.man
@@ -1,7 +1,6 @@
 MAN1+=	gamma4scanimage.1
 MAN1+=	sane-config.1
 MAN1+=	sane-find-scanner.1
-MAN1+=	saned.1
 MAN1+=	scanimage.1
 MAN5+=	sane-abaton.5
 MAN5+=	sane-agfafocus.5
@@ -66,3 +65,4 @@ MAN5+=	sane-umax_pp.5
 MAN5+=	sane-usb.5
 MAN5+=	sane-v4l.5
 MAN7+=	sane.7
+MAN8+=	saned.8
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index cc1652735efd..6c37707cb314 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,2 +1,2 @@
-MD5 (sane-backends-1.0.14.tar.gz) = 7ae5bf91aea34ef7956df6f53cf073bd
-SIZE (sane-backends-1.0.14.tar.gz) = 3198777
+MD5 (sane-backends-1.0.15.tar.gz) = 3b804f35cdfbc5ad2d201ffe078bbac9
+SIZE (sane-backends-1.0.15.tar.gz) = 3231759
diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in
index f26db2c24ddf..7c91d2acfe09 100644
--- a/graphics/sane-backends/files/patch-doc_Makefile.in
+++ b/graphics/sane-backends/files/patch-doc_Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Thu May  1 08:12:55 2003
-+++ doc/Makefile.in	Thu Jul 24 12:48:33 2003
+--- doc/Makefile.in.orig	Wed Aug  4 01:22:28 2004
++++ doc/Makefile.in	Tue Nov  9 12:19:47 2004
 @@ -25,7 +25,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -9,16 +9,16 @@
  
  MKDIR = $(top_srcdir)/mkinstalldirs
  INSTALL = @INSTALL@
-@@ -54,7 +54,7 @@
- 	  sane-ma1509.5 sane-ibm.5 sane-hp5400.5
+@@ -56,7 +56,7 @@
  SECT7   = sane.7
- MANPAGES = $(SECT1) $(SECT5) $(SECT7)
+ SECT8	= saned.8
+ MANPAGES = $(SECT1) $(SECT5) $(SECT7) $(SECT8)
 -READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \
 +READMES = README AUTHORS ChangeLog LICENSE NEWS PROBLEMS \
            PROJECTS README README.aix README.beos README.darwin README.freebsd \
+ 	  README.djpeg \
            README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
-           README.solaris README.unixware2 README.unixware7 TODO
-@@ -77,7 +77,7 @@
+@@ -78,7 +78,7 @@
  ifeq (@USE_LATEX@,no)
  STANDARD =
  else
@@ -27,15 +27,15 @@
  endif
  
  SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external
-@@ -133,6 +133,7 @@
- 	  echo installing $${page} in $(mandir)/man7/$${page}...; \
- 	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man7/$${page} || exit 1; \
+@@ -139,6 +139,7 @@
+ 	  echo installing $${page} in $(mandir)/man8/$${page}...; \
+ 	  $(INSTALL_DATA) $${page} $(DESTDIR)$(mandir)/man8/$${page} || exit 1; \
  	done
 +ifndef NOPORTDOCS
  	$(MKDIR) $(DESTDIR)$(docdir)
  	@for readme in $(READMES); do \
  	  echo installing $${readme} in $(docdir)/$${readme}...; \
-@@ -149,10 +150,11 @@
+@@ -155,10 +156,11 @@
  	    fi \
  	  done \
  	done
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 871df3e8d1bc..7aeea099bc91 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -31,7 +31,6 @@ etc/sane.d/matsushita.conf
 etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
-etc/sane.d/mustek_pp.conf
 etc/sane.d/mustek_usb.conf
 etc/sane.d/nec.conf
 etc/sane.d/net.conf
@@ -150,9 +149,6 @@ lib/sane/libsane-microtek2.so.1
 lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.so
 lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek_pp.a
-lib/sane/libsane-mustek_pp.so
-lib/sane/libsane-mustek_pp.so.1
 lib/sane/libsane-mustek_usb.a
 lib/sane/libsane-mustek_usb.so
 lib/sane/libsane-mustek_usb.so.1
@@ -162,6 +158,9 @@ lib/sane/libsane-nec.so.1
 lib/sane/libsane-net.a
 lib/sane/libsane-net.so
 lib/sane/libsane-net.so.1
+lib/sane/libsane-niash.a
+lib/sane/libsane-niash.so
+lib/sane/libsane-niash.so.1
 lib/sane/libsane-pie.a
 lib/sane/libsane-pie.so
 lib/sane/libsane-pie.so.1
@@ -247,25 +246,23 @@ sbin/saned
 %%PORTDOCS%%%%DOCSDIR%%/canon/canon.changes
 %%PORTDOCS%%%%DOCSDIR%%/canon/canon.install2700F.txt
 %%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/gt68xx/gt68xx.TODO
 %%PORTDOCS%%%%DOCSDIR%%/leo/leo.txt
 %%PORTDOCS%%%%DOCSDIR%%/matsushita/matsushita.txt
 %%PORTDOCS%%%%DOCSDIR%%/mustek/mustek.CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/mustek_usb/mustek_usb.CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/mustek_usb/mustek_usb.TODO
-%%PORTDOCS%%%%DOCSDIR%%/plustek/BUILD
+%%PORTDOCS%%%%DOCSDIR%%/niash/niash.TODO
 %%PORTDOCS%%%%DOCSDIR%%/plustek/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/plustek/MakeModule.sh
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Makefile.kernel24
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Makefile.kernel26
-%%PORTDOCS%%%%DOCSDIR%%/plustek/Makefile.module
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-PARPORT-TODO.txt
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-PARPORT.changes
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-PARPORT.txt
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-USB-TODO.txt
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-USB.changes
 %%PORTDOCS%%%%DOCSDIR%%/plustek/Plustek-USB.txt
-%%PORTDOCS%%%%DOCSDIR%%/plustek/VERSION0
-%%PORTDOCS%%%%DOCSDIR%%/plustek/VERSION1
 %%PORTDOCS%%%%DOCSDIR%%/sane-backends-external.html
 %%PORTDOCS%%%%DOCSDIR%%/sane-backends.html
 %%PORTDOCS%%%%DOCSDIR%%/sane-mfgs-external.html
@@ -308,6 +305,7 @@ sbin/saned
 %%NLS%%share/locale/da/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/de/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sane-backends.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sane-backends.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sane-backends.mo
@@ -324,6 +322,7 @@ sbin/saned
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/teco
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/sceptre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/plustek
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/niash
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/mustek_usb
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/mustek
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/matsushita