head	1.11;
access;
symbols
	RELEASE_8_3_0:1.11
	RELEASE_9_0_0:1.11
	RELEASE_7_4_0:1.11
	RELEASE_8_2_0:1.11
	RELEASE_6_EOL:1.11
	RELEASE_8_1_0:1.11
	RELEASE_7_3_0:1.11
	RELEASE_8_0_0:1.11
	RELEASE_7_2_0:1.11
	RELEASE_7_1_0:1.11
	RELEASE_6_4_0:1.11
	RELEASE_5_EOL:1.11
	RELEASE_7_0_0:1.11
	RELEASE_6_3_0:1.11
	PRE_XORG_7:1.11
	RELEASE_4_EOL:1.11
	RELEASE_6_2_0:1.11
	RELEASE_6_1_0:1.11
	RELEASE_5_5_0:1.11
	RELEASE_6_0_0:1.10
	RELEASE_5_4_0:1.10
	RELEASE_4_11_0:1.10
	RELEASE_5_3_0:1.10
	RELEASE_4_10_0:1.10
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.8
	RELEASE_5_1_0:1.8
	RELEASE_4_8_0:1.8
	RELEASE_5_0_0:1.7
	RELEASE_4_7_0:1.7
	RELEASE_4_6_2:1.7
	RELEASE_4_6_1:1.7
	RELEASE_4_6_0:1.7
	RELEASE_5_0_DP1:1.7
	RELEASE_4_5_0:1.7
	RELEASE_4_4_0:1.6
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.3
	zebedee_1_2_0:1.1.1.1
	DBAKER:1.1.1;
locks; strict;
comment	@# @;


1.11
date	2005.09.20.17.15.59;	author oliver;	state Exp;
branches;
next	1.10;

1.10
date	2004.04.06.23.43.01;	author oliver;	state Exp;
branches;
next	1.9;

1.9
date	2003.10.06.10.19.02;	author fjoe;	state Exp;
branches;
next	1.8;

1.8
date	2003.03.04.03.58.15;	author foxfair;	state Exp;
branches;
next	1.7;

1.7
date	2001.12.24.23.20.43;	author steve;	state Exp;
branches;
next	1.6;

1.6
date	2001.07.04.21.31.26;	author dwcjr;	state Exp;
branches;
next	1.5;

1.5
date	2001.02.11.17.25.09;	author dbaker;	state Exp;
branches;
next	1.4;

1.4
date	2001.01.25.18.16.45;	author dbaker;	state Exp;
branches;
next	1.3;

1.3
date	2000.02.06.21.53.04;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	2000.01.23.05.32.36;	author dbaker;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.09.08.15.41;	author dbaker;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.01.09.08.15.41;	author dbaker;	state Exp;
branches;
next	;


desc
@@


1.11
log
@update to 2.5.3

PR:		86331
Submitted by:	oliver
Approved by:	maintainer
@
text
@--- Makefile.orig	Tue Sep  6 07:59:53 2005
+++ Makefile	Thu Sep 15 07:34:55 2005
@@@@ -5,7 +5,7 @@@@
 
 ZBD_VERSION = 2.5.3
 
-OS = 
+OS = freebsd
 
 ###
 ### Locations of tools, libraries and installation directories.
@@@@ -14,13 +14,11 @@@@
 
 # Choose your C compiler
 
-CC_$(OS) = gcc
-
 CC_win32 = gcc -mno-cygwin
 CC_linux = gcc -pthread
 CC_linux64 = $(CC_linux) -m64
 CC_solaris = gcc
-CC_freebsd = gcc -pthread
+CC_freebsd ?= gcc
 CC_tru64 = cc
 CC_irix = cc -n32 -woff 1110
 CC_hpux = cc -Ae +DAportable
@@@@ -31,7 +29,7 @@@@
 # Optimise/debug compilation
 
 #OPTIM = -Wall -g
-OPTIM = -Wall -O3
+OPTIM = -Wall
 
 # Location of gmp include and library
 #
@@@@ -46,25 +44,26 @@@@
 # BFINC = /usr/include/openssl
 # BFLIB = -lcrypto
 
