Date: Tue, 28 Jun 2011 20:03:25 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r576 - branches/experimental/Mk trunk/Mk Message-ID: <201106282003.p5SK3PQO050630@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Tue Jun 28 20:03:25 2011
New Revision: 576
Log:
- prepare for thunderbird 5.0
- merge patches from ports/158380 [1]
Submitted by: Pan Tsu <inyaoo@gmail.com> [1]
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 Tue Jun 28 19:55:43 2011 (r575)
+++ branches/experimental/Mk/bsd.gecko.mk Tue Jun 28 20:03:25 2011 (r576)
@@ -203,9 +203,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 31+ 30+ 31 30
+# Available values: yes 50+ 31+ 50 31
# NOTE:
-# default value 31 is used in case of USE_THUNDERBIRD=yes
+# default value 50 is used in case of USE_THUNDERBIRD=yes
#
# USE_THUNDERBIRD_BUILD Add buildtime dependency on Thunderbird.
# Available values: see USE_THUNDERBIRD
@@ -368,13 +368,13 @@
_THUNDERBIRD_BUILD_DEPENDS= yes
.endif
-_THUNDERBIRD_DEFAULT_VERSION= 31
-_THUNDERBIRD_VERSIONS= 31 30
-_THUNDERBIRD_RANGE_VERSIONS= 31+ 30+
+_THUNDERBIRD_DEFAULT_VERSION= 50
+_THUNDERBIRD_VERSIONS= 50 31
+_THUNDERBIRD_RANGE_VERSIONS= 50+ 31+
# For specifying [31, 30, ..]+
-_THUNDERBIRD_30P= 30 ${_THUNDERBIRD_31P}
-_THUNDERBIRD_31P= 31
+_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_31P}
+_THUNDERBIRD_50P= 50
# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
.if ${USE_THUNDERBIRD} == "yes"
@@ -416,8 +416,8 @@
.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
+50_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3
# Add dependencies
.if defined(USE_THUNDERBIRD)
@@ -642,6 +642,7 @@
MOZ_OPTIONS+= --with-system-zlib=/usr \
--with-gssapi=${KRB5_HOME} \
--disable-auto-deps \
+ --disable-debug-symbols \
--enable-chrome-format=jar \
--disable-cpp-exceptions \
--disable-cpp-rtti \
@@ -677,6 +678,8 @@
.if !defined(STRIP) || ${STRIP} == ""
MOZ_OPTIONS+= --disable-strip --disable-install-strip
+.else
+MOZ_OPTIONS+= --enable-strip --enable-install-strip
.endif
.if defined(WITH_DEBUG)
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Tue Jun 28 19:55:43 2011 (r575)
+++ trunk/Mk/bsd.gecko.mk Tue Jun 28 20:03:25 2011 (r576)
@@ -199,9 +199,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 31+ 30+ 31 30
+# Available values: yes 50+ 31+ 50 31
# NOTE:
-# default value 31 is used in case of USE_THUNDERBIRD=yes
+# default value 50 is used in case of USE_THUNDERBIRD=yes
#
# USE_THUNDERBIRD_BUILD Add buildtime dependency on Thunderbird.
# Available values: see USE_THUNDERBIRD
@@ -364,13 +364,13 @@
_THUNDERBIRD_BUILD_DEPENDS= yes
.endif
-_THUNDERBIRD_DEFAULT_VERSION= 31
-_THUNDERBIRD_VERSIONS= 31 30
-_THUNDERBIRD_RANGE_VERSIONS= 31+ 30+
+_THUNDERBIRD_DEFAULT_VERSION= 50
+_THUNDERBIRD_VERSIONS= 50 31
+_THUNDERBIRD_RANGE_VERSIONS= 50+ 31+
# For specifying [31, 30, ..]+
-_THUNDERBIRD_30P= 30 ${_THUNDERBIRD_31P}
-_THUNDERBIRD_31P= 31
+_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_31P}
+_THUNDERBIRD_50P= 50
# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
.if ${USE_THUNDERBIRD} == "yes"
@@ -412,8 +412,8 @@
.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
+50_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird3
# Add dependencies
.if defined(USE_THUNDERBIRD)
@@ -638,6 +638,7 @@
MOZ_OPTIONS+= --with-system-zlib=/usr \
--with-gssapi=${KRB5_HOME} \
--disable-auto-deps \
+ --disable-debug-symbols \
--enable-chrome-format=jar \
--disable-cpp-exceptions \
--disable-cpp-rtti \
@@ -673,6 +674,8 @@
.if !defined(STRIP) || ${STRIP} == ""
MOZ_OPTIONS+= --disable-strip --disable-install-strip
+.else
+MOZ_OPTIONS+= --enable-strip --enable-install-strip
.endif
.if defined(WITH_DEBUG)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106282003.p5SK3PQO050630>