git: 44165da3cf27 - main - security/softether{, -devel}: revert unnecessary use of DIST_SUBDIR

[Koichiro Iwao]

The branch main has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44165da3cf275175ded24c4baf9fdfd21774c592

commit 44165da3cf275175ded24c4baf9fdfd21774c592
Author:     Koichiro Iwao <meta at FreeBSD.org>
AuthorDate: 2021-06-08 02:25:37 +0000
Commit:     Koichiro Iwao <meta at FreeBSD.org>
CommitDate: 2021-06-08 02:27:35 +0000

    security/softether{,-devel}: revert unnecessary use of DIST_SUBDIR
    
    Reported by:    mat (pointed out in sysutils/mackerel-agent)
---
 security/softether-devel/Makefile | 1 -
 security/softether-devel/distinfo | 6 +++---
 security/softether/Makefile       | 1 -
 security/softether/distinfo       | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/security/softether-devel/Makefile b/security/softether-devel/Makefile
index 34c574f16f5c..36d70304c71a 100644
--- a/security/softether-devel/Makefile
+++ b/security/softether-devel/Makefile
@@ -5,7 +5,6 @@ CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-2021.06.07-tree/Source_Code/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	meta at FreeBSD.org
 COMMENT=	Softether VPN 4 (stable beta version)
diff --git a/security/softether-devel/distinfo b/security/softether-devel/distinfo
index 60d61f4d1f8f..d4e8888c51f0 100644
--- a/security/softether-devel/distinfo
+++ b/security/softether-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623076375
-SHA256 (softether/softether-src-v4.36-9754-beta.tar.gz) = 8592424f413f658eaf56ff879947f5aece7069f3f2f67a81d1d6323f7558f4b0
-SIZE (softether/softether-src-v4.36-9754-beta.tar.gz) = 59312762
+TIMESTAMP = 1623118972
+SHA256 (softether-src-v4.36-9754-beta.tar.gz) = 9f5e3b091da3f21d773c16c54d4e428449b8628311dd1d56e8bf0bbfc204ebb3
+SIZE (softether-src-v4.36-9754-beta.tar.gz) = 21282816
diff --git a/security/softether/Makefile b/security/softether/Makefile
index e615b0fdb8cc..825c93ae2db4 100644
--- a/security/softether/Makefile
+++ b/security/softether/Makefile
@@ -4,7 +4,6 @@ PORTREVISION=	3
 CATEGORIES=	security net-vpn
 MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2020.04.05-tree/Source_Code/
 DISTNAME=	${PORTNAME}-src-v${DISTVERSION}-rtm
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	meta at FreeBSD.org
 COMMENT=	SoftEther VPN 4 (RTM version)
diff --git a/security/softether/distinfo b/security/softether/distinfo
index 395039c9d298..d1ca47ed61b0 100644
--- a/security/softether/distinfo
+++ b/security/softether/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623076578
-SHA256 (softether/softether-src-v4.34-9745-rtm.tar.gz) = bf5547e2a190e8620fe02da9756b32d010e3b64cbc6317f172f7820394b4c036
-SIZE (softether/softether-src-v4.34-9745-rtm.tar.gz) = 59108198
+TIMESTAMP = 1623118938
+SHA256 (softether-src-v4.34-9745-rtm.tar.gz) = bf5547e2a190e8620fe02da9756b32d010e3b64cbc6317f172f7820394b4c036
+SIZE (softether-src-v4.34-9745-rtm.tar.gz) = 59108198