[SVN-Commit] r733 - branches/experimental/Mk

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Jun  8 14:13:10 2012
New Revision: 733

Log:
convert to bsd.gecko.mk to optionsNG

Modified:
   branches/experimental/Mk/bsd.gecko.mk

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Jun  8 14:12:50 2012	(r732)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Jun  8 14:13:10 2012	(r733)
@@ -561,18 +561,11 @@
 USE_GECKO_OPTIONS=	dbus debug logging optimized_cflags
 .endif
 
-dbus_OPTION=	"Enable D-BUS support" on
-debug_OPTION=	"Build a debugging image" off
-java_OPTION=	"Enable JAVA xpcom" off
-logging_OPTION=	"Enable additional log messages" off
-optimized_cflags_OPTION=	"Enable some additional optimizations" off
-
-.for option in ${USE_GECKO_OPTIONS:L}
-.if ${_USE_GECKO_OPTIONS_ALL:M${option}}!=""
-OPTIONS+=	${option:U} ${${option}_OPTION}
-_${option}=	${TRUE}
-.endif
-.endfor
+JAVA_DESC?=		Enable JAVA xpcom
+LOGGING_DESC?=	Enable additional log messages
+
+OPTIONS_DEFINE+= ${USE_GECKO_OPTIONS:U}
+OPTIONS_DEFAULT+=DBUS
 
 # Standard depends
 _ALL_DEPENDS=	cairo dbm event ffi jpeg nspr nss png sqlite vpx zip
@@ -676,7 +669,7 @@
 MOZ_MK_OPTIONS+=	XP_UNIX=1		\
 			PERL=${PERL}
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MOZ_OPTIONS+=	--enable-optimize=${WITH_OPTIMIZE}
 CFLAGS:=	${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS}
 WITH_OPTIMIZE?=	-O2
@@ -685,14 +678,14 @@
 CFLAGS:=	${CFLAGS} ${EXTRA_CFLAGS}
 .endif
 
-.if defined(WITH_DBUS)
+.if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 				notify.4:${PORTSDIR}/devel/libnotify
 .else
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .endif
 
-.if defined(WITH_SMB)
+.if ${PORT_OPTIONS:MSMB}
 USE_GNOME+=		gnomevfs2
 MOZ_OPTIONS+=	--enable-gnomevfs
 .else
@@ -705,14 +698,14 @@
 MOZ_OPTIONS+=	--enable-strip --enable-install-strip
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 MOZ_OPTIONS+=	--enable-debug
 WITH_LOGGING=	yes
 .else
 MOZ_OPTIONS+=	--disable-debug
 .endif
 
-.if defined(WITH_JAVA) && defined(_WITH_JAVA)
+.if ${PORT_OPTIONS:MJAVA} && defined(_WITH_JAVA)
 USE_JAVA=	yes
 JAVA_VERSION+=	1.5+
 JAVA_OS+=	native
@@ -720,7 +713,7 @@
 MOZ_OPTIONS+=	--enable-javaxpcom
 .endif
 
-.if defined(WITH_LOGGING)
+.if ${PORT_OPTIONS:MLOGGING}
 MOZ_OPTIONS+=	--enable-logging
 .else
 MOZ_OPTIONS+=	--disable-logging