From owner-svn-ports-head@freebsd.org  Wed Sep  5 13:38:27 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDC07FF03CF;
 Wed,  5 Sep 2018 13:38:27 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 7217D81323;
 Wed,  5 Sep 2018 13:38:27 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 68F1D26843;
 Wed,  5 Sep 2018 13:38:27 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w85DcReE037999;
 Wed, 5 Sep 2018 13:38:27 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w85DcQWw037998;
 Wed, 5 Sep 2018 13:38:26 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201809051338.w85DcQWw037998@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Wed, 5 Sep 2018 13:38:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r479021 - head/net/ss5
X-SVN-Group: ports-head
X-SVN-Commit-Author: swills
X-SVN-Commit-Paths: head/net/ss5
X-SVN-Commit-Revision: 479021
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Sep 2018 13:38:27 -0000

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@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
+@sample %%ETCDIR%%/ss5.conf.sample
+@sample %%ETCDIR%%/ss5.ha.sample
+@sample %%ETCDIR%%/ss5.passwd.sample