Date: Sun, 5 Dec 2010 09:51:22 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r460 - branches/experimental/Mk Message-ID: <201012050951.oB59pMMp015888@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sun Dec 5 09:51:22 2010
New Revision: 460
Log:
- Fix path to SeaMonkey 1.1 executable
- Find Firefox 3 version first as Firefox 4 isn't in ports tree yet and
produces false positives if installed.
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sun Dec 5 09:06:06 2010 (r459)
+++ branches/experimental/Mk/bsd.gecko.mk Sun Dec 5 09:51:22 2010 (r460)
@@ -287,10 +287,10 @@
.endif
# Setting/finding Firefox version we want.
-.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)
+.if exists(${LOCALBASE}/bin/firefox3)
_FIREFOX_VER!= ${LOCALBASE}/bin/firefox3 --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
+.elif exists(${LOCALBASE}/bin/firefox)
+_FIREFOX_VER!= ${LOCALBASE}/bin/firefox --version | ${SED} -e 's/Mozilla Firefox \([0-9]\)\.\([0-9]*\).*/\1\2/'
.endif
# Check if installed Firefox version matches the wanted one
@@ -418,7 +418,7 @@
.endif
# Dependence lines for different SeaMonkey versions
-11_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+11_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey
20_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey2
# Add dependencies
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012050951.oB59pMMp015888>