Date: Mon, 18 Jun 2012 14:09:37 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r772 - in branches/experimental: Mk www/libxul www/libxul19 Message-ID: <201206181409.q5IE9b5F055887@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Jun 18 14:09:37 2012
New Revision: 772
Log:
--enable-javaxpcom obsolete since 2011/04/08 (bug#648593)
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul19/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:59:30 2012 (r771)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 14:09:37 2012 (r772)
@@ -554,7 +554,6 @@
_USE_GECKO_OPTIONS_DEFAULT= dbus debug logging optimized_cflags
-JAVA_DESC?= Enable JAVA xpcom
LOGGING_DESC?= Enable additional log messages
SMB?= Enable smb:// URI support using gnomevfs
@@ -698,14 +697,6 @@
MOZ_OPTIONS+= --disable-debug
.endif
-.if ${PORT_OPTIONS:MJAVA} && defined(_WITH_JAVA)
-USE_JAVA= yes
-JAVA_VERSION+= 1.5+
-JAVA_OS+= native
-CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}"
-MOZ_OPTIONS+= --enable-javaxpcom
-.endif
-
.if ${PORT_OPTIONS:MLOGGING}
MOZ_OPTIONS+= --enable-logging
.else
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Mon Jun 18 13:59:30 2012 (r771)
+++ branches/experimental/www/libxul/Makefile Mon Jun 18 14:09:37 2012 (r772)
@@ -38,12 +38,10 @@
PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --disable-javaxpcom \
--disable-updater \
--disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS= # Empty, used for generic gecko OPTIONS
-USE_GECKO_OPTIONS=+java
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
USE_MOZILLA= -nss -dbm
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Mon Jun 18 13:59:30 2012 (r771)
+++ branches/experimental/www/libxul19/Makefile Mon Jun 18 14:09:37 2012 (r772)
@@ -34,19 +34,20 @@
PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --disable-javaxpcom \
--disable-ipc \
--disable-updater \
--disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS= # Empty, used for generic gecko OPTIONS
-USE_GECKO_OPTIONS=+java
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
USE_MOZILLA= -nss -dbm -event -ffi -vpx
MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \
mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
+OPTIONS_DEFINE= JAVA
+JAVA_DESC= Enable JAVA xpcom
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 700000
@@ -65,6 +66,16 @@
.endif
.endif
+.if ${PORT_OPTIONS:MJAVA} && defined(_WITH_JAVA)
+USE_JAVA= yes
+JAVA_VERSION+= 1.5+
+JAVA_OS+= native
+CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}"
+MOZ_OPTIONS+= --enable-javaxpcom
+.else
+MOZ_OPTIONS+= --disable-javaxpcom
+.endif
+
post-patch:
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
${WRKSRC}/storage/build/Makefile.in \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206181409.q5IE9b5F055887>