diff options
author | wiz <wiz@pkgsrc.org> | 2002-10-25 09:33:36 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2002-10-25 09:33:36 +0000 |
commit | fad35e4f01dadc958922509fde950cb8d75a842a (patch) | |
tree | 007468208be2418ddf337526714617a7662ae578 | |
parent | 13d81c50b24e0eb9416a1723113833fda564aaaf (diff) | |
download | pkgsrc-fad35e4f01dadc958922509fde950cb8d75a842a.tar.gz |
buildlink1 -> buildlink2; fix rpath.
-rw-r--r-- | www/http_load/Makefile | 5 | ||||
-rw-r--r-- | www/http_load/distinfo | 4 | ||||
-rw-r--r-- | www/http_load/patches/patch-aa | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/www/http_load/Makefile b/www/http_load/Makefile index 6998fa1283e..7626e705b87 100644 --- a/www/http_load/Makefile +++ b/www/http_load/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/07/02 16:26:30 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/10/25 09:33:36 wiz Exp $ DISTNAME= http_load-04jan2002 PKGNAME= http_load-20020104 @@ -10,6 +10,7 @@ HOMEPAGE= http://www.acme.com/software/http_load/ COMMENT= multiprocessing http test client MAKE_ENV+= SSLBASE="${SSLBASE}" +USE_BUILDLINK2= YES -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/http_load/distinfo b/www/http_load/distinfo index d3fce4bcdc3..1cfc6369569 100644 --- a/www/http_load/distinfo +++ b/www/http_load/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2002/07/02 16:26:31 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/10/25 09:33:36 wiz Exp $ SHA1 (http_load-04jan2002.tar.gz) = 7b21fd2cfeb4bf6705ef6bd3f194a6a2f01ff976 Size (http_load-04jan2002.tar.gz) = 16710 bytes -SHA1 (patch-aa) = 8283eff2ea39dc7dd57d0346d39a6c812cc6bbb6 +SHA1 (patch-aa) = a5303abf65e48825607d47d6d519c24b28a42718 diff --git a/www/http_load/patches/patch-aa b/www/http_load/patches/patch-aa index 49a1f76e27e..0ad953cd0df 100644 --- a/www/http_load/patches/patch-aa +++ b/www/http_load/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2002/07/02 16:26:32 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2002/10/25 09:33:37 wiz Exp $ ---- Makefile.orig Fri Jan 4 05:54:43 2002 +--- Makefile.orig Fri Jan 4 06:54:43 2002 +++ Makefile @@ -9,14 +9,14 @@ # http://www.openssl.org/ Make sure the SSL_TREE definition points to the @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.2 2002/07/02 16:26:32 wiz Exp $ +SSL_TREE = ${SSLBASE} +SSL_DEFS = -DUSE_SSL +SSL_INC = -I$(SSL_TREE)/include -+SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto ++SSL_LIBS = -L$(SSL_TREE)/lib -Wl,-R$(SSL_TREE)/lib -lssl -lcrypto -BINDIR = /usr/local/bin @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2002/07/02 16:26:32 wiz Exp $ CC = gcc -Wall CFLAGS = -O $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) #CFLAGS = -g $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) -@@ -35,10 +35,9 @@ +@@ -35,10 +35,9 @@ timers.o: timers.c timers.h $(CC) $(CFLAGS) -c timers.c install: all |