svn commit: r491823 - in head/graphics/sane-frontends: . files

[Tobias Kortkamp]

Author: tobik
Date: Fri Feb  1 15:05:20 2019
New Revision: 491823
URL: https://svnweb.freebsd.org/changeset/ports/491823

Log:
  graphics/sane-frontends: Remove GTK1 option
  
  x11-toolkits/gtk12 is gone since r488008.
  
  Convert to options helpers too while here.

Modified:
  head/graphics/sane-frontends/Makefile
  head/graphics/sane-frontends/files/pkg-message.in

Modified: head/graphics/sane-frontends/Makefile
==============================================================================
--- head/graphics/sane-frontends/Makefile	Fri Feb  1 14:57:36 2019	(r491822)
+++ head/graphics/sane-frontends/Makefile	Fri Feb  1 15:05:20 2019	(r491823)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sane-frontends
 PORTVERSION=	1.0.14
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/1140/ \
 		ftp://ftp2.sane-project.org/pub/sane/
@@ -15,7 +15,9 @@ LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libsane.so:graphics/sane-backends
 
-USES=		gmake pkgconfig
+USES=		gmake gnome pkgconfig
+USE_GNOME=	gtk20
+
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -23,24 +25,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GTK1 GIMP
-GTK1_DESC=	GTK1 support (Default is GTK2)
+OPTIONS_DEFINE=	GIMP
+
 GIMP_DESC=	also build xscanimage as a GIMP plug-in
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK1}
-USE_GNOME+=	gtk12
-CONFIGURE_ARGS+=	--disable-gtk2
-CONFIGURE_ARGS+=	--disable-gimp
-.else
-USE_GNOME+=	gtk20
-.if ${PORT_OPTIONS:MGIMP}
-LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
-CONFIGURE_ARGS+=	--enable-gimp
-.else
-CONFIGURE_ARGS+=	--disable-gimp
-.endif
-.endif
+GIMP_CONFIGURE_ENABLE=	gimp
+GIMP_LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 
 .include <bsd.port.mk>

Modified: head/graphics/sane-frontends/files/pkg-message.in
==============================================================================
--- head/graphics/sane-frontends/files/pkg-message.in	Fri Feb  1 14:57:36 2019	(r491822)
+++ head/graphics/sane-frontends/files/pkg-message.in	Fri Feb  1 15:05:20 2019	(r491823)
@@ -4,7 +4,6 @@ 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 %%PREFIX%%/bin/xscanimage ~/.gimp-2.0/plug-ins/xscanimage (gimp-2.x)
-ln -sf %%PREFIX%%/bin/xscanimage ~/.gimp-1.2/plug-ins/xscanimage (gimp-1.x)
 
 Then run the GIMP, and a new "xscanimage" menu item should appear in the
 "File->Acquire" menu.  Use this to access your scanner.