From 27a2d8cffb62a75c25ee1acfec825aea8a75bb36 Mon Sep 17 00:00:00 2001
From: Kai Knoblich <kai@FreeBSD.org>
Date: Mon, 22 Jul 2019 11:36:10 +0000
Subject: [PATCH] net-p2p/go-ethereum: Update to 1.9.0

* Remove no longer required patch "fdlimit_freebsd.go" as those changes have
  been merged by upstream.
* Add a pkg-message to give users some advice when upgrading from releases
  lower than 1.9.0. [1]

Changelog:

https://github.com/ethereum/go-ethereum/releases/tag/v1.9.0

PR:		239111
Submitted by:	Enrique Fynn <me@enriquefynn.com> (maintainer)
Approved by:	Enrique Fynn (maintainer) [1]
---
 net-p2p/go-ethereum/Makefile                        |  4 ++--
 net-p2p/go-ethereum/distinfo                        |  6 +++---
 .../files/patch-common_fdlimit_fdlimit__freebsd.go  | 11 -----------
 net-p2p/go-ethereum/pkg-message                     | 13 +++++++++++++
 net-p2p/go-ethereum/pkg-plist                       |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 net-p2p/go-ethereum/files/patch-common_fdlimit_fdlimit__freebsd.go
 create mode 100644 net-p2p/go-ethereum/pkg-message

diff --git a/net-p2p/go-ethereum/Makefile b/net-p2p/go-ethereum/Makefile
index 2f744ee76a16..5d03f7a24c5d 100644
--- a/net-p2p/go-ethereum/Makefile
+++ b/net-p2p/go-ethereum/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	go-ethereum
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.27
+DISTVERSION=	1.9.0
 CATEGORIES=	net-p2p
 
 MAINTAINER=	me@enriquefynn.com
@@ -30,7 +30,7 @@ do-install-DEVTOOLS-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/bootnode ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/evm ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/rlpdump ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/swarm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/clef ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/build/bin/puppeth ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-p2p/go-ethereum/distinfo b/net-p2p/go-ethereum/distinfo
index ea7e995e9270..2d86402a8ef6 100644
--- a/net-p2p/go-ethereum/distinfo
+++ b/net-p2p/go-ethereum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558944912
-SHA256 (ethereum-go-ethereum-v1.8.27_GH0.tar.gz) = 45d264106991d0e2a4c34ac5d6539fc9460c768fc70588ea38a25f467039ece8
-SIZE (ethereum-go-ethereum-v1.8.27_GH0.tar.gz) = 10545102
+TIMESTAMP = 1563666425
+SHA256 (ethereum-go-ethereum-v1.9.0_GH0.tar.gz) = 94843ce7715ff2ce2ee4f463b09dbd9209303ad9aa8e5fad3381376b0f1a075d
+SIZE (ethereum-go-ethereum-v1.9.0_GH0.tar.gz) = 16399034
diff --git a/net-p2p/go-ethereum/files/patch-common_fdlimit_fdlimit__freebsd.go b/net-p2p/go-ethereum/files/patch-common_fdlimit_fdlimit__freebsd.go
deleted file mode 100644
index 69ec59df47ba..000000000000
--- a/net-p2p/go-ethereum/files/patch-common_fdlimit_fdlimit__freebsd.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/fdlimit/fdlimit_freebsd.go.orig	2019-04-08 13:16:05 UTC
-+++ common/fdlimit/fdlimit_freebsd.go
-@@ -43,7 +43,7 @@ func Raise(max uint64) (uint64, error) {
- 	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
- 		return 0, err
- 	}
--	return limit.Cur, nil
-+	return uint64(limit.Cur), nil
- }
- 
- // Current retrieves the number of file descriptors allowed to be opened by this
diff --git a/net-p2p/go-ethereum/pkg-message b/net-p2p/go-ethereum/pkg-message
new file mode 100644
index 000000000000..71ea2c39971c
--- /dev/null
+++ b/net-p2p/go-ethereum/pkg-message
@@ -0,0 +1,13 @@
+[
+{
+  message: <<EOD
+* It's recommended to make a backup as the v1.9.0 release contains database
+  schema changes, meaning it's not possible to downgrade once updated!
+
+* It's also recommended to do a fresh fast sync as it can drastically reduce
+  the database size.
+EOD
+  maximum_version: "1.9.0"
+  type: upgrade
+}
+]
diff --git a/net-p2p/go-ethereum/pkg-plist b/net-p2p/go-ethereum/pkg-plist
index 2663f7d05c81..1b78719ab3ec 100644
--- a/net-p2p/go-ethereum/pkg-plist
+++ b/net-p2p/go-ethereum/pkg-plist
@@ -3,5 +3,5 @@ bin/geth
 %%DEVTOOLS%%bin/bootnode
 %%DEVTOOLS%%bin/evm
 %%DEVTOOLS%%bin/rlpdump
-%%DEVTOOLS%%bin/swarm
+%%DEVTOOLS%%bin/clef
 %%DEVTOOLS%%bin/puppeth