diff options
author | Scott Mace <smace@FreeBSD.org> | 2003-01-07 20:32:30 +0000 |
---|---|---|
committer | Scott Mace <smace@FreeBSD.org> | 2003-01-07 20:32:30 +0000 |
commit | 1680eba2db4f255169cb7819a68cbd56dac592d2 (patch) | |
tree | 0f0307f4eb6a731c501ab6f7450f511e6eb9a21c /net/tcpreplay | |
parent | Cleanup Makefile with after portlint. (diff) |
Update to tcpreplay-1.3.1.
Notes
Notes:
svn path=/head/; revision=72709
Diffstat (limited to 'net/tcpreplay')
-rw-r--r-- | net/tcpreplay/Makefile | 6 | ||||
-rw-r--r-- | net/tcpreplay/distinfo | 2 | ||||
-rw-r--r-- | net/tcpreplay/files/patch-Makefile.in | 52 | ||||
-rw-r--r-- | net/tcpreplay/files/patch-configure.in | 40 |
4 files changed, 2 insertions, 98 deletions
diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index bf5afb30e2cf..e068ca732d14 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -6,22 +6,18 @@ # PORTNAME= tcpreplay -PORTVERSION= 1.3.b5 -DISTNAME= tcpreplay-1.3-beta5 +PORTVERSION= 1.3.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= smace@FreeBSD.org -LIB_DEPENDS= redblack:${PORTSDIR}/devel/libredblack BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libnet=${PREFIX} --with-libredblack=${PREFIX} -USE_AUTOCONF= yes - MAN1= capinfo.1 tcpprep.1 MAN8= tcpreplay.8 diff --git a/net/tcpreplay/distinfo b/net/tcpreplay/distinfo index 7d6889e92a2a..7c28e6895e80 100644 --- a/net/tcpreplay/distinfo +++ b/net/tcpreplay/distinfo @@ -1 +1 @@ -MD5 (tcpreplay-1.3-beta5.tar.gz) = 4fe82b88abbf140bed9ad13b602fe984 +MD5 (tcpreplay-1.3.1.tar.gz) = 98d2082769ca3aa34c923998126db8af diff --git a/net/tcpreplay/files/patch-Makefile.in b/net/tcpreplay/files/patch-Makefile.in deleted file mode 100644 index 647a0e50c16e..000000000000 --- a/net/tcpreplay/files/patch-Makefile.in +++ /dev/null @@ -1,52 +0,0 @@ ---- Makefile.in.orig Wed Nov 6 23:33:09 2002 -+++ Makefile.in Fri Nov 22 16:18:50 2002 -@@ -10,8 +10,11 @@ - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ - DEFS = @DEFS@ --INCS = @LNETINC@ -I. -Ilibredblack --LIBS = @LIBS@ @LNETLIB@ -+INCS = @LNETINC@ @REDBLACKINC@ -+TLIBS = @LIBS@ @LNETLIB@ -+CLIBS = @LIBS@ -+PLIBS = @LIBS@ @LNETLIB@ @REDBLACKLIB@ -+ - - INSTALL = @INSTALL@ - -@@ -29,31 +32,24 @@ - .c.o: - $(CC) $(CFLAGS) $(INCS) -c $*.c - --all: libredblack $(BINARIES) -+all: $(BINARIES) - - tcpprep: $(POBJS) -- $(CC) $(CFLAGS) $(DEFS) $(INCS) -o $@ $(POBJS) $(LDFLAGS) $(LIBS) libredblack/.libs/libredblack.a -+ $(CC) $(CFLAGS) $(DEFS) $(INCS) -o $@ $(POBJS) $(LDFLAGS) $(PLIBS) - - tcpreplay: $(TOBJS) -- $(CC) $(CFLAGS) $(DEFS) $(INCS) -o $@ $(TOBJS) $(LDFLAGS) $(LIBS) -+ $(CC) $(CFLAGS) $(DEFS) $(INCS) -o $@ $(TOBJS) $(LDFLAGS) $(TLIBS) - - capinfo: $(COBJS) -- $(CC) $(CFLAGS) $(DEFS) $(INCS) -o $@ $(COBJS) $(LDFLAGS) $(LIBS) -- --libredblack: libredblack/.libs/libredblack.a -- --libredblack/.libs/libredblack.a: -- cd libredblack && ./configure && make -+ $(CC) $(CFLAGS) $(DEFS) $(INCS) -o $@ $(COBJS) $(LDFLAGS) $(CLIBS) - - clean: - rm -f *.o *core $(BINARIES) -- cd libredblack && make clean - cd test && make clean - - distclean: clean - rm -f Makefile config.h config.status config.cache config.log *~ - rm -rf autom4te-2.53.cache -- cd libredblack && make distclean - - install: - test -d $(SBINDIR) || $(INSTALL) -d $(SBINDIR) diff --git a/net/tcpreplay/files/patch-configure.in b/net/tcpreplay/files/patch-configure.in deleted file mode 100644 index 3dd69d2f721c..000000000000 --- a/net/tcpreplay/files/patch-configure.in +++ /dev/null @@ -1,40 +0,0 @@ ---- configure.in.orig Wed Oct 9 17:55:34 2002 -+++ configure.in Wed Oct 9 18:27:27 2002 -@@ -91,6 +91,37 @@ - fi - AC_SUBST(EXTRAS) - -+dnl Checks for libredblack -+AC_ARG_WITH(libredblack, -+[ --with-libredblack=DIR use libredblack from DIR/lib], -+[ case "$withval" in -+ yes|no) -+ AC_MSG_ERROR(no) -+ ;; -+ *) -+ AC_MSG_CHECKING(for libredblack) -+ AC_MSG_RESULT($withval) -+ if test -f $withval/lib/libredblack.a -a -f $withval/include/redblack.h; then -+ owd=`pwd` -+ if cd $withval; then withval=`pwd`; cd $owd; fi -+ REDBLACKINC="-I$withval/include" -+ REDBLACKLIB="-lredblack" -+ LDFLAGS="$LDFLAGS -L$withval/lib" -+ AC_SUBST(REDBLACKINC) -+ AC_SUBST(REDBLACKLIB) -+ else -+ AC_ERROR(unable to find $withval/lib/libredback or $withval/include/redblack.h -+Please download: http://libredblack.sourceforge.net/ -+) -+ fi -+ ;; -+ esac ], -+AC_CHECK_LIB(redblack, rbwalk, , AC_MSG_ERROR(redblack >= 1.1.0 not found. -+ -+Please download: http://libredblack.sourceforge.net/ -+)) -+) -+ - dnl Checks for libnet (shamelessly horked from dsniff) - AC_MSG_CHECKING(for libnet) - AC_ARG_WITH(libnet, |