- Patch net/libnet* to versioned libraries and header files, so they can

  coexist

PR:		ports/103861
Submitted by:	alepulver
Tested by:	pointyhat
With hat:	portmgr

6 files changed, 79 insertions, 93 deletions

diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile
index 175ccfeca713..84bd9f37c0d4 100644
--- a/net/libnet10/Makefile
+++ b/net/libnet10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libnet
 PORTVERSION=	1.0.2a
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.packetfactory.net/libnet/dist/
@@ -16,28 +16,24 @@ PKGNAMESUFFIX=	10
 MAINTAINER=	shipley@dis.org
 COMMENT=	A C library for creating IP packets
 
-CONFLICTS=	libnet-devel-1.1.*\
-		libnet-1.1.*
-
-USE_AUTOTOOLS=	autoconf:213
-
+USE_AUTOTOOLS=	autoconf:259
 WRKSRC=		${WRKDIR}/Libnet-${PORTVERSION}
-MAN3=		libnet.3
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+MAN3=		libnet${PKGNAMESUFFIX}.3
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 \
+		${MANPREFIX}/man/man3/libnet${PKGNAMESUFFIX}.3
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/libnet
-	@${MKDIR} ${PREFIX}/share/doc/libnet/examples
-	@${MKDIR} ${PREFIX}/share/doc/libnet/ancillary
+	@${MKDIR} ${DOCSDIR}/ancillary ${DOCSDIR}/examples
 .for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .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
+	${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${DOCSDIR}/ancillary
 .endfor
 .for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c
-	${INSTALL_DATA} ${WRKSRC}/example/${i} ${PREFIX}/share/doc/libnet/examples
+	${INSTALL_DATA} ${WRKSRC}/example/${i} ${DOCSDIR}/examples
 .endfor
 .endif
 
diff --git a/net/libnet10/files/patch-Makefile.in b/net/libnet10/files/patch-Makefile.in
new file mode 100644
index 000000000000..6fc8a0495af1
--- /dev/null
+++ b/net/libnet10/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	Mon Feb  5 14:51:41 2001
++++ Makefile.in	Mon Sep 25 18:26:09 2006
+@@ -14,8 +14,8 @@
+ exec_prefix =   @exec_prefix@
+ srcdir      =   @srcdir@
+ BIN_PREFIX  =   @bindir@/
+-INC_PREFIX  =   @includedir@/
+-LIB_PREFIX  =   @libdir@/
++INC_PREFIX  =   @includedir@/libnet10/
++LIB_PREFIX  =   @libdir@/libnet10/
+ MAN_PREFIX  =   @MAN_PREFIX@
+ 
+ LIBNET      =   libnet
+@@ -108,8 +108,8 @@
+ 	$(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) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)
++	$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX)libnet10.3
++	$(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX)$(CONFIG:S/libnet/libnet10/)
+ 
+ 
+ 
diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa
deleted file mode 100644
index 57137897cbc7..000000000000
--- a/net/libnet10/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
--dnl if test -z $CFLAGS; then 
--    CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
--    CFLAGS="$CCOPTS"
--dnl fi
-+    if test -z "$CFLAGS"; then 
-+        CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall'
-+        CFLAGS="$CCOPTS"
-+    fi
- fi
- 
- 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
-     ;;
- 
diff --git a/net/libnet10/files/patch-ab b/net/libnet10/files/patch-ab
deleted file mode 100644
index 9106f9921b2a..000000000000
--- a/net/libnet10/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)
- 
- 
diff --git a/net/libnet10/files/patch-libnet-config.in b/net/libnet10/files/patch-libnet-config.in
new file mode 100644
index 000000000000..7be6f3841eaf
--- /dev/null
+++ b/net/libnet10/files/patch-libnet-config.in
@@ -0,0 +1,13 @@
+--- libnet-config.in.orig	Tue Dec 12 15:33:42 2000
++++ libnet-config.in	Mon Sep 25 18:02:39 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/libnet10"
++libnet_libs="@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/libnet10 -lnet"
+ 
+ usage()
+ {
diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist
index 212baac7b536..50e22574bac5 100644
--- a/net/libnet10/pkg-plist
+++ b/net/libnet10/pkg-plist
@@ -1,30 +1,32 @@
-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-ospf.h
-include/libnet/libnet-structures.h
-lib/libnet.a
-lib/libpwrite.a
-share/doc/libnet/CHANGELOG
-share/doc/libnet/CHANGELOG-NEWFUNCTIONS
-share/doc/libnet/COPYING
-share/doc/libnet/README
-share/doc/libnet/TODO-1.0
-share/doc/libnet/TODO-1.1
-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
+bin/libnet10-config
+include/libnet10/libnet.h
+include/libnet10/libnet/libnet-asn1.h
+include/libnet10/libnet/libnet-functions.h
+include/libnet10/libnet/libnet-headers.h
+include/libnet10/libnet/libnet-macros.h
+include/libnet10/libnet/libnet-ospf.h
+include/libnet10/libnet/libnet-structures.h
+lib/libnet10/libnet.a
+lib/libnet10/libpwrite.a
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG-NEWFUNCTIONS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO-1.0
+%%PORTDOCS%%%%DOCSDIR%%/TODO-1.1
+%%PORTDOCS%%%%DOCSDIR%%/examples/libnet-example-1.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/libnet-example-2.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/libnet-example-3.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/libnet-example-4.c
+%%PORTDOCS%%%%DOCSDIR%%/ancillary/README.asn.1
+%%PORTDOCS%%%%DOCSDIR%%/ancillary/README.bpf
+%%PORTDOCS%%%%DOCSDIR%%/ancillary/README.legacy-applications
+%%PORTDOCS%%%%DOCSDIR%%/ancillary/README.libnet-config
+%%PORTDOCS%%%%DOCSDIR%%/ancillary/README.linux
+%%PORTDOCS%%%%DOCSDIR%%/ancillary/README.rawsockets
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ancillary
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/libnet10
+@dirrm include/libnet10/libnet
+@dirrm include/libnet10