From owner-svn-ports-head@FreeBSD.ORG  Sun Jan  6 14:33:14 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8EE10115;
 Sun,  6 Jan 2013 14:33:14 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 68229234;
 Sun,  6 Jan 2013 14:33:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06EXESD075528;
 Sun, 6 Jan 2013 14:33:14 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06EXEjc075527;
 Sun, 6 Jan 2013 14:33:14 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201301061433.r06EXEjc075527@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 6 Jan 2013 14:33:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309990 - head/graphics/xsane
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jan 2013 14:33:14 -0000

Author: bapt
Date: Sun Jan  6 14:33:13 2013
New Revision: 309990
URL: http://svnweb.freebsd.org/changeset/ports/309990

Log:
  Convert to new options framework
  Remove gtk12 support

Modified:
  head/graphics/xsane/Makefile

Modified: head/graphics/xsane/Makefile
==============================================================================
--- head/graphics/xsane/Makefile	Sun Jan  6 14:26:52 2013	(r309989)
+++ head/graphics/xsane/Makefile	Sun Jan  6 14:33:13 2013	(r309990)
@@ -12,14 +12,15 @@ MASTER_SITES=	http://www.xsane.org/downl
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gtk-based X11 frontend for SANE (Scanner Access Now Easy)
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		sane.1:${PORTSDIR}/graphics/sane-backends
+		tiff:${PORTSDIR}/graphics/tiff \
+		sane:${PORTSDIR}/graphics/sane-backends
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
+USE_GNOME=	gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -27,13 +28,12 @@ MAN1=		xsane.1
 
 #SUB_FILES+=	pkg-message
 
-OPTIONS=	GTK2 "Enable GTK2 support (use GTK1 if turned off)" on \
-		GIMP "Enable GIMP plugin support" off \
-		NLS "Enable Native Language Support" on
+OPTIONS_DEFINE=	GIMP NLS
+GIMP_DESC=	GIMP plugin support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .else
@@ -42,21 +42,9 @@ PLIST_SUB+=	NLS=""
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -lintl"
 .endif
 
-.if defined(WITHOUT_GTK2)
-USE_GNOME=	gtk12
-CONFIGURE_ARGS+=	--disable-gtk2
-.else
-USE_GNOME=	gtk20
-.endif
-
-.if defined(WITH_GIMP)
+.if ${PORT_OPTIONS:MGIMP}
 SUB_FILES+=	pkg-message
-.if defined(WITHOUT_GTK2)
-LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp1
-CONFIGURE_ARGS+=	--disable-gimp2
-.else
 LIB_DEPENDS+=	gimp:${PORTSDIR}/graphics/gimp-app
-.endif # WITHOUT_GTK2
 .else
 CONFIGURE_ARGS+=	--disable-gimp
 .endif
@@ -66,8 +54,8 @@ pre-patch:
 		-i "" -e 's|\$$(DESTDIR)\$$(sbindir)||g'
 
 post-install:
-.if defined(WITH_GIMP)
+.if ${PORT_OPTIONS:MGIMP}
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>