From b8d6d9d462e5c5e13a28719397a03789c62f8dea Mon Sep 17 00:00:00 2001
From: Daniel Baker <dbaker@FreeBSD.org>
Date: Thu, 25 Jan 2001 18:16:45 +0000
Subject: [PATCH] Update version: 1.3.0 -> 2.0.1

Submitted by:	 Maintainer (Greg Hewgill <greg@hewgill.com>)
---
 security/zebedee/Makefile       |  5 ++++-
 security/zebedee/distinfo       |  2 +-
 security/zebedee/files/patch-aa | 32 ++++++++++++++------------------
 security/zebedee/pkg-plist      |  3 +++
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index fdeedbef6a8d..a6e5b6be246f 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zebedee
-PORTVERSION=	1.3.0
+PORTVERSION=	2.0.1
 CATEGORIES=	security
 MASTER_SITES=	http://www.winton.org.uk/zebedee/ \
 		http://www.hewgill.com/zebedee/
@@ -31,6 +31,9 @@ do-install:
 	${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} ${PREFIX}/share/doc/zebedee
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/zebedee
 	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${PREFIX}/share/doc/zebedee
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo
index 8702609a7e34..ea35a129ea91 100644
--- a/security/zebedee/distinfo
+++ b/security/zebedee/distinfo
@@ -1 +1 @@
-MD5 (zebedee-1.3.0.tar.gz) = 94df6fd7bf3cf77f17f65a9b8e9c5a0b
+MD5 (zebedee-2.0.1.tar.gz) = 7cafb5ea0d4bc7def12fed445eeebad6
diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-aa
index b1ecc24ca32f..c9e7fe144d23 100644
--- a/security/zebedee/files/patch-aa
+++ b/security/zebedee/files/patch-aa
@@ -1,21 +1,20 @@
---- Makefile.orig	Fri Jan 21 13:47:17 2000
-+++ Makefile	Sat Feb  5 23:59:19 2000
+--- Makefile.orig	Sun Aug 13 11:06:36 2000
++++ Makefile	Thu Jan 25 04:08:11 2001
 @@ -3,7 +3,7 @@
  #
- # $Id: Makefile,v 1.10 2000/01/21 21:46:41 nwinton Exp nwinton $
+ # $Id: Makefile,v 1.13 2000/06/05 21:34:27 nwinton Exp nwinton $
  
 -OS =
 +OS = freebsd
  
  ###
  ### Locations of tools, libraries and installation directories.
-@@ -17,33 +17,34 @@
- CC_win32 = /gcc-2.95/bin/gcc
+@@ -17,12 +17,13 @@
+ CC_win32 = gcc -mno-cygwin
  CC_linux = gcc
  CC_solaris = gcc
--CC = $(CC_$(OS))
 +CC_freebsd = cc
-+CC ?= $(CC_$(OS))
+ CC = $(CC_$(OS))
  
  # Optimise/debug compilation
  
@@ -24,11 +23,8 @@
 +OPTIM = -Wall
  
  # Location of gmp include and library
- 
--GMPINC = -I../gmp-2.0.2
--GMPLIB = ../gmp-2.0.2/libgmp.a
-+GMPINC =
-+GMPLIB = -lgmp
+ #
+@@ -34,19 +35,19 @@
  
  # Location of Blowfish include and library
  
@@ -51,10 +47,10 @@
 -BZLIB = ../bzip2-0.9.5d/libbz2.a
 +BZINC = -I${LOCALBASE}/include
 +BZLIB = ${LOCALBASE}/lib/libbz2.a
+ 
  #
  # Tools needed for Perl "POD"-format documentation conversion.
- #
-@@ -90,6 +91,7 @@
+@@ -94,6 +95,7 @@
  DEFINES_win32 = 				# Win32
  DEFINES_linux = -D_REENTRANT -DHAVE_PTHREADS	# Linux
  DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS	# Solaris
@@ -62,15 +58,15 @@
  DEFINES = $(DEFINES_$(OS))
  
  # Suffix for executables
-@@ -101,6 +103,7 @@
- 
+@@ -106,6 +108,7 @@
  OSLIBS_win32 = -lwsock32 -lwinmm		# Win32
  OSLIBS_linux = -lpthread			# Linux
-+OSLIBS_freebsd =				# FreeBSD
  OSLIBS_solaris = -lsocket -lnsl -lthread	# Solaris
++OSLIBS_freebsd = 				# FreeBSD
  OSLIBS = $(OSLIBS_$(OS))
  
-@@ -116,7 +119,8 @@
+ # Supplementary object files (Win32 ONLY)
+@@ -120,7 +123,8 @@
  #### You REALLY shouldn't have to modify anything beyond here ...
  ####
  
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index 7a5b74c123a0..d2e026f98b9b 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -5,6 +5,9 @@ share/examples/zebedee/vncviewer.zbd
 share/examples/zebedee/vncserver.zbd
 share/examples/zebedee/server.key
 share/examples/zebedee/server.id
+share/examples/zebedee/client1.key
+share/examples/zebedee/client2.key
+share/examples/zebedee/clients.id
 share/doc/zebedee/README.txt
 share/doc/zebedee/LICENCE.txt
 share/doc/zebedee/CHANGES.txt