2 files changed, 36 insertions, 27 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 443d59ed61c3..0ef246ad15c3 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xsane
 PORTVERSION=	0.991
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -25,19 +25,28 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_GETTEXT=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		xsane.1
 
 #SUB_FILES+=	pkg-message
 
 OPTIONS=	GTK2 "Enable GTK2 support (use GTK1 if turned off)" on \
-		GIMP "Enable GIMP plugin support" off
+		GIMP "Enable GIMP plugin support" off \
+		NLS "Enable Native Language Support" on
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl"
+.endif
+
 .if defined(WITHOUT_GTK2)
 USE_GNOME=	gtk12
 CONFIGURE_ARGS+=	--disable-gtk2
@@ -51,7 +60,7 @@ SUB_FILES+=	pkg-message
 LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp1
 CONFIGURE_ARGS+=	--disable-gimp2
 .else
-LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp
+LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp-app
 .endif # WITHOUT_GTK2
 .else
 CONFIGURE_ARGS+=	--disable-gimp
@@ -63,7 +72,7 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS:C/-O[0-9]*//g}"
 
 pre-patch:
 	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} \
-		-i "" -e 's|\$$(sbindir)||g'
+		-i "" -e 's|\$$(DESTDIR)\$$(sbindir)||g'
 
 post-install:
 .if defined(WITH_GIMP)
diff --git a/graphics/xsane/pkg-plist b/graphics/xsane/pkg-plist
index 65f6b4494652..d7d6045cf9bf 100644
--- a/graphics/xsane/pkg-plist
+++ b/graphics/xsane/pkg-plist
@@ -1,25 +1,25 @@
 bin/xsane
-share/locale/cs/LC_MESSAGES/xsane.mo
-share/locale/da/LC_MESSAGES/xsane.mo
-share/locale/de/LC_MESSAGES/xsane.mo
-share/locale/es/LC_MESSAGES/xsane.mo
-share/locale/fr/LC_MESSAGES/xsane.mo
-share/locale/hu/LC_MESSAGES/xsane.mo
-share/locale/it/LC_MESSAGES/xsane.mo
-share/locale/ja/LC_MESSAGES/xsane.mo
-share/locale/nl/LC_MESSAGES/xsane.mo
-share/locale/pl/LC_MESSAGES/xsane.mo
-share/locale/pt/LC_MESSAGES/xsane.mo
-share/locale/pt_BR/LC_MESSAGES/xsane.mo
-share/locale/ro/LC_MESSAGES/xsane.mo
-share/locale/ru/LC_MESSAGES/xsane.mo
-share/locale/sk/LC_MESSAGES/xsane.mo
-share/locale/sl/LC_MESSAGES/xsane.mo
-share/locale/sr/LC_MESSAGES/xsane.mo
-share/locale/sv/LC_MESSAGES/xsane.mo
-share/locale/tr/LC_MESSAGES/xsane.mo
-share/locale/vi/LC_MESSAGES/xsane.mo
-share/locale/zh/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xsane.mo
+%%NLS%%share/locale/zh/LC_MESSAGES/xsane.mo
 share/sane/xsane/Mustek-logo.xpm
 share/sane/xsane/Plustek-logo.xpm
 share/sane/xsane/UMAX-logo.xpm