5 files changed, 38 insertions, 180 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 50ddfcf49d3d..ea97cddadadb 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -2,63 +2,61 @@
 # $FreeBSD$
 
 PORTNAME=	xsane
-PORTVERSION=	0.998
-PORTREVISION=	3
+PORTVERSION=	0.999
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.xsane.org/download/ \
-		http://gd.tuwien.ac.at/hci/sane/xsane/ \
-		ftp://ftp.mostang.com/pub/sane/xsane/
+MASTER_SITES=	http://www.xsane.org/download/
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Gtk-based X11 frontend for SANE (Scanner Access Now Easy)
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		tiff:${PORTSDIR}/graphics/tiff
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		liblcms.so:${PORTSDIR}/graphics/lcms
 BUILD_DEPENDS=	scanimage:${PORTSDIR}/graphics/sane-backends
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
+USE_GNOME=	gtk20 gdkpixbuf2
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		pkgconfig
 
-MAN1=		xsane.1
+PORTDOCS=	*.html *.jpg
 
-OPTIONS_DEFINE=	GIMP NLS
+OPTIONS_DEFINE=	DOCS GIMP NLS
 GIMP_DESC=	GIMP plugin support
+OPTIONS_DEFAULT=	GIMP
+
+OPTIONS_SUB=	yes
+
+GIMP_RUN_DEPENDS=	${LOCALBASE}/bin/gimp:${PORTSDIR}/graphics/gimp-app
+GIMP_CONFIGURE_ENABLE=	gimp2 gimp
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl"
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGIMP}
 SUB_FILES+=	pkg-message
-LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp-app
-CONFIGURE_ARGS+=--enable-gimp2
-.else
-CONFIGURE_ARGS+=--disable-gimp
 .endif
 
-pre-patch:
-	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} \
-		-i "" -e 's|\$$(DESTDIR)\$$(sbindir)||g'
+post-patch:
+	@${REINPLACE_CMD} -e 's| $$(DESTDIR)$$(sbindir)||' \
+		-e 's|$$(DESTDIR)$$(xsanedocdir)||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|@POSUB@ doc|@POSUB@|' ${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MGIMP}
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-.endif
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.man ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}.1
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
index 019925ed5e76..47e0deec2f34 100644
--- a/graphics/xsane/distinfo
+++ b/graphics/xsane/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xsane-0.998.tar.gz) = a32e2f8057782a29619f082dcf6b5f944bf12abe3d4121c516f7c9589064c26e
-SIZE (xsane-0.998.tar.gz) = 2950560
+SHA256 (xsane-0.999.tar.gz) = 5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
+SIZE (xsane-0.999.tar.gz) = 2950621
diff --git a/graphics/xsane/files/pkg-message.in b/graphics/xsane/files/pkg-message.in
index f6b35d87037e..21a7a2609564 100644
--- a/graphics/xsane/files/pkg-message.in
+++ b/graphics/xsane/files/pkg-message.in
@@ -7,7 +7,7 @@ To install XSane as a GIMP plug-in, please type:
     ln -sf %%LOCALBASE%%/bin/xsane ~/.gimp-*/plug-ins/xsane
 
 Then run the GIMP, and a new "XSane" menu item should appear in the
-"File->Acquire" menu. Use this to access your scanner.
+"File -> Acquire" menu. Use this to access your scanner.
 
 Have fun!
 
diff --git a/graphics/xsane/pkg-descr b/graphics/xsane/pkg-descr
index dab8b879ae0b..85d15e8abefa 100644
--- a/graphics/xsane/pkg-descr
+++ b/graphics/xsane/pkg-descr
@@ -1,4 +1,4 @@
-XSANE is a gtk based X11 frontend for SANE (Scanner Access Now Easy). It
-works either standalone or as a GIMP plugin.
+XSANE is a gtk based X11 frontend for SANE (Scanner Access Now Easy).
+It works either standalone or as a GIMP plugin.
 
 WWW: http://www.xsane.org/
diff --git a/graphics/xsane/pkg-plist b/graphics/xsane/pkg-plist
index 39d149893348..9ee904158e90 100644
--- a/graphics/xsane/pkg-plist
+++ b/graphics/xsane/pkg-plist
@@ -1,4 +1,6 @@
 bin/xsane
+man/man1/xsane.1.gz
+share/applications/xsane.desktop
 %%NLS%%share/locale/ca/LC_MESSAGES/xsane.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xsane.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xsane.mo
@@ -24,151 +26,10 @@ bin/xsane
 %%NLS%%share/locale/vi/LC_MESSAGES/xsane.mo
 %%NLS%%share/locale/zh/LC_MESSAGES/xsane.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xsane.mo
-share/applications/xsane.desktop
 share/pixmaps/xsane.xpm
 share/sane/xsane/Mustek-logo.xpm
 share/sane/xsane/Plustek-logo.xpm
 share/sane/xsane/UMAX-logo.xpm
