diff options
| author | Daniel Baker <dbaker@FreeBSD.org> | 2000-01-23 05:32:37 +0000 |
|---|---|---|
| committer | Daniel Baker <dbaker@FreeBSD.org> | 2000-01-23 05:32:37 +0000 |
| commit | 59378ebd8b1e5cc71e1bb7eed9fbf6abf0e64da7 (patch) | |
| tree | 98a2263b0a6c66eb7d87d51ce9bf50797b69310c /security/zebedee/files | |
| parent | 9ef74882d1b4d3c7e984b787027d05b52a93cbd8 (diff) | |
| download | freebsd-ports-59378ebd8b1e5cc71e1bb7eed9fbf6abf0e64da7.zip | |
Update v1.2.0 -> v1.3.0
Submitted by: Greg Hewgill <greg@hewgill.com>
Diffstat (limited to 'security/zebedee/files')
| -rw-r--r-- | security/zebedee/files/patch-aa | 54 |
1 files changed, 35 insertions, 19 deletions
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) |