Update v1.2.0 -> v1.3.0

Submitted by: Greg Hewgill <greg@hewgill.com>

4 files changed, 44 insertions, 23 deletions

diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 8ee0f1a0e412..8364b7873bda 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	zebedee
-# Version required:	1.2.0
+# Version required:	1.3.0
 # Date created:		4 January 2000
 # Whom:			Greg Hewgill <greg@hewgill.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	zebedee-1.2.0
+DISTNAME=	zebedee-1.3.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.winton.org.uk/zebedee/ \
 		http://www.hewgill.com/zebedee/
@@ -19,11 +19,13 @@ BUILD_DEPENDS=	${LOCALBASE}/include/openssl/blowfish.h:${PORTSDIR}/security/open
 
 USE_PERL5=	yes
 
-MAN1=		zebedee.1
+MAN1=		zebedee.1 ftpgw.tcl.1
 
 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
@@ -35,5 +37,6 @@ do-install:
 	${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
 
 .include <bsd.port.mk>
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo
index dc4185b9ee3d..8702609a7e34 100644
--- a/security/zebedee/distinfo
+++ b/security/zebedee/distinfo
@@ -1 +1 @@
-MD5 (zebedee-1.2.0.tar.gz) = 75183e084b4e983782f4ea248b89b78b
+MD5 (zebedee-1.3.0.tar.gz) = 94df6fd7bf3cf77f17f65a9b8e9c5a0b
diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-aa
index b644dd933006..0d7e189d9688 100644
--- a/security/zebedee/files/patch-aa
+++ b/security/zebedee/files/patch-aa
@@ -1,19 +1,29 @@
---- Makefile.orig	Fri Nov 19 13:36:27 1999
-+++ Makefile	Sat Jan  8 01:51:44 2000
-@@ -28,29 +28,30 @@
- #   the use of bzip2 compression
+--- ../zebedee-1.3.0.orig/Makefile	Fri Jan 21 13:47:17 2000
++++ Makefile	Sat Jan 22 19:15:21 2000
+@@ -3,7 +3,7 @@
+ #
+ # $Id: Makefile,v 1.10 2000/01/21 21:46:41 nwinton Exp nwinton $
  
- #DEFINES =						# Win32
--DEFINES = -DHAVE_DEV_RANDOM -DHAVE_PTHREADS		# Linux
-+#DEFINES = -DHAVE_DEV_RANDOM -DHAVE_PTHREADS		# Linux
-+DEFINES = -DHAVE_DEV_RANDOM				# FreeBSD
- #DEFINES = -DHAVE_PROC_FS -DHAVE_PTHREADS		# Solaris
+-OS =
++OS = freebsd
+ 
+ ###
+ ### Locations of tools, libraries and installation directories.
+@@ -17,6 +17,7 @@
+ CC_win32 = /gcc-2.95/bin/gcc
+ CC_linux = gcc
+ CC_solaris = gcc
++CC_freebsd = cc
+ CC = $(CC_$(OS))
+ 
+ # Optimise/debug compilation
+@@ -26,24 +27,24 @@
  
  # Location of gmp include and library
  
 -GMPINC = -I../gmp-2.0.2
 -GMPLIB = ../gmp-2.0.2/libgmp.a
-+GMPINC = 
++GMPINC =
 +GMPLIB = -lgmp
  
  # Location of Blowfish include and library
@@ -37,16 +47,22 @@
 -BZLIB = ../bzip2-0.9.5d/libbz2.a
 +BZINC = -I${PREFIX}/include
 +BZLIB = ${PREFIX}/lib/libbz2.a
- 
+ #
+ # Tools needed for Perl "POD"-format documentation conversion.
+ #
+@@ -90,6 +91,7 @@
+ DEFINES_win32 = 				# Win32
+ DEFINES_linux = -D_REENTRANT -DHAVE_PTHREADS	# Linux
+ DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS	# Solaris
++DEFINES_freebsd = -D_REENTRANT			# FreeBSD
+ DEFINES = $(DEFINES_$(OS))
  
  # Suffix for executables
-@@ -61,7 +62,8 @@
- # Extra OS-specific libraries
+@@ -101,6 +103,7 @@
  
- #OSLIBS = -lwsock32 -lwinmm		# Win32
--OSLIBS = -lpthread			# Linux
-+#OSLIBS = -lpthread			# Linux
-+OSLIBS =				# FreeBSD
- #OSLIBS = -lsocket -lnsl -lthread	# Solaris
+ OSLIBS_win32 = -lwsock32 -lwinmm		# Win32
+ OSLIBS_linux = -lpthread			# Linux
++OSLIBS_freebsd =				# FreeBSD
+ OSLIBS_solaris = -lsocket -lnsl -lthread	# Solaris
+ OSLIBS = $(OSLIBS_$(OS))
  
- # Supplementary object files (Win32 ONLY)
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index 121ee2c82085..7a5b74c123a0 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -1,4 +1,5 @@
 bin/zebedee
+bin/ftpgw.tcl
 etc/server.zbd.sample
 share/examples/zebedee/vncviewer.zbd
 share/examples/zebedee/vncserver.zbd
@@ -8,5 +9,6 @@ share/doc/zebedee/README.txt
 share/doc/zebedee/LICENCE.txt
 share/doc/zebedee/CHANGES.txt
 share/doc/zebedee/zebedee.html
+share/doc/zebedee/ftpgw.tcl.html
 @dirrm share/examples/zebedee
 @dirrm share/doc/zebedee