diff options
| author | dbaker <dbaker@FreeBSD.org> | 2001-02-12 01:25:09 +0800 |
|---|---|---|
| committer | dbaker <dbaker@FreeBSD.org> | 2001-02-12 01:25:09 +0800 |
| commit | 8160af2230b3d9810ce3c2c4478170f2062895fc (patch) | |
| tree | 7e2198583ec352560247843f46d89965aaaafb00 | |
| parent | db55b9fe0b41c8d6fb84455c12a8380368c253d5 (diff) | |
| download | freebsd-ports-gnome-8160af2230b3d9810ce3c2c4478170f2062895fc.tar.gz freebsd-ports-gnome-8160af2230b3d9810ce3c2c4478170f2062895fc.tar.zst freebsd-ports-gnome-8160af2230b3d9810ce3c2c4478170f2062895fc.zip | |
Update: 2.2.1
Submitted by: Greg Hewgill <greg@hewgill.com>
| -rw-r--r-- | security/zebedee/Makefile | 2 | ||||
| -rw-r--r-- | security/zebedee/distinfo | 2 | ||||
| -rw-r--r-- | security/zebedee/files/patch-aa | 52 |
3 files changed, 17 insertions, 39 deletions
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index a6e5b6be246f..0997a4987937 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zebedee -PORTVERSION= 2.0.1 +PORTVERSION= 2.2.1 CATEGORIES= security MASTER_SITES= http://www.winton.org.uk/zebedee/ \ http://www.hewgill.com/zebedee/ diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo index ea35a129ea91..2e38ac09d896 100644 --- a/security/zebedee/distinfo +++ b/security/zebedee/distinfo @@ -1 +1 @@ -MD5 (zebedee-2.0.1.tar.gz) = 7cafb5ea0d4bc7def12fed445eeebad6 +MD5 (zebedee-2.2.1.tar.gz) = bfd0f9908930d9253236a687656b052d diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-aa index c9e7fe144d23..8db659bde77a 100644 --- a/security/zebedee/files/patch-aa +++ b/security/zebedee/files/patch-aa @@ -1,35 +1,29 @@ ---- Makefile.orig Sun Aug 13 11:06:36 2000 -+++ Makefile Thu Jan 25 04:08:11 2001 +--- Makefile.orig Tue Feb 6 15:43:58 2001 ++++ Makefile Tue Feb 6 15:44:36 2001 @@ -3,7 +3,7 @@ # - # $Id: Makefile,v 1.13 2000/06/05 21:34:27 nwinton Exp nwinton $ + # $Id: Makefile,v 1.19 2000/10/18 20:55:53 nwinton Exp nwinton $ --OS = +-OS = +OS = freebsd ### ### Locations of tools, libraries and installation directories. -@@ -17,12 +17,13 @@ - CC_win32 = gcc -mno-cygwin - CC_linux = gcc - CC_solaris = gcc -+CC_freebsd = cc - CC = $(CC_$(OS)) - +@@ -24,7 +24,7 @@ # Optimise/debug compilation #OPTIM = -Wall -g --OPTIM = -Wall -O -+OPTIM = -Wall +-OPTIM = -O3 ++OPTIM = # Location of gmp include and library # -@@ -34,19 +35,19 @@ +@@ -36,19 +36,19 @@ # Location of Blowfish include and library --BFINC = -I../blowfish --BFLIB = ../blowfish/libblowfish.a +-BFINC = -I../blowfish-0.9.5a +-BFLIB = ../blowfish-0.9.5a/libblowfish.a +BFINC = -I${OPENSSLINC} -I${OPENSSLINC}/openssl +BFLIB = ${OPENSSLLIB}/libcrypto.a @@ -37,41 +31,25 @@ -ZINC = -I../zlib-1.1.3 -ZLIB = ../zlib-1.1.3/libz.a -+ZINC = ++ZINC = +ZLIB = -lz # Location of bzlib include and library # Set these empty if you don't want bzib2 support --BZINC = -I../bzip2-0.9.5d --BZLIB = ../bzip2-0.9.5d/libbz2.a +-BZINC = -I../bzip2-1.0.1 +-BZLIB = ../bzip2-1.0.1/libbz2.a +BZINC = -I${LOCALBASE}/include +BZLIB = ${LOCALBASE}/lib/libbz2.a # # Tools needed for Perl "POD"-format documentation conversion. -@@ -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 @@ +@@ -133,7 +133,8 @@ #### You REALLY shouldn't have to modify anything beyond here ... #### -CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) -+CFLAGS ?= -O ++CFLAGS ?= -O3 +CFLAGS += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) |