Update to version 0.6

PR: 20425
Submitted by: Ports Fury

3 files changed, 37 insertions, 40 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index a8c686f36469..477d20de96b7 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xsane
-PORTVERSION=	0.56
+PORTVERSION=	0.60
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.wolfsburg.de/~rauch/sane/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -24,24 +24,15 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-
-MAN1=		xsane.1
-
+USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}"
-
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-intl-patch
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 300000
-CONFIGURE_ENV+=	LIBS="-Wl,--rpath -Wl,${LOCALBASE}/lib/sane -L${LOCALBASE}/lib"
-.else
-CONFIGURE_ENV+=	LIBS="-Wl,--rpath -Wl,${LOCALBASE}/lib/sane -L${LOCALBASE}/lib -lcam"
-.endif
+MAN1=		xsane.1
 
 post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
index bc8ada255792..daa80fdcf195 100644
--- a/graphics/xsane/distinfo
+++ b/graphics/xsane/distinfo
@@ -1 +1 @@
-MD5 (xsane-0.56.tar.gz) = cb9973d04c2c086a80e427cd63324b04
+MD5 (xsane-0.60.tar.gz) = 7a8b9faa712db553af15ef30012f37a7
diff --git a/graphics/xsane/pkg-plist b/graphics/xsane/pkg-plist
index 81fa12d91f80..912289c99297 100644
--- a/graphics/xsane/pkg-plist
+++ b/graphics/xsane/pkg-plist
@@ -2,29 +2,7 @@ bin/xsane
 share/locale/cs/LC_MESSAGES/xsane.mo
 share/locale/de/LC_MESSAGES/xsane.mo
 share/locale/fr/LC_MESSAGES/xsane.mo
-share/sane/xsane/xsane-style.rc
-share/sane/xsane-logo.xpm
-share/sane/sane-backends-doc.html
-share/sane/sane-pnm-doc.html
-share/sane/sane-pnm16-doc.html
-share/sane/sane-problems-doc.html
-share/sane/sane-scantips-doc.html
-share/sane/sane-xsane-advanced-doc.html
-share/sane/sane-xsane-copy-doc.html
-share/sane/sane-xsane-doc.html
-share/sane/sane-xsane-enhancement-doc.html
-share/sane/sane-xsane-fax-doc.html
-share/sane/sane-xsane-gimp-doc.html
-share/sane/sane-xsane-histogram-doc.html
-share/sane/sane-xsane-main-doc.html
-share/sane/sane-xsane-output-formats-doc.html
-share/sane/sane-xsane-preview-doc.html
-share/sane/sane-xsane-scan-doc.html
-share/sane/sane-xsane-setup-copy-doc.html
-share/sane/sane-xsane-setup-display-doc.html
-share/sane/sane-xsane-setup-fax-doc.html
-share/sane/sane-xsane-setup-save-doc.html
-share/sane/sane-xsane-standard-doc.html
+share/locale/sv/LC_MESSAGES/xsane.mo
 share/sane/autoenhance.jpg
 share/sane/brightness.jpg
 share/sane/contrast.jpg
@@ -33,22 +11,45 @@ share/sane/gamma.jpg
 share/sane/negative.jpg
 share/sane/restore.jpg
 share/sane/rgb-default.jpg
+share/sane/sane-backends-doc.html
 share/sane/sane-logo.jpg
 share/sane/sane-logo2.jpg
+share/sane/sane-pnm-doc.html
+share/sane/sane-pnm16-doc.html
+share/sane/sane-problems-doc.html
+share/sane/sane-scantips-doc.html
+share/sane/sane-xsane-advanced-doc.html
 share/sane/sane-xsane-advanced.jpg
+share/sane/sane-xsane-copy-doc.html
 share/sane/sane-xsane-copy.jpg
+share/sane/sane-xsane-doc.html
+share/sane/sane-xsane-enhancement-doc.html
+share/sane/sane-xsane-fax-doc.html
 share/sane/sane-xsane-fax-project.jpg
 share/sane/sane-xsane-fax.jpg
+share/sane/sane-xsane-gimp-doc.html
 share/sane/sane-xsane-gimp.jpg
+share/sane/sane-xsane-histogram-doc.html
 share/sane/sane-xsane-histogram.jpg
+share/sane/sane-xsane-main-doc.html
+share/sane/sane-xsane-output-formats-doc.html
 share/sane/sane-xsane-pipette-black.jpg
 share/sane/sane-xsane-pipette-gray.jpg
 share/sane/sane-xsane-pipette-white.jpg
+share/sane/sane-xsane-preview-doc.html
 share/sane/sane-xsane-preview.jpg
+share/sane/sane-xsane-scan-doc.html
+share/sane/sane-xsane-setup-copy-doc.html
 share/sane/sane-xsane-setup-copy.jpg
+share/sane/sane-xsane-setup-device-doc.html
+share/sane/sane-xsane-setup-device.jpg
+share/sane/sane-xsane-setup-display-doc.html
 share/sane/sane-xsane-setup-display.jpg
+share/sane/sane-xsane-setup-fax-doc.html
 share/sane/sane-xsane-setup-fax.jpg
+share/sane/sane-xsane-setup-save-doc.html
 share/sane/sane-xsane-setup-save.jpg
+share/sane/sane-xsane-standard-doc.html
 share/sane/sane-xsane-standard.jpg
 share/sane/sane-xsane-visible-area.jpg
 share/sane/sane-xsane-zoom-in.jpg
@@ -57,7 +58,12 @@ share/sane/sane-xsane-zoom-out.jpg
 share/sane/sane-xsane-zoom-undo.jpg
 share/sane/sane-xsane.jpg
 share/sane/store.jpg
+share/sane/threshold.jpg
+share/sane/xsane/xsane-calibration.pnm
+share/sane/xsane/xsane-startimage.pnm
+share/sane/xsane/xsane-style.rc
 share/sane/xsane-logo.jpg
+share/sane/xsane-logo.xpm
 share/sane/xsane-logo2.jpg
 @dirrm share/sane/xsane
 @dirrm share/sane