Date: Mon, 29 Nov 2010 15:05:57 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r445 - branches/experimental/Mk Message-ID: <201011291505.oATF5v2X094637@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Mon Nov 29 15:05:56 2010
New Revision: 445
Log:
- Update USE_FIREFOX section to the current Firefox layout
- Add USE_SEAMONKEY and related options to bsd.gecko.mk
- Add USE_THUNDERBIRD and related options to bsd.gecko.mk
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sun Nov 28 14:36:38 2010 (r444)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Nov 29 15:05:56 2010 (r445)
@@ -14,7 +14,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 36+ 35+ 30+ 36 35 30
+# Available values: yes 36+ 35+ 36 35
# NOTE:
# default value 36 is used in case of USE_FIREFOX=yes
#
@@ -23,13 +23,55 @@
#
# INVALID_FIREFOX_VER - This variable contains a list of Firefox versions
# not supported by the port. This setting is effective
-# only when USE_FIREFOX is set to a range (e.g. 30+)
+# only when USE_FIREFOX is set to a range (e.g. 35+)
#
# WITH_FIREFOX_VER - User defined global variable to set Firefox version
# This variable is effective only if USE_FIREFOX is
-# set to a range (e.g. 30+) and WITH_FIREFOX_VER
+# set to a range (e.g. 35+) and WITH_FIREFOX_VER
# points inside that range.
# NOTE: INVALID_FIREFOX_VER takes precedence
+#
+# USE_SEAMONKEY - Add runtime dependency on SeaMonkey. If no
+# 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
+# NOTE:
+# default value 20 is used in case of USE_SEAMONKEY=yes
+#
+# USE_SEAMONKEY_BUILD - Add buildtime dependency on SeaMonkey.
+# Available values: see USE_SEAMONKEY
+#
+# INVALID_SEAMONKEY_VER - This variable contains a list of SeaMonkey versions
+# not supported by the port. This setting is effective
+# only when USE_SEAMONKEY is set to a range (e.g. 11+)
+#
+# WITH_SEAMONKEY_VER - User defined global variable to set SeaMonkey version
+# This variable is effective only if USE_SEAMONKEY is
+# set to a range (e.g. 11+) and WITH_SEAMONKEY_VER
+# points inside that range.
+# NOTE: INVALID_SEAMONKEY_VER takes precedence
+#
+# USE_THUNDERBIRD - Add runtime dependency on Thunderbird. If no
+# 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 31+ 30+ 31 30
+# NOTE:
+# default value 31 is used in case of USE_THUNDERBIRD=yes
+#
+# USE_THUNDERBIRD_BUILD - Add buildtime dependency on Thunderbird.
+# Available values: see USE_THUNDERBIRD
+#
+# INVALID_THUNDERBIRD_VER - This variable contains a list of Thunderbird versions
+# not supported by the port. This setting is effective
+# only when USE_THUNDERBIRD is set to a range (e.g. 30+)
+#
+# WITH_THUNDERBIRD_VER - User defined global variable to set Thunderbird version
+# This variable is effective only if USE_THUNDERBIRD is
+# set to a range (e.g. 30+) and WITH_THUNDERBIRD_VER
+# points inside that range.
+# NOTE: INVALID_THUNDERBIRD_VER takes precedence
#
# Firefox part
@@ -45,11 +87,10 @@
.endif
_FIREFOX_DEFAULT_VERSION= 36
-_FIREFOX_VERSIONS= 36 35 30
-_FIREFOX_RANGE_VERSIONS= 36+ 35+ 30+
+_FIREFOX_VERSIONS= 36 35
+_FIREFOX_RANGE_VERSIONS= 36+ 35+
# For specifying [36, 35, ..]+
-_FIREFOX_30P= 30 ${_FIREFOX_35P}
_FIREFOX_35P= 35 ${_FIREFOX_36P}
_FIREFOX_36P= 36
@@ -89,7 +130,9 @@
.endif
# Setting/finding Firefox version we want.
-.if exists(${LOCALBASE}/bin/firefox3)
+.if exists(${LOCALBASE}/bin/firefox)
+_FIREFOX_VER!= ${LOCALBASE}/bin/firefox --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/firefox3)
_FIREFOX_VER!= ${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
.endif
@@ -102,7 +145,6 @@
# Dependence lines for different Firefox versions
36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox
35_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
-30_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox3
# Add dependencies
.if defined(USE_FIREFOX)
@@ -114,6 +156,168 @@
.endif
.endif # defined(USE_FIREFOX)
+#
+# SeaMonkey part
+#
+.if defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD)
+
+# Process USE_SEAMONKEY_BUILD
+.if !defined(USE_SEAMONKEY)
+.if defined(USE_SEAMONKEY_BUILD)
+USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD}
+_SEAMONKEY_BUILD_DEPENDS= yes
+.endif
+.endif
+
+_SEAMONKEY_DEFAULT_VERSION= 20
+_SEAMONKEY_VERSIONS= 11 20
+_SEAMONKEY_RANGE_VERSIONS= 11+ 20+
+
+# For specifying [20, 11, ..]+
+_SEAMONKEY_11P= 11 ${_SEAMONKEY_20P}
+_SEAMONKEY_20P= 20
+
+# Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given
+.if ${USE_SEAMONKEY} == "yes"
+USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION}
+.endif
+
+.if !defined(_SEAMONKEY_${USE_SEAMONKEY}P)
+IGNORE:= cannot install: unknown SeaMonkey version: seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/}
+.endif
+
+# Check if we have user-defined WITH_SEAMONKEY_VER and if it matches
+# the range specified in port's USE_SEAMONKEY
+.if defined(WITH_SEAMONKEY_VER)
+.for ver in ${_SEAMONKEY_RANGE_VERSIONS}
+.if ${USE_SEAMONKEY} == "${ver}"
+_MATCHED_SEAMONKEY_VER:= ${USE_SEAMONKEY:S/+//}
+.for seamonkey in ${_SEAMONKEYL_${_MATCHED_SEAMONKEY_VER}P}
+.if ${WITH_SEAMONKEY_VER} == ${seamonkey}
+# Check if user supplied WITH_SEAMONKEY is in the INVALID_SEAMONKEY_VER list
+_BRKSEAMONKEY= no
+.for iver in ${INVALID_SEAMONKEY_VER}
+.if ${WITH_SEAMONKEY_VER} == ${iver}
+_BRKSEAMONKEY= yes
+.endif
+.endfor
+# If WITH_SEAMONKEY is not in the INVALID_SEAMONKEY_VER list, use it
+# otherwise take default from port
+.if ${_BRKSEAMONKEY} == "no"
+USE_SEAMONKEY= ${WITH_SEAMONKEY_VER}
+.endif
+.endif
+.endfor
+.endif
+.endfor
+.endif
+
+# Setting/finding SeaMonkey version we want.
+.if exists(${LOCALBASE}/bin/seamonkey)
+_FIREFOX_VER!= ${LOCALBASE}/bin/seamonkey --version | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.endif
+
+.if defined(_SEAMONKEY_VER)
+.if ${_SEAMONKEY_VER} != ${USE_SEAMONKEY}
+IGNORE= cannot install: SeaMonkey versions mismatch: seamonkey-${_SEAMONKEY_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is seamonkey-${USE_SEAMONKEY:C/([0-9])([0-9])/\1.\2/}
+.endif
+.endif
+
+# Dependence lines for different SeaMonkey versions
+11_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+20_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2
+
+# Add dependencies
+.if defined(USE_SEAMONKEY)
+.if defined(_SEAMONKEY_BUILD_DEPENDS)
+BUILD_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS}
+.else
+RUN_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS}
+.endif
+.endif
+
+.endif # defined(USE_SEAMONKEY)
+#
+# Thunderbird part
+#
+.if defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD)
+
+# Process USE_THUNDERBIRD_BUILD
+.if !defined(USE_THUNDERBIRD)
+.if defined(USE_THUNDERBIRD_BUILD)
+USE_THUNDERBIRD:= ${USE_THUNDERBIRD_BUILD}
+_THUNDERBIRD_BUILD_DEPENDS= yes
+.endif
+.endif
+
+_THUNDERBIRD_DEFAULT_VERSION= 31
+_THUNDERBIRD_VERSIONS= 31 30
+_THUNDERBIRD_FIREFOX_RANGE_VERSIONS= 31+ 30+
+
+# For specifying [31, 30, ..]+
+_FIREFOX_30P= 30 ${_THUNDERBIRD_31P}
+_FIREFOX_31P= 31
+
+# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
+.if ${USE_THUNDERBIRD} == "yes"
+USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION}
+.endif
+
+.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD}P)
+IGNORE:= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
+.endif
+
+# Check if we have user-defined WITH_THUNDERBIRD_VER and if it matches
+# the range specified in port's USE_THUNDERBIRD
+.if defined(WITH_THUNDERBIRD_VER)
+.for ver in ${_THUNDERBIRD_RANGE_VERSIONS}
+.if ${USE_THUNDERBIRD} == "${ver}"
+_MATCHED_THUNDERBIRD_VER:= ${USE_THUNDERBIRD:S/+//}
+.for thunderbird in ${_THUNDERBIRDL_${_MATCHED_THUNDERBIRD_VER}P}
+.if ${WITH_THUNDERBIRD_VER} == ${thunderbird}
+# Check if user supplied WITH_THUNDERBIRD is in the INVALID_THUNDERBIRD_VER list
+_BRKTHUNDERBIRD= no
+.for iver in ${INVALID_THUNDERBIRD_VER}
+.if ${WITH_THUNDERBIRD_VER} == ${iver}
+_BRKTHUNDERBIRD= yes
+.endif
+.endfor
+# If WITH_THUNDERBIRD is not in the INVALID_THUNDERBIRD_VER list, use it
+# otherwise take default from port
+.if ${_BRKTHUNDERBIRD} == "no"
+USE_THUNDERBIRD= ${WITH_THUNDERBIRD_VER}
+.endif
+.endif
+.endfor
+.endif
+.endfor
+.endif
+
+# Setting/finding Thunderbird version we want.
+.if exists(${LOCALBASE}/bin/thunderbird)
+_FIREFOX_VER!= ${LOCALBASE}/bin/thunderbird --version | ${SED} -e 's/ Thunderbird \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.endif
+
+.if defined(_THUNDERBIRD_VER)
+.if ${_THUNDERBIRD_VER} != ${USE_THUNDERBIRD}
+IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_THUNDERBIRD_VER:C/([0-9])([0-9])/\1.\2/} is installed and wanted version is thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/}
+.endif
+.endif
+
+# Dependence lines for different Thunderbird versions
+31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+30_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3
+
+# Add dependencies
+.if defined(USE_THUNDERBIRD)
+.if defined(_THUNDERBIRD_BUILD_DEPENDS)
+BUILD_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS}
+.else
+RUN_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS}
+.endif
+.endif
+
+.endif # defined(USE_THUNDERBIRD)
.endif
# ======================= USERS =================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011291505.oATF5v2X094637>