6 files changed, 65 insertions, 15 deletions

diff --git a/net/libnet/Makefile b/net/libnet/Makefile
index f6e2b4fd96bd..2f8754c7d7b0 100644
--- a/net/libnet/Makefile
+++ b/net/libnet/Makefile
@@ -7,20 +7,21 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.1.2.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
+PKGNAMESUFFIX=	11
 
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-CONFLICTS=	libnet-devel-1.1.*\
-		libnet10-1.0.*
-
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX}
 
 DOCS=		README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING \
 		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
@@ -28,7 +29,8 @@ DOCS=		README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING \
 EXAMPLES=	sample/*.c
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config \
+		${PREFIX}/bin/libnet${PKGNAMESUFFIX}-config
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
diff --git a/net/libnet/files/patch-include__Makefile.in b/net/libnet/files/patch-include__Makefile.in
new file mode 100644
index 000000000000..4114b4aaf60c
--- /dev/null
+++ b/net/libnet/files/patch-include__Makefile.in
@@ -0,0 +1,11 @@
+--- ./include/Makefile.in.orig	Thu Mar 11 15:50:20 2004
++++ ./include/Makefile.in	Tue Sep 26 15:23:43 2006
+@@ -40,7 +40,7 @@
+ libdir = @libdir@
+ infodir = @infodir@
+ mandir = @mandir@
+-includedir = @includedir@
++includedir = @includedir@/libnet11
+ oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
diff --git a/net/libnet/files/patch-include__libnet__Makefile.in b/net/libnet/files/patch-include__libnet__Makefile.in
new file mode 100644
index 000000000000..ea7a54013fc1
--- /dev/null
+++ b/net/libnet/files/patch-include__libnet__Makefile.in
@@ -0,0 +1,11 @@
+--- ./include/libnet/Makefile.in.orig	Thu Mar 11 15:50:20 2004
++++ ./include/libnet/Makefile.in	Tue Sep 26 15:19:23 2006
+@@ -40,7 +40,7 @@
+ libdir = @libdir@
+ infodir = @infodir@
+ mandir = @mandir@
+-includedir = @includedir@
++includedir = @includedir@/libnet11
+ oldincludedir = /usr/include
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
diff --git a/net/libnet/files/patch-libnet-config.in b/net/libnet/files/patch-libnet-config.in
new file mode 100644
index 000000000000..e653ad961f88
--- /dev/null
+++ b/net/libnet/files/patch-libnet-config.in
@@ -0,0 +1,13 @@
+--- ./libnet-config.in.orig	Sat Jan  3 17:31:00 2004
++++ ./libnet-config.in	Tue Sep 26 15:19:23 2006
+@@ -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()
+ {
diff --git a/net/libnet/files/patch-src__Makefile.in b/net/libnet/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..75522a845d0e
--- /dev/null
+++ b/net/libnet/files/patch-src__Makefile.in
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.orig	Thu Mar 11 15:50:20 2004
++++ ./src/Makefile.in	Tue Sep 26 15:19:23 2006
+@@ -43,7 +43,7 @@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+-libdir = @libdir@
++libdir = @libdir@/libnet11
+ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
diff --git a/net/libnet/pkg-plist b/net/libnet/pkg-plist
index d34cc252a33a..6d136643c9f7 100644
--- a/net/libnet/pkg-plist
+++ b/net/libnet/pkg-plist
@@ -1,12 +1,12 @@
-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
+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
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIB
@@ -96,4 +96,6 @@ lib/libnet.a
 %%EXAMPLESDIR%%/udp2.c
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/libnet
+@dirrm lib/libnet11
+@dirrm include/libnet11/libnet
+@dirrm include/libnet11