Hi,
On Sat, Oct 24, 2020 at 12:28:50PM +0100, Stuart Henderson wrote:
> On 2020/10/24 10:34, Caspar Schutijser wrote:
> > Hi,
> >
> > www/tor-browser/https-everywhere can be removed since it is now part
> > of the www/tor-browser/browser port. The diff below makes that happen.
> > I went with "outdated and/or no longer required by other ports" as the
> > reason for removal; it is indeed no longer required by
> > www/tor-browser/browser.
>
> Please just merge it into www/tor-browser/browser with a @pkgpath,
> there is no need for upgrading users to keep the old version on their
> system.
Klemens and Stuart, thanks to both of you for your replies. The diff
below implements Stuart's suggestion (I hope I did it correctly).
There's no need for a @conflict marker, I think, because there's no
overlap between files installed by the old tb-https-everywhere port
and tb-browser.
Thanks,
Caspar Schutijser
Index: browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- browser/Makefile 23 Oct 2020 07:04:09 -0000 1.50
+++ browser/Makefile 25 Oct 2020 08:31:34 -0000
@@ -17,6 +17,7 @@ PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
DISTNAME = src-firefox-tor-browser-78.4.0esr-10.0-2-build2
+REVISION = 0
FIX_EXTRACT_PERMISSIONS = Yes
EXTRACT_ONLY += ${DISTNAME}.tar.xz \
Index: browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- browser/pkg/PLIST 23 Oct 2020 07:04:09 -0000 1.9
+++ browser/pkg/PLIST 25 Oct 2020 08:31:34 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.9 2020/10/23 07:04:09 landry Exp $
@conflict tor-launcher-*
@conflict torbutton-*
+@pkgpath www/tor-browser/https-everywhere
@pkgpath www/tor-browser/tor-launcher
@pkgpath www/tor-browser/torbutton
bin/${BROWSER_NAME}
Index: https-everywhere/Makefile
===================================================================
RCS file: https-everywhere/Makefile
diff -N https-everywhere/Makefile
--- https-everywhere/Makefile 26 Aug 2020 07:37:39 -0000 1.20
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-# $OpenBSD: Makefile,v 1.20 2020/08/26 07:37:39 landry Exp $
-
-ADDON_NAME = https-everywhere
-V = 2020.8.13
-COMMENT = Tor Browser add-on: force https where possible
-HOMEPAGE = https://www.eff.org/https-everywhere
-MASTER_SITES = https://www.eff.org/files/
-GUID = [email protected]
-ADDON_XPI_FILE = ${ADDON_NAME}-${V}-eff.xpi
-DISTFILES = ${ADDON_XPI_FILE}
-DISTFILE_IS_XPI = Yes
-
-.include <bsd.port.mk>
Index: https-everywhere/distinfo
===================================================================
RCS file: https-everywhere/distinfo
diff -N https-everywhere/distinfo
--- https-everywhere/distinfo 26 Aug 2020 07:37:39 -0000 1.18
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (https-everywhere-2020.8.13-eff.xpi) =
e1XWrqP5HNCK5Hp5VDDX2SXwHiNsgfsLNyqxu1NrTeU=
-SIZE (https-everywhere-2020.8.13-eff.xpi) = 1766618
Index: https-everywhere/pkg/DESCR
===================================================================
RCS file: https-everywhere/pkg/DESCR
diff -N https-everywhere/pkg/DESCR
--- https-everywhere/pkg/DESCR 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-HTTPS Everywhere is a Firefox extension from the EFF that forces HTTPS
-use wherever possible when browsing. It does this by means of an
-extensive set of rules maintained and updated by the EFF.
-
-This package provides the HTTPS Everywhere add-on for use with Tor
-Browser. It will not work with any other Mozilla-based browser
-package.
Index: https-everywhere/pkg/PLIST
===================================================================
RCS file: https-everywhere/pkg/PLIST
diff -N https-everywhere/pkg/PLIST
--- https-everywhere/pkg/PLIST 5 Apr 2020 16:58:27 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/04/05 16:58:27 landry Exp $
-${EXTDIR_ROOT}/browser/extensions/
-${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
