From be70ff6c0c6ad9c5644eb97d9b1749c966c73c14 Mon Sep 17 00:00:00 2001
From: meta <meta@FreeBSD.org>
Date: Tue, 6 Nov 2018 05:44:42 +0000
Subject: security/softether{,-devel}: switch to DISTVERSION

- Quit using hardcoded WRKSRC, it is almost as same as DISTVERSION

Approved by:	mentors (implicit)
---
 security/softether-devel/Makefile | 2 +-
 security/softether/Makefile       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'security')

diff --git a/security/softether-devel/Makefile b/security/softether-devel/Makefile
index 04377cfed818..c378134f9e72 100644
--- a/security/softether-devel/Makefile
+++ b/security/softether-devel/Makefile
@@ -47,7 +47,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # a pity the source directory has such a naming scheme, but well
-WRKSRC=		${WRKDIR}/v4.27-9668
+WRKSRC=		${WRKDIR}/v${DISTVERSION:S/-beta$//}
 
 ALL_TARGET=	build
 
diff --git a/security/softether/Makefile b/security/softether/Makefile
index 74bd38012f85..7af712102af2 100644
--- a/security/softether/Makefile
+++ b/security/softether/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	softether
-PORTVERSION=	4.25.9656
+DISTVERSION=	4.25-9656
 PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	https://www.softether-download.com/files/softether/v4.25-9656-rtm-2018.01.15-tree/Source_Code/
-DISTNAME=	${PORTNAME}-src-v4.25-9656-rtm
+MASTER_SITES=	https://www.softether-download.com/files/softether/v${DISTVERSION}-rtm-2018.01.15-tree/Source_Code/
+DISTNAME=	${PORTNAME}-src-v${DISTVERSION}-rtm
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Softether VPN solution
@@ -47,7 +47,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # a pity the source directory has such a naming scheme, but well
-WRKSRC=		${WRKDIR}/v4.25-9656
+WRKSRC=		${WRKDIR}/v${DISTVERSION}
 
 ALL_TARGET=	build
 
-- 
cgit