- 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

4 files changed, 30 insertions, 15 deletions

diff --git a/security/unicornscan/Makefile b/security/unicornscan/Makefile
index f719169cc464..1fb0a267234b 100644
--- a/security/unicornscan/Makefile
+++ b/security/unicornscan/Makefile
@@ -7,20 +7,23 @@
 
 PORTNAME=	unicornscan
 PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.dyadsecurity.com/unicornscan/
 
 MAINTAINER=	cykyc@yahoo.com
 COMMENT=	Next-generation of udpscan plus a high-speed TCP scanner
 
-BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
 
 USE_GMAKE=	yes
+MAKE_ENV=	LIBNET_CONFIG="${LIBNET_CONFIG}"
 
 MAN1=		unicornscan.1
 
-PKGMESSAGE=     ${WRKDIR}/pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
 .include <bsd.port.pre.mk>
 
@@ -35,7 +38,7 @@ BUILD_DEPENDS+=	${PREFIX}/lib/libpcap.a:${PORTSDIR}/net/libpcap
 # function
 
 .if ${OSVERSION} > 502103
-CFLAGS+= -DWITH_LONGOPTS
+CFLAGS+=	-DWITH_LONGOPTS
 .endif
 
 post-patch:
@@ -43,6 +46,8 @@ post-patch:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
 	${PKGDIR}/${text} >${WRKDIR}/${text}
 .endfor
+	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
+		${WRKSRC}/src/scan_progs/Makefile ${WRKSRC}/src/tools/Makefile
 
 do-install:
 	${MKDIR} ${PREFIX}/etc/unicornscan
diff --git a/security/unicornscan/files/patch-libs::Makefile b/security/unicornscan/files/patch-libs::Makefile
index b5afb29c6ce7..ee72e98bea78 100644
--- a/security/unicornscan/files/patch-libs::Makefile
+++ b/security/unicornscan/files/patch-libs::Makefile
@@ -1,5 +1,5 @@
---- libs/Makefile.orig	Thu Sep 30 05:29:05 2004
-+++ libs/Makefile	Tue Oct  5 13:36:57 2004
+--- libs/Makefile.orig	Thu Sep 30 07:29:05 2004
++++ libs/Makefile	Fri Sep 29 14:32:37 2006
 @@ -6,30 +6,10 @@
  default: pcap_test libnet_test
  
@@ -29,7 +29,7 @@
 -
 -libpcap-$(PCAPVER).tar.gz:
 -	wget http://tcpdump.org/release/libpcap-$(PCAPVER).tar.gz
-+	$(CC) $(CFLAGS) -o libnet_test libnet_test.c -lpcap -lnet $(LDADD)
++	$(CC) $(CFLAGS) -o libnet_test libnet_test.c -lpcap `$(LIBNET_CONFIG) --libs` $(LDADD)
  
  clean:
 -	rm -rf fake libnet libpcap-$(PCAPVER) pcap_test libnet_test
diff --git a/security/unicornscan/files/patch-src::Makefile b/security/unicornscan/files/patch-src::Makefile
index 05ebc6d7fdce..9ca33750fd80 100644
--- a/security/unicornscan/files/patch-src::Makefile
+++ b/security/unicornscan/files/patch-src::Makefile
@@ -1,11 +1,13 @@
---- src/Makefile.orig	Mon Dec 13 22:24:21 2004
-+++ src/Makefile	Mon Dec 13 22:24:38 2004
-@@ -4,7 +4,7 @@
+--- src/Makefile.orig	Thu Sep 30 07:29:05 2004
++++ src/Makefile	Fri Sep 29 14:32:21 2006
+@@ -4,8 +4,8 @@
  HDRS=$(SRCS:.c=.h) config.h settings.h
  OBJS=$(SRCS:.c=.o)
  
 -CFLAGS=$(MYCFLAGS)
+-LIBS=-lscan -luni -lparse -lpcap -lnet $(LDADD)
 +CFLAGS+=$(MYCFLAGS)
- LIBS=-lscan -luni -lparse -lpcap -lnet $(LDADD)
++LIBS=-lscan -luni -lparse -lpcap `$(LIBNET_CONFIG) --libs` $(LDADD)
  LIBDIRS=-L./unilib -L./scan_progs -L./parse -L../libs/fake/lib
  TARGETNAME=unicornscan
+ 
diff --git a/security/unicornscan/files/patch-src::Makefile.inc b/security/unicornscan/files/patch-src::Makefile.inc
index a8f1455e4f7c..91e7e62fc17e 100644
--- a/security/unicornscan/files/patch-src::Makefile.inc
+++ b/security/unicornscan/files/patch-src::Makefile.inc
@@ -1,8 +1,9 @@
---- src/Makefile.inc.orig	Thu Sep 30 05:29:05 2004
-+++ src/Makefile.inc	Tue Oct  5 11:07:49 2004
-@@ -1,8 +1,7 @@
+--- src/Makefile.inc.orig	Thu Sep 30 07:29:05 2004
++++ src/Makefile.inc	Thu Sep 28 14:08:32 2006
+@@ -1,14 +1,13 @@
  # gcc only
- CC=gcc
+-CC=gcc
++CC?=gcc
  
 -PREFIX=/usr/local
 -LOCALSTATEDIR=/var
@@ -10,6 +11,13 @@
  TARGETNAME=unicornscan
  SENDERNAME=unisend
  LISTENERNAME=unilisten
+ 
+ # its fine to do almost anything here, just dont remove the includes
+-MYCFLAGS=-O1 -ggdb -Wall -Wshadow -Wcast-align -Wcast-qual -Wchar-subscripts -Wno-deprecated-declarations -Wformat-security -Wimplicit -Wsign-compare -Wuninitialized -Wunused -Wwrite-strings -I. -rdynamic -I../libs/fake/include -I/usr/local/include -L/usr/local/lib -DPREFIX=\"$(PREFIX)\" -DLOCALSTATEDIR=\"$(LOCALSTATEDIR)\" -DTARGETNAME=\"$(TARGETNAME)\" -DSENDERNAME=\"$(SENDERNAME)\" -DLISTENERNAME=\"$(LISTENERNAME)\"
++MYCFLAGS:=$(CFLAGS) -O1 -ggdb -Wall -Wshadow -Wcast-align -Wcast-qual -Wchar-subscripts -Wno-deprecated-declarations -Wformat-security -Wimplicit -Wsign-compare -Wuninitialized -Wunused -Wwrite-strings -I. -rdynamic -I../libs/fake/include `$(LIBNET_CONFIG) --defines` `$(LIBNET_CONFIG) --cflags` -DPREFIX=\"$(PREFIX)\" -DLOCALSTATEDIR=\"$(LOCALSTATEDIR)\" -DTARGETNAME=\"$(TARGETNAME)\" -DSENDERNAME=\"$(SENDERNAME)\" -DLISTENERNAME=\"$(LISTENERNAME)\"
+ 
+ # sometimes you dont have a link to gmake, if your make _is_ gmake, you can use make then, but we need GNU make (for now)
+ MAKE=gmake
 @@ -23,10 +22,10 @@
  #LDADD=-lsocket -lnsl -ldl -lposix4 -lresolv