- Support CFLAGS/LOCALBASE properly

- Fix pkg-comment

PR: 24555
Submitted by: Ports Fury

4 files changed, 47 insertions, 23 deletions

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index c943993c37c7..575a4e1dbbe9 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -5,19 +5,17 @@
 # $FreeBSD$
 #
 
-PORTNAME=		tcpreplay
-PORTVERSION=		1.0.1
-CATEGORIES=		net
-MASTER_SITES=		http://www.anzen.com/research/nidsbench/
+PORTNAME=	tcpreplay
+PORTVERSION=	1.0.1
+CATEGORIES=	net
+MASTER_SITES=	http://www.anzen.com/research/nidsbench/
 
-MAINTAINER=		ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
-USE_AUTOCONF=		yes
-GNU_CONFIGURE=		yes
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */libpcap-* --exclude */Libnet-*
+USE_AUTOCONF=	yes
 
-MAN8=			tcpreplay.8
+MAN8=		tcpreplay.8
 
 .include <bsd.port.mk>
diff --git a/net/tcpreplay/files/patch-Makefile.in b/net/tcpreplay/files/patch-Makefile.in
index 4a4c01002a10..a54081d50383 100644
--- a/net/tcpreplay/files/patch-Makefile.in
+++ b/net/tcpreplay/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Nov  2 18:01:53 2000
-+++ Makefile.in	Thu Nov  2 18:04:49 2000
-@@ -9,22 +9,22 @@
+--- Makefile.in.orig	Thu Apr 22 07:16:41 1999
++++ Makefile.in	Thu Jan 18 01:05:19 2001
+@@ -9,22 +9,23 @@
  CC		= @CC@
  CFLAGS		= @CFLAGS@
  LDFLAGS		= @LDFLAGS@
@@ -11,6 +11,7 @@
  
  INSTALL		= @INSTALL@
  INSTALL_PROGRAM	= @INSTALL_PROGRAM@
++INSTALL_DATA	= @INSTALL_DATA@
  
 -PCAPDIR		= libpcap-0.4
 -PCAPINCS	= -I$(PCAPDIR)
@@ -22,13 +23,23 @@
 +# PCAPDEP		= $(PCAPDIR)/pcap.h $(PCAPDIR)/libpcap.a
  
 -LNETDIR		= Libnet-0.99
--LNETINCS	= -I$(LNETDIR)/include
++LNETDIR		= ${LOCALBASE}
+ LNETINCS	= -I$(LNETDIR)/include
 -LNETLIBS	= -L$(LNETDIR)/lib -lnet
 -LNETDEP		= $(LNETDIR)/include/libnet.h $(LNETDIR)/libnet.a
-+# LNETDIR		= Libnet-0.99
-+LNETINCS	= -I$(PREFIX)/include
-+LNETLIBS	= -L$(PREFIX)/lib `libnet-config --libs`
++LNETLIBS	= -L$(LNETDIR)/lib `libnet-config --libs`
 +# LNETDEP		= $(LNETDIR)/include/libnet.h $(LNETDIR)/libnet.a
  
  PROGRAMS	= tcpreplay
  
+@@ -51,8 +52,8 @@
+ 	rm -f Makefile config.h config.status config.cache config.log
+ 
+ install: 
+-	$(INSTALL_PROGRAM) -m 755 tcpreplay $(SBINDIR)
+-	$(INSTALL) -m 644 tcpreplay.8 $(MANDIR)
++	$(INSTALL_PROGRAM) tcpreplay $(SBINDIR)
++	$(INSTALL_DATA) tcpreplay.8 $(MANDIR)
+ 
+ uninstall:
+ 	rm -f $(SBINDIR)/tcpreplay
diff --git a/net/tcpreplay/files/patch-configure.in b/net/tcpreplay/files/patch-configure.in
index 91888f2fb4a2..b3ff9a2b4fec 100644
--- a/net/tcpreplay/files/patch-configure.in
+++ b/net/tcpreplay/files/patch-configure.in
@@ -1,10 +1,25 @@
---- configure.in.orig	Thu Nov  2 16:18:38 2000
-+++ configure.in	Thu Nov  2 16:18:52 2000
-@@ -29,7 +29,5 @@
+--- configure.in.orig	Thu May 20 04:55:28 1999
++++ configure.in	Thu Jan 18 01:02:11 2001
+@@ -8,13 +8,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
+-dnl Use these compiler flags if we have gcc.
+-dnl
+-if test $ac_cv_prog_gcc = yes; then
+-    CCOPTS='-O3 -pipe -Wall'
+-    CFLAGS="$CCOPTS"
+-fi
+-
+ dnl Checks for libraries.
+ AC_CHECK_LIB(socket, socket)
+ AC_CHECK_LIB(nsl, gethostbyname)
+@@ -28,8 +21,6 @@
+ 
  dnl Checks for library functions.
  AC_CHECK_FUNCS(gettimeofday)
- 
--AC_CONFIG_SUBDIRS(Libnet-0.99 libpcap-0.4)
 -
+-AC_CONFIG_SUBDIRS(Libnet-0.99 libpcap-0.4)
+ 
  AC_CONFIG_HEADER(config.h)
  AC_OUTPUT(Makefile)
diff --git a/net/tcpreplay/pkg-comment b/net/tcpreplay/pkg-comment
index d24bbf51cf65..db5ed6432b4a 100644
--- a/net/tcpreplay/pkg-comment
+++ b/net/tcpreplay/pkg-comment
@@ -1 +1 @@
-resend libpcap saved files (ala tcpdump -w)
+A tool to replay saved tcpdump files