From owner-svn-ports-all@FreeBSD.ORG  Sat Feb 23 14:18:11 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 386E65B7;
 Sat, 23 Feb 2013 14:18:11 +0000 (UTC)
 (envelope-from pawel@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 13EFCF0F;
 Sat, 23 Feb 2013 14:18:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1NEIAmw026729;
 Sat, 23 Feb 2013 14:18:10 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1NEIA6h026728;
 Sat, 23 Feb 2013 14:18:10 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201302231418.r1NEIA6h026728@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sat, 23 Feb 2013 14:18:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312818 - head/x11-toolkits/swt-devel
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Feb 2013 14:18:11 -0000

Author: pawel
Date: Sat Feb 23 14:18:10 2013
New Revision: 312818
URL: http://svnweb.freebsd.org/changeset/ports/312818

Log:
  - Fix build when MOZILLA=on
  - Convert to OptionsNG
  
  PR:		ports/175937
  Submitted by:	myself
  Approved by:	maintainer timeout

Modified:
  head/x11-toolkits/swt-devel/Makefile

Modified: head/x11-toolkits/swt-devel/Makefile
==============================================================================
--- head/x11-toolkits/swt-devel/Makefile	Sat Feb 23 14:15:53 2013	(r312817)
+++ head/x11-toolkits/swt-devel/Makefile	Sat Feb 23 14:18:10 2013	(r312818)
@@ -39,26 +39,28 @@ PLIST_FILES=	%%JAVAJARDIR%%/${OUTPUT_JAR
 
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	CAIRO "Cairo Support" on \
-		GNOMEVFS "Gnome VFS Support" on \
-		MOZILLA "Gecko Browser Support" off
+OPTIONS_DEFINE=	CAIRO GNOMEVFS MOZILLA
+GNOMEVFS_DESC=	Gnome VFS support
+MOZILLA_DESC=	Gecko browser support
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=CAIRO GNOMEVFS
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CAIRO)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+.if ${PORT_OPTIONS:MCAIRO}
+LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
 PLIST_FILES+=	lib/libswt-cairo-gtk-%%BUILD%%.so
 MAKE_CAIRO=	make_cairo
 .endif
 
-.if defined(WITH_GNOMEVFS)
+.if ${PORT_OPTIONS:MGNOMEVFS}
 USE_GNOME+=	gnomevfs2 libgnome libgnomeui
 PLIST_FILES+=	lib/libswt-gnome-gtk-%%BUILD%%.so
 MAKE_GNOME=	make_gnome
 .endif
 
-.if defined(WITH_MOZILLA)
-USE_MOZILLA=	libxul
+.if ${PORT_OPTIONS:MMOZILLA}
+USE_GECKO=	libxul19
 PLIST_FILES+=	lib/libswt-xulrunner-gtk-%%BUILD%%.so
 MAKE_MOZILLA=	make_xulrunner
 .endif
@@ -76,6 +78,8 @@ DIST_EXT=	gtk-linux-ppc64
 DIST_EXT=	gtk-linux-x86
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 .if ${OSVERSION} > 900044
 	@(cd ${WRKSRC} && /usr/bin/unzip -qo *.zip)