-share/sane/xsane/doc/sane-backends-doc.html
-share/sane/xsane/doc/sane-pnm-doc.html
-share/sane/xsane/doc/sane-problems-doc.html
-share/sane/xsane/doc/sane-scantips-doc.html
-share/sane/xsane/doc/sane-xsane-advanced-doc.html
-share/sane/xsane/doc/sane-xsane-batch-scan-doc.html
-share/sane/xsane/doc/sane-xsane-color-correction-doc.html
-share/sane/xsane/doc/sane-xsane-color-management-doc.html
-share/sane/xsane/doc/sane-xsane-copy-doc.html
-share/sane/xsane/doc/sane-xsane-doc.html
-share/sane/xsane/doc/sane-xsane-empty-doc.html
-share/sane/xsane/doc/sane-xsane-fax-doc.html
-share/sane/xsane/doc/sane-xsane-gimp-doc.html
-share/sane/xsane/doc/sane-xsane-histogram-doc.html
-share/sane/xsane/doc/sane-xsane-medium-definition-doc.html
-share/sane/xsane/doc/sane-xsane-preview-doc.html
-share/sane/xsane/doc/sane-xsane-save-doc.html
-share/sane/xsane/doc/sane-xsane-setup-color-management-doc.html
-share/sane/xsane/doc/sane-xsane-setup-copy-doc.html
-share/sane/xsane/doc/sane-xsane-setup-display-doc.html
-share/sane/xsane/doc/sane-xsane-setup-enhancement-doc.html
-share/sane/xsane/doc/sane-xsane-setup-fax-doc.html
-share/sane/xsane/doc/sane-xsane-setup-save-doc.html
-share/sane/xsane/doc/sane-xsane-standard-doc.html
-share/sane/xsane/doc/sane-xsane-viewer-doc.html
-share/sane/xsane/doc/xsane-advanced.jpg
-share/sane/xsane/doc/xsane-aspect-ratio.jpg
-share/sane/xsane/doc/xsane-autoenhance.jpg
-share/sane/xsane/doc/xsane-autoraise_scanarea.jpg
-share/sane/xsane/doc/xsane-autoselect.jpg
-share/sane/xsane/doc/xsane-batch-scan-add.jpg
-share/sane/xsane/doc/xsane-batch-scan-delete.jpg
-share/sane/xsane/doc/xsane-batch-scan.jpg
-share/sane/xsane/doc/xsane-blur.jpg
-share/sane/xsane/doc/xsane-brightness.jpg
-share/sane/xsane/doc/xsane-clone.jpg
-share/sane/xsane/doc/xsane-cms-function.jpg
-share/sane/xsane/doc/xsane-color-correction-rgb-default.jpg
-share/sane/xsane/doc/xsane-color-management-main-window.jpg
-share/sane/xsane/doc/xsane-colormode.jpg
-share/sane/xsane/doc/xsane-contrast.jpg
-share/sane/xsane/doc/xsane-copy.jpg
-share/sane/xsane/doc/xsane-default.jpg
-share/sane/xsane/doc/xsane-delete-preview-cache.jpg
-share/sane/xsane/doc/xsane-despeckle.jpg
-share/sane/xsane/doc/xsane-disk.jpg
-share/sane/xsane/doc/xsane-edit-medium.jpg
-share/sane/xsane/doc/xsane-enable-color-management.jpg
-share/sane/xsane/doc/xsane-fax-project.jpg
-share/sane/xsane/doc/xsane-fax.jpg
-share/sane/xsane/doc/xsane-gamma.jpg
-share/sane/xsane/doc/xsane-gimp.jpg
-share/sane/xsane/doc/xsane-histogram.jpg
-share/sane/xsane/doc/xsane-logo.jpg
-share/sane/xsane/doc/xsane-medium.jpg
-share/sane/xsane/doc/xsane-medium-add.jpg
-share/sane/xsane/doc/xsane-mirror-x.jpg
-share/sane/xsane/doc/xsane-mirror-y.jpg
-share/sane/xsane/doc/xsane-negative.jpg
-share/sane/xsane/doc/xsane-new.jpg
-share/sane/xsane/doc/xsane-ocr.jpg
-share/sane/xsane/doc/xsane-open.jpg
-share/sane/xsane/doc/xsane-paper-landscape-bottom-left.jpg
-share/sane/xsane/doc/xsane-paper-landscape-bottom-right.jpg
-share/sane/xsane/doc/xsane-paper-landscape-center.jpg
-share/sane/xsane/doc/xsane-paper-landscape-top-left.jpg
-share/sane/xsane/doc/xsane-paper-landscape-top-right.jpg
-share/sane/xsane/doc/xsane-paper-portrait-bottom-left.jpg
-share/sane/xsane/doc/xsane-paper-portrait-bottom-right.jpg
-share/sane/xsane/doc/xsane-paper-portrait-center.jpg
-share/sane/xsane/doc/xsane-paper-portrait-top-left.jpg
-share/sane/xsane/doc/xsane-paper-portrait-top-right.jpg
-share/sane/xsane/doc/xsane-pipette-black.jpg
-share/sane/xsane/doc/xsane-pipette-gray.jpg
-share/sane/xsane/doc/xsane-pipette-white.jpg
-share/sane/xsane/doc/xsane-preferences.jpg
-share/sane/xsane/doc/xsane-preset-area.jpg
-share/sane/xsane/doc/xsane-preset-area-context-menu.jpg
-share/sane/xsane/doc/xsane-preview.jpg
-share/sane/xsane/doc/xsane-printer.jpg
-share/sane/xsane/doc/xsane-rename.jpg
-share/sane/xsane/doc/xsane-resolution.jpg
-share/sane/xsane/doc/xsane-restore.jpg
-share/sane/xsane/doc/xsane-rgb-default.jpg
-share/sane/xsane/doc/xsane-rgb-values.jpg
-share/sane/xsane/doc/xsane-rotate-180.jpg
-share/sane/xsane/doc/xsane-rotate-270.jpg
-share/sane/xsane/doc/xsane-rotate-90.jpg
-share/sane/xsane/doc/xsane-rotation.jpg
-share/sane/xsane/doc/xsane-save.jpg
-share/sane/xsane/doc/xsane-save2.jpg
-share/sane/xsane/doc/xsane-scale.jpg
-share/sane/xsane/doc/xsane-scansource.jpg
-share/sane/xsane/doc/xsane-setup-copy.jpg
-share/sane/xsane/doc/xsane-setup-display.jpg
-share/sane/xsane/doc/xsane-setup-color-management.jpg
-share/sane/xsane/doc/xsane-setup-enhancement.jpg
-share/sane/xsane/doc/xsane-setup-fax.jpg
-share/sane/xsane/doc/xsane-setup-ocr.jpg
-share/sane/xsane/doc/xsane-setup-save.jpg
-share/sane/xsane/doc/xsane-standard.jpg
-share/sane/xsane/doc/xsane-store.jpg
-share/sane/xsane/doc/xsane-threshold.jpg
-share/sane/xsane/doc/xsane-viewer-window.jpg
-share/sane/xsane/doc/xsane-viewer.jpg
-share/sane/xsane/doc/xsane-visible-area.jpg
-share/sane/xsane/doc/xsane-zoom-in.jpg
-share/sane/xsane/doc/xsane-zoom-not.jpg
-share/sane/xsane/doc/xsane-zoom-out.jpg
-share/sane/xsane/doc/xsane-zoom-undo.jpg
-share/sane/xsane/doc/xsane-zoom.jpg
-share/sane/xsane/doc/sane-xsane-email-doc.html
-share/sane/xsane/doc/xsane-adf-pages.jpg
-share/sane/xsane/doc/sane-xsane-guide-doc.html
-share/sane/xsane/doc/sane-xsane-multipage-doc.html
-share/sane/xsane/doc/sane-xsane-scan-options-doc.html
-share/sane/xsane/doc/sane-xsane-setup-email-doc.html
-share/sane/xsane/doc/sane-xsane-setup-filetype-doc.html
-share/sane/xsane/doc/xsane-color-correction.jpg
-share/sane/xsane/doc/xsane-copy-number.jpg
-share/sane/xsane/doc/xsane-email-project.jpg
-share/sane/xsane/doc/xsane-email.jpg
-share/sane/xsane/doc/xsane-guide-1-decoration.jpg
-share/sane/xsane/doc/xsane-guide-10-scan.jpg
-share/sane/xsane/doc/xsane-guide-2-menu.jpg
-share/sane/xsane/doc/xsane-guide-3-options.jpg
-share/sane/xsane/doc/xsane-guide-4.jpg
-share/sane/xsane/doc/xsane-guide-4a-adf-pages.jpg
-share/sane/xsane/doc/xsane-guide-4b-xsane-mode.jpg
-share/sane/xsane/doc/xsane-guide-5-saving-options.jpg
-share/sane/xsane/doc/xsane-guide-6-scan-options.jpg
-share/sane/xsane/doc/xsane-guide-7-medium-selection.jpg
-share/sane/xsane/doc/xsane-guide-8-resolution.jpg
-share/sane/xsane/doc/xsane-guide-9-color-correction.jpg
-share/sane/xsane/doc/xsane-multipage-project.jpg
-share/sane/xsane/doc/xsane-multipage.jpg
-share/sane/xsane/doc/xsane-setup-email.jpg
-share/sane/xsane/doc/xsane-setup-filetype.jpg
-share/sane/xsane/doc/xsane-step.jpg
-share/sane/xsane/doc/xsane-target.jpg
 share/sane/xsane/sane-epson-logo.xpm
 share/sane/xsane/sane-hp-logo.xpm
 share/sane/xsane/sane-umax-logo.xpm
@@ -179,7 +40,6 @@ share/sane/xsane/xsane-gpl.txt
 share/sane/xsane/xsane-logo.xpm
 share/sane/xsane/xsane-startimage.pnm
 share/sane/xsane/xsane-style.rc
-@dirrm share/sane/xsane/doc
 @dirrm share/sane/xsane
-@dirrmtry share/applications
 @dirrmtry share/sane
+@dirrmtry share/applications