-BFINC = -I../blowfish-0.9.5a
-BFLIB = ../blowfish-0.9.5a/libblowfish.a
+BFINC = -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl
+BFLIB = $(OPENSSLLIB)/libcrypto.a
 
 # Location of zlib include and library
 
-ZINC = -I../zlib-1.2.3
-ZLIB = ../zlib-1.2.3/libz.a
+ZINC = 
+ZLIB = -lz
 
 # Location of bzlib include and library
 # Set these empty if you don't want bzib2 support
 
-BZINC = -I../bzip2-1.0.3
-BZLIB = ../bzip2-1.0.3/libbz2.a
+BZINC = -I$(LOCALBASE)/include
+BZLIB = -L$(LOCALBASE)/lib -lbz2
 
 #
 # Tools needed for Perl "POD"-format documentation conversion.
 #
 PERL_$(OS) = perl
 PERL_win32 = c:/perl/bin/perl	# Avoid Cygwin port
+PERL_freebsd = perl
 PERL = $(PERL_$(OS))
 
 BAT_win32 = .bat
@@@@ -186,7 +185,8 @@@@
 #### You REALLY shouldn't have to modify anything beyond here ...
 ####
 
-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
+CFLAGS ?= -03
+CFLAGS += $(PTHREAD_CFLAGS) $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
 
 LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
 
@@@@ -206,7 +206,7 @@@@
 	@@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi
 
 zebedee$(EXE) : $(OBJS)
-	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) $(PTHREAD_LIBS)
 
 huge.o : huge.h
 
@


1.10
log
@update to 2.5.2

Approved By:	maintainer timeout (2 weeks)
@
text
@d1 2
a2 2
--- Makefile.orig	Tue Sep 23 14:37:56 2003
+++ Makefile	Mon Dec 15 19:56:14 2003
d5 1
a5 1
 ZBD_VERSION = 2.5.2
d12 1
a12 1
@@@@ -14,12 +14,10 @@@@
d20 1
d27 1
a27 1
@@@@ -30,7 +28,7 @@@@
d36 1
a36 1
@@@@ -45,25 +43,26 @@@@
d47 3
a49 3
-ZINC = -I../zlib-1.1.4
-ZLIB = ../zlib-1.1.4/libz.a
+ZINC =
d55 2
a56 2
-BZINC = -I../bzip2-1.0.1
-BZLIB = ../bzip2-1.0.1/libbz2.a
d69 1
a69 1
@@@@ -182,7 +181,8 @@@@
d79 2
a80 2
@@@@ -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
@


1.9
log
@Do not use -pthread (maintainer timeout).
@
text
@d1 2
a2 2
--- ./Makefile.orig	Thu May 30 00:42:08 2002
+++ ./Makefile	Wed Sep 24 16:37:09 2003
d5 1
a5 1
 ZBD_VERSION = 2.4.1
d18 1
a18 1
 CC_win32 = c:/msys/1.0/mingw/bin/gcc
d22 1
a22 1
+CC_freebsd = gcc
d30 2
a31 2
-OPTIM = -O3
+OPTIM = 
d68 1
a68 1
@@@@ -175,7 +174,8 @@@@
d78 1
a78 1
@@@@ -195,7 +195,7 @@@@
@


1.8
log
@PR:		48754
Submitted by:	Adam Jette <jettea46@@yahoo.com>
Update to 2.4.1, also notice chages to MAINTAINER
@
text
@d1 86
a86 158
*** Makefile.orig	Thu Feb 27 11:48:08 2003
--- Makefile	Thu Feb 27 11:48:13 2003
***************
*** 3,23 ****
  #
  # $Id: Makefile,v 1.13 2002/05/29 17:42:08 ndwinton Exp $
  
  ZBD_VERSION = 2.4.1
  
! OS = 
  
  ###
  ### Locations of tools, libraries and installation directories.
  ### You may well need to change these.
  ###
  
  # Choose your C compiler
  
- CC_$(OS) = gcc
- 
  CC_win32 = c:/msys/1.0/mingw/bin/gcc
  CC_linux = gcc -pthread
  CC_solaris = gcc
  CC_freebsd = gcc -pthread
  CC_tru64 = cc
