diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-02-01 15:05:20 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-02-01 15:05:20 +0000 |
| commit | 1fa156d341b835c3142ff3a4506d892b9030b88d (patch) | |
| tree | 947be570462ef1e7ca1dad4f70c922af28eb7420 | |
| parent | aa7be5bb5a4f0558943c337b8637f73486db2ec1 (diff) | |
graphics/sane-frontends: Remove GTK1 option
x11-toolkits/gtk12 is gone since r488008.
Convert to options helpers too while here.
Notes
Notes:
svn path=/head/; revision=491823
| -rw-r--r-- | graphics/sane-frontends/Makefile | 27 | ||||
| -rw-r--r-- | graphics/sane-frontends/files/pkg-message.in | 1 |
2 files changed, 8 insertions, 20 deletions
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 60d453e7b5f8..17f2cfc4b6e5 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -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> diff --git a/graphics/sane-frontends/files/pkg-message.in b/graphics/sane-frontends/files/pkg-message.in index d27a55c8ee62..82c6b1796900 100644 --- a/graphics/sane-frontends/files/pkg-message.in +++ b/graphics/sane-frontends/files/pkg-message.in @@ -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. |