aboutsummaryrefslogtreecommitdiff
path: root/security/zebedee
diff options
context:
space:
mode:
authorDavid W. Chapman Jr. <dwcjr@FreeBSD.org>2001-07-04 21:31:26 +0000
committerDavid W. Chapman Jr. <dwcjr@FreeBSD.org>2001-07-04 21:31:26 +0000
commit589eb16419e52bf9bd73bdae881fe31b972ddc46 (patch)
tree4a043ec069b01181092f220522134957b8fab924 /security/zebedee
parent45bd8c5f79af7a36e4d8ca6af783c2cb1b329c43 (diff)
downloadports-589eb16419e52bf9bd73bdae881fe31b972ddc46.tar.gz
ports-589eb16419e52bf9bd73bdae881fe31b972ddc46.zip
Notes
Diffstat (limited to 'security/zebedee')
-rw-r--r--security/zebedee/Makefile11
-rw-r--r--security/zebedee/distinfo2
-rw-r--r--security/zebedee/files/patch-aa26
-rw-r--r--security/zebedee/pkg-plist22
4 files changed, 39 insertions, 22 deletions
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 0997a4987937..2ee9908774e5 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -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 @@ do-install:
${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 <bsd.port.mk>
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo
index 2e38ac09d896..8e08b01c7503 100644
--- a/security/zebedee/distinfo
+++ b/security/zebedee/distinfo
@@ -1 +1 @@
-MD5 (zebedee-2.2.1.tar.gz) = bfd0f9908930d9253236a687656b052d
+MD5 (zebedee-2.2.2.tar.gz) = 74d33041bcf49b5c49f0e44b6fa0e169
diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-aa
index 8db659bde77a..c6c009b753f5 100644
--- a/security/zebedee/files/patch-aa
+++ b/security/zebedee/files/patch-aa
@@ -1,15 +1,27 @@
---- Makefile.orig Tue Feb 6 15:43:58 2001
-+++ Makefile Tue Feb 6 15:44:36 2001
+--- Makefile.orig Wed Jul 4 17:16:33 2001
++++ Makefile Wed Jul 4 17:16:54 2001
@@ -3,7 +3,7 @@
#
- # $Id: Makefile,v 1.19 2000/10/18 20:55:53 nwinton Exp nwinton $
+ # $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)
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index d2e026f98b9b..1f72ad3732c9 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -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