svn commit: r479021 - head/net/ss5

[Steve Wills]

Author: swills
Date: Wed Sep  5 13:38:26 2018
New Revision: 479021
URL: https://svnweb.freebsd.org/changeset/ports/479021

Log:
  Fix issues in previous commit
  
  PR:		230556
  Reported by:	tobik
  Pointyhat to:	swills

Modified:
  head/net/ss5/Makefile   (contents, props changed)
  head/net/ss5/pkg-plist   (contents, props changed)

Modified: head/net/ss5/Makefile
==============================================================================
--- head/net/ss5/Makefile	Wed Sep  5 13:26:05 2018	(r479020)
+++ head/net/ss5/Makefile	Wed Sep  5 13:38:26 2018	(r479021)
@@ -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 at libero.it
 COMMENT=	SOCKS v4/v5 application layer gateway with many features
@@ -13,7 +12,7 @@ COMMENT=	SOCKS v4/v5 application layer gateway with ma
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//}
 
 USES=		ssl
 USE_OPENLDAP=	yes

Modified: head/net/ss5/pkg-plist
==============================================================================
--- head/net/ss5/pkg-plist	Wed Sep  5 13:26:05 2018	(r479020)
+++ head/net/ss5/pkg-plist	Wed Sep  5 13:38:26 2018	(r479021)
@@ -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
+ at sample %%ETCDIR%%/ss5.conf.sample
+ at sample %%ETCDIR%%/ss5.ha.sample
+ at sample %%ETCDIR%%/ss5.passwd.sample