From owner-freebsd-ports Fri Jun 29 8: 0:37 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F1FF137B408 for ; Fri, 29 Jun 2001 08:00:11 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.3/8.11.3) id f5TF0B477035; Fri, 29 Jun 2001 08:00:11 -0700 (PDT) (envelope-from gnats) Received: from electron.databits.net (electron.databits.net [207.29.204.16]) by hub.freebsd.org (Postfix) with ESMTP id C986537B409 for ; Fri, 29 Jun 2001 07:54:46 -0700 (PDT) (envelope-from petef@electron.databits.net) Received: (from petef@localhost) by electron.databits.net (8.11.4/8.11.4) id f5TErnR49881; Fri, 29 Jun 2001 10:53:49 -0400 (EDT) (envelope-from petef) Message-Id: <200106291453.f5TErnR49881@electron.databits.net> Date: Fri, 29 Jun 2001 10:53:49 -0400 (EDT) From: Pete Fritchman Reply-To: Pete Fritchman To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/28517: Update security/zebedee to 2.2.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 28517 >Category: ports >Synopsis: Update security/zebedee to 2.2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Jun 29 08:00:11 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Pete Fritchman >Release: FreeBSD 4.3-STABLE i386 >Organization: Databits Network Services, Inc. >Environment: System: FreeBSD electron.databits.net 4.3-STABLE FreeBSD 4.3-STABLE #7: Mon Jun 11 10:15:45 EDT 2001 root@electron.databits.net:/usr/obj/usr/src/sys/ELECTRON i386 >Description: - update to 2.2.2 - clean up pthread handling - support NOPORTDOCS - sort pkg-plist - clean up patch Although I am not the maintainer, I emailed Greg , and he responded saying he's about to go on vacation for a week and I should just go ahead and send-pr(1). >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/zebedee/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile --- Makefile 2001/02/11 17:25:08 1.8 +++ Makefile 2001/06/27 18:53:23 @@ -6,18 +6,21 @@ # PORTNAME= zebedee -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= security MASTER_SITES= http://www.winton.org.uk/zebedee/ \ http://www.hewgill.com/zebedee/ MAINTAINER= greg@hewgill.com -BUILD_DEPENDS= ${LOCALBASE}/lib/libbz2.a:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= bz2.1:${PORTSDIR}/archivers/bzip2 USE_OPENSSL= YES USE_PERL5= yes +MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS=${PTHREAD_LIBS} + MAN1= zebedee.1 ftpgw.tcl.1 do-install: @@ -34,11 +37,13 @@ ${INSTALL_DATA} ${WRKSRC}/client1.key ${PREFIX}/share/examples/zebedee ${INSTALL_DATA} ${WRKSRC}/client2.key ${PREFIX}/share/examples/zebedee ${INSTALL_DATA} ${WRKSRC}/clients.id ${PREFIX}/share/examples/zebedee - ${MKDIR} ${PREFIX}/share/doc/zebedee +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/zebedee ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/zebedee ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${PREFIX}/share/doc/zebedee ${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${PREFIX}/share/doc/zebedee ${INSTALL_DATA} ${WRKSRC}/zebedee.html ${PREFIX}/share/doc/zebedee ${INSTALL_DATA} ${WRKSRC}/ftpgw.tcl.html ${PREFIX}/share/doc/zebedee +.endif .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/security/zebedee/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 2001/02/11 17:25:08 1.4 +++ distinfo 2001/06/27 18:39:11 @@ -1 +1 @@ -MD5 (zebedee-2.2.1.tar.gz) = bfd0f9908930d9253236a687656b052d +MD5 (zebedee-2.2.2.tar.gz) = 74d33041bcf49b5c49f0e44b6fa0e169 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/zebedee/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 2001/01/25 18:16:45 1.3 +++ pkg-plist 2001/06/27 18:54:58 @@ -1,17 +1,17 @@ -bin/zebedee bin/ftpgw.tcl +bin/zebedee etc/server.zbd.sample -share/examples/zebedee/vncviewer.zbd -share/examples/zebedee/vncserver.zbd -share/examples/zebedee/server.key -share/examples/zebedee/server.id share/examples/zebedee/client1.key share/examples/zebedee/client2.key share/examples/zebedee/clients.id -share/doc/zebedee/README.txt -share/doc/zebedee/LICENCE.txt -share/doc/zebedee/CHANGES.txt -share/doc/zebedee/zebedee.html -share/doc/zebedee/ftpgw.tcl.html +share/examples/zebedee/server.id +share/examples/zebedee/server.key +share/examples/zebedee/vncserver.zbd +share/examples/zebedee/vncviewer.zbd +%%PORTDOCS%%share/doc/zebedee/CHANGES.txt +%%PORTDOCS%%share/doc/zebedee/LICENCE.txt +%%PORTDOCS%%share/doc/zebedee/README.txt +%%PORTDOCS%%share/doc/zebedee/ftpgw.tcl.html +%%PORTDOCS%%share/doc/zebedee/zebedee.html @dirrm share/examples/zebedee -@dirrm share/doc/zebedee +%%PORTDOCS%%@dirrm share/doc/zebedee Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/security/zebedee/files/patch-aa,v retrieving revision 1.5 diff -u -r1.5 patch-aa --- files/patch-aa 2001/02/11 17:25:09 1.5 +++ files/patch-aa 2001/06/27 18:52:34 @@ -1,15 +1,27 @@ ---- Makefile.orig Tue Feb 6 15:43:58 2001 -+++ Makefile Tue Feb 6 15:44:36 2001 +--- Makefile.orig Fri Apr 13 13:41:22 2001 ++++ Makefile Wed Jun 27 14:52:28 2001 @@ -3,7 +3,7 @@ # - # $Id: patch-aa,v 1.5 2001/02/11 17:25:09 dbaker Exp $ + # Id: Makefile,v 1.2 2001/04/13 17:41:21 ndwinton Exp -OS = +OS = freebsd ### ### Locations of tools, libraries and installation directories. -@@ -24,7 +24,7 @@ +@@ -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 @@ -18,7 +30,7 @@ # Location of gmp include and library # -@@ -36,19 +36,19 @@ +@@ -36,19 +33,19 @@ # Location of Blowfish include and library @@ -44,13 +56,13 @@ # # Tools needed for Perl "POD"-format documentation conversion. -@@ -133,7 +133,8 @@ +@@ -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 += $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) ++CFLAGS += ${PTHREAD_LIBS} ${PTHREAD_CFLAGS} $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC) LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message