Index: net/ss5/Makefile
===================================================================
--- net/ss5/Makefile
+++ net/ss5/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	ss5
-PORTVERSION=	3.8.9
-DISTVERSIONSUFFIX=	-8
+DISTVERSION=	3.8.9-8
+PORTREVISION=	1
 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 +13,7 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/License
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USES=		ssl
 USE_OPENLDAP=	yes
Index: net/ss5/files/patch-Makefile.in
===================================================================
--- net/ss5/files/patch-Makefile.in
+++ net/ss5/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2009-07-17 21:03:01 UTC
+--- Makefile.in.orig	2011-08-26 12:28:01 UTC
 +++ Makefile.in
 @@ -1,7 +1,7 @@
  SUBDIRS=src modules
@@ -21,19 +21,19 @@
  
  CFLAGS=@CFLAGS@ -I . @EXTRA_CFLAGS@ 
  
-@@ -32,19 +34,26 @@ src ::
+@@ -32,20 +34,27 @@ src ::
  
  .PHONY : install
  install:
 -	@( if [ ! -d $(dst_dir)$(log_path_base) ]; then mkdir -p $(dst_dir)$(log_path_base); fi )
 -	@( if [ ! -d $(dst_dir)$(trc_path_base) ]; then mkdir -p $(dst_dir)$(trc_path_base); fi )
--
--	@( if [ ! -d $(dst_dir)$(bin_path_base) ]; then mkdir -p $(dst_dir)$(bin_path_base); fi )
--	@( cp src/ss5 $(dst_dir)$(bin_path_base)/ )
--	@( cp src/ss5srv $(dst_dir)$(bin_path_base)/ )
 +	cp src/ss5 $(dst_dir)$(bin_path_base)/
 +	cp src/ss5srv $(dst_dir)$(bin_path_base)/
  
+-	@( if [ ! -d $(dst_dir)$(bin_path_base) ]; then mkdir -p $(dst_dir)$(bin_path_base); fi )
+-	@( cp src/ss5 $(dst_dir)$(bin_path_base)/ )
+-	@( cp src/ss5srv $(dst_dir)$(bin_path_base)/ )
+-
  	@( if [ ! -d $(dst_dir)$(lib_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(lib_path_base)/ss5; fi )
 -	@( find modules -name *.so -exec cp {} $(dst_dir)$(lib_path_base)/ss5/ \; )
 -	@( cp modules/mod_statistics/statmgr.cgi $(dst_dir)$(lib_path_base)/ss5/ )
@@ -41,7 +41,7 @@
 -	@( cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ )
 -	@( cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ )
 +	find modules -name *.so -exec cp {} $(dst_dir)$(lib_path_base)/ss5/ \;
-+
+ 
 +	@( if [ ! -d $(ss5_share) ] && [ $(OS) = "FreeBSD" ]; then mkdir -p $(ss5_share); fi )
 +	if [ $(OS) = "FreeBSD" ]; then \
 +	 cp modules/mod_statistics/statmgr.cgi $(ss5_share)/ ; \
@@ -56,9 +56,10 @@
 +	 cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ; \
 +	 cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ; \
 +	fi )
- 
++
  	@( if [ $(OS) = "Linux" ]; then \
  	if [ ! -d $(dst_dir)/etc/rc.d/init.d ]; then mkdir -p $(dst_dir)/etc/rc.d/init.d; fi ; \
+         fi )
 @@ -67,45 +76,51 @@ install:
  	if [ ! -f $(dst_dir)/etc/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/init.d/ss5; \
  	else cp conf/ss5.init $(dst_dir)/etc/init.d/ss5.rpmnew ; fi ; \
Index: net/ss5/files/patch-configure
===================================================================
--- net/ss5/files/patch-configure
+++ net/ss5/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2009-07-17 16:03:06.000000000 -0500
+--- configure.orig	2012-01-11 09:33:26 UTC
 +++ configure
 @@ -1843,7 +1843,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ac_config_headers="$ac_config_headers include/config.h"
Index: net/ss5/files/patch-include_SS5Debug.h
===================================================================
--- net/ss5/files/patch-include_SS5Debug.h
+++ net/ss5/files/patch-include_SS5Debug.h
@@ -1,4 +1,4 @@
---- include/SS5Debug.h.orig	2009-08-02 01:58:07.000000000 -0500
+--- include/SS5Debug.h.orig	2011-08-26 12:28:01 UTC
 +++ include/SS5Debug.h
 @@ -19,37 +19,37 @@
  #ifndef SS5DEBUG_H
Index: net/ss5/files/patch-include_SS5Server.h
===================================================================
--- net/ss5/files/patch-include_SS5Server.h
+++ net/ss5/files/patch-include_SS5Server.h
@@ -1,4 +1,4 @@
---- include/SS5Server.h.orig	2009-08-02 01:58:07.000000000 -0500
+--- include/SS5Server.h.orig	2011-08-26 12:28:01 UTC
 +++ include/SS5Server.h
 @@ -31,7 +31,7 @@ UINT
    S5ServerClose(	int exitcode
Index: net/ss5/files/patch-src-SS5Server.c
===================================================================
--- net/ss5/files/patch-src-SS5Server.c
+++ net/ss5/files/patch-src-SS5Server.c
@@ -1,6 +1,6 @@
---- src/SS5Server.c.orig	2009-08-02 01:57:19.000000000 -0500
-+++ src/SS5Server.c	2013-03-05 19:49:44.744425659 -0600
-@@ -44,6 +44,8 @@
+--- src/SS5Server.c.orig	2011-08-26 12:28:01 UTC
++++ src/SS5Server.c
+@@ -44,6 +44,8 @@ void S5SetStatic( void )
    SS5SocksOpt.PreforkProcesses = 1;
    SS5SocksOpt.PropagateKey     = 0;
    SS5SocksOpt.Role             = ALONE;
Index: net/ss5/files/patch-src-SS5Utils.c
===================================================================
--- net/ss5/files/patch-src-SS5Utils.c
+++ net/ss5/files/patch-src-SS5Utils.c
@@ -1,6 +1,6 @@
---- src/SS5Utils.c.orig	2009-08-02 17:57:19.000000000 +1100
-+++ src/SS5Utils.c	2011-02-25 13:34:42.311808628 +1000
-@@ -117,6 +117,10 @@
+--- src/SS5Utils.c.orig	2012-01-11 16:40:01 UTC
++++ src/SS5Utils.c
+@@ -117,6 +117,10 @@ UINT S5LoadConfig( UINT loadMode )
      case ALONE:
        snprintf(logString,256 - 1,"[VERB] Role is ALONE.");
      break;
Index: net/ss5/pkg-plist
===================================================================
--- net/ss5/pkg-plist
+++ net/ss5/pkg-plist
@@ -1,9 +1,6 @@
-%%ETCDIR%%/ss5.conf
-%%ETCDIR%%/ss5.conf.sample
-%%ETCDIR%%/ss5.ha
-%%ETCDIR%%/ss5.ha.sample
-%%ETCDIR%%/ss5.passwd
-%%ETCDIR%%/ss5.passwd.sample
+@sample %%ETCDIR%%/ss5.conf.sample
+@sample %%ETCDIR%%/ss5.ha.sample
+@sample %%ETCDIR%%/ss5.passwd.sample
 lib/ss5/mod_authentication.so
 lib/ss5/mod_authorization.so
 lib/ss5/mod_balance.so