From 4aa43af6eb51fbc4791840db037594025505cdc3 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 22 Jul 2019 19:51:29 +0200 Subject: [PATCH] sysutils/beadm: sync with upstream Taken from: HardenedBSD --- sysutils/beadm/Makefile | 6 +++--- sysutils/beadm/distinfo | 6 +++--- sysutils/beadm/files/patch-beadm.1 | 30 ------------------------------ 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 sysutils/beadm/files/patch-beadm.1 diff --git a/sysutils/beadm/Makefile b/sysutils/beadm/Makefile index 919ae8edaca..6273858a213 100644 --- a/sysutils/beadm/Makefile +++ b/sysutils/beadm/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= beadm -PORTVERSION= 1.2.9 -PORTREVISION= 1 +PORTVERSION= 1.3.0 +PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= \ LOCAL/bdrewery/${PORTNAME} \ @@ -16,9 +16,9 @@ LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= vermaden -GH_TAGNAME= 2665f52786a12aadbe8984731b8a64d1249692f4 NO_BUILD= YES +NO_ARCH= YES CONFLICTS_INSTALL= beadm-devel-* diff --git a/sysutils/beadm/distinfo b/sysutils/beadm/distinfo index b9e15ffe038..c24244f0011 100644 --- a/sysutils/beadm/distinfo +++ b/sysutils/beadm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531090975 -SHA256 (vermaden-beadm-1.2.9-2665f52786a12aadbe8984731b8a64d1249692f4_GH0.tar.gz) = e1ddfcb35b4a96d115f89837da59ba51528c493201f70b96c536cac5d1674397 -SIZE (vermaden-beadm-1.2.9-2665f52786a12aadbe8984731b8a64d1249692f4_GH0.tar.gz) = 15391 +TIMESTAMP = 1563564184 +SHA256 (vermaden-beadm-1.3.0_GH0.tar.gz) = 2ac6537bfb7aa1ceb1757e63d75a1eadd65f1ddc2c7ab4bda609985acddf99ad +SIZE (vermaden-beadm-1.3.0_GH0.tar.gz) = 15667 diff --git a/sysutils/beadm/files/patch-beadm.1 b/sysutils/beadm/files/patch-beadm.1 deleted file mode 100644 index dc0dc69049b..00000000000 --- a/sysutils/beadm/files/patch-beadm.1 +++ /dev/null @@ -1,30 +0,0 @@ -commit 25a066def7cddd0f9178d07531b1f18703308db0 -Author: Alan Somers -Date: Wed Sep 6 09:17:00 2017 -0600 - - Fix indentation in man page - ---- beadm.1.orig 2018-06-13 03:53:03 UTC -+++ beadm.1 -@@ -89,9 +89,11 @@ If the -e param is specified, the new environment will - Creates a snapshot of the existing boot environment named - .Ar beName . - .Pp --.It --.Ic destroy Op Fl F -+.It Xo -+.Ic destroy -+.Op Fl F - .Ao Ar beName | beName@snapshot Ac -+.Xc - .Pp - Destroys the given - .Ar beName -@@ -151,6 +153,7 @@ will force the unmount if busy. - .Pp - .It Ic version - List the beadm version and exit. -+.El - .Sh EXAMPLES - .Bl -bullet - .It