Date: Wed, 3 Aug 2011 22:48:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r605 - branches/experimental/Mk trunk/Mk Message-ID: <201108032248.p73MmmoL001367@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Aug 3 22:48:48 2011
New Revision: 605
Log:
sync bsd.gecko.mk with ports
Modified:
branches/experimental/Mk/bsd.gecko.mk
trunk/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Wed Aug 3 20:53:16 2011 (r604)
+++ branches/experimental/Mk/bsd.gecko.mk Wed Aug 3 22:48:48 2011 (r605)
@@ -4,7 +4,7 @@
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.28 2011/06/21 21:12:30 flo Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.33 2011/08/03 22:33:41 flo Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -181,7 +181,7 @@
# is given by the maintainer via the port or by the
# user via defined variable try to find the highest
# stable installed version.
-# Available values: yes 50+ 36+ 35+ 50 36 35
+# Available values: yes 50+ 36+ 50 36
# NOTE:
# default value 50 is used in case of USE_FIREFOX=yes
#
@@ -223,11 +223,10 @@
.endif
_FIREFOX_DEFAULT_VERSION= 50
-_FIREFOX_VERSIONS= 50 36 35
-_FIREFOX_RANGE_VERSIONS= 50+ 36+ 35+
+_FIREFOX_VERSIONS= 50 36
+_FIREFOX_RANGE_VERSIONS= 50+ 36+
-# For specifying [36, 35, ..]+
-_FIREFOX_35P= 35 ${_FIREFOX_36P}
+# For specifying [36, ..]+
_FIREFOX_36P= 36 ${_FIREFOX_50P}
_FIREFOX_50P= 50
@@ -275,7 +274,6 @@
# Dependence lines for different Firefox versions
50_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
-35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
# Add dependencies
.if defined(USE_FIREFOX)
@@ -692,7 +690,7 @@
.if defined(WITH_JAVA) && defined(_WITH_JAVA)
USE_JAVA= yes
-JAVA_VERSION+= 1.4+
+JAVA_VERSION+= 1.5+
JAVA_OS+= native
CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}"
MOZ_OPTIONS+= --enable-javaxpcom
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Wed Aug 3 20:53:16 2011 (r604)
+++ trunk/Mk/bsd.gecko.mk Wed Aug 3 22:48:48 2011 (r605)
@@ -4,7 +4,7 @@
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.28 2011/06/21 21:12:30 flo Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.33 2011/08/03 22:33:41 flo Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -14,7 +14,7 @@
# WITH_GECKO= libxul
#
# The valid backends are:
-# libxul seamonkey
+# libxul
#
# See below for more details.
# ======================= /USERS ================================
@@ -36,8 +36,9 @@
# Users should use the following syntax:
#
-# WITH_GECKO= libxul seamonkey
-# Use libxul whenever a port supports it, falling back on seamonkey.
+# WITH_GECKO= libxul libxul-devel
+# Use libxul whenever a port supports it, falling back on libxul-devel.
+# Note: libxul-devel does not exist at the moment!
# WITH_GECKO= libxul
# Sets your preferred backend. With this example, libxul will always
# be chosen, unless the port doesn't support a libxul backend. In that
@@ -47,19 +48,21 @@
#
# Ports should use the following:
#
-# USE_GECKO= libxul seamonkey
+# USE_GECKO= libxul libxul-devel
# The list of gecko backends that the port supports. Unless the user
# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO
# will be the default. In the above example, www/libxul will be used
-# as a gecko backend unless WITH_GECKO=seamonkey is defined by the user.
+# as a gecko backend unless WITH_GECKO=libxul-devel is defined by the
+# user. Note: libxul-devel does not exist at the moment!
#
# USE_GECKO= libxul-devel<->libxul
# This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure
# if ${GECKO}=="libxul-devel"
#
# Example:
-# USE_GECKO= libxul seamonkey
-#
+# USE_GECKO= libxul libxul-devel
+# Note: libxul-devel does not exist at the moment!
+#
# post-patch:
# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
# ${MOZSRC}/configure
@@ -68,15 +71,16 @@
# has been chosen.
#
# Example:
-# USE_GECKO= libxul seamonkey
+# USE_GECKO= libxul libxul-devel
+# Note: libxul-devel does not exist at the moment!
#
# post-patch:
-# .if ${GECKO}=="seamonkey"
-# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \
+# .if ${GECKO}=="libxul-devel"
+# @${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \
# ${MOZSRC}/configure
# .endif
-_GECKO_ALL= seamonkey libxul
+_GECKO_ALL= libxul
libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so
@@ -177,7 +181,7 @@
# is given by the maintainer via the port or by the
# user via defined variable try to find the highest
# stable installed version.
-# Available values: yes 50+ 36+ 35+ 50 36 35
+# Available values: yes 50+ 36+ 50 36
# NOTE:
# default value 50 is used in case of USE_FIREFOX=yes
#
@@ -188,9 +192,9 @@
# version is given by the maintainer via the port
# or by the user via defined variable try to find
# the highest stable installed version.
-# Available values: yes 11+ 20+ 11 20
+# Available values: yes 22+ 20+ 22 20
# NOTE:
-# default value 20 is used in case of USE_SEAMONKEY=yes
+# default value 22 is used in case of USE_SEAMONKEY=yes
#
# USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey.
# Available values: see USE_SEAMONKEY
@@ -219,11 +223,10 @@
.endif
_FIREFOX_DEFAULT_VERSION= 50
-_FIREFOX_VERSIONS= 50 36 35
-_FIREFOX_RANGE_VERSIONS= 50+ 36+ 35+
+_FIREFOX_VERSIONS= 50 36
+_FIREFOX_RANGE_VERSIONS= 50+ 36+
-# For specifying [36, 35, ..]+
-_FIREFOX_35P= 35 ${_FIREFOX_36P}
+# For specifying [36, ..]+
_FIREFOX_36P= 36 ${_FIREFOX_50P}
_FIREFOX_50P= 50
@@ -271,7 +274,6 @@
# Dependence lines for different Firefox versions
50_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
-35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
# Add dependencies
.if defined(USE_FIREFOX)
@@ -293,12 +295,12 @@
_SEAMONKEY_BUILD_DEPENDS= yes
.endif
-_SEAMONKEY_DEFAULT_VERSION= 20
-_SEAMONKEY_VERSIONS= 11 20
-_SEAMONKEY_RANGE_VERSIONS= 11+ 20+
+_SEAMONKEY_DEFAULT_VERSION= 22
+_SEAMONKEY_VERSIONS= 22 20
+_SEAMONKEY_RANGE_VERSIONS= 22+ 20+
-# For specifying [20, 11, ..]+
-_SEAMONKEY_11P= 11 ${_SEAMONKEY_20P}
+# For specifying [22, 20, ..]+
+_SEAMONKEY_22P= 22 ${_SEAMONKEY_20P}
_SEAMONKEY_20P= 20
# Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
@@ -688,7 +690,7 @@
.if defined(WITH_JAVA) && defined(_WITH_JAVA)
USE_JAVA= yes
-JAVA_VERSION+= 1.4+
+JAVA_VERSION+= 1.5+
JAVA_OS+= native
CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}"
MOZ_OPTIONS+= --enable-javaxpcom
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108032248.p73MmmoL001367>