svn commit: r312818 - head/x11-toolkits/swt-devel

[Pawel Pekala]

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)