Index: head/net/ss5/Makefile
===================================================================
--- head/net/ss5/Makefile	(revision 479020)
+++ head/net/ss5/Makefile	(revision 479021)
@@ -1,47 +1,46 @@
 # Created by: Raffaele De Lorenzo  - raffaele.delorenzo@libero.it
 # $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
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]+//}
 
 USES=		ssl
 USE_OPENLDAP=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-binpathbase=${PREFIX}/sbin \
 		--with-docpathbase=${PREFIX}/share/doc \
 		--with-confpathbase=${PREFIX}/etc \
 		--with-libpath=${PREFIX}/lib
 
 MAKE_ENV=	DATADIR=${DATADIR} EXAMPLESDIR=${EXAMPLESDIR}
 MAKE_ARGS+=	CC="${CC}"
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's,/usr/local/etc/opt/ss5,${PREFIX}/etc/ss5,' \
 		${WRKSRC}/include/config.h.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/log/ss5 ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/ss5.conf \
 		${STAGEDIR}${PREFIX}/etc/ss5/ss5.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/ss5.ha \
 		${STAGEDIR}${PREFIX}/etc/ss5/ss5.ha.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/ss5.passwd \
 		${STAGEDIR}${PREFIX}/etc/ss5/ss5.passwd.sample
 
 .include <bsd.port.mk>
Index: head/net/ss5/pkg-plist
===================================================================
--- head/net/ss5/pkg-plist	(revision 479020)
+++ head/net/ss5/pkg-plist	(revision 479021)
@@ -1,40 +1,37 @@
-%%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
 lib/ss5/mod_bandwidth.so
 lib/ss5/mod_dump.so
 lib/ss5/mod_filter.so
 lib/ss5/mod_log.so
 lib/ss5/mod_proxy.so
 lib/ss5/mod_socks4.so
 lib/ss5/mod_socks5.so
 lib/ss5/mod_statistics.so
 man/man1/ss5.1.gz
 man/man1/ss5srv.1.gz
 man/man5/ss5.conf.5.gz
 man/man5/ss5.ha.5.gz
 man/man5/ss5.pam.5.gz
 man/man5/ss5.passwd.5.gz
 man/man5/ss5_gss.5.gz
 man/man5/ss5_supa.5.gz
 sbin/ss5
 sbin/ss5srv
 %%PORTDOCS%%%%DOCSDIR%%/License
 %%PORTDOCS%%%%DOCSDIR%%/README.balamgr
 %%PORTDOCS%%%%DOCSDIR%%/README.ldap
 %%PORTDOCS%%%%DOCSDIR%%/README.pam
 %%PORTDOCS%%%%DOCSDIR%%/README.statmgr
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/entries.ldif
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/slapd.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ss5.pam
 %%DATADIR%%/SS5Logo.jpg
 %%DATADIR%%/balamgr.cgi
 %%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