View | Details | Raw Unified | Return to bug 86331
Collapse All | Expand All

(-)Makefile (-1 / +1 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	zebedee
8
PORTNAME=	zebedee
9
PORTVERSION=	2.5.2
9
PORTVERSION=	2.5.3
10
CATEGORIES=	security
10
CATEGORIES=	security
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (zebedee-2.5.2.tar.gz) = 60b3675c792fc65ef79aeb9a6ea40789
1
MD5 (zebedee-2.5.3.tar.gz) = 8a25832efb563578e66a7aa4195bc8f3
2
SIZE (zebedee-2.5.2.tar.gz) = 175463
2
SIZE (zebedee-2.5.3.tar.gz) = 176088
(-)files/patch-aa (-14 / +15 lines)
Lines 1-15 Link Here
1
--- Makefile.orig	Tue Sep 23 14:37:56 2003
1
--- Makefile.orig	Tue Sep  6 07:59:53 2005
2
+++ Makefile	Mon Dec 15 19:56:14 2003
2
+++ Makefile	Thu Sep 15 07:34:55 2005
3
@@ -5,7 +5,7 @@
3
@@ -5,7 +5,7 @@
4
 
4
 
5
 ZBD_VERSION = 2.5.2
5
 ZBD_VERSION = 2.5.3
6
 
6
 
7
-OS = 
7
-OS = 
8
+OS = freebsd
8
+OS = freebsd
9
 
9
 
10
 ###
10
 ###
11
 ### Locations of tools, libraries and installation directories.
11
 ### Locations of tools, libraries and installation directories.
12
@@ -14,12 +14,10 @@
12
@@ -14,13 +14,11 @@
13
 
13
 
14
 # Choose your C compiler
14
 # Choose your C compiler
15
 
15
 
Lines 17-29 Link Here
17
-
17
-
18
 CC_win32 = gcc -mno-cygwin
18
 CC_win32 = gcc -mno-cygwin
19
 CC_linux = gcc -pthread
19
 CC_linux = gcc -pthread
20
 CC_linux64 = $(CC_linux) -m64
20
 CC_solaris = gcc
21
 CC_solaris = gcc
21
-CC_freebsd = gcc -pthread
22
-CC_freebsd = gcc -pthread
22
+CC_freebsd ?= gcc
23
+CC_freebsd ?= gcc
23
 CC_tru64 = cc
24
 CC_tru64 = cc
24
 CC_irix = cc -n32 -woff 1110
25
 CC_irix = cc -n32 -woff 1110
25
 CC_hpux = cc -Ae +DAportable
26
 CC_hpux = cc -Ae +DAportable
26
@@ -30,7 +28,7 @@
27
@@ -31,7 +29,7 @@
27
 # Optimise/debug compilation
28
 # Optimise/debug compilation
28
 
29
 
29
 #OPTIM = -Wall -g
30
 #OPTIM = -Wall -g
Lines 32-38 Link Here
32
 
33
 
33
 # Location of gmp include and library
34
 # Location of gmp include and library
34
 #
35
 #
35
@@ -45,25 +43,26 @@
36
@@ -46,25 +44,26 @@
36
 # BFINC = /usr/include/openssl
37
 # BFINC = /usr/include/openssl
37
 # BFLIB = -lcrypto
38
 # BFLIB = -lcrypto
38
 
39
 
Lines 43-58 Link Here
43
 
44
 
44
 # Location of zlib include and library
45
 # Location of zlib include and library
45
 
46
 
46
-ZINC = -I../zlib-1.1.4
47
-ZINC = -I../zlib-1.2.3
47
-ZLIB = ../zlib-1.1.4/libz.a
48
-ZLIB = ../zlib-1.2.3/libz.a
48
+ZINC =
49
+ZINC = 
49
+ZLIB = -lz
50
+ZLIB = -lz
50
 
51
 
51
 # Location of bzlib include and library
52
 # Location of bzlib include and library
52
 # Set these empty if you don't want bzib2 support
53
 # Set these empty if you don't want bzib2 support
53
 
54
 
54
-BZINC = -I../bzip2-1.0.1
55
-BZINC = -I../bzip2-1.0.3
55
-BZLIB = ../bzip2-1.0.1/libbz2.a
56
-BZLIB = ../bzip2-1.0.3/libbz2.a
56
+BZINC = -I$(LOCALBASE)/include
57
+BZINC = -I$(LOCALBASE)/include
57
+BZLIB = -L$(LOCALBASE)/lib -lbz2
58
+BZLIB = -L$(LOCALBASE)/lib -lbz2
58
 
59
 
Lines 65-71 Link Here
65
 PERL = $(PERL_$(OS))
66
 PERL = $(PERL_$(OS))
66
 
67
 
67
 BAT_win32 = .bat
68
 BAT_win32 = .bat
68
@@ -182,7 +181,8 @@
69
@@ -186,7 +185,8 @@
69
 #### You REALLY shouldn't have to modify anything beyond here ...
70
 #### You REALLY shouldn't have to modify anything beyond here ...
70
 ####
71
 ####
71
 
72
 
Lines 75-82 Link Here
75
 
76
 
76
 LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
77
 LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
77
 
78
 
78
@@ -202,7 +202,7 @@
79
@@ -206,7 +206,7 @@
79
 	@ 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
80
 	@ 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
80
 
81
 
81
 zebedee$(EXE) : $(OBJS)
82
 zebedee$(EXE) : $(OBJS)
82
-	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
83
-	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)

Return to bug 86331