4 files changed, 21 insertions, 16 deletions

diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 0c0cee770f67..112ba9463924 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sane-frontends
-PORTVERSION=	1.0.11
-PORTREVISION=	1
+PORTVERSION=	1.0.12
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/%SUBDIR%/ \
 		ftp://ftp.de.mostang.com/pub/sane/%SUBDIR%/ \
@@ -19,26 +18,31 @@ COMMENT=	Tools for access to scanners, digitals camera, frame grabbers etc
 
 LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends
 
+USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		scanadf.1 xcam.1 xscanimage.1
 
+.if defined(WITH_GTK1)
+USE_GNOME+=	gtk12
+CONFIGURE_ARGS+=	--disable-gtk2
 .if defined(WITH_GIMP)
 LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp1
-CONFIGURE_ARGS+=	--enable-gimp
+CONFIGURE_ARGS+=	--enable-gimp12
 .else
 CONFIGURE_ARGS+=	--disable-gimp
 .endif
-
-.if defined(WITH_GTK2)
-.undef WITH_GIMP
-USE_GNOME=	gtk20
 .else
-USE_GNOME=	gtk12
-CONFIGURE_ARGS=	--disable-gtk2
+USE_GNOME+=	gtk20
+.if defined(WITH_GIMP)
+LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp
+CONFIGURE_ARGS+=	--enable-gimp
+.else
+CONFIGURE_ARGS+=	--disable-gimp
+.endif
 .endif
 
 pre-everything::
diff --git a/graphics/sane-frontends/distinfo b/graphics/sane-frontends/distinfo
index cefbf995e84d..97d10abbd97a 100644
--- a/graphics/sane-frontends/distinfo
+++ b/graphics/sane-frontends/distinfo
@@ -1,2 +1,2 @@
-MD5 (sane-frontends-1.0.11.tar.gz) = 59b143e12c926726db16983d288aa1a1
-SIZE (sane-frontends-1.0.11.tar.gz) = 184844
+MD5 (sane-frontends-1.0.12.tar.gz) = 6a6166428491b268f5ebe03f16d1bc1f
+SIZE (sane-frontends-1.0.12.tar.gz) = 202872
diff --git a/graphics/sane-frontends/pkg-message b/graphics/sane-frontends/pkg-message
index 061daa48e274..90708a10a88e 100644
--- a/graphics/sane-frontends/pkg-message
+++ b/graphics/sane-frontends/pkg-message
@@ -3,9 +3,10 @@ Congratulations, SANE-FRONTENDS is now installed.
 If you built it with WITH_GIMP set to yes, you can use
 xscanimage as a GIMP plug-in.  To do this, type:
 
-ln -sf /usr/local/bin/xscanimage ~/.gimp-1.2/plug-ins/xscanimage
+ln -sf /usr/local/bin/xscanimage ~/.gimp-2.0/plug-ins/xscanimage (gimp-2.x)
+ln -sf /usr/local/bin/xscanimage ~/.gimp-1.2/plug-ins/xscanimage (gimp-1.x)
 
-Then run the GIMP, and a new "Acquire Image" menu item should appear in the
-"Xtns" menu.  Use this to access your scanner.
+Then run the GIMP, and a new "xscanimage" menu item should appear in the
+"File->Acquire" menu.  Use this to access your scanner.
 
 Have fun!
diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist
index e4aed551633e..8e12e9929fcc 100644
--- a/graphics/sane-frontends/pkg-plist
+++ b/graphics/sane-frontends/pkg-plist
@@ -2,4 +2,4 @@ bin/scanadf
 bin/xcam
 bin/xscanimage
 share/sane/sane-style.rc
-@dirrm share/sane
+@unexec rmdir %D/share/sane 2>/dev/null || true