Date: Mon, 19 Sep 2005 13:47:51 +0200 (CEST) From: Oliver Lehmann <oliver@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <oliver@FreeBSD.org> Subject: ports/86331: update-port: security/zebedee Message-ID: <200509191147.j8JBlpvT052209@kartoffel.salatschuessel.net> Resent-Message-ID: <200509191150.j8JBo46a028767@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 86331
>Category: ports
>Synopsis: update-port: security/zebedee
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 19 11:50:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Oliver Lehmann
>Release: FreeBSD 6.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.0-BETA2 FreeBSD 6.0-BETA2 #1: Mon Aug 15 21:40:51 CEST 2005 olivleh1@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.0/usr/src/sys/KARTOFFEL amd64
>Description:
update to 2.5.3
>How-To-Repeat:
>Fix:
--- zebedee.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/security/zebedee/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile 13 Sep 2005 15:06:23 -0000 1.16
+++ Makefile 19 Sep 2005 11:46:51 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= zebedee
-PORTVERSION= 2.5.2
+PORTVERSION= 2.5.3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/security/zebedee/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 6 Apr 2004 23:43:01 -0000 1.8
+++ distinfo 19 Sep 2005 11:46:51 -0000
@@ -1,2 +1,2 @@
-MD5 (zebedee-2.5.2.tar.gz) = 60b3675c792fc65ef79aeb9a6ea40789
-SIZE (zebedee-2.5.2.tar.gz) = 175463
+MD5 (zebedee-2.5.3.tar.gz) = 8a25832efb563578e66a7aa4195bc8f3
+SIZE (zebedee-2.5.3.tar.gz) = 176088
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/security/zebedee/files/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- files/patch-aa 6 Apr 2004 23:43:01 -0000 1.10
+++ files/patch-aa 19 Sep 2005 11:46:51 -0000
@@ -1,15 +1,15 @@
---- Makefile.orig Tue Sep 23 14:37:56 2003
-+++ Makefile Mon Dec 15 19:56:14 2003
+--- 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.2
+ ZBD_VERSION = 2.5.3
-OS =
+OS = freebsd
###
### Locations of tools, libraries and installation directories.
-@@ -14,12 +14,10 @@
+@@ -14,13 +14,11 @@
# Choose your C compiler
@@ -17,13 +17,14 @@
-
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
-@@ -30,7 +28,7 @@
+@@ -31,7 +29,7 @@
# Optimise/debug compilation
#OPTIM = -Wall -g
@@ -32,7 +33,7 @@
# Location of gmp include and library
#
-@@ -45,25 +43,26 @@
+@@ -46,25 +44,26 @@
# BFINC = /usr/include/openssl
# BFLIB = -lcrypto
@@ -43,16 +44,16 @@
# Location of zlib include and library
--ZINC = -I../zlib-1.1.4
--ZLIB = ../zlib-1.1.4/libz.a
-+ZINC =
+-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.1
--BZLIB = ../bzip2-1.0.1/libbz2.a
+-BZINC = -I../bzip2-1.0.3
+-BZLIB = ../bzip2-1.0.3/libbz2.a
+BZINC = -I$(LOCALBASE)/include
+BZLIB = -L$(LOCALBASE)/lib -lbz2
@@ -65,7 +66,7 @@
PERL = $(PERL_$(OS))
BAT_win32 = .bat
-@@ -182,7 +181,8 @@
+@@ -186,7 +185,8 @@
#### You REALLY shouldn't have to modify anything beyond here ...
####
@@ -75,8 +76,8 @@
LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
-@@ -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
+@@ -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)
--- zebedee.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509191147.j8JBlpvT052209>