The libnet 1.1.x branch will now install as libnet11-1.1.x this will avoid

conflicts with the libnet 1.0.x branch and allow the two to be run
side-by-side.

5 files changed, 162 insertions, 133 deletions

diff --git a/devel/libnet11/Makefile b/devel/libnet11/Makefile
index 157e9c6ef2b..9f97dc1b64d 100644
--- a/devel/libnet11/Makefile
+++ b/devel/libnet11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:51 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/18 18:30:59 adrianp Exp $
 
 DISTNAME=	libnet-1.1.2.1
-PKGREVISION=	1
+PKGNAME=	${DISTNAME:S/libnet/libnet11/}
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
 
@@ -9,42 +9,49 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.packetfactory.net/libnet/
 COMMENT=	C library for portable packet creation and injection
 
-CONFLICTS=	libnet-1.0.[0-9]*
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+CONFLICTS=	libnet-[0-9]*
 
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/libnet
 
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/libnet11
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/libnet11
+
 LNDOCS=		DESIGN_NOTES MIGRATION PACKET_BUILDING RAWSOCKET_NON_SEQUITUR
+LNMAN=		libnet-functions.h.3 libnet-headers.h.3 libnet-macros.h.3 \
+		libnet.h.3 libnet_802_1q_hdr.3 libnet_802_1x_hdr.3
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet/html
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/libnet
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet11
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet11/html
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/libnet11
 	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man3
 
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html \
-		${PREFIX}/share/doc/libnet/html
+		${PREFIX}/share/doc/libnet11/html
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.css \
-		${PREFIX}/share/doc/libnet/html
+		${PREFIX}/share/doc/libnet11/html
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.png\
-		${PREFIX}/share/doc/libnet/html
+		${PREFIX}/share/doc/libnet11/html
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.dot\
-		${PREFIX}/share/doc/libnet/html
+		${PREFIX}/share/doc/libnet11/html
 
 	${INSTALL_DATA} ${WRKSRC}/sample/*.c \
-		${PREFIX}/share/examples/libnet
+		${PREFIX}/share/examples/libnet11
 
-	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/*.3 \
-		${PREFIX}/${PKGMANDIR}/man3
+.	for f in ${LNMAN}
+		${INSTALL_MAN} ${WRKSRC}/doc/man/man3/${f} \
+			${PREFIX}/${PKGMANDIR}/man3/${f:S/libnet/libnet11/}
+.	endfor
 
-	for f in ${LNDOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/doc/$$f \
-			${PREFIX}/share/doc/libnet/; \
-	done
+.	for f in ${LNDOCS}
+		${INSTALL_DATA} ${WRKSRC}/doc/${f} \
+			${PREFIX}/share/doc/libnet11/
+.	endfor
 
-	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config \
+		${PREFIX}/bin/libnet11-config
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libnet11/PLIST b/devel/libnet11/PLIST
index ffa89ee64dc..e1e3b584923 100644
--- a/devel/libnet11/PLIST
+++ b/devel/libnet11/PLIST
@@ -1,100 +1,102 @@
-@comment $NetBSD: PLIST,v 1.3 2006/06/17 20:39:36 rillig Exp $
-bin/libnet-config
-include/libnet.h
-include/libnet/libnet-asn1.h
-include/libnet/libnet-functions.h
-include/libnet/libnet-headers.h
-include/libnet/libnet-macros.h
-include/libnet/libnet-structures.h
-include/libnet/libnet-types.h
-lib/libnet.a
-man/man3/libnet-functions.h.3
-man/man3/libnet-headers.h.3
-man/man3/libnet-macros.h.3
-man/man3/libnet.h.3
-man/man3/libnet_802_1q_hdr.3
-man/man3/libnet_802_1x_hdr.3
-share/doc/libnet/DESIGN_NOTES
-share/doc/libnet/MIGRATION
-share/doc/libnet/PACKET_BUILDING
-share/doc/libnet/RAWSOCKET_NON_SEQUITUR
-share/doc/libnet/html/acconfig_8h-source.html
-share/doc/libnet/html/annotated.html
-share/doc/libnet/html/bpf_8h-source.html
-share/doc/libnet/html/config_8h-source.html
-share/doc/libnet/html/doxygen.css
-share/doc/libnet/html/doxygen.png
-share/doc/libnet/html/files.html
-share/doc/libnet/html/functions.html
-share/doc/libnet/html/functions_vars.html
-share/doc/libnet/html/getopt_8h-source.html
-share/doc/libnet/html/globals.html
-share/doc/libnet/html/globals_defs.html
-share/doc/libnet/html/globals_func.html
-share/doc/libnet/html/gnuc_8h-source.html
-share/doc/libnet/html/graph_legend.dot
-share/doc/libnet/html/graph_legend.html
-share/doc/libnet/html/ifaddrlist_8h-source.html
-share/doc/libnet/html/in__systm_8h-source.html
-share/doc/libnet/html/index.html
-share/doc/libnet/html/libnet-asn1_8h-source.html
-share/doc/libnet/html/libnet-functions_8h-source.html
-share/doc/libnet/html/libnet-functions_8h.html
-share/doc/libnet/html/libnet-headers_8h-source.html
-share/doc/libnet/html/libnet-headers_8h.html
-share/doc/libnet/html/libnet-macros_8h-source.html
-share/doc/libnet/html/libnet-macros_8h.html
-share/doc/libnet/html/libnet-structures_8h-source.html
-share/doc/libnet/html/libnet-types_8h-source.html
-share/doc/libnet/html/libnet_8h-source.html
-share/doc/libnet/html/libnet_8h.html
-share/doc/libnet/html/structlibnet__802__1q__hdr.html
-share/doc/libnet/html/structlibnet__802__1x__hdr.html
-share/examples/libnet/arp-new.c
-share/examples/libnet/arp.c
-share/examples/libnet/bgp4_hdr.c
-share/examples/libnet/bgp4_notification.c
-share/examples/libnet/bgp4_open.c
-share/examples/libnet/bgp4_update.c
-share/examples/libnet/cdp.c
-share/examples/libnet/dhcp_discover.c
-share/examples/libnet/dns.c
-share/examples/libnet/dot1x.c
-share/examples/libnet/fddi_tcp1.c
-share/examples/libnet/fddi_tcp2.c
-share/examples/libnet/get_addr.c
-share/examples/libnet/gre.c
-share/examples/libnet/icmp6_echoreq.c
-share/examples/libnet/icmp_echo_cq.c
-share/examples/libnet/icmp_redirect.c
-share/examples/libnet/icmp_timeexceed.c
-share/examples/libnet/icmp_timestamp.c
-share/examples/libnet/icmp_unreach.c
-share/examples/libnet/ieee.c
-share/examples/libnet/ip_link.c
-share/examples/libnet/ip_raw.c
-share/examples/libnet/isl.c
-share/examples/libnet/mpls.c
-share/examples/libnet/ntp.c
-share/examples/libnet/ospf_hello.c
-share/examples/libnet/ospf_lsa.c
-share/examples/libnet/ping_of_death.c
-share/examples/libnet/rpc_tcp.c
-share/examples/libnet/rpc_udp.c
-share/examples/libnet/sebek.c
-share/examples/libnet/smurf.c
-share/examples/libnet/stp.c
-share/examples/libnet/synflood.c
-share/examples/libnet/synflood6.c
-share/examples/libnet/synflood6_frag.c
-share/examples/libnet/tcp1.c
-share/examples/libnet/tcp2.c
-share/examples/libnet/tftp.c
-share/examples/libnet/tring_tcp1.c
-share/examples/libnet/tring_tcp2.c
-share/examples/libnet/udp1.c
-share/examples/libnet/udp2.c
-@dirrm share/examples/libnet
-@dirrm share/doc/libnet/html
-@dirrm share/doc/libnet
-@dirrm include/libnet
+@comment $NetBSD: PLIST,v 1.4 2007/02/18 18:31:00 adrianp Exp $
+bin/libnet11-config
+include/libnet11/libnet.h
+include/libnet11/libnet/libnet-asn1.h
+include/libnet11/libnet/libnet-functions.h
+include/libnet11/libnet/libnet-headers.h
+include/libnet11/libnet/libnet-macros.h
+include/libnet11/libnet/libnet-structures.h
+include/libnet11/libnet/libnet-types.h
+lib/libnet11/libnet.a
+man/man3/libnet11-functions.h.3
+man/man3/libnet11-headers.h.3
+man/man3/libnet11-macros.h.3
+man/man3/libnet11.h.3
+man/man3/libnet11_802_1q_hdr.3
+man/man3/libnet11_802_1x_hdr.3
+share/doc/libnet11/DESIGN_NOTES
+share/doc/libnet11/MIGRATION
+share/doc/libnet11/PACKET_BUILDING
+share/doc/libnet11/RAWSOCKET_NON_SEQUITUR
+share/doc/libnet11/html/acconfig_8h-source.html
+share/doc/libnet11/html/annotated.html
+share/doc/libnet11/html/bpf_8h-source.html
+share/doc/libnet11/html/config_8h-source.html
+share/doc/libnet11/html/doxygen.css
+share/doc/libnet11/html/doxygen.png
+share/doc/libnet11/html/files.html
+share/doc/libnet11/html/functions.html
+share/doc/libnet11/html/functions_vars.html
+share/doc/libnet11/html/getopt_8h-source.html
+share/doc/libnet11/html/globals.html
+share/doc/libnet11/html/globals_defs.html
+share/doc/libnet11/html/globals_func.html
+share/doc/libnet11/html/gnuc_8h-source.html
+share/doc/libnet11/html/graph_legend.dot
+share/doc/libnet11/html/graph_legend.html
+share/doc/libnet11/html/ifaddrlist_8h-source.html
+share/doc/libnet11/html/in__systm_8h-source.html
+share/doc/libnet11/html/index.html
+share/doc/libnet11/html/libnet-asn1_8h-source.html
+share/doc/libnet11/html/libnet-functions_8h-source.html
+share/doc/libnet11/html/libnet-functions_8h.html
+share/doc/libnet11/html/libnet-headers_8h-source.html
+share/doc/libnet11/html/libnet-headers_8h.html
+share/doc/libnet11/html/libnet-macros_8h-source.html
+share/doc/libnet11/html/libnet-macros_8h.html
+share/doc/libnet11/html/libnet-structures_8h-source.html
+share/doc/libnet11/html/libnet-types_8h-source.html
+share/doc/libnet11/html/libnet_8h-source.html
+share/doc/libnet11/html/libnet_8h.html
+share/doc/libnet11/html/structlibnet__802__1q__hdr.html
+share/doc/libnet11/html/structlibnet__802__1x__hdr.html
+share/examples/libnet11/arp-new.c
+share/examples/libnet11/arp.c
+share/examples/libnet11/bgp4_hdr.c
+share/examples/libnet11/bgp4_notification.c
+share/examples/libnet11/bgp4_open.c
+share/examples/libnet11/bgp4_update.c
+share/examples/libnet11/cdp.c
+share/examples/libnet11/dhcp_discover.c
+share/examples/libnet11/dns.c
+share/examples/libnet11/dot1x.c
+share/examples/libnet11/fddi_tcp1.c
+share/examples/libnet11/fddi_tcp2.c
+share/examples/libnet11/get_addr.c
+share/examples/libnet11/gre.c
+share/examples/libnet11/icmp6_echoreq.c
+share/examples/libnet11/icmp_echo_cq.c
+share/examples/libnet11/icmp_redirect.c
+share/examples/libnet11/icmp_timeexceed.c
+share/examples/libnet11/icmp_timestamp.c
+share/examples/libnet11/icmp_unreach.c
+share/examples/libnet11/ieee.c
+share/examples/libnet11/ip_link.c
+share/examples/libnet11/ip_raw.c
+share/examples/libnet11/isl.c
+share/examples/libnet11/mpls.c
+share/examples/libnet11/ntp.c
+share/examples/libnet11/ospf_hello.c
+share/examples/libnet11/ospf_lsa.c
+share/examples/libnet11/ping_of_death.c
+share/examples/libnet11/rpc_tcp.c
+share/examples/libnet11/rpc_udp.c
+share/examples/libnet11/sebek.c
+share/examples/libnet11/smurf.c
+share/examples/libnet11/stp.c
+share/examples/libnet11/synflood.c
+share/examples/libnet11/synflood6.c
+share/examples/libnet11/synflood6_frag.c
+share/examples/libnet11/tcp1.c
+share/examples/libnet11/tcp2.c
+share/examples/libnet11/tftp.c
+share/examples/libnet11/tring_tcp1.c
+share/examples/libnet11/tring_tcp2.c
+share/examples/libnet11/udp1.c
+share/examples/libnet11/udp2.c
+@dirrm share/examples/libnet11
+@dirrm share/doc/libnet11/html
+@dirrm share/doc/libnet11
+@dirrm include/libnet11/libnet
+@dirrm include/libnet11
+@dirrm lib/libnet11
diff --git a/devel/libnet11/buildlink3.mk b/devel/libnet11/buildlink3.mk
index 6cad8c9a494..c14b9cc5dff 100644
--- a/devel/libnet11/buildlink3.mk
+++ b/devel/libnet11/buildlink3.mk
@@ -1,19 +1,23 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2007/02/18 18:31:00 adrianp Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-LIBNET_BUILDLINK3_MK:=	${LIBNET_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBNET11_BUILDLINK3_MK:=	${LIBNET11_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	libnet
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	libnet11
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnet}
-BUILDLINK_PACKAGES+=	libnet
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnet11}
+BUILDLINK_PACKAGES+=	libnet11
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libnet11
 
-.if !empty(LIBNET_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libnet+=	libnet>=1.1.2.1
-BUILDLINK_PKGSRCDIR.libnet?=	../../devel/libnet11
-.endif	# LIBNET_BUILDLINK3_MK
+.if ${LIBNET11_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.libnet11+=	libnet11>=1.1.2.1
+BUILDLINK_PKGSRCDIR.libnet11?=		../../devel/libnet11
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_INCDIRS.libnet11+=		include/libnet11
+BUILDLINK_LIBDIRS.libnet11+=		lib/libnet11
+BUILDLINK_CPPFLAGS.libnet11+=		-lnet
+.endif	# LIBNET11_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libnet11/distinfo b/devel/libnet11/distinfo
index 426abe46d70..ba31a7dc793 100644
--- a/devel/libnet11/distinfo
+++ b/devel/libnet11/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/02/09 23:58:23 rillig Exp $
+$NetBSD: distinfo,v 1.4 2007/02/18 18:31:00 adrianp Exp $
 
 SHA1 (libnet-1.1.2.1.tar.gz) = 760783a2adbd845b731e2000aafa3cd9c3b028d5
 RMD160 (libnet-1.1.2.1.tar.gz) = 2d8d87930d09a74ab369bd7c240af4b5426ae380
 Size (libnet-1.1.2.1.tar.gz) = 1021236 bytes
 SHA1 (patch-aa) = cac87f7ede65258eb672fbeb8923841aa0d87135
+SHA1 (patch-ab) = 70a38d114f9d3a4e08cb55af5d3645b92526cdbb
diff --git a/devel/libnet11/patches/patch-ab b/devel/libnet11/patches/patch-ab
new file mode 100644
index 00000000000..b6672f0e338
--- /dev/null
+++ b/devel/libnet11/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2007/02/18 18:31:00 adrianp Exp $
+
+--- libnet-config.in.orig	2004-01-03 20:31:00.000000000 +0000
++++ libnet-config.in
+@@ -8,8 +8,8 @@
+ #   @configure_input@
+ 
+ libnet_defines="@LIBNET_CONFIG_DEFINES@"
+-libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
+-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
++libnet_cflags="@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include/libnet11"
++libnet_libs="@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/libnet11 -lnet"
+ 
+ usage()
+ {