Date: Sat, 14 Apr 2012 21:18:59 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r707 - branches/experimental/Mk Message-ID: <201204142118.q3ELIxeA071811@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Sat Apr 14 21:18:59 2012
New Revision: 707
Log:
- revert my previous commit, restoring work for firefox/thunderbird 11
Reported by: beat
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sat Apr 14 20:54:17 2012 (r706)
+++ branches/experimental/Mk/bsd.gecko.mk Sat Apr 14 21:18:59 2012 (r707)
@@ -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 10+ 36+ 10 36
+# Available values: yes 10+ 11+ 36+ 10 11+ 36
# NOTE:
# default value 10 is used in case of USE_FIREFOX=yes
#
@@ -203,7 +203,7 @@
# 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 10+ 31+ 10 31
+# Available values: yes 10+ 11+ 31+ 10 11 31
# NOTE:
# default value 10 is used in case of USE_THUNDERBIRD=yes
#
@@ -223,11 +223,12 @@
.endif
_FIREFOX_DEFAULT_VERSION= 10
-_FIREFOX_VERSIONS= 10 36
-_FIREFOX_RANGE_VERSIONS= 10+ 36+
+_FIREFOX_VERSIONS= 10 11 36
+_FIREFOX_RANGE_VERSIONS= 10+ 11+ 36+
# For specifying [36, ..]+
-_FIREFOX_36P= 36 ${_FIREFOX_10P}
+_FIREFOX_36P= 36 ${_FIREFOX_11P}
+_FIREFOX_11P= 11 ${_FIREFOX_10P}
_FIREFOX_10P= 10
# Set the default Firefox version and check if USE_FIREFOX=yes was given
@@ -288,7 +289,8 @@
.endif
# Dependence lines for different Firefox versions
-10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+10_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
+11_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
36_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox36
# Add dependencies
@@ -381,11 +383,12 @@
.endif
_THUNDERBIRD_DEFAULT_VERSION= 10
-_THUNDERBIRD_VERSIONS= 10 31
-_THUNDERBIRD_RANGE_VERSIONS= 10+ 31+
+_THUNDERBIRD_VERSIONS= 10 11 31
+_THUNDERBIRD_RANGE_VERSIONS= 10+ 11+ 31+
# For specifying [31, 30, ..]+
-_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_31P}
+_THUNDERBIRD_31P= 31 ${_THUNDERBIRD_11P}
+_THUNDERBIRD_11P= 11 ${_THUNDERBIRD_10P}
_THUNDERBIRD_10P= 10
# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given
@@ -445,7 +448,8 @@
.endif
# Dependence lines for different Thunderbird versions
-10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+10_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird-esr
+11_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
31_DEPENDS= ${LOCALBASE}/lib/thunderbird3/thunderbird:${PORTSDIR}/mail/thunderbird3
# Add dependencies
@@ -828,10 +832,14 @@
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${MOZSRC}/build/unix/run-mozilla.sh
- @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
- ${MOZSRC}/widget/src/gtk2/nsSound.cpp
- @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
- ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp
+ @if [ -f ${MOZSRC}/widget/src/gtk2/nsSound.cpp ] ; then \
+ ${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
+ ${MOZSRC}/widget/src/gtk2/nsSound.cpp ; \
+ fi
+ @if ! [ -f ${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp ] ; then \
+ ${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
+ ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp ; \
+ fi
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204142118.q3ELIxeA071811>