Date: Mon, 27 Nov 2017 13:25:12 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454949 - in head/www: . waterfox waterfox/files Message-ID: <201711271325.vARDPCpL052279@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Nov 27 13:25:12 2017 New Revision: 454949 URL: https://svnweb.freebsd.org/changeset/ports/454949 Log: www/waterfox: add new (demo) port PR: 222859 Added: head/www/waterfox/ - copied from r454192, head/www/firefox/ Deleted: head/www/waterfox/Makefile.options head/www/waterfox/files/firefox.desktop.in head/www/waterfox/files/patch-a-bug1399540 head/www/waterfox/files/patch-bug1261175 head/www/waterfox/files/patch-bug1325923 head/www/waterfox/files/patch-bug1365894 head/www/waterfox/files/patch-bug1366420 head/www/waterfox/files/patch-bug1369561 head/www/waterfox/files/patch-bug1370497 head/www/waterfox/files/patch-bug1375146 head/www/waterfox/files/patch-bug1383019 head/www/waterfox/files/patch-bug1387799 head/www/waterfox/files/patch-bug1387845 head/www/waterfox/files/patch-bug1394031 head/www/waterfox/files/patch-bug1394265 head/www/waterfox/files/patch-bug1394530 head/www/waterfox/files/patch-bug1395138 head/www/waterfox/files/patch-bug1397811 head/www/waterfox/files/patch-bug1399922 head/www/waterfox/files/patch-bug1400003 head/www/waterfox/files/patch-bug1400554 head/www/waterfox/files/patch-bug1401339 head/www/waterfox/files/patch-bug1401804 head/www/waterfox/files/patch-bug1402363 head/www/waterfox/files/patch-bug1402876 head/www/waterfox/files/patch-bug1402896 head/www/waterfox/files/patch-bug1403646 head/www/waterfox/files/patch-bug1404636 head/www/waterfox/files/patch-bug1406154 head/www/waterfox/files/patch-bug1406398 head/www/waterfox/files/patch-bug1406750 head/www/waterfox/files/patch-bug1407032 head/www/waterfox/files/patch-bug1407375 head/www/waterfox/files/patch-bug1407740 head/www/waterfox/files/patch-bug1407751 head/www/waterfox/files/patch-bug1408005 head/www/waterfox/files/patch-bug1408412 head/www/waterfox/files/patch-bug1408782 head/www/waterfox/files/patch-bug1411458 head/www/waterfox/files/patch-bug1412252 head/www/waterfox/files/pkg-deinstall.in head/www/waterfox/files/pkg-install.in Modified: head/www/Makefile head/www/waterfox/Makefile head/www/waterfox/distinfo head/www/waterfox/pkg-descr head/www/waterfox/pkg-message Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Mon Nov 27 13:24:09 2017 (r454948) +++ head/www/Makefile Mon Nov 27 13:25:12 2017 (r454949) @@ -2415,6 +2415,7 @@ SUBDIR += w3mir SUBDIR += waccess SUBDIR += wadcomblog + SUBDIR += waterfox SUBDIR += web2ldap SUBDIR += webalizer SUBDIR += webbrowser Modified: head/www/waterfox/Makefile ============================================================================== --- head/www/firefox/Makefile Tue Nov 14 19:04:06 2017 (r454192) +++ head/www/waterfox/Makefile Mon Nov 27 13:25:12 2017 (r454949) @@ -1,18 +1,15 @@ -# Created by: Alan Eldridge <alane@FreeBSD.org> # $FreeBSD$ -PORTNAME= firefox -DISTVERSION= 56.0.2 -DISTVERSIONSUFFIX=.source -PORTREVISION= 10 -PORTEPOCH= 1 +PORTNAME= waterfox +DISTVERSION= 56.0.s20171122 CATEGORIES= www ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source -MAINTAINER= gecko@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Distilled fork of Firefox ${MOZILLA_VER:R:R} +DEPRECATED= Temporary experiment +EXPIRATION_DATE=2017-12-12 + BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ @@ -32,33 +29,34 @@ BUILD_DEPENDS= nspr>=4.16:devel/nspr \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l +USE_GITHUB= yes +GH_ACCOUNT= MrAlex94 +GH_PROJECT= Waterfox +GH_TAGNAME= 224e688d8ddf + USE_GECKO= gecko -CONFLICTS_INSTALL= firefox-esr-45.* firefox-esr-3[18].* firefox-esr-24.* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch -MOZILLA_NAME= Firefox +MOZILLA_NAME= Waterfox USE_GL= gl -USES= tar:xz -FIREFOX_ICON= ${MOZILLA}.png -FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png +WATERFOX_ICON= ${MOZILLA}.png +WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png +WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop MOZ_OPTIONS= --enable-application=browser \ - --enable-official-branding + --with-app-name=${MOZILLA} \ + --with-app-basename=${MOZILLA_NAME} \ + --with-distribution-id=org.${MOZILLA}project OPTIONS_DEFAULT= BUNDLED_CAIRO -OPTIONS_EXCLUDE= GNOMEUI .include "${.CURDIR}/../../www/firefox/Makefile.options" -WRKSRC:= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - -post-extract: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - post-patch: + @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ + -e 's/Firefox/${MOZILLA_NAME}/' \ + ${WATERFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp @@ -67,8 +65,9 @@ pre-configure: (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: + ${INSTALL_DATA} ${WATERFOX_DESKTOP} \ + ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ - ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} + ${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} .include <bsd.port.mk> Modified: head/www/waterfox/distinfo ============================================================================== --- head/www/firefox/distinfo Tue Nov 14 19:04:06 2017 (r454192) +++ head/www/waterfox/distinfo Mon Nov 27 13:25:12 2017 (r454949) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508873487 -SHA256 (firefox-56.0.2.source.tar.xz) = 6f7d284c31383a9860d7b52f05f866526d5a7c31e3ef2959d79122ba074f5ca1 -SIZE (firefox-56.0.2.source.tar.xz) = 255658916 +TIMESTAMP = 1511372895 +SHA256 (MrAlex94-Waterfox-56.0.s20171122-224e688d8ddf_GH0.tar.gz) = f9d62e1f1d4379304e688dcd895bc1dded49fb7ed99d03419662db08ffc84a13 +SIZE (MrAlex94-Waterfox-56.0.s20171122-224e688d8ddf_GH0.tar.gz) = 394181158 Modified: head/www/waterfox/pkg-descr ============================================================================== --- head/www/firefox/pkg-descr Tue Nov 14 19:04:06 2017 (r454192) +++ head/www/waterfox/pkg-descr Mon Nov 27 13:25:12 2017 (r454949) @@ -1,13 +1,24 @@ -Mozilla Firefox is a free and open source web browser descended from the -Mozilla Application Suite. It is small, fast and easy to use, and offers -many advanced features: +The Waterfox source code is a specialised modification of the Mozilla +platform, designed for privacy and user choice in mind. You should be +able to install it and compile Waterfox without any issues. Other +modifications and patches that are more upstream have been implemented +as well to fix any compatibility/security issues that Mozilla may lag +behind in implementing (usually due to not being high priority). High +request features removed by Mozilla but wanted by users are retained +(if they aren't removed due to security). - o Popup Blocking - o Tabbed Browsing - o Live Bookmarks (ie. RSS) - o Extensions - o Themes - o FastFind - o Improved Security +Features: -WWW: http://www.mozilla.com/firefox + o Disabled Encrypted Media Extensions (EME) + o Disabled Web Runtime (deprecated as of 2015) + o Removed Pocket + o Removed Telemetry + o Removed data collection + o Removed startup profiling + o Allow running of all 64-Bit NPAPI plugins + o Allow running of unsigned extensions + o Removal of Sponsored Tiles on New Tab Page + o Addition of Duplicate Tab option (toggle with browser.tabs.duplicateTab) + o Locale selector in about:preferences > General + +WWW: https://www.waterfoxproject.org/ Modified: head/www/waterfox/pkg-message ============================================================================== --- head/www/firefox/pkg-message Tue Nov 14 19:04:06 2017 (r454192) +++ head/www/waterfox/pkg-message Mon Nov 27 13:25:12 2017 (r454949) @@ -32,20 +32,3 @@ cat ~/.ssh/id_rsa.pub | ssh remote_host "cat >> .ssh/a The SSH server on remote_host must allow pub key authentication. ====================================================================== - -Any bug reports should be addressed to the maintainers at: - gecko@FreeBSD.org -You may also Cc: freebsd-ports@FreeBSD.org. Please do not send -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Output from 'ident /usr/ports/www/firefox/Makefile' -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gecko@) -======================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711271325.vARDPCpL052279>