From e59ea98af157d87dd60719a7a525343bff5e798b Mon Sep 17 00:00:00 2001
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 5 Sep 2018 13:38:26 +0000
Subject: [PATCH] Fix issues in previous commit

PR:		230556
Reported by:	tobik
Pointyhat to:	swills
---
 net/ss5/Makefile  | 7 +++----
 net/ss5/pkg-plist | 9 +++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 0f5fbf9117f5..62ead894eeb3 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	ss5
-PORTVERSION=	3.8.9
-DISTVERSIONSUFFIX=	-8
+DISTVERSION=	3.8.9-8
 CATEGORIES=	net security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	raffaele.delorenzo@libero.it
 COMMENT=	SOCKS v4/v5 application layer gateway with many features
@@ -13,7 +12,7 @@ COMMENT=	SOCKS v4/v5 application layer gateway with many features
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//}
 
 USES=		ssl
 USE_OPENLDAP=	yes
diff --git a/net/ss5/pkg-plist b/net/ss5/pkg-plist
index 3a430aa12f86..0b33a1befa95 100644
--- a/net/ss5/pkg-plist
+++ b/net/ss5/pkg-plist
@@ -1,9 +1,3 @@
-%%ETCDIR%%/ss5.conf
-%%ETCDIR%%/ss5.conf.sample
-%%ETCDIR%%/ss5.ha
-%%ETCDIR%%/ss5.ha.sample
-%%ETCDIR%%/ss5.passwd
-%%ETCDIR%%/ss5.passwd.sample
 lib/ss5/mod_authentication.so
 lib/ss5/mod_authorization.so
 lib/ss5/mod_balance.so
@@ -38,3 +32,6 @@ sbin/ss5srv
 %%DATADIR%%/statmgr.cgi
 @dir /var/log/ss5
 @dir /var/run/ss5
+@sample %%ETCDIR%%/ss5.conf.sample
+@sample %%ETCDIR%%/ss5.ha.sample
+@sample %%ETCDIR%%/ss5.passwd.sample