svn commit: r484276 - in head/security: softether softether-devel

[Koichiro Iwao]

Author: meta
Date: Tue Nov  6 05:44:42 2018
New Revision: 484276
URL: https://svnweb.freebsd.org/changeset/ports/484276

Log:
  security/softether{,-devel}: switch to DISTVERSION
  
  - Quit using hardcoded WRKSRC, it is almost as same as DISTVERSION
  
  Approved by:	mentors (implicit)

Modified:
  head/security/softether-devel/Makefile
  head/security/softether/Makefile

Modified: head/security/softether-devel/Makefile
==============================================================================
--- head/security/softether-devel/Makefile	Tue Nov  6 05:19:29 2018	(r484275)
+++ head/security/softether-devel/Makefile	Tue Nov  6 05:44:42 2018	(r484276)
@@ -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
 

Modified: head/security/softether/Makefile
==============================================================================
--- head/security/softether/Makefile	Tue Nov  6 05:19:29 2018	(r484275)
+++ head/security/softether/Makefile	Tue Nov  6 05:44:42 2018	(r484276)
@@ -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 at 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