Pass LDFLAGS through to link step so that zebedee gets the right rpath

for systems where the dependent libraries aren't part of the base system.
Don't include tcl/buildlink.mk as the libraries aren't required for the
build -- only the tclsh binary is required at run-time.  Also honor CFLAGS
passed in from environment during the build.

3 files changed, 22 insertions, 29 deletions

diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 787aa4a850d..80e9257c6bf 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/15 15:51:11 taca Exp $
+# $NetBSD: Makefile,v 1.3 2001/07/15 16:52:02 jlam Exp $
 #
 
 DISTNAME=		zebedee-2.2.2
@@ -11,13 +11,14 @@ HOMEPAGE=		http://www.winton.org.uk/zebedee/
 COMMENT=		Simple tunneling program for TCP or UDP with encryption
 
 BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
+DEPENDS+=		tcl>=8.3.2:../../lang/tcl
 
 USE_BUILDLINK_ONLY=	# defined
 
+MAKE_ENV+=		OPTIM="${CFLAGS}"
 MAKE_FLAGS=		OS=${LOWER_OPSYS}
 
 .include "../../archivers/bzip2/buildlink.mk"
 .include "../../devel/zlib/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo
index 69c97d17efd..98681f4a3a6 100644
--- a/security/zebedee/distinfo
+++ b/security/zebedee/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/07/15 15:51:11 taca Exp $
+$NetBSD: distinfo,v 1.3 2001/07/15 16:52:02 jlam Exp $
 
 SHA1 (zebedee-2.2.2.tar.gz) = 7068141a1449016076b84335db2e889803d85719
 Size (zebedee-2.2.2.tar.gz) = 141259 bytes
-SHA1 (patch-aa) = 3375e8334ac99a01b65476135901c252118b6768
+SHA1 (patch-aa) = 227a182d275a9b92f12b06619f65a7725dfbe023
 SHA1 (patch-ab) = 8fb781f2c6fe5807a196ceb2f0f0eb0a09053288
diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa
index c9d3ccf78e2..9a969a3e635 100644
--- a/security/zebedee/patches/patch-aa
+++ b/security/zebedee/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
+$NetBSD: patch-aa,v 1.3 2001/07/15 16:52:02 jlam Exp $
 
---- Makefile.orig	Sat Apr 14 02:41:22 2001
+--- Makefile.orig	Fri Apr 13 13:41:22 2001
 +++ Makefile
-@@ -18,13 +18,13 @@
+@@ -18,13 +18,14 @@
  CC_linux = gcc -pthread
  CC_solaris = gcc
  CC_freebsd = gcc -pthread
@@ -12,13 +12,13 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
  
  # Optimise/debug compilation
  
--#OPTIM = -Wall -g
+ #OPTIM = -Wall -g
 -OPTIM = -O3
-+OPTIM = -Wall -O2
++#OPTIM = -O3
  
  # Location of gmp include and library
  #
-@@ -36,19 +36,19 @@
+@@ -36,19 +37,19 @@
  
  # Location of Blowfish include and library
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
  
  #
  # Tools needed for Perl "POD"-format documentation conversion.
-@@ -62,9 +62,9 @@
+@@ -62,9 +63,9 @@
  
  # Installation directories for the Linux/Solaris/*NIX World
  
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
  MANDIR = $(ROOTDIR)/man/man1
  
  # This is a BSD-style install
-@@ -74,6 +74,7 @@
+@@ -74,6 +75,7 @@
  INSTALL_linux = install -c
  INSTALL_solaris = /usr/ucb/install -c
  INSTALL_freebsd = install -c
@@ -64,7 +64,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
  INSTALL_tru64 = installbsd -c
  INSTALL = $(INSTALL_$(OS))
  
-@@ -104,6 +105,7 @@
+@@ -104,6 +106,7 @@
  DEFINES_linux = -DHAVE_PTHREADS
  DEFINES_solaris = -D_REENTRANT -DHAVE_PTHREADS
  DEFINES_freebsd = -DHAVE_PTHREADS -DBUGGY_FORK_WITH_THREADS
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
  DEFINES_tru64 = -D_REENTRANT -DHAVE_PTHREADS
  DEFINES = $(DEFINES_$(OS))
  
-@@ -118,6 +120,7 @@
+@@ -118,6 +121,7 @@
  OSLIBS_linux = -lpthread
  OSLIBS_solaris = -lsocket -lnsl -lthread
  OSLIBS_freebsd =
@@ -80,19 +80,7 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
  OSLIBS_tru64 = -lpthread
  OSLIBS = $(OSLIBS_$(OS))
  
-@@ -133,9 +136,9 @@
- #### You REALLY shouldn't have to modify anything beyond here ...
- ####
- 
--CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
-+CFLAGS = $(OPTIM) $(DEFINES) -I. -I${BUILDLINK_DIR}/include $(GMPINC)
- 
--LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
-+LIBS = -L${BUILDLINK_DIR}/lib $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
- 
- OBJS = zebedee.o sha_func.o huge.o $(GETOPTOBJ) $(SERVICEOBJ)
- 
-@@ -150,7 +153,7 @@
+@@ -150,10 +154,10 @@
  all : precheck zebedee$(EXE) zebedee.1 zebedee.html ftpgw.tcl.1 ftpgw.tcl.html zebedee.ja_JP.html
  
  precheck :
@@ -100,8 +88,12 @@ $NetBSD: patch-aa,v 1.2 2001/07/15 15:51:12 taca Exp $
 +	@ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, solaris, freebsd, netbsd or tru64"; exit 1; fi
  
  zebedee$(EXE) : $(OBJS)
- 	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
-@@ -182,12 +185,12 @@
+-	$(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
+ 
+ huge.o : huge.h
+ 
+@@ -182,12 +186,12 @@
  
  install : precheck zebedee$(EXE) zebedee.1 ftpgw.tcl.1 $(ZBDFILES) $(TXTFILES)
  	-mkdir -p $(BINDIR) $(MANDIR) $(ZBDDIR)