[SVN-Commit] r660 - branches/experimental/www/firefox branches/experimental/www/firefox-beta branches/experimental/www/firefox-beta/files branches/experimental/www/firefox/files trunk/www/firefox trunk/www/firefox/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Wed Oct 19 20:18:26 2011
New Revision: 660

Log:
- Add x-scheme-handler/http(s) MimeTypes to firefox.desktop. [1]
- Add temporary workaround to fix detection of all plugins until we have
  found a proper solution for this problem. The workaround use the
  run-mozilla.sh script to start Firefox as it was the default prior to
  the Firefox 7 release. [2]
- Bump PORTREVISION.

PR:		ports/159606 [1]
Submitted by:	Dmitry <smallcms AT gmail.com> [1]
Discussed with:	flo@ [2]

Modified:
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-beta/files/firefox.desktop.in
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox/files/firefox.desktop.in
   trunk/www/firefox/Makefile
   trunk/www/firefox/files/firefox.desktop.in

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Wed Oct 19 17:21:47 2011	(r659)
+++ branches/experimental/www/firefox-beta/Makefile	Wed Oct 19 20:18:26 2011	(r660)
@@ -137,6 +137,13 @@
 	(cd ${WRKSRC} && ${GMAKE} distclean)
 .endif
 
+post-build:
+	${RM} ${WRKSRC}/dist/bin/${PORTNAME}
+	${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/dist/bin/${PORTNAME}
+	${ECHO_CMD} "cd ${PREFIX}/lib/firefox && ./run-mozilla.sh ./firefox-bin" \
+		>> ${WRKSRC}/dist/bin/${PORTNAME}
+	${CHMOD} 755 ${WRKSRC}/dist/bin/${PORTNAME}
+
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}

Modified: branches/experimental/www/firefox-beta/files/firefox.desktop.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/firefox.desktop.in	Wed Oct 19 17:21:47 2011	(r659)
+++ branches/experimental/www/firefox-beta/files/firefox.desktop.in	Wed Oct 19 20:18:26 2011	(r660)
@@ -188,4 +188,4 @@
 Terminal=false
 Type=Application
 Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Wed Oct 19 17:21:47 2011	(r659)
+++ branches/experimental/www/firefox/Makefile	Wed Oct 19 20:18:26 2011	(r660)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.251 2011/09/30 15:07:49 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.252 2011/10/19 19:29:28 beat Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	7.0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -145,6 +146,13 @@
 	(cd ${WRKSRC} && ${GMAKE} distclean)
 .endif
 
+post-build:
+	${RM} ${WRKSRC}/dist/bin/${PORTNAME}
+	${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/dist/bin/${PORTNAME}
+	${ECHO_CMD} "cd ${PREFIX}/lib/firefox && ./run-mozilla.sh ./firefox-bin" \
+		>> ${WRKSRC}/dist/bin/${PORTNAME}
+	${CHMOD} 755 ${WRKSRC}/dist/bin/${PORTNAME}
+
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}

Modified: branches/experimental/www/firefox/files/firefox.desktop.in
==============================================================================
--- branches/experimental/www/firefox/files/firefox.desktop.in	Wed Oct 19 17:21:47 2011	(r659)
+++ branches/experimental/www/firefox/files/firefox.desktop.in	Wed Oct 19 20:18:26 2011	(r660)
@@ -188,4 +188,4 @@
 Terminal=false
 Type=Application
 Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Wed Oct 19 17:21:47 2011	(r659)
+++ trunk/www/firefox/Makefile	Wed Oct 19 20:18:26 2011	(r660)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.251 2011/09/30 15:07:49 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.252 2011/10/19 19:29:28 beat Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	7.0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -136,6 +137,13 @@
 	(cd ${WRKSRC} && ${GMAKE} distclean)
 .endif
 
+post-build:
+	${RM} ${WRKSRC}/dist/bin/${PORTNAME}
+	${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/dist/bin/${PORTNAME}
+	${ECHO_CMD} "cd ${PREFIX}/lib/firefox && ./run-mozilla.sh ./firefox-bin" \
+		>> ${WRKSRC}/dist/bin/${PORTNAME}
+	${CHMOD} 755 ${WRKSRC}/dist/bin/${PORTNAME}
+
 port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}

Modified: trunk/www/firefox/files/firefox.desktop.in
==============================================================================
--- trunk/www/firefox/files/firefox.desktop.in	Wed Oct 19 17:21:47 2011	(r659)
+++ trunk/www/firefox/files/firefox.desktop.in	Wed Oct 19 20:18:26 2011	(r660)
@@ -188,4 +188,4 @@
 Terminal=false
 Type=Application
 Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;