[SVN-Commit] r734 - in branches/experimental: Mk www/kompozer www/libxul

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Fri Jun  8 14:13:46 2012
New Revision: 734

Log:
make USE_GECKO_OPTIONS similar to USE_MOZILLA

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/kompozer/Makefile
   branches/experimental/www/libxul/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Jun  8 14:13:10 2012	(r733)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Jun  8 14:13:46 2012	(r734)
@@ -555,18 +555,23 @@
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv
 
-_USE_GECKO_OPTIONS_ALL=	java dbus debug logging optimized_cflags
-
-.if !defined(USE_GECKO_OPTIONS)
-USE_GECKO_OPTIONS=	dbus debug logging optimized_cflags
-.endif
+_USE_GECKO_OPTIONS_DEFAULT=	dbus debug logging optimized_cflags
 
 JAVA_DESC?=		Enable JAVA xpcom
 LOGGING_DESC?=	Enable additional log messages
 
-OPTIONS_DEFINE+= ${USE_GECKO_OPTIONS:U}
 OPTIONS_DEFAULT+=DBUS
 
+.for use in ${USE_GECKO_OPTIONS}
+${use:S/-/_WITHOUT_/}=	${TRUE}
+.endfor
+
+.for dep in ${_USE_GECKO_OPTIONS_DEFAULT} ${USE_GECKO_OPTIONS:M+*:S/+//}
+.if !defined(_WITHOUT_${dep})
+OPTIONS_DEFINE+= ${dep:U}
+.endif
+.endfor
+
 # Standard depends
 _ALL_DEPENDS=	cairo dbm event ffi jpeg nspr nss png sqlite vpx zip
 

Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile	Fri Jun  8 14:13:10 2012	(r733)
+++ branches/experimental/www/kompozer/Makefile	Fri Jun  8 14:13:46 2012	(r734)
@@ -25,7 +25,7 @@
 MAKEFILE=	client.mk
 ALL_TARGET=	build_all
 USE_MOZILLA=	-event -ffi -sqlite -vpx
-USE_GECKO_OPTIONS=debug logging optimized_cflags
+USE_GECKO_OPTIONS=-dbus
 MOZ_EXTENSIONS=	wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 				--enable-application=composer \

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Fri Jun  8 14:13:10 2012	(r733)
+++ branches/experimental/www/libxul/Makefile	Fri Jun  8 14:13:46 2012	(r734)
@@ -43,7 +43,7 @@
 		--disable-necko-wifi
 MOZ_EXTENSIONS=	default,cookie,permissions
 OPTIONS=	# Empty, used for generic gecko OPTIONS
-USE_GECKO_OPTIONS=	java debug logging optimized_cflags
+USE_GECKO_OPTIONS=+java
 USE_GECKO=	gecko
 MOZILLA_EXEC_NAME=xulrunner
 MOZ_TOOLKIT=	cairo-gtk2