ports/65716: Update port: graphics/sane-frontends to 1.0.12

[KATO Tsuguru]

>Number:         65716
>Category:       ports
>Synopsis:       Update port: graphics/sane-frontends to 1.0.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 18 06:40:09 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.12

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/sane-frontends/Makefile graphics/sane-frontends/Makefile
--- /usr/ports/graphics/sane-frontends/Makefile	Wed Feb  4 18:59:45 2004
+++ graphics/sane-frontends/Makefile	Sun Apr 18 08:59:16 2004
@@ -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 @@
 
 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 -urN /usr/ports/graphics/sane-frontends/distinfo graphics/sane-frontends/distinfo
--- /usr/ports/graphics/sane-frontends/distinfo	Thu Jan 29 20:26:44 2004
+++ graphics/sane-frontends/distinfo	Sun Apr 18 08:42:48 2004
@@ -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 -urN /usr/ports/graphics/sane-frontends/pkg-message graphics/sane-frontends/pkg-message
--- /usr/ports/graphics/sane-frontends/pkg-message	Tue Jul  3 22:17:59 2001
+++ graphics/sane-frontends/pkg-message	Sun Apr 18 11:30:23 2004
@@ -3,9 +3,10 @@
 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 -urN /usr/ports/graphics/sane-frontends/pkg-plist graphics/sane-frontends/pkg-plist
--- /usr/ports/graphics/sane-frontends/pkg-plist	Sun Feb 10 08:28:47 2002
+++ graphics/sane-frontends/pkg-plist	Sun Apr 18 08:56:08 2004
@@ -2,4 +2,4 @@
 bin/xcam
 bin/xscanimage
 share/sane/sane-style.rc
- at dirrm share/sane
+ at unexec rmdir %D/share/sane 2>/dev/null || true
>Release-Note:
>Audit-Trail:
>Unformatted: