From cnh@netvmg.com  Mon Jul  2 20:19:44 2001
Return-Path: <cnh@netvmg.com>
Received: from pefw00.ivmg.net (mail.ivmg.net [64.209.84.66])
	by hub.freebsd.org (Postfix) with ESMTP id E816E37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  2 Jul 2001 20:19:43 -0700 (PDT)
	(envelope-from cnh@netvmg.com)
Received: from pimx00.ivmg.net (pimx00.ivmg.net [192.168.0.10])
	by pefw00.ivmg.net (8.10.2/8.10.1) with ESMTP id f633Jhv65460
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 3 Jul 2001 03:19:43 GMT
Received: from craptop (iVMG-192-168-0-180.dhcp.ivmg.net [192.168.0.180])
	by pimx00.ivmg.net (iVMG) with ESMTP id f633JhX21319
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 2 Jul 2001 20:19:43 -0700
Received: (from cnh@localhost)
	by craptop (8.11.3/8.11.3) id f633Jcj57461;
	Mon, 2 Jul 2001 20:19:38 -0700 (PDT)
	(envelope-from cnh)
Message-Id: <200107030319.f633Jcj57461@craptop>
Date: Mon, 2 Jul 2001 20:19:38 -0700 (PDT)
From: cnh@netvmg.com
Reply-To: cnh@netvmg.com
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: update ports/net/libnet (w/ patch)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         28656
>Category:       ports
>Synopsis:       update ports/net/libnet (w/ patch)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 02 20:20:01 PDT 2001
>Closed-Date:    Thu Jul 12 14:32:58 PDT 2001
>Last-Modified:  Thu Jul 12 14:33:19 PDT 2001
>Originator:     Christopher N. Harrell
>Release:        FreeBSD 4.3-RC i386
>Organization:
>Environment:
System: FreeBSD craptop 4.3-RC FreeBSD 4.3-RC #1: Tue Jun 12 17:06:55 PDT 2001 cnh@craptop:/usr/src/sys/compile/CRAPTOP i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/libnet/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	2001/01/16 17:31:52	1.9
+++ Makefile	2001/07/03 02:52:14
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libnet
-PORTVERSION=	1.0.1b
+PORTVERSION=	1.0.2a
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
@@ -14,7 +14,7 @@
 
 MAN3=		libnet.3
 
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 
 WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
 MAN3=		libnet.3
@@ -23,16 +23,16 @@
 	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/libnet
-	@${MKDIR} ${PREFIX}/share/doc/libnet/html
-	@${MKDIR} ${PREFIX}/share/doc/libnet/html/examples
-.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets TODO-1.0 TODO-1.1
+	@${MKDIR} ${PREFIX}/share/doc/libnet/examples
+	@${MKDIR} ${PREFIX}/share/doc/libnet/ancillary
+.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
 .endfor
-.for i in 1.html 2.html 3.html 4.html 5.html 6.html 7.html contrib.html fig-3a.gif figure-1.gif figure-2.gif figure-3.gif figure-3a.gif lrm.html
-	${INSTALL_DATA} ${WRKSRC}/doc/html/${i} ${PREFIX}/share/doc/libnet/html
+.for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets
+	${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${PREFIX}/share/doc/libnet/ancillary
 .endfor
 .for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
-	${INSTALL_DATA} ${WRKSRC}/doc/html/examples/${i} ${PREFIX}/share/doc/libnet/html/examples
+	${INSTALL_DATA} ${WRKSRC}/example/${i} ${PREFIX}/share/doc/libnet/examples
 .endfor
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/libnet/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	2000/06/02 22:51:20	1.5
+++ distinfo	2001/07/03 02:52:14
@@ -1 +1 @@
-MD5 (libnet-1.0.1b.tar.gz) = 6eed9efc6c806911721b8830f18b5237
+MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/libnet/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	2000/06/02 22:51:20	1.6
+++ pkg-plist	2001/07/03 02:52:14
@@ -7,38 +7,24 @@
 include/libnet/libnet-ospf.h
 include/libnet/libnet-structures.h
 lib/libnet.a
-lib/libpwrite
+lib/libpwrite.a
 share/doc/libnet/CHANGELOG
 share/doc/libnet/CHANGELOG-NEWFUNCTIONS
 share/doc/libnet/COPYING
 share/doc/libnet/README
-share/doc/libnet/README.asn.1
-share/doc/libnet/README.bpf
-share/doc/libnet/README.legacy-applications
-share/doc/libnet/README.libnet-config
-share/doc/libnet/README.linux
-share/doc/libnet/README.rawsockets
 share/doc/libnet/TODO-1.0
 share/doc/libnet/TODO-1.1
-share/doc/libnet/html/1.html
-share/doc/libnet/html/2.html
-share/doc/libnet/html/3.html
-share/doc/libnet/html/4.html
-share/doc/libnet/html/5.html
-share/doc/libnet/html/6.html
-share/doc/libnet/html/7.html
-share/doc/libnet/html/contrib.html
-share/doc/libnet/html/examples/libnet-example-1.c
-share/doc/libnet/html/examples/libnet-example-2.c
-share/doc/libnet/html/examples/libnet-example-3.c
-share/doc/libnet/html/examples/libnet-example-4.c
-share/doc/libnet/html/fig-3a.gif
-share/doc/libnet/html/figure-1.gif
-share/doc/libnet/html/figure-2.gif
-share/doc/libnet/html/figure-3.gif
-share/doc/libnet/html/figure-3a.gif
-share/doc/libnet/html/lrm.html
-@dirrm share/doc/libnet/html/examples
-@dirrm share/doc/libnet/html
+share/doc/libnet/examples/libnet-example-1.c
+share/doc/libnet/examples/libnet-example-2.c
+share/doc/libnet/examples/libnet-example-3.c
+share/doc/libnet/examples/libnet-example-4.c
+share/doc/libnet/ancillary/README.asn.1
+share/doc/libnet/ancillary/README.bpf
+share/doc/libnet/ancillary/README.legacy-applications
+share/doc/libnet/ancillary/README.libnet-config
+share/doc/libnet/ancillary/README.linux
+share/doc/libnet/ancillary/README.rawsockets
+@dirrm share/doc/libnet/ancillary
+@dirrm share/doc/libnet/examples
 @dirrm share/doc/libnet
 @dirrm include/libnet
Index: files/patch-aa
===================================================================
RCS file: /home/ncvs/ports/net/libnet/files/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- files/patch-aa	2000/06/02 22:51:20	1.4
+++ files/patch-aa	2001/07/03 02:52:14
@@ -1,31 +1,29 @@
---- configure.orig	Wed Oct 27 11:47:27 1999
-+++ configure	Sat Apr 22 04:01:09 2000
-@@ -903,7 +903,7 @@
- 
+--- configure.in.orig	Wed Jan 17 12:59:30 2001
++++ configure.in	Mon Jul  2 19:18:50 2001
+@@ -50,10 +50,10 @@
+ dnl Use these compiler flags if we have gcc.
+ dnl
  if test $ac_cv_prog_gcc = yes; then
-     CCOPTS='-O3 -funroll-loops -fomit-frame-pointer -Wall'
+-dnl if test -z $CFLAGS; then 
+-    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
 -    CFLAGS="$CCOPTS"
-+    CFLAGS?="$CCOPTS"
+-dnl fi
++    if test -z "$CFLAGS"; then 
++        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
++        CFLAGS="$CCOPTS"
++    fi
  fi
- 
- # Check whether --with-pf_packet or --without-pf_packet was given.
-@@ -1497,8 +1497,8 @@
- 
-     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP \
-         -DHAVE_SOCKADDR_SA_LEN"
--    MAN_PREFIX="$prefix/man/man3/"
--    LIB_PREFIX="$prefix/lib/aout"
-+    MAN_PREFIX="$prefix/man/"
-+    LIB_PREFIX="$prefix/lib/"
-     INC_PREFIX="$prefix/include/"
-     BIN_PREFIX="$prefix/bin/"
-     echo "$ac_t""Note: support/bpf-lkm/etherspoof contains the lkm source \
-@@ -1517,7 +1517,7 @@
  
-     LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP"
-     MAN_PREFIX="$prefix/man/man3/"
--    LIB_PREFIX="$prefix/lib/aout"
-+    LIB_PREFIX="$prefix/lib/"
+ dnl
+@@ -163,8 +163,9 @@
+     LIB_PREFIX="$prefix/lib/aout"
      INC_PREFIX="$prefix/include/"
      BIN_PREFIX="$prefix/bin/"
+-    AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
+-required to spoof ethernet frames)
++dnl etherspoof lkm is horrible and only necesary on < RELENG_4
++dnl     AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \
++dnl required to spoof ethernet frames)
+     ln -sf FreeBSD support/bpf-lkm/etherspoof
      ;;
+ 
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/net/libnet/files/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- files/patch-ab	1999/10/08 03:46:26	1.3
+++ files/patch-ab	2001/07/03 02:52:14
@@ -1,11 +1,20 @@
---- Makefile.in.orig	Thu Oct  7 20:17:43 1999
-+++ Makefile.in	Thu Oct  7 20:17:56 1999
-@@ -104,7 +104,7 @@
- 	$(INSTALL) -c -m 0644 $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL) -c -m 0644 $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
- 	$(INSTALL) -c -m 0644 $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
--	$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)
-+	$(INSTALL) -c -m 0644 $(MAN) $(DESTDIR)$(MAN_PREFIX)/man3
- 	$(INSTALL) -c -m 0755 $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
+--- Makefile.in.orig	Mon Feb  5 09:51:41 2001
++++ Makefile.in	Mon Jul  2 19:41:27 2001
+@@ -96,7 +96,7 @@
+ 	$(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755
+-	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
++#	$(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755
+ 	$(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755
+ 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX)
+ 	rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a
+@@ -108,7 +108,7 @@
+ 	$(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+ 	$(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+ 	$(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET)
+-	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
++#	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)
+ 	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
  
- clean:
+ 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: keichii 
State-Changed-When: Thu Jul 12 14:32:58 PDT 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=28656 
>Unformatted:
