diff options
| author | agc <agc> | 2001-10-26 10:03:50 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-10-26 10:03:50 +0000 |
| commit | 77ed6c68dea278d9b4f61c6e4822e4a90d4c0ad8 (patch) | |
| tree | 6cac5e0147724d9ae14b8173a8b9f2d2776e48b7 /net | |
| parent | 3f1f0ec1598f55e48a80fa928fbf1939abd74809 (diff) | |
| download | pkgsrc-77ed6c68dea278d9b4f61c6e4822e4a90d4c0ad8.tar.gz | |
Rather than jumping through hoops during the configure stage trying to
calculate CFLAGS, and add to them using sed, do this properly with a
make(1) "+=" assignment in the patch stage.
Remove unnecessary script file.
Diffstat (limited to 'net')
| -rw-r--r-- | net/netperf/Makefile | 4 | ||||
| -rw-r--r-- | net/netperf/distinfo | 4 | ||||
| -rw-r--r-- | net/netperf/patches/patch-aa | 4 | ||||
| -rwxr-xr-x | net/netperf/scripts/configure | 17 |
4 files changed, 7 insertions, 22 deletions
diff --git a/net/netperf/Makefile b/net/netperf/Makefile index 44b244dff94..329fc7af4a7 100644 --- a/net/netperf/Makefile +++ b/net/netperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/04/22 22:14:24 zuntum Exp $ +# $NetBSD: Makefile,v 1.8 2001/10/26 10:03:50 agc Exp $ # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp # @@ -19,7 +19,9 @@ MAKEFILE= makefile MAN1= netperf.1 netserver.1 BUILD_DEFS+= USE_INET6 + .include "../../mk/bsd.prefs.mk" + .if defined(USE_INET6) && ${USE_INET6} == "YES" CFLAGS+= -DDO_IPV6 .endif diff --git a/net/netperf/distinfo b/net/netperf/distinfo index fee545f350d..7f9d8d630a4 100644 --- a/net/netperf/distinfo +++ b/net/netperf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 11:23:24 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/26 10:03:50 agc Exp $ SHA1 (netperf-2.1pl3.tar.gz) = e288cc4093058451625b288c96589414e6682ea6 Size (netperf-2.1pl3.tar.gz) = 832946 bytes SHA1 (netperf-21pl3-20000721.diff.gz) = b660eda13e7c1a8f4f7ad601be0940999f5451d9 Size (netperf-21pl3-20000721.diff.gz) = 8570 bytes -SHA1 (patch-aa) = 71af36a516994072f57081c961d81997407cceb3 +SHA1 (patch-aa) = 01cdafd761f50058d02331b4d0d44bcce5c04e7f diff --git a/net/netperf/patches/patch-aa b/net/netperf/patches/patch-aa index 9ca53e68383..a3e72ced436 100644 --- a/net/netperf/patches/patch-aa +++ b/net/netperf/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2000/01/21 13:01:57 itojun Exp $ +$NetBSD: patch-aa,v 1.3 2001/10/26 10:03:50 agc Exp $ --- makefile.orig Thu Apr 10 03:02:19 1997 +++ makefile Fri Jan 21 21:31:07 2000 @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.2 2000/01/21 13:01:57 itojun Exp $ LOG_FILE=DEBUG_LOG_FILE="\"/tmp/netperf.debug\"" -CFLAGS = -O -D$(LOG_FILE) -DUSE_LOOPER -+CFLAGS = %CFLAGS% -D$(LOG_FILE) -DUSE_LOOPER -DHISTOGRAM -DDO_UNIX ++CFLAGS += -fno-strength-reduce -D$(LOG_FILE) -DUSE_LOOPER -DHISTOGRAM -DDO_UNIX # Some platforms, and some options, require additional libraries. # you can add to the "LIBS =" line to accomplish this. if you find diff --git a/net/netperf/scripts/configure b/net/netperf/scripts/configure deleted file mode 100755 index ce86533f8cb..00000000000 --- a/net/netperf/scripts/configure +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# -# If this is FreeBSD 2.2 or later, this will work. Older FreeBSD versions -# will set CFLAGS to "". Life's a bitch. -# -CFLAGS=`make -V CFLAGS echo` || echo "*** Ignore this error" - -if [ X"$CFLAGS" = X ] ; then - CFLAGS="-O2 -fno-strength-reduce" -fi - -cd $WRKSRC -echo "Setting CFLAGS to \"$CFLAGS\"" -sed -e "s/%CFLAGS%/${CFLAGS}/" makefile | sed -e "s#/usr/local#${PREFIX}#" | sed -e "s#${PREFIX}/v6/lib#/usr/local/v6/lib#" >makefile.new -mv -f makefile makefile.orig2 -mv -f makefile.new makefile |