--- 3,21 ----
  #
  # $Id: Makefile,v 1.13 2002/05/29 17:42:08 ndwinton Exp $
  
  ZBD_VERSION = 2.4.1
  
! OS = freebsd
  
  ###
  ### Locations of tools, libraries and installation directories.
  ### You may well need to change these.
  ###
  
  # Choose your C compiler
  
  CC_win32 = c:/msys/1.0/mingw/bin/gcc
  CC_linux = gcc -pthread
  CC_solaris = gcc
  CC_freebsd = gcc -pthread
  CC_tru64 = cc
***************
*** 28,38 ****
  CC = $(CC_$(OS))
  
  # Optimise/debug compilation
  
  #OPTIM = -Wall -g
! OPTIM = -O3
  
  # Location of gmp include and library
  #
  # NOTE: These are no longer used unless you define USE_GMP_LIBRARY (which is
  # undefined by default). Uncomment them as necessary.
--- 26,36 ----
  CC = $(CC_$(OS))
  
  # Optimise/debug compilation
  
  #OPTIM = -Wall -g
! OPTIM = 
  
  # Location of gmp include and library
  #
  # NOTE: These are no longer used unless you define USE_GMP_LIBRARY (which is
  # undefined by default). Uncomment them as necessary.
***************
*** 43,71 ****
  # Location of Blowfish include and library
  # You can use the versions from OpenSSL if you have it installed, as follows:
  # BFINC = /usr/include/openssl
  # BFLIB = -lcrypto
  
! BFINC = -I../blowfish-0.9.5a
! BFLIB = ../blowfish-0.9.5a/libblowfish.a
  
  # Location of zlib include and library
  
! ZINC = -I../zlib-1.1.4
! ZLIB = ../zlib-1.1.4/libz.a
  
  # Location of bzlib include and library
  # Set these empty if you don't want bzib2 support
  
! BZINC = -I../bzip2-1.0.1
! BZLIB = ../bzip2-1.0.1/libbz2.a
  
  #
  # Tools needed for Perl "POD"-format documentation conversion.
  #
  PERL_$(OS) = perl
  PERL_win32 = c:/perl/bin/perl	# Avoid Cygwin port
  PERL = $(PERL_$(OS))
  
  BAT_win32 = .bat
  
  POD2HTML = $(PERL) -S pod2html$(BAT_$(OS))
--- 41,70 ----
  # Location of Blowfish include and library
  # You can use the versions from OpenSSL if you have it installed, as follows:
  # BFINC = /usr/include/openssl
  # BFLIB = -lcrypto
  
! BFINC = -I${OPENSSLINC} -I${OPENSSLINC}/openssl
! BFLIB = ${OPENSSLLIB}/libcrypto.a
  
  # Location of zlib include and library
  
! ZINC =
! ZLIB = -lz
  
  # Location of bzlib include and library
  # Set these empty if you don't want bzib2 support
  
! BZINC = -I${LOCALBASE}/include
! BZLIB = -L${LOCALBASE}/lib -lbz2
  
  #
  # Tools needed for Perl "POD"-format documentation conversion.
  #
  PERL_$(OS) = perl
  PERL_win32 = c:/perl/bin/perl	# Avoid Cygwin port
+ PERL_freebsd = perl
  PERL = $(PERL_$(OS))
  
  BAT_win32 = .bat
  
  POD2HTML = $(PERL) -S pod2html$(BAT_$(OS))
***************
*** 173,183 ****
  
  ####
  #### You REALLY shouldn't have to modify anything beyond here ...
  ####
  
! CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
  
  LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
  
  OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ)
  
--- 172,183 ----
  
  ####
  #### You REALLY shouldn't have to modify anything beyond here ...
  ####
  
! CFLAGS ?= -03
! CFLAGS += ${PTHREAD_LIBS} ${PTHREAD_CFLAGS} $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
  
  LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
  
  OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ)
  
@


1.7
log
@Allow this to build on bento again where /usr/bin/bzip2 exists on bento
but not on gohan*.
@
text
@d1 158
a158 68
--- Makefile.orig	Fri Apr 13 12:41:22 2001
+++ Makefile	Mon Dec 24 17:17:48 2001
@@@@ -3,7 +3,7 @@@@
 #
 # $Id: Makefile,v 1.2 2001/04/13 17:41:21 ndwinton Exp $
 
-OS = 
+OS = freebsd
 
 ###
 ### Locations of tools, libraries and installation directories.
@@@@ -12,19 +12,16 @@@@
 
 # Chose your C compiler
 
-CC_$(OS) = gcc
-
 CC_win32 = c:/gcc-2.95.2/bin/gcc
 CC_linux = gcc -pthread
 CC_solaris = gcc
 CC_freebsd = gcc -pthread
 CC_tru64 = cc
-CC = $(CC_$(OS))
 
 # Optimise/debug compilation
 
 #OPTIM = -Wall -g
-OPTIM = -O3
+OPTIM = 
 
 # Location of gmp include and library
 #
@@@@ -36,19 +33,19 @@@@
 
 # Location of Blowfish include and library
 
-BFINC = -I../blowfish-0.9.5a
-BFLIB = ../blowfish-0.9.5a/libblowfish.a
+BFINC = -I${OPENSSLINC} -I${OPENSSLINC}/openssl
+BFLIB = ${OPENSSLLIB}/libcrypto.a
 
 # Location of zlib include and library
 
-ZINC = -I../zlib-1.1.3
-ZLIB = ../zlib-1.1.3/libz.a
+ZINC = 
+ZLIB = -lz
 
 # Location of bzlib include and library
 # Set these empty if you don't want bzib2 support
 
-BZINC = -I../bzip2-1.0.1
-BZLIB = ../bzip2-1.0.1/libbz2.a
+BZINC = -I${LOCALBASE}/include
+BZLIB = -L${LOCALBASE}/lib -lbz2
 
 #
 # Tools needed for Perl "POD"-format documentation conversion.
@@@@ -133,7 +130,8 @@@@
 #### You REALLY shouldn't have to modify anything beyond here ...
 ####
 
-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
+CFLAGS ?= -O3
+CFLAGS += ${PTHREAD_LIBS} ${PTHREAD_CFLAGS} $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
 
 LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
 
@


1.6
log
@Make PORTDOCS compliant
Add missing files to pkg-plist
Update to 2.2.2
Change dependency to look for bzip shared lib instead of static lib
Update patch-aa to work with new version

PR:		28517
Submitted by:	Pete Fritchman <petef@@databits.net>
@
text
@d1 2
a2 2
--- Makefile.orig	Wed Jul  4 17:16:33 2001
+++ Makefile	Wed Jul  4 17:16:54 2001
d55 1
a55 1
+BZLIB = ${LOCALBASE}/lib/libbz2.a
@


1.5
log
@Update: 2.2.1

Submitted by:	Greg Hewgill <greg@@hewgill.com>
@
text
@d1 2
a2 2
--- Makefile.orig	Tue Feb  6 15:43:58 2001
+++ Makefile	Tue Feb  6 15:44:36 2001
d5 1
a5 1
 # $Id: Makefile,v 1.19 2000/10/18 20:55:53 nwinton Exp nwinton $
d12 13
a24 1
@@@@ -24,7 +24,7 @@@@
d33 1
a33 1
@@@@ -36,19 +36,19 @@@@
d59 1
a59 1
@@@@ -133,7 +133,8 @@@@
d65 1
a65 1
+CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
@


1.4
log
@Update version: 1.3.0 -> 2.0.1

Submitted by:	 Maintainer (Greg Hewgill <greg@@hewgill.com>)
@
text
@d1 2
a2 2
--- Makefile.orig	Sun Aug 13 11:06:36 2000
+++ Makefile	Thu Jan 25 04:08:11 2001
d5 1
a5 1
 # $Id: Makefile,v 1.13 2000/06/05 21:34:27 nwinton Exp nwinton $
d7 1
a7 1
-OS =
d12 1
a12 7
@@@@ -17,12 +17,13 @@@@
 CC_win32 = gcc -mno-cygwin
 CC_linux = gcc
 CC_solaris = gcc
+CC_freebsd = cc
 CC = $(CC_$(OS))
 
d16 2
a17 2
-OPTIM = -Wall -O
+OPTIM = -Wall
d21 1
a21 1
@@@@ -34,19 +35,19 @@@@
d25 2
a26 2
-BFINC = -I../blowfish
-BFLIB = ../blowfish/libblowfish.a
d34 1
a34 1
+ZINC =
d40 2
a41 2
-BZINC = -I../bzip2-0.9.5d
-BZLIB = ../bzip2-0.9.5d/libbz2.a
d47 1
a47 17
@@@@ -94,6 +95,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
@@@@ -106,6 +108,7 @@@@
 OSLIBS_win32 = -lwsock32 -lwinmm		# Win32
 OSLIBS_linux = -lpthread			# Linux
 OSLIBS_solaris = -lsocket -lnsl -lthread	# Solaris
+OSLIBS_freebsd = 				# FreeBSD
 OSLIBS = $(OSLIBS_$(OS))
 
 # Supplementary object files (Win32 ONLY)
@@@@ -120,7 +123,8 @@@@
d52 1
a52 1
+CFLAGS ?= -O
@


1.3
log
@USE_OPENSSL, respect CC, CFLAGS, LOCALBASE

Assisted by:    Jim Bloom <bloom@@acm.org>
@
text
@d1 2
a2 2
--- Makefile.orig	Fri Jan 21 13:47:17 2000
+++ Makefile	Sat Feb  5 23:59:19 2000
d5 1
a5 1
 # $Id: Makefile,v 1.10 2000/01/21 21:46:41 nwinton Exp nwinton $
d12 2
a13 2
@@@@ -17,33 +17,34 @@@@
 CC_win32 = /gcc-2.95/bin/gcc
a15 1
-CC = $(CC_$(OS))
d17 1
a17 1
+CC ?= $(CC_$(OS))
d26 2
a27 5
 
-GMPINC = -I../gmp-2.0.2
-GMPLIB = ../gmp-2.0.2/libgmp.a
+GMPINC =
+GMPLIB = -lgmp
d50 1
d53 1
a53 2
 #
@@@@ -90,6 +91,7 @@@@
d61 1
a61 2
@@@@ -101,6 +103,7 @@@@
 
a63 1
+OSLIBS_freebsd =				# FreeBSD
d65 1
d68 2
a69 1
@@@@ -116,7 +119,8 @@@@
@


1.2
log
@Update v1.2.0 -> v1.3.0

Submitted by: Greg Hewgill <greg@@hewgill.com>
@
text
@d1 2
a2 2
--- ../zebedee-1.3.0.orig/Makefile	Fri Jan 21 13:47:17 2000
+++ Makefile	Sat Jan 22 19:15:21 2000
d12 1
a12 1
@@@@ -17,6 +17,7 @@@@
d16 1
d18 1
a18 1
 CC = $(CC_$(OS))
d21 4
a24 1
@@@@ -26,24 +27,24 @@@@
d37 2
a38 2
+BFINC = -I${PREFIX}/include/openssl
+BFLIB = ${PREFIX}/lib/libcrypto.a
d52 2
a53 2
+BZINC = -I${PREFIX}/include
+BZLIB = ${PREFIX}/lib/libbz2.a
d72 10
@


1.1
log
@Initial revision
@
text
@d1 20
a20 10
--- 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
 
 #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
d26 1
a26 1
+GMPINC = 
d50 9
a58 1
 
d61 1
a61 2
@@@@ -61,7 +62,8 @@@@
 # Extra OS-specific libraries
d63 5
a67 5
 #OSLIBS = -lwsock32 -lwinmm		# Win32
-OSLIBS = -lpthread			# Linux
+#OSLIBS = -lpthread			# Linux
+OSLIBS =				# FreeBSD
 #OSLIBS = -lsocket -lnsl -lthread	# Solaris
a68 1
 # Supplementary object files (Win32 ONLY)
@


1.1.1.1
log
@initial import of zebedee port

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