update to 2.5.2

Approved By:	maintainer timeout (2 weeks)

4 files changed, 41 insertions, 41 deletions

diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 69084eb7f38d..bba44df6218d 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	zebedee
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.2
 CATEGORIES=	security
-MASTER_SITES=	http://www.winton.org.uk/zebedee/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://www.winton.org.uk/zebedee/ \
 		http://www.hewgill.com/zebedee/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	greg@hewgill.com
 COMMENT=	Encrypted, secure compressed TCP tunnel
@@ -26,27 +28,25 @@ MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 
 MAN1=		zebedee.1 ftpgw.tcl.1
 
+EXAMPLES=	vncviewer.zbd vncserver.zbd server.key server.id client1.key \
+		client2.key clients.id
+DOCS=		README.txt LICENCE.txt CHANGES.txt zebedee.html ftpgw.tcl.html
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zebedee ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/ftpgw.tcl ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/zebedee.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/server.zbd ${PREFIX}/etc/server.zbd.sample
-	${MKDIR} ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/vncviewer.zbd ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/vncserver.zbd ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/server.key ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/server.id ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/client1.key ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/client2.key ${PREFIX}/share/examples/zebedee
-	${INSTALL_DATA} ${WRKSRC}/clients.id ${PREFIX}/share/examples/zebedee
+	${MKDIR} ${EXAMPLESDIR}
+.for e in ${EXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/${e} ${EXAMPLESDIR}
+.endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/zebedee
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/zebedee
-	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${PREFIX}/share/doc/zebedee
-	${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${PREFIX}/share/doc/zebedee
-	${INSTALL_DATA} ${WRKSRC}/zebedee.html ${PREFIX}/share/doc/zebedee
-	${INSTALL_DATA} ${WRKSRC}/ftpgw.tcl.html ${PREFIX}/share/doc/zebedee
+	@${MKDIR} ${DOCSDIR}
+.for d in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo
index e3e403e0c12f..9d17fb7ba696 100644
--- a/security/zebedee/distinfo
+++ b/security/zebedee/distinfo
@@ -1,2 +1,2 @@
-MD5 (zebedee-2.4.1.tar.gz) = d17a556b966b7b8b1a199b2078e32780
-SIZE (zebedee-2.4.1.tar.gz) = 165130
+MD5 (zebedee-2.5.2.tar.gz) = 60b3675c792fc65ef79aeb9a6ea40789
+SIZE (zebedee-2.5.2.tar.gz) = 175463
diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-aa
index 4b45f409e899..b93c06e9d52a 100644
--- a/security/zebedee/files/patch-aa
+++ b/security/zebedee/files/patch-aa
@@ -1,8 +1,8 @@
---- ./Makefile.orig	Thu May 30 00:42:08 2002
-+++ ./Makefile	Wed Sep 24 16:37:09 2003
+--- Makefile.orig	Tue Sep 23 14:37:56 2003
++++ Makefile	Mon Dec 15 19:56:14 2003
 @@ -5,7 +5,7 @@
  
- ZBD_VERSION = 2.4.1
+ ZBD_VERSION = 2.5.2
  
 -OS = 
 +OS = freebsd
@@ -15,11 +15,11 @@
  
 -CC_$(OS) = gcc
 -
- CC_win32 = c:/msys/1.0/mingw/bin/gcc
+ CC_win32 = gcc -mno-cygwin
  CC_linux = gcc -pthread
  CC_solaris = gcc
 -CC_freebsd = gcc -pthread
-+CC_freebsd = gcc
++CC_freebsd ?= gcc
  CC_tru64 = cc
  CC_irix = cc -n32 -woff 1110
  CC_hpux = cc -Ae +DAportable
@@ -27,8 +27,8 @@
  # Optimise/debug compilation
  
  #OPTIM = -Wall -g
--OPTIM = -O3
-+OPTIM = 
+-OPTIM = -Wall -O3
++OPTIM = -Wall
  
  # Location of gmp include and library
  #
@@ -65,7 +65,7 @@
  PERL = $(PERL_$(OS))
  
  BAT_win32 = .bat
-@@ -175,7 +174,8 @@
+@@ -182,7 +181,8 @@
  #### You REALLY shouldn't have to modify anything beyond here ...
  ####
  
@@ -75,7 +75,7 @@
  
  LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
  
-@@ -195,7 +195,7 @@
+@@ -202,7 +202,7 @@
  	@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi
  
  zebedee$(EXE) : $(OBJS)
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index 1f72ad3732c9..fb5ab7363e52 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -1,17 +1,17 @@
 bin/ftpgw.tcl
 bin/zebedee
 etc/server.zbd.sample
-share/examples/zebedee/client1.key
-share/examples/zebedee/client2.key
-share/examples/zebedee/clients.id
-share/examples/zebedee/server.id
-share/examples/zebedee/server.key
-share/examples/zebedee/vncserver.zbd
-share/examples/zebedee/vncviewer.zbd
-%%PORTDOCS%%share/doc/zebedee/CHANGES.txt
-%%PORTDOCS%%share/doc/zebedee/LICENCE.txt
-%%PORTDOCS%%share/doc/zebedee/README.txt
-%%PORTDOCS%%share/doc/zebedee/ftpgw.tcl.html
-%%PORTDOCS%%share/doc/zebedee/zebedee.html
-@dirrm share/examples/zebedee
-%%PORTDOCS%%@dirrm share/doc/zebedee
+%%EXAMPLESDIR%%/client1.key
+%%EXAMPLESDIR%%/client2.key
+%%EXAMPLESDIR%%/clients.id
+%%EXAMPLESDIR%%/server.id
+%%EXAMPLESDIR%%/server.key
+%%EXAMPLESDIR%%/vncserver.zbd
+%%EXAMPLESDIR%%/vncviewer.zbd
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html
+%%PORTDOCS%%%%DOCSDIR%%/zebedee.html
+@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%