Attachment 168381 Details for Bug 208122 – patch2

[patch] patch2

libnet.patch (text/plain), 62.21 KB, created by Tijl Coosemans on 2016-03-19 11:46:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2016-03-19 11:46:13 UTC

Size: 62.21 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 411360)
>+++ MOVED	(working copy)
>@@ -8234,3 +8234,4 @@ security/openvas-libnasl|security/openva
> security/openvas-server|security/openvas-scanner|2016-03-17|Renamed
> security/openvas-plugins|security/openvas-scanner|2016-03-17|Merged
> security/openvas-client||2016-03-17|Discontinued, try security/greenbone-security-assistant
>+net/libnids-libnet11|net/libnids|2016-03-17|Same content
>Index: net/Makefile
>===================================================================
>--- net/Makefile	(revision 411360)
>+++ net/Makefile	(working copy)
>@@ -327,7 +327,6 @@
>     SUBDIR += libnetdude
>     SUBDIR += libnfs
>     SUBDIR += libnids
>-    SUBDIR += libnids-libnet11
>     SUBDIR += libnss-cache
>     SUBDIR += libnss-mysql
>     SUBDIR += liboauth
>Index: net/arp-sk/Makefile
>===================================================================
>--- net/arp-sk/Makefile	(revision 411360)
>+++ net/arp-sk/Makefile	(working copy)
>@@ -14,22 +14,10 @@ COMMENT=	Tool designed to manipulate ARP
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> GNU_CONFIGURE=	yes
>-
>-CFLAGS+=	`${LIBNET_CONFIG} --cflags`
>+CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
> 
> PLIST_FILES=	sbin/arp-sk man/man1/arp-sk.1.gz
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
>-post-patch:
>-	@${REINPLACE_CMD} -Ee \
>-		's| -pedantic -g||; \
>-		 s|test -f \$${prefix}/include/libnet\.h|${TRUE}|; \
>-		 s|\$$NETINC/libnet\.h|libnet.h|; \
>-		 s|(NETINC=).*|\1"`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"|; \
>-		 s|(NETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
>-		 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/arp-sk ${STAGEDIR}${PREFIX}/sbin
> 	${INSTALL_MAN} ${WRKSRC}/man/arp-sk.1 ${STAGEDIR}${MANPREFIX}/man/man1
>Index: net/arping/Makefile
>===================================================================
>--- net/arping/Makefile	(revision 411360)
>+++ net/arping/Makefile	(working copy)
>@@ -15,11 +15,8 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include \
>-		`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
>-LIBS+=		-L${LOCALBASE}/lib `${LIBNET_CONFIG} --libs` -lpcap
>-
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> PLIST_FILES=	sbin/arping man/man8/arping.8.gz
> 
>Index: net/arprelease/Makefile
>===================================================================
>--- net/arprelease/Makefile	(revision 411360)
>+++ net/arprelease/Makefile	(working copy)
>@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> PLIST_FILES=	bin/arprelease
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>+LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
> 
> do-build:
> 	(cd ${WRKSRC} && \
>Index: net/fonulator/Makefile
>===================================================================
>--- net/fonulator/Makefile	(revision 411360)
>+++ net/fonulator/Makefile	(working copy)
>@@ -15,30 +15,19 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libargta
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include ${LIBNET_CPPFLAGS}
>-LDFLAGS+=	${LIBNET_LIBS:N-l*}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> CONFIGURE_ARGS=	--disable-shared
> 
>-LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11-config
>-
> PLIST_FILES=	bin/fonulator \
> 		man/man1/fonulator.1.gz
> 
> post-patch:
> 	@${REINPLACE_CMD}\
> 	    -e 's,/usr/lib/libargtable2.a,${LOCALBASE}/lib/libargtable2.a,'\
>-	    -e 's,/usr/lib/libnet.a,${LIBNET_LIBS:N-l*:S,-L,,}/libnet.a,'\
>+	    -e 's,/usr/lib/libnet.a,${LOCALBASE}/lib/libnet.a,'\
> 	    ${WRKSRC}/Makefile.in ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's,/etc/redfone.conf,${LOCALBASE}/etc/redfone.conf,'\
> 	    ${WRKSRC}/fonulator.c ${WRKSRC}/fonulator.1
> 
>-.if 0
>-# this does not work when LIBNET_CONFIG does not exist prior to building this port
>-LIBNET_CPPFLAGS!=	${LIBNET_CONFIG} --cflags --defines
>-LIBNET_LIBS!=		${LIBNET_CONFIG} --libs
>-.else
>-LIBNET_CPPFLAGS=	-I${LOCALBASE}/include/libnet11
>-LIBNET_LIBS=		-L${LOCALBASE}/lib/libnet11
>-.endif
>-
> .include <bsd.port.mk>
>Index: net/gspoof/Makefile
>===================================================================
>--- net/gspoof/Makefile	(revision 411360)
>+++ net/gspoof/Makefile	(working copy)
>@@ -14,17 +14,13 @@ LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/l
> 
> USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--with-libnet-prefix=${LOCALBASE}
> USES=		gmake
> 
> OPTIONS_DEFINE=	DOCS
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|-Wall -O2|$${CFLAGS}|g; \
>-		 s|libnet-config|${LIBNET_CONFIG}|' \
>-		 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>+	@${REINPLACE_CMD} 's|-Wall -O2|$${CFLAGS}|' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e 's|-Wall -O2|@CFLAGS@|g' ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share|g ; \
> 		 s|/usr/share|${LOCALBASE}/share|g' ${WRKSRC}/gtk.c
>Index: net/gspoof/files/patch-configure
>===================================================================
>--- net/gspoof/files/patch-configure	(revision 411360)
>+++ net/gspoof/files/patch-configure	(nonexistent)
>@@ -1,30 +0,0 @@
>---- ./configure.orig	Tue Dec 23 07:54:42 2003
>-+++ ./configure	Wed Sep 27 18:23:26 2006
>-@@ -2505,24 +2505,12 @@
>- as_ac_File=`echo "ac_cv_file_$LIBNET_PREFIX/lib/libnet.a" | $as_tr_sh`
>- echo "$as_me:$LINENO: checking for $LIBNET_PREFIX/lib/libnet.a" >&5
>- echo $ECHO_N "checking for $LIBNET_PREFIX/lib/libnet.a... $ECHO_C" >&6
>--if eval "test \"\${$as_ac_File+set}\" = set"; then
>--  echo $ECHO_N "(cached) $ECHO_C" >&6
>--else
>--  test "$cross_compiling" = yes &&
>--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
>--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
>--   { (exit 1); exit 1; }; }
>--if test -r "$LIBNET_PREFIX/lib/libnet.a"; then
>--  eval "$as_ac_File=yes"
>--else
>--  eval "$as_ac_File=no"
>--fi
>--fi
>-+eval "$as_ac_File=yes"
>- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
>- echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
>- if test `eval echo '${'$as_ac_File'}'` = yes; then
>--  LDFLAGS="-L$LIBNET_PREFIX/lib"
>--	       CPPFLAGS="-I$LIBNET_PREFIX/include"
>-+  LDFLAGS="`libnet-config --libs`"
>-+  CPPFLAGS="`libnet-config --cflags`"
>- else
>-   { { echo "$as_me:$LINENO: error:
>- Libnet-1.1.1 Packet Shaping Library is required!
>
>Property changes on: net/gspoof/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/libfb/Makefile
>===================================================================
>--- net/libfb/Makefile	(revision 411360)
>+++ net/libfb/Makefile	(working copy)
>@@ -14,15 +14,9 @@ LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/l
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-shared
>-CPPFLAGS+=	${LIBNET_CPPFLAGS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> USES=		libtool
> 
>-LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11-config
>-LIBNET_CPPFLAGS=`${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
>-LIBNET_LIBS=	`${LIBNET_CONFIG} --libs`
>-
>-post-patch:
>-	@${REINPLACE_CMD} 's,-lnet,${LIBNET_LIBS},' ${WRKSRC}/configure
>-
> .include <bsd.port.mk>
>Index: net/libnet/Makefile
>===================================================================
>--- net/libnet/Makefile	(revision 411360)
>+++ net/libnet/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libnet
> PORTVERSION=	1.1.6
>-PORTREVISION=	3
>+PORTREVISION=	4
> PORTEPOCH=	1
> CATEGORIES=	net
> MASTER_SITES=	SF/libnet-dev
>@@ -12,6 +12,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	C library for creating IP packets
> 
> LICENSE=	BSD2CLAUSE
>+LICENSE_FILE=	${WRKSRC}/doc/COPYING
> 
> OPTIONS_DEFINE=	BPF DOCS EXAMPLES
> OPTIONS_DEFAULT=BPF
>@@ -23,13 +24,9 @@ USE_CSTD=	gnu89
> USE_LDCONFIG=	yes
> USES=		libtool
> 
>-SHORT_NAME=	${PORTNAME}11
>-DOCSDIR=	${PREFIX}/share/doc/${SHORT_NAME}
>-EXAMPLESDIR=	${PREFIX}/share/examples/${SHORT_NAME}
>-USE_LDCONFIG=	${PREFIX}/lib/${SHORT_NAME}
>-PLIST_SUB=	SNAME=${SHORT_NAME} VERSION=${PORTVERSION}
>+PLIST_SUB=	VERSION=${PORTVERSION}
> 
>-DOCS=		README doc/CHANGELOG doc/CONTRIB doc/COPYING \
>+DOCS=		README doc/CHANGELOG doc/CONTRIB \
> 		doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
> 		doc/RAWSOCKET_NON_SEQUITUR doc/TODO
> EXAMPLES=	sample/*.c
>@@ -39,19 +36,11 @@ BPF_CONFIGURE_ON=	--with-link-layer=bpf
> 
> post-patch:
> 	@${REINPLACE_CMD} \
>-		 -e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/${SHORT_NAME}|' \
>-		 -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include/${SHORT_NAME}|' \
>+		-e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L@prefix@/lib|' \
>+		-e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I@prefix@/include|' \
> 			${WRKSRC}/libnet-config.in
>-	@${REINPLACE_CMD} -e 's|^includedir =.*|includedir = @includedir@/${SHORT_NAME}|' \
>-		${WRKSRC}/include/Makefile.in \
>-		${WRKSRC}/include/libnet/Makefile.in
>-	@${REINPLACE_CMD} -e 's|^libdir =.*|libdir = @libdir@/${SHORT_NAME}|' \
>-		-e 's|^libnet_la_LDFLAGS =$.*$|libnet_la_LDFLAGS =\1 -soname=libnet-${SHORT_NAME}.so.1|' \
>-		${WRKSRC}/src/Makefile.in
> 
> post-install:
>-	${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${STAGEDIR}${PREFIX}/bin/${SHORT_NAME}-config
>-	${LN} -fs ${SHORT_NAME}/libnet.so.1 ${STAGEDIR}${PREFIX}/lib/libnet-${PORTVERSION}.so.1
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
> 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
>Index: net/libnet/files/patch-Makefile.in
>===================================================================
>--- net/libnet/files/patch-Makefile.in	(revision 411360)
>+++ net/libnet/files/patch-Makefile.in	(nonexistent)
>@@ -1,10 +0,0 @@
>---- ./Makefile.in.orig	Thu Dec  2 21:27:39 2004
>-+++ ./Makefile.in	Sat Jan 20 14:10:35 2007
>-@@ -208,7 +208,6 @@
>- DISTCLEANFILES = *~
>- SUBDIRS = include src sample
>- EXTRA_DIST = Makefile.am.common
>--bin_SCRIPTS = libnet-config
>- all: all-recursive
>- 
>- .SUFFIXES:
>
>Property changes on: net/libnet/files/patch-Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/libnet/pkg-plist
>===================================================================
>--- net/libnet/pkg-plist	(revision 411360)
>+++ net/libnet/pkg-plist	(working copy)
>@@ -1,22 +1,20 @@
>-bin/%%SNAME%%-config
>-include/%%SNAME%%/libnet.h
>-include/%%SNAME%%/libnet/libnet-asn1.h
>-include/%%SNAME%%/libnet/libnet-functions.h
>-include/%%SNAME%%/libnet/libnet-headers.h
>-include/%%SNAME%%/libnet/libnet-macros.h
>-include/%%SNAME%%/libnet/libnet-structures.h
>-include/%%SNAME%%/libnet/libnet-types.h
>-lib/%%SNAME%%/libnet.a
>-lib/%%SNAME%%/libnet.so
>-lib/%%SNAME%%/libnet.so.1
>-lib/%%SNAME%%/libnet.so.1.7.0
>-lib/libnet-%%VERSION%%.so.1
>+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
>+lib/libnet.so
>+lib/libnet.so.1
>+lib/libnet.so.1.7.0
> man/man3/libnet-functions.h.3.gz
> man/man3/libnet-macros.h.3.gz
> man/man3/libnet.h.3.gz
> %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
> %%PORTDOCS%%%%DOCSDIR%%/CONTRIB
>-%%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/DESIGN_NOTES
> %%PORTDOCS%%%%DOCSDIR%%/MIGRATION
> %%PORTDOCS%%%%DOCSDIR%%/PACKET_BUILDING
>Index: net/libnids/Makefile
>===================================================================
>--- net/libnids/Makefile	(revision 411360)
>+++ net/libnids/Makefile	(working copy)
>@@ -14,8 +14,6 @@ LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/l
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS?=	libnids-libnet11-[0-9]*
>-
> OPTIONS_DEFINE=	GLIB2 DOCS
> OPTIONS_DEFAULT=GLIB2
> GLIB2_DESC=	Use GLIB2 for multiprocessing support
>@@ -27,14 +25,6 @@ GLIB2_CONFIGURE_ENABLE=	libglib
> USES=		pkgconfig
> GNU_CONFIGURE=	yes
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
>-post-patch:
>-	@${REINPLACE_CMD} -Ee \
>-		's|(LNET_CFLAGS=).*|\1"`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"|; \
>-		 s|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
>-		 ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-
> do-install:
> 	${INSTALL_DATA} ${WRKSRC}/src/nids.h ${STAGEDIR}${PREFIX}/include
> 	${INSTALL_DATA} ${WRKSRC}/src/libnids.a ${STAGEDIR}${PREFIX}/lib
>Index: net/libnids-libnet11/Makefile
>===================================================================
>--- net/libnids-libnet11/Makefile	(revision 411360)
>+++ net/libnids-libnet11/Makefile	(nonexistent)
>@@ -1,17 +0,0 @@
>-# $FreeBSD$
>-
>-PKGNAMESUFFIX=	-libnet11
>-
>-COMMENT=	Network monitoring library with TCP/IP reassembly using libnet11
>-
>-MASTERDIR=	${.CURDIR}/../libnids
>-
>-DESCR=		${.CURDIR}/pkg-descr
>-
>-WITH_LIBNET11=	yes
>-
>-CONFLICTS?=	libnids-[0-9]*
>-
>-DISTINFO_FILE=	${MASTERDIR}/distinfo
>-
>-.include "${MASTERDIR}/Makefile"
>
>Property changes on: net/libnids-libnet11/Makefile
>___________________________________________________________________
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:keywords
>## -1 +0,0 ##
>-FreeBSD=%H
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/libnids-libnet11/pkg-descr
>===================================================================
>--- net/libnids-libnet11/pkg-descr	(revision 411360)
>+++ net/libnids-libnet11/pkg-descr	(nonexistent)
>@@ -1,13 +0,0 @@
>-Libnids is a library that provides the function of one of the NIDS
>-(Network Intrusion Detection System) components, namely E-component. The
>-libnids code watches all local network traffic, processes received
>-datagrams a bit, and provides convenient information on them to analyzing
>-modules. Libnids performs:
>-
>-a) assembly of TCP segments into TCP streams
>-b) IP defragmentation
>-c) TCP port scan detection 
>-
>-This slave port builds with libnet11 by default.
>-
>-WWW: http://libnids.sf.net
>
>Property changes on: net/libnids-libnet11/pkg-descr
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/nast/Makefile
>===================================================================
>--- net/nast/Makefile	(revision 411360)
>+++ net/nast/Makefile	(working copy)
>@@ -20,18 +20,11 @@ GNU_CONFIGURE=	yes
> 
> PLIST_FILES=	bin/nast man/man8/nast.8.gz
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
>-.include <bsd.port.pre.mk>
>-
> post-patch:
>-	@${REINPLACE_CMD} -e \
>-		's|libnet-config|${LIBNET_CONFIG}|; \
>-		 s|-lnet|`${LIBNET_CONFIG} --libs`|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>+	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: net/nast/files/patch-configure
>===================================================================
>--- net/nast/files/patch-configure	(revision 411360)
>+++ net/nast/files/patch-configure	(working copy)
>@@ -1,61 +1,42 @@
> --- configure.orig	2004-01-20 18:54:58 UTC
> +++ configure
>-@@ -2337,52 +2337,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>- #
>+@@ -2379,7 +2379,7 @@ fi
>+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libnet_a" >&5
>+ echo "${ECHO_T}$ac_cv_file__usr_local_lib_libnet_a" >&6
>+ if test $ac_cv_file__usr_local_lib_libnet_a = yes; then
>+-  filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include"
>++  filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+ fi
>  
>- filechk="yes"
>--echo "$as_me:$LINENO: checking for /usr/lib/libnet.a" >&5
>--echo $ECHO_N "checking for /usr/lib/libnet.a... $ECHO_C" >&6
>--if test "${ac_cv_file__usr_lib_libnet_a+set}" = set; then
>--  echo $ECHO_N "(cached) $ECHO_C" >&6
>--else
>--  test "$cross_compiling" = yes &&
>--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
>--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
>--   { (exit 1); exit 1; }; }
>--if test -r "/usr/lib/libnet.a"; then
>--  ac_cv_file__usr_lib_libnet_a=yes
>--else
>--  ac_cv_file__usr_lib_libnet_a=no
>--fi
>--fi
>--echo "$as_me:$LINENO: result: $ac_cv_file__usr_lib_libnet_a" >&5
>--echo "${ECHO_T}$ac_cv_file__usr_lib_libnet_a" >&6
>--if test $ac_cv_file__usr_lib_libnet_a = yes; then
>--  :
>--else
>--  filechk="no"
>--fi
>--
>--if test "$filechk" = "no"; then
>-- echo "$as_me:$LINENO: checking for /usr/local/lib/libnet.a" >&5
>--echo $ECHO_N "checking for /usr/local/lib/libnet.a... $ECHO_C" >&6
>--if test "${ac_cv_file__usr_local_lib_libnet_a+set}" = set; then
>--  echo $ECHO_N "(cached) $ECHO_C" >&6
>--else
>--  test "$cross_compiling" = yes &&
>--  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
>--echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
>--   { (exit 1); exit 1; }; }
>--if test -r "/usr/local/lib/libnet.a"; then
>--  ac_cv_file__usr_local_lib_libnet_a=yes
>--else
>--  ac_cv_file__usr_local_lib_libnet_a=no
>--fi
>--fi
>--echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libnet_a" >&5
>--echo "${ECHO_T}$ac_cv_file__usr_local_lib_libnet_a" >&6
>--if test $ac_cv_file__usr_local_lib_libnet_a = yes; then
>+ fi
>+@@ -2530,7 +2530,7 @@ fi
>+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libpcap_a" >&5
>+ echo "${ECHO_T}$ac_cv_file__usr_local_lib_libpcap_a" >&6
>+ if test $ac_cv_file__usr_local_lib_libpcap_a = yes; then
> -  filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include"
>--fi
>--
>--fi
>-+CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
>-+LDFLAGS="${LDFLAGS} `libnet-config --libs`"
>++  filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+ fi
>  
>- if test "$filechk" = "no"; then { { echo "$as_me:$LINENO: error:
>+ fi
>+@@ -2680,7 +2680,7 @@ fi
>+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libncurses_a" >&5
>+ echo "${ECHO_T}$ac_cv_file__usr_local_lib_libncurses_a" >&6
>+ if test $ac_cv_file__usr_local_lib_libncurses_a = yes; then
>+-  filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include"
>++  filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+ fi
>  
>-@@ -3045,8 +3001,8 @@ fi
>+ fi
>+@@ -2840,7 +2840,7 @@ fi
>+ echo "$as_me:$LINENO: result: $ac_cv_file__usr_local_lib_libmenu_a" >&5
>+ echo "${ECHO_T}$ac_cv_file__usr_local_lib_libmenu_a" >&6
>+ if test $ac_cv_file__usr_local_lib_libmenu_a = yes; then
>+-  filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include"
>++  filechk="yes" ; LIBS="$LIBS -L/usr/local/lib"; CPPFLAGS="$CPPFLAGS -I/usr/local/include"
>+ fi
>+ 
>+ fi
>+@@ -3045,8 +3045,8 @@ fi
>  
>  	CFLAGS="-Wall -O2"
>  	;;
>Index: net/netwib/Makefile
>===================================================================
>--- net/netwib/Makefile	(revision 411360)
>+++ net/netwib/Makefile	(working copy)
>@@ -21,21 +21,16 @@ SHORTPORTVERSION=${PORTVERSION:C/([0-9]*
> 
> PLIST_SUB+=	SHORTPORTVERSION=${SHORTPORTVERSION}
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
> post-patch:
>-	@${REINPLACE_CMD} -Ee \
>-		's|libnet-config|${LIBNET_CONFIG}|; \
>-		 s|-lnet|`${LIBNET_CONFIG} --libs`|; \
>-		 s|^(gccIncLnet=).*|\1"`${LIBNET_CONFIG} --cflags`"|' \
>-		 ${WRKSRC}/genemake
>-
>-do-configure:
>-		@${REINPLACE_CMD} \
>+	@${REINPLACE_CMD} '/^gccIncLnet=/s/=""/=`libnet-config --cflags`/' \
>+		${WRKSRC}/genemake
>+	@${REINPLACE_CMD} \
> 		-e 's|%%PREFIX%%|${PREFIX}|' \
> 		-e 's|%%CFLAGS%%|${CFLAGS}|' \
> 		-e 's|gcc|${CC}|' \
> 		${WRKSRC}/config.dat
>-		(cd ${WRKSRC} ; ${SH} ${WRKSRC}/genemake )
>+
>+do-configure:
>+	(cd ${WRKSRC} && ${SH} genemake)
> 
> .include <bsd.port.mk>
>Index: net/py-libnet/Makefile
>===================================================================
>--- net/py-libnet/Makefile	(revision 411360)
>+++ net/py-libnet/Makefile	(working copy)
>@@ -28,6 +28,9 @@ EXAMPLESDIR=	${PREFIX}/share/examples/py
> OPTIONS_DEFINE=	EXAMPLES
> OSVER=		uname -r
> 
>+post-patch:
>+	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.py
>+
> do-install:
> 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
> 	${INSTALL_LIB} \
>Index: net/py-libnet/files/patch-setup.py
>===================================================================
>--- net/py-libnet/files/patch-setup.py	(revision 411360)
>+++ net/py-libnet/files/patch-setup.py	(nonexistent)
>@@ -1,13 +0,0 @@
>---- ./setup.py.orig	2011-08-02 17:53:25.000000000 +0200
>-+++ ./setup.py	2014-05-30 12:55:01.000000000 +0200
>-@@ -5,8 +5,8 @@
>- import os
>- import sys
>- 
>--include_dir = None
>--lib_dir = None
>-+include_dir = '/usr/local/include/libnet11/'
>-+lib_dir = '/usr/local/lib/libnet11'
>- 
>- 
>- package_version = '3.0-beta-rc1'
>
>Property changes on: net/py-libnet/files/patch-setup.py
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/pynids/Makefile
>===================================================================
>--- net/pynids/Makefile	(revision 411360)
>+++ net/pynids/Makefile	(working copy)
>@@ -12,22 +12,12 @@ DIST_SUBDIR=	python
> MAINTAINER=	corsmith@gmail.com
> COMMENT=	Python interface to libnids
> 
>-PATCH_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> USES=		pkgconfig python
> USE_GNOME=	glib20
> USE_PYTHON=	distutils autoplist pythonprefix
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
>-.include <bsd.port.pre.mk>
>-
>-.if exists(${LIBNET_CONFIG})
>-LIBNET_CFLAGS!=	${LIBNET_CONFIG} --cflags
>-LIBNET_LIBS!=	${LIBNET_CONFIG} --libs
>-.endif
>-
> post-extract:
> 	@cd ${WRKSRC} && ${TAR} xzf libnids-1.24.tar.gz
> 
>@@ -36,14 +26,6 @@ post-patch:
> 	@${CHMOD} a+rx ${WRKSRC}/config.guess
> 	@${CP} -f ${TEMPLATES}/config.sub ${WRKSRC}
> 	@${CHMOD} a+rx ${WRKSRC}/config.sub
>-	@${REINPLACE_CMD} -e \
>-		"s|/usr/local/include|${PREFIX}/include', '${LIBNET_CFLAGS:S/-I//}|; \
>-		 s|/usr/local/lib|${PREFIX}/lib', '${LIBNET_LIBS:N-l*:S/-L//}|" \
>-		 ${WRKSRC}/setup.py
>-	@${REINPLACE_CMD} -Ee \
>-		's|(LNET_CFLAGS=).*|\1"`${LIBNET_CONFIG} --defines` ${LIBNET_CFLAGS}"|; \
>-		 s|(LNETLIB=).*|\1"${LIBNET_LIBS} -L${LOCALBASE}/lib"|; \
>-		 s|gcc|${CC}|' \
>-		 ${WRKSRC}/libnids-1.24/configure
>+	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.py
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: net/rtpbreak/Makefile
>===================================================================
>--- net/rtpbreak/Makefile	(revision 411360)
>+++ net/rtpbreak/Makefile	(working copy)
>@@ -13,8 +13,8 @@ COMMENT=	Detects, reconstructs, and anal
> 
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
>-CFLAGS+=	-I${LOCALBASE}/include/libnet11
>-LIBS+=		-L${LOCALBASE}/lib/libnet11 -lpcap -lnet
>+CFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib -lpcap -lnet
> 
> MAKE_ARGS=	CFLAGS="${CFLAGS}" LIBS="${LIBS}"
> 
>Index: net/tcptraceroute/Makefile
>===================================================================
>--- net/tcptraceroute/Makefile	(revision 411360)
>+++ net/tcptraceroute/Makefile	(working copy)
>@@ -19,6 +19,7 @@ OPTIONS_DEFINE=	DOCS
> PORTSCOUT=	limit:^[0-9]
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
> USES=		gmake
> 
> PORTDOCS=	*
>Index: net/tcptraceroute/files/patch-configure
>===================================================================
>--- net/tcptraceroute/files/patch-configure	(revision 411360)
>+++ net/tcptraceroute/files/patch-configure	(nonexistent)
>@@ -1,73 +0,0 @@
>---- configure.orig	2006-03-28 13:00:00.000000000 +0800
>-+++ configure	2014-09-10 00:44:22.750008451 +0800
>-@@ -3713,37 +3713,39 @@
>- 
>- fi;
>- 
>--LIBNET_CONFIG="libnet-config"	# relative, using $PATH
>--
>--# Check whether --with-libnet or --without-libnet was given.
>--if test "${with_libnet+set}" = set; then
>--  withval="$with_libnet"
>--
>--		LIBNETCC=""
>--		LIBNETLD=""
>--
>--		test -x "$withval/bin/libnet-config" &&	LIBNET_CONFIG="$withval/bin/libnet-config"
>--		test -x "$withval/libnet-config"	 &&	LIBNET_CONFIG="$withval/libnet-config"
>--
>--		test -f "$withval/libnet.h"			&&	LIBNETCC="$LIBNETCC -I$withval"
>--		test -f "$withval/include/libnet.h"	&&	LIBNETCC="$LIBNETCC -I$withval/include"
>--
>--		test -f "$withval/libnet.a"			&&	LIBNETLD="$LIBNETLD -L$withval"
>--		test -f "$withval/lib/libnet.a"		&&	LIBNETLD="$LIBNETLD -L$withval/lib"
>--
>--		if test -z "$LIBNETCC" -o -z "$LIBNETLD"
>--		then
>--			{ { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5
>--echo "$as_me: error: No valid libnet library found in $withval" >&2;}
>--   { (exit 1); exit 1; }; }
>--		else
>--			CPPFLAGS="$CPPFLAGS $LIBNETCC"
>--			LDFLAGS="$LDFLAGS $LIBNETLD"
>--			{ echo "$as_me:$LINENO: using libnet in $withval" >&5
>--echo "$as_me: using libnet in $withval" >&6;}
>--		fi
>--
>--fi;
>-+LIBNET_CONFIG="libnet11-config"	# relative, using $PATH
>-+CPPFLAGS="$CPPFLAGS $(${LIBNET_CONFIG} --cflags)"
>-+LDFLAGS="$LDFLAGS $(${LIBNET_CONFIG} --libs)"
>-+
>-+## Check whether --with-libnet or --without-libnet was given.
>-+#if test "${with_libnet+set}" = set; then
>-+#  withval="$with_libnet"
>-+#
>-+#		LIBNETCC=""
>-+#		LIBNETLD=""
>-+#
>-+#		test -x "$withval/bin/libnet-config" &&	LIBNET_CONFIG="$withval/bin/libnet-config"
>-+#		test -x "$withval/libnet-config"	 &&	LIBNET_CONFIG="$withval/libnet-config"
>-+#
>-+#		test -f "$withval/libnet.h"			&&	LIBNETCC="$LIBNETCC -I$withval"
>-+#		test -f "$withval/include/libnet.h"	&&	LIBNETCC="$LIBNETCC -I$withval/include"
>-+#
>-+#		test -f "$withval/libnet.a"			&&	LIBNETLD="$LIBNETLD -L$withval"
>-+#		test -f "$withval/lib/libnet.a"		&&	LIBNETLD="$LIBNETLD -L$withval/lib"
>-+#
>-+#		if test -z "$LIBNETCC" -o -z "$LIBNETLD"
>-+#		then
>-+#			{ { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5
>-+#echo "$as_me: error: No valid libnet library found in $withval" >&2;}
>-+#   { (exit 1); exit 1; }; }
>-+#		else
>-+#			CPPFLAGS="$CPPFLAGS $LIBNETCC"
>-+#			LDFLAGS="$LDFLAGS $LIBNETLD"
>-+#			{ echo "$as_me:$LINENO: using libnet in $withval" >&5
>-+#echo "$as_me: using libnet in $withval" >&6;}
>-+#		fi
>-+#
>-+#fi;
>- 
>- 
>- echo "$as_me:$LINENO: checking for pcap_open_live in -lpcap" >&5
>
>Property changes on: net/tcptraceroute/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/tcptraceroute-devel/Makefile
>===================================================================
>--- net/tcptraceroute-devel/Makefile	(revision 411360)
>+++ net/tcptraceroute-devel/Makefile	(working copy)
>@@ -25,9 +25,7 @@ OPTIONS_DEFINE=	DOCS
> USES=		gmake
> GNU_CONFIGURE=	yes
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
>-CONFIGURE_ARGS=	--with-libpcap=/usr --bindir=${PREFIX}/sbin
>+CONFIGURE_ARGS=	--with-libnet=${LOCALBASE} --with-libpcap=/usr --bindir=${PREFIX}/sbin
> 
> post-install:
> 	@${CHMOD} u+s ${STAGEDIR}${PREFIX}/sbin/tcptraceroute
>Index: net/tcptraceroute-devel/files/patch-configure
>===================================================================
>--- net/tcptraceroute-devel/files/patch-configure	(revision 411360)
>+++ net/tcptraceroute-devel/files/patch-configure	(nonexistent)
>@@ -1,46 +0,0 @@
>---- configure.old	2006-03-28 20:49:55.000000000 -0500
>-+++ configure	2007-12-13 13:57:42.000000000 -0500
>-@@ -3713,38 +3713,11 @@
>- 
>- fi;
>- 
>--LIBNET_CONFIG="libnet-config"	# relative, using $PATH
>--
>--# Check whether --with-libnet or --without-libnet was given.
>--if test "${with_libnet+set}" = set; then
>--  withval="$with_libnet"
>--
>--		LIBNETCC=""
>--		LIBNETLD=""
>--
>--		test -x "$withval/bin/libnet-config" &&	LIBNET_CONFIG="$withval/bin/libnet-config"
>--		test -x "$withval/libnet-config"	 &&	LIBNET_CONFIG="$withval/libnet-config"
>--
>--		test -f "$withval/libnet.h"			&&	LIBNETCC="$LIBNETCC -I$withval"
>--		test -f "$withval/include/libnet.h"	&&	LIBNETCC="$LIBNETCC -I$withval/include"
>--
>--		test -f "$withval/libnet.a"			&&	LIBNETLD="$LIBNETLD -L$withval"
>--		test -f "$withval/lib/libnet.a"		&&	LIBNETLD="$LIBNETLD -L$withval/lib"
>--
>--		if test -z "$LIBNETCC" -o -z "$LIBNETLD"
>--		then
>--			{ { echo "$as_me:$LINENO: error: No valid libnet library found in $withval" >&5
>--echo "$as_me: error: No valid libnet library found in $withval" >&2;}
>--   { (exit 1); exit 1; }; }
>--		else
>--			CPPFLAGS="$CPPFLAGS $LIBNETCC"
>--			LDFLAGS="$LDFLAGS $LIBNETLD"
>--			{ echo "$as_me:$LINENO: using libnet in $withval" >&5
>--echo "$as_me: using libnet in $withval" >&6;}
>--		fi
>--
>--fi;
>--
>-+LIBNET_CONFIG="libnet11-config"	# relative, using $PATH
>-+LIBNETCC=`$LIBNET_CONFIG --cflags`
>-+LIBNETLD=`$LIBNET_CONFIG --libs`
>-+CPPFLAGS="$CPPFLAGS $LIBNETCC"
>-+LDFLAGS="$LDFLAGS $LIBNETLD"
>- 
>- echo "$as_me:$LINENO: checking for pcap_open_live in -lpcap" >&5
>- echo $ECHO_N "checking for pcap_open_live in -lpcap... $ECHO_C" >&6
>
>Property changes on: net/tcptraceroute-devel/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net/vortex/Makefile
>===================================================================
>--- net/vortex/Makefile	(revision 411360)
>+++ net/vortex/Makefile	(working copy)
>@@ -12,17 +12,15 @@ COMMENT=	Network surveillance engine
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids-libnet11
>+BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
>-LIBNET_CONFIG=	${LOCALBASE}/bin/libnet11-config
>-
> WRKSRC=		${WRKDIR}/${PORTNAME}-2.9.0
> USE_GNOME=	glib20
> 
> do-build:
> 	cd ${WRKSRC} && ${CC} -c vortex.c -I${LOCALBASE}/include
>-	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a `${LIBNET_CONFIG} --libs` -lglib-2.0 -lgthread-2.0 -lpcap -pthread
>+	cd ${WRKSRC} && ${CC} -v -o vortex vortex.o -L${LOCALBASE}/lib ${LOCALBASE}/lib/libnids.a -lnet -lglib-2.0 -lgthread-2.0 -lpcap -pthread
> 	cd ${WRKSRC} && ${CC} -o xpipes xpipes.c -pthread
> 
> do-install:
>Index: net-mgmt/dhcp_probe/Makefile
>===================================================================
>--- net-mgmt/dhcp_probe/Makefile	(revision 411360)
>+++ net-mgmt/dhcp_probe/Makefile	(working copy)
>@@ -3,38 +3,32 @@
> 
> PORTNAME=	dhcp_probe
> PORTVERSION=	1.3.0
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://www.net.princeton.edu/software/dhcp_probe/
> 
> MAINTAINER=	khung@nullaxiom.com
> COMMENT=	Attempts to discover DHCP and BootP servers on a network
> 
>-LICENSE=	GPLv2 addl
>+LICENSE=	GPLv2 LGPL20 addl
> LICENSE_COMB=	multi
>+LICENSE_FILE_GPLv2=${WRKSRC}/COPYING.GPL
>+LICENSE_FILE_LGPL20=${WRKSRC}/COPYING.LIB
> LICENSE_NAME_addl=Additional legal notices for copyrighted code
> LICENSE_FILE_addl=${WRKSRC}/COPYING
> LICENSE_PERMS_addl=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
>-USE_AUTOTOOLS=	aclocal automake
>-AUTOMAKE_ARGS=	-a
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-libnet-include=${LOCALBASE}/include/libnet11/ --with-libnet-lib=${LOCALBASE}/lib/libnet11/
>-MANPREFIX=	${PREFIX}
>+INSTALL_TARGET=	install-strip
> 
> USE_RC_SUBR=	dhcp_probe
> 
> SUB_FILES=	pkg-message
> 
>-# Put additional licenses in DOCS
>-PORTDOCS=	COPYING*
>-
>-# Can't use INSTALL_PROGRAM macro as we need to patch Makefile.am and
>-# regenerate Makefile.in
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcp_probe
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_MAN} ${WRKSRC}/COPYING* ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/extras/dhcp_probe.cf.sample \
>+		${STAGEDIR}${PREFIX}/etc
> 
> .include <bsd.port.mk>
>Index: net-mgmt/dhcp_probe/files/patch-Makefile.am
>===================================================================
>--- net-mgmt/dhcp_probe/files/patch-Makefile.am	(revision 411360)
>+++ net-mgmt/dhcp_probe/files/patch-Makefile.am	(nonexistent)
>@@ -1,9 +0,0 @@
>---- Makefile.am.orig	2015-01-28 01:27:58.000000000 -0500
>-+++ Makefile.am	2015-01-28 01:38:40.000000000 -0500
>-@@ -25,3 +25,6 @@
>- 	extras/README
>- 
>- ACLOCAL_AMFLAGS = -I m4
>-+
>-+## Copy sample configuration file to PREFIX/etc/
>-+sysconf_DATA=	extras/dhcp_probe.cf.sample
>
>Property changes on: net-mgmt/dhcp_probe/files/patch-Makefile.am
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: net-mgmt/ettercap/Makefile
>===================================================================
>--- net-mgmt/ettercap/Makefile	(revision 411360)
>+++ net-mgmt/ettercap/Makefile	(working copy)
>@@ -27,11 +27,11 @@ CMAKE_ARGS=	-DBUNDLED_LIBS=OFF \
> 		-DHAVE_DLOPEN=ON \
> 		-DHAVE_PCAP=${LIBDIR} \
> 		-DHAVE_RESOLV=${LIBDIR} \
>-		-DHAVE_LIBNET=${LOCALBASE}/lib/libnet11 \
>+		-DHAVE_LIBNET=${LOCALBASE}/lib \
> 		-DINSTALL_SYSCONFDIR=${PREFIX}/etc \
> 		-DMAN_INSTALLDIR=${PREFIX}/man
> CMAKE_VERBOSE=	yes
>-LDFLAGS+=	-L${LIBDIR} -L${LOCALBASE}/lib/libnet11 ${ICONV_LIB} -lnet -lpcap
>+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB} -lnet -lpcap
> MAKE_JOBS_UNSAFE=	yes
> USE_LDCONFIG=	yes
> USES=		bison cmake:outsource cpe iconv localbase pkgconfig
>Index: net-mgmt/isic/Makefile
>===================================================================
>--- net-mgmt/isic/Makefile	(revision 411360)
>+++ net-mgmt/isic/Makefile	(working copy)
>@@ -17,12 +17,4 @@ LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/l
> GNU_CONFIGURE=	yes
> USES=		tar:tgz
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-	@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
>-		${WRKSRC}/Makefile.in
>-
> .include <bsd.port.mk>
>Index: net-mgmt/isic/files/patch-isic.h
>===================================================================
>--- net-mgmt/isic/files/patch-isic.h	(revision 411360)
>+++ net-mgmt/isic/files/patch-isic.h	(working copy)
>@@ -1,10 +1,8 @@
>---- isic.h.orig	2006-12-16 01:08:44.000000000 +0100
>-+++ isic.h	2014-08-11 16:25:34.551003726 +0200
>-@@ -5,11 +5,15 @@
>- #endif
>+--- isic.h.orig	2006-12-16 00:08:44 UTC
>++++ isic.h
>+@@ -6,10 +6,13 @@
>  
>  #include <libnet.h>
>-+#include <libnet/libnet-headers.h>
>  
> +#include <netinet/ip.h>
>  #include <netinet/ip_icmp.h>
>@@ -16,7 +14,7 @@
>  
>  #ifndef ETHER_FRAME_SIZE
>  #define ETHER_FRAME_SIZE 1500
>-@@ -21,11 +25,6 @@
>+@@ -21,11 +24,6 @@
>  #define IP6_FRAGH 8
>  #define ICMP6_H   8
>  
>Index: net-mgmt/packit/Makefile
>===================================================================
>--- net-mgmt/packit/Makefile	(revision 411360)
>+++ net-mgmt/packit/Makefile	(working copy)
>@@ -14,13 +14,12 @@ COMMENT=	Network auditing tool
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> PLIST_FILES=	sbin/packit \
> 		man/man8/packit.8.gz
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
> .if defined(WITHOUT_CAPTURE)
> CONFIGURE_ARGS+=	--without-capture
> .endif
>@@ -28,8 +27,4 @@ CONFIGURE_ARGS+=	--without-capture
> CONFIGURE_ARGS+=	--without-injection
> .endif
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-
> .include <bsd.port.mk>
>Index: net-mgmt/pixilate/Makefile
>===================================================================
>--- net-mgmt/pixilate/Makefile	(revision 411360)
>+++ net-mgmt/pixilate/Makefile	(working copy)
>@@ -23,18 +23,11 @@ GNU_CONFIGURE=	yes
> PORTDOCS=	README
> PLIST_FILES=	bin/pixilate man/man1/pixilate.1.gz
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>-
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
> 	@cd ${WRKSRC} && ${RM} -f INSTALL install-sh missing mkinstalldirs
> 
>-	@${REINPLACE_CMD} -e \
>-		's|libnet-config|${LIBNET_CONFIG}|; \
>-		 s|--defines`|& `${LIBNET_CONFIG} --cflags`|' \
>-		${WRKSRC}/configure.ac
>-
> post-install:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
>Index: security/dsniff/Makefile
>===================================================================
>--- security/dsniff/Makefile	(revision 411360)
>+++ security/dsniff/Makefile	(working copy)
>@@ -16,6 +16,8 @@ LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/l
> BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
> 
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--with-libnet=${LOCALBASE}
>+DESTDIRNAME=	install_prefix
> USES=		pkgconfig
> WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/(.*)..$/\1/}
> 
>@@ -26,22 +28,7 @@ OPTIONS_SUB=	yes
> X11_USE=	xorg=x11,xmu
> X11_CONFIGURE_WITH=x
> 
>-LIBNET_VERSION=	11
>-LIBNET_CONFIG=	${LOCALBASE}/bin/libnet${LIBNET_VERSION}-config
>-LIBNET_INC=	"`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"
>-LIBNET_LIB=	"`${LIBNET_CONFIG} --libs`"
>-
>-pre-configure:
>-	@${REINPLACE_CMD} -e 's|@NIDSLIB@|& `pkg-config --libs gthread-2.0`|' \
>-		${WRKSRC}/Makefile.in
>-
> post-patch:
>-	@${REINPLACE_CMD} -Ee \
>-		's|libnet-config|${LIBNET_CONFIG:T}|; \
>-		 s|test -f \$${prefix}/include/libnet.h|${TRUE}|; \
>-		 s|(LNETINC=).*|\1${LIBNET_INC}|; \
>-		 s|(LNETLIB=).*|\1${LIBNET_LIB}|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's,csin,_csin,g' \
> 		${WRKSRC}/webmitm.c \
> 		${WRKSRC}/sshmitm.c
>Index: security/dsniff/files/patch-Makefile.in
>===================================================================
>--- security/dsniff/files/patch-Makefile.in	(revision 411360)
>+++ security/dsniff/files/patch-Makefile.in	(working copy)
>@@ -1,23 +1,15 @@
>---- ./Makefile.in.orig	2001-03-15 09:34:42.000000000 +0100
>-+++ ./Makefile.in	2014-07-22 13:21:21.000000000 +0200
>-@@ -8,7 +8,6 @@
>- srcdir          = @srcdir@
>- VPATH           = @srcdir@
>- 
>--install_prefix  =
>- prefix          = @prefix@
>- exec_prefix	= @exec_prefix@
>- libdir		= @libdir@
>-@@ -26,7 +25,7 @@
>+--- Makefile.in.orig	2001-03-15 08:34:42 UTC
>++++ Makefile.in
>+@@ -26,7 +26,7 @@ LNETINC = @LNETINC@
>  LNETLIB = @LNETLIB@
>  
>  NIDSINC	= @NIDSINC@
> -NIDSLIB	= @NIDSLIB@
>-+NIDSLIB	= @NIDSLIB@ `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0` `pkg-config --libs gthread-2.0`
>++NIDSLIB	= @NIDSLIB@ `pkg-config --libs gthread-2.0`
>  
>  DBINC	= @DBINC@
>  DBLIB	= @DBLIB@
>-@@ -37,9 +36,8 @@
>+@@ -37,9 +37,8 @@ SSLLIB	= @SSLLIB@
>  X11INC	= @X_CFLAGS@
>  X11LIB	= @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
>  
>@@ -29,7 +21,7 @@
>  
>  INSTALL	= @INSTALL@
>  INSTALL_PROGRAM = @INSTALL_PROGRAM@
>-@@ -76,22 +74,23 @@
>+@@ -76,22 +75,23 @@ CONFIGS	= dsniff.magic dsniff.services d
>  .c.o:
>  	$(CC) $(CFLAGS) $(INCS) -c $(srcdir)/$*.c
>  
>@@ -64,33 +56,7 @@
>  
>  dsniff: $(HDRS) $(SRCS) $(OBJS)
>  	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(DBLIB) $(SSLLIB)
>-@@ -139,24 +138,24 @@
>- 	$(CC) $(LDFLAGS) -o $@ webspy.o base64.o buf.o remote.o $(LIBS) $(NIDSLIB) $(PCAPLIB) $(LNETLIB) $(X11LIB)
>- 
>- install:
>--	test -d $(install_prefix)$(sbindir) || \
>--	   $(INSTALL) -d $(install_prefix)$(sbindir)
>-+	test -d $(DESTDIR)$(sbindir) || \
>-+	   $(INSTALL) -d $(DESTDIR)$(sbindir)
>- 	for file in $(PROGS); do \
>--	   $(INSTALL_PROGRAM) -m 755 $$file $(install_prefix)$(sbindir); \
>-+	   $(INSTALL_PROGRAM) -m 755 $$file $(DESTDIR)$(sbindir); \
>- 	done
>--	test -d $(install_prefix)$(libdir) || \
>--	   $(INSTALL) -d $(install_prefix)$(libdir)
>-+	test -d $(DESTDIR)$(libdir) || \
>-+	   $(INSTALL) -d $(DESTDIR)$(libdir)
>- 	for file in $(CONFIGS); do \
>--	   $(INSTALL_DATA) $$file $(install_prefix)$(libdir); \
>-+	   $(INSTALL_DATA) $$file $(DESTDIR)$(libdir); \
>- 	done
>--	test -d $(install_prefix)$(mandir)/man8 || \
>--	   $(INSTALL) -d $(install_prefix)$(mandir)/man8
>-+	test -d $(DESTDIR)$(mandir)/man8 || \
>-+	   $(INSTALL) -d $(DESTDIR)$(mandir)/man8
>- 	for file in *.8; do \
>--	   $(INSTALL_DATA) $$file $(install_prefix)$(mandir)/man8; \
>-+	   $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man8; \
>+@@ -156,7 +156,7 @@ install:
>  	done
>  
>  clean:
>Index: security/dsniff/files/patch-configure.in
>===================================================================
>--- security/dsniff/files/patch-configure.in	(revision 411360)
>+++ security/dsniff/files/patch-configure.in	(nonexistent)
>@@ -1,20 +0,0 @@
>---- ./configure.in.orig	2000-12-20 17:31:21.000000000 +0100
>-+++ ./configure.in	2014-07-22 13:20:14.000000000 +0200
>-@@ -21,7 +21,7 @@
>- dnl Checks for header files.
>- AC_PATH_XTRA
>- AC_HEADER_STDC
>--AC_CHECK_HEADERS(err.h fcntl.h sys/ioctl.h sys/queue.h unistd.h libgen.h net/if_tun.h)
>-+AC_CHECK_HEADERS(err.h fcntl.h sys/ioctl.h sys/queue.h unistd.h libgen.h net/if_tun.h net/ethernet.h)
>- dnl XXX - Solaris sux.
>- AC_MSG_CHECKING(for MIN and MAX in sys/param.h)
>- AC_EGREP_CPP(yes, [
>-@@ -43,7 +43,7 @@
>- AC_CHECK_TYPE(u_int64_t, uint64_t)
>- dnl XXX - Linux sux.
>- AC_CHECK_TYPE(in_addr_t, u_int32_t)
>--CFLAGS="$CFLAGS -D_BSD_SOURCE"
>-+CFLAGS="$CFLAGS -D_BSD_SOURCE -DBIND_8_COMPAT"
>- 
>- dnl Checks for library functions.
>- AC_PROG_GCC_TRADITIONAL
>
>Property changes on: security/dsniff/files/patch-configure.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/firewalk/Makefile
>===================================================================
>--- security/firewalk/Makefile	(revision 411360)
>+++ security/firewalk/Makefile	(working copy)
>@@ -16,10 +16,8 @@ LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/
> 
> GNU_CONFIGURE=	yes
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> PLIST_FILES=	bin/firewalk man/man8/firewalk.8.gz
> PORTDOCS=	BUGS README TODO
>@@ -28,10 +26,6 @@ WRKSRC=		${WRKDIR}/Firewalk
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
>-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/firewalk ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${STAGEDIR}${MANPREFIX}/man/man8
>Index: security/ipguard/files/patch-Makefile
>===================================================================
>--- security/ipguard/files/patch-Makefile	(revision 411360)
>+++ security/ipguard/files/patch-Makefile	(working copy)
>@@ -1,15 +1,17 @@
>---- Makefile.orig	2014-02-11 16:45:41.000000000 -0200
>-+++ Makefile	2014-02-11 16:46:25.000000000 -0200
>-@@ -10,7 +10,7 @@
>+--- Makefile.orig	2010-07-12 03:46:36 UTC
>++++ Makefile
>+@@ -10,8 +10,8 @@ PREFIX?=/usr/local
>  ETHERS?=/etc/ethers
>  
>  ## FreeBSD
> -LOCALBASE=/usr/local
>+-LIBNET_CONFIG=libnet11-config
> +LOCALBASE?=/usr/local
>- LIBNET_CONFIG=libnet11-config
>++LIBNET_CONFIG=libnet-config
>  
>  ## OpenBSD (tested by irix)
>-@@ -26,7 +26,7 @@
>+ # LOCALBASE=/usr/local
>+@@ -26,7 +26,7 @@ LIBS=`${LIBNET_CONFIG} --libs` -lpcap -L
>  DEFINES=`${LIBNET_CONFIG} --defines`
>  
>  STATIC=
>@@ -18,7 +20,7 @@
>  
>  CFLAGS+=-g -Wall -DETHERS='"$(ETHERS)"'
>  
>-@@ -58,10 +58,10 @@
>+@@ -58,10 +58,10 @@ cleanall: clean
>  	@rm -f $(NAME)
>  
>  install: all
>Index: security/sasp/Makefile
>===================================================================
>--- security/sasp/Makefile	(revision 411360)
>+++ security/sasp/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	sasp
> PORTVERSION=	0.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	security
> MASTER_SITES=	LOCAL/ahze \
> 		http://people.freebsd.org/~ahze/distfiles/
>@@ -14,9 +14,13 @@ COMMENT=	Tool that permits to use a gate
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> NO_WRKSUBDIR=	yes
>-MAKE_ENV=	LIBNET_CONFIG="${LIBNET_CONFIG}"
> PLIST_FILES=	sbin/sasp
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
>+do-build:
>+	(cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -o sasp sasp.c \
>+		${LDFLAGS} -L${LOCALBASE}/lib -lpcap -lnet)
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/sasp ${STAGEDIR}${PREFIX}/sbin
> 
> .include <bsd.port.mk>
>Index: security/sasp/files/patch-Makefile
>===================================================================
>--- security/sasp/files/patch-Makefile	(revision 411360)
>+++ security/sasp/files/patch-Makefile	(nonexistent)
>@@ -1,11 +0,0 @@
>---- ./Makefile.orig	Thu Apr  7 06:33:45 2005
>-+++ ./Makefile	Wed Sep 27 22:46:49 2006
>-@@ -1,6 +1,6 @@
>- all:
>--	cc -o sasp sasp.c -L/usr/local/lib -I/usr/local/include -lpcap -lnet
>-+	${CC} `${LIBNET_CONFIG} --cflags` -o sasp sasp.c -lpcap `${LIBNET_CONFIG} --libs`
>- install:
>--	install -o root -m 555 sasp /usr/local/sbin
>-+	${BSD_INSTALL_PROGRAM} sasp ${DESTDIR}${PREFIX}/sbin
>- clean:
>- 	rm -rf *.o
>
>Property changes on: security/sasp/files/patch-Makefile
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/scanlogd/Makefile
>===================================================================
>--- security/scanlogd/Makefile	(revision 411360)
>+++ security/scanlogd/Makefile	(working copy)
>@@ -34,8 +34,6 @@ PCAP_BASE_ALL_TARGET=	libpcap
> NIDS_ALL_TARGET=	libnids
> NIDS_BUILD_DEPENDS=	${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
> NIDS_LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
>-NIDS_CFLAGS=		-I${LOCALBASE}/include/libnet11
>-NIDS_LDFLAGS=		-L${LOCALBASE}/lib/libnet11
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/scanlogd ${STAGEDIR}${PREFIX}/bin
>Index: security/snort/Makefile
>===================================================================
>--- security/snort/Makefile	(revision 411360)
>+++ security/snort/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	snort
> PORTVERSION=	2.9.8.0
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	https://snort.org/downloads/snort/ \
> 		http://www.talosintel.com/downloads/ \
>@@ -17,7 +18,7 @@ LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
>-		libnet.so:${PORTSDIR}/net/libnet
>+		libdnet.so:${PORTSDIR}/net/libdnet
> BUILD_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
> RUN_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
> 
>@@ -88,24 +89,10 @@ DOCS=		RELEASE.NOTES doc/AUTHORS doc/BUG
> 		doc/README* doc/USAGE doc/*.pdf
> PREPROC_RULES=	decoder.rules preprocessor.rules sensitive-data.rules
> 
>-LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
>-.if exists(${LIBNET_CONFIG})
>-LIBNET_CFLAGS!=	${LIBNET_CONFIG} --cflags
>-LIBNET_LIBS!=	${LIBNET_CONFIG} --libs
>-.else
>-LIBNET_CFLAGS=	-I${LOCALBASE}/include/libnet11
>-LIBNET_LIBS=	-L${LOCALBASE}/lib/libnet11 -lnet
>-.endif
>-
>-LIBNET_INCDIR=	${LIBNET_CFLAGS:M-I*:S/-I//}
>-LIBNET_LIBDIR=	${LIBNET_LIBS:M-L*:S/-L//}
>-
> CFLAGS+=	-fstack-protector
> CONFIGURE_ARGS+=--enable-reload \
> 		--enable-mpls --enable-targetbased \
>-		--enable-reload-error-restart \
>-		--with-dnet-includes=${LIBNET_INCDIR} \
>-		--with-dnet-libraries=${LIBNET_LIBDIR}
>+		--enable-reload-error-restart
> 
> post-patch:
> 	@${REINPLACE_CMD} "s,/etc/snort.conf,${ETCDIR}/snort.conf," \
>@@ -116,8 +103,6 @@ post-patch:
> 		-e '/^# include .PREPROC_RULE/s/# include/include/' \
> 		${WRKSRC}/etc/snort.conf
> 
>-	@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|g' ${WRKSRC}/configure
>-
> # IPv6 is no longer a ./configure option!
> .if ! ${PORT_OPTIONS:MIPV6}
> 	@${REINPLACE_CMD} -e '/normalize_ip6/s/^preprocessor/#preprocessor/' \
>Index: security/suricata/Makefile
>===================================================================
>--- security/suricata/Makefile	(revision 411360)
>+++ security/suricata/Makefile	(working copy)
>@@ -106,14 +106,12 @@ CONFIGURE_ARGS+=--enable-gccprotect \
> 		--with-libpcre-libraries=${LOCALBASE}/lib \
> 		--with-libyaml-includes=${LOCALBASE}/include \
> 		--with-libyaml-libraries=${LOCALBASE}/lib \
>-		--with-libnet-includes=${LOCALBASE}/include/libnet11 \
>-		--with-libnet-libraries=${LOCALBASE}/lib/libnet11 \
>+		--with-libnet-includes=${LOCALBASE}/include \
>+		--with-libnet-libraries=${LOCALBASE}/lib \
> 		--with-libhtp-includes=${LOCALBASE}/include/ \
> 		--with-libhtp-libraries=${LOCALBASE}/lib \
>-	        --disable-gccmarch-native \
>-		--localstatedir=/var/
>+	        --disable-gccmarch-native
> 
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
> CONFIG_DIR?=	${ETCDIR}
> CONFIG_FILES=	suricata.yaml classification.config reference.config threshold.config
> RULES_DIR=	${CONFIG_DIR}/rules
>Index: security/unicornscan/Makefile
>===================================================================
>--- security/unicornscan/Makefile	(revision 411360)
>+++ security/unicornscan/Makefile	(working copy)
>@@ -15,15 +15,11 @@ LICENSE=	GPLv2
> LIB_DEPENDS=	libnet.so:${PORTSDIR}/net/libnet
> 
> USES=		gmake
>-MAKE_ENV=	LIBNET_CONFIG="${LIBNET_CONFIG}"
> CFLAGS+=	-DWITH_LONGOPTS
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
> 
> SUB_FILES=	pkg-message
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
>-		${WRKSRC}/src/scan_progs/Makefile ${WRKSRC}/src/tools/Makefile
> 	@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/etc|' \
> 		${WRKSRC}/fconf/unicorn.conf
> # Unbreak the build against Clang (it does not like one function being inline)
>Index: security/unicornscan/files/patch-libs__Makefile
>===================================================================
>--- security/unicornscan/files/patch-libs__Makefile	(revision 411360)
>+++ security/unicornscan/files/patch-libs__Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- libs/Makefile.orig	Thu Sep 30 07:29:05 2004
>-+++ libs/Makefile	Fri Sep 29 14:32:37 2006
>-@@ -6,30 +6,10 @@
>+--- libs/Makefile.orig	2004-09-30 10:29:05 UTC
>++++ libs/Makefile
>+@@ -6,30 +6,10 @@ CFLAGS=$(MYCFLAGS)
>  default: pcap_test libnet_test
>  
>  pcap_test: pcap_test.c
>@@ -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 `$(LIBNET_CONFIG) --libs` $(LDADD)
>++	$(CC) $(CFLAGS) -o libnet_test libnet_test.c -lpcap -lnet $(LDADD)
>  
>  clean:
> -	rm -rf fake libnet libpcap-$(PCAPVER) pcap_test libnet_test
>Index: security/unicornscan/files/patch-src-scan_progs-Makefile
>===================================================================
>--- security/unicornscan/files/patch-src-scan_progs-Makefile	(revision 411360)
>+++ security/unicornscan/files/patch-src-scan_progs-Makefile	(working copy)
>@@ -18,7 +18,7 @@
> +	$(CC) -c $(ENTRY) $(CFLAGS) -DBUILD_IDENT_RECV=1 -o $@
> +
> +$(SENDERNAME): $(S_OBJS) $(G_HDRS) $(S_HDRS) $(C_OBJS) entry_send.o
>-+	$(CC) $(CFLAGS) -o $(SENDERNAME) $(S_OBJS) $(C_OBJS) entry_send.o $(G_LDADD) -lpcap `/usr/local/bin/libnet11-config --libs` $(LDADD)
>++	$(CC) $(CFLAGS) -o $(SENDERNAME) $(S_OBJS) $(C_OBJS) entry_send.o $(G_LDADD) -lpcap -lnet $(LDADD)
> +
> +$(LISTENERNAME): $(L_OBJS) $(G_HDRS) $(L_HDRS) $(C_OBJS) entry_recv.o
> +	$(CC) $(CFLAGS) -o $(LISTENERNAME) $(L_OBJS) $(C_OBJS) entry_recv.o $(G_LDADD) -lpcap $(LDADD)
>Index: security/unicornscan/files/patch-src__Makefile
>===================================================================
>--- security/unicornscan/files/patch-src__Makefile	(revision 411360)
>+++ security/unicornscan/files/patch-src__Makefile	(working copy)
>@@ -1,17 +1,6 @@
>---- 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 `$(LIBNET_CONFIG) --libs` $(LDADD)
>- LIBDIRS=-L./unilib -L./scan_progs -L./parse -L../libs/fake/lib
>- TARGETNAME=unicornscan
>- 
>-@@ -19,42 +19,42 @@
>+--- src/Makefile.orig	2004-09-30 10:29:05 UTC
>++++ src/Makefile
>+@@ -19,42 +19,42 @@ compile.h:
>  	./compiledby.sh > compile.h
>  
>  unilib_d:
>Index: security/unicornscan/files/patch-src__Makefile.inc
>===================================================================
>--- security/unicornscan/files/patch-src__Makefile.inc	(revision 411360)
>+++ security/unicornscan/files/patch-src__Makefile.inc	(working copy)
>@@ -1,5 +1,5 @@
>---- src/Makefile.inc.orig	Thu Sep 30 07:29:05 2004
>-+++ src/Makefile.inc	Thu Sep 28 14:08:32 2006
>+--- src/Makefile.inc.orig	2004-09-30 10:29:05 UTC
>++++ src/Makefile.inc
> @@ -1,14 +1,13 @@
>  # gcc only
> -CC=gcc
>@@ -14,16 +14,12 @@
>  
>  # 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) -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)\"
>++MYCFLAGS:=$(CFLAGS) -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)\"
>  
>  # 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
>- 
>- # freebsd, netbsd example
>--#LDADD=
>-+LDADD=
>+@@ -26,7 +25,7 @@ MAKE=gmake
>+ #LDADD=
>  
>  # linux example
> -LDADD=-ldl
>Index: security/yersinia/Makefile
>===================================================================
>--- security/yersinia/Makefile	(revision 411360)
>+++ security/yersinia/Makefile	(working copy)
>@@ -27,18 +27,11 @@ CONFIGURE_ARGS+=	--disable-gtk
> CONFLICTS=	yersinia-gtk-[0-9]*
> .endif
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	LIBNET_CONFIG="${LIBNET_CONFIG}"
>-
>-LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
> 
> #NOT_FOR_ARCHS=	ia64 sparc64
> PLIST_FILES=	sbin/yersinia \
> 		man/man8/yersinia.8.gz
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
>-		${WRKSRC}/src/Makefile.in
>-
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${STAGEDIR}${PREFIX}/sbin/
> 	${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
>Index: security/yersinia/files/patch-configure
>===================================================================
>--- security/yersinia/files/patch-configure	(revision 411360)
>+++ security/yersinia/files/patch-configure	(working copy)
>@@ -19,79 +19,3 @@
>         else
>            pcap_dir="$dir"
>         fi
>-@@ -4636,64 +4637,8 @@
>- 
>- fi
>- 
>--
>--
>--{ echo "$as_me:$LINENO: checking for a complete set of libnet headers" >&5
>--echo $ECHO_N "checking for a complete set of libnet headers... $ECHO_C" >&6; }
>--
>--possible_dirs="`eval echo -n ${includedir}` \
>--	       /usr/include /usr/include/libnet \
>--               /usr/local/include /usr/local/include/libnet \
>--               /usr/share/include /usr/share/include/libnet"
>--
>--possible_libnet_config_dirs="/usr /usr/local /opt"
>--
>--
>--# Check whether --with-libnet-includes was given.
>--if test "${with_libnet_includes+set}" = set; then
>--  withval=$with_libnet_includes; LIBNET_DIR=$withval LIBNET_CONFIG_DIR=$withval
>--else
>--  LIBNET_DIR=$possible_dirs LIBNET_CONFIG_DIR=$possible_libnet_config_dirs
>--fi
>--
>--
>--libnet_dir=""
>--for dir in $LIBNET_DIR ; do
>--    if test -d $dir -a -r "$dir/libnet.h" ; then
>--       if test -n "$libnet_dir" -a "$libnet_dir" != "$dir"; then
>--          echo
>--          echo; echo more than one set found in:
>--          echo  $libnet_dir
>--          echo  $dir
>--          echo; echo please wipe out all unused libnet installations
>--          exit
>--       else
>--          libnet_dir="$dir"
>--       fi
>--    fi
>--done
>--
>--for dir in $LIBNET_CONFIG_DIR ; do
>--    if test -d $dir -a -r "$dir/bin/libnet-config" ; then
>--       libnet_config_dir="$dir/bin"
>--    fi
>--done
>--
>--if test -z "$libnet_dir" ; then
>--   echo no; echo !!! couldn\'t find a complete set of libnet headers
>--   exit
>--else
>--   echo found $libnet_dir
>--
>--   LIBNET_INCLUDE="-I$libnet_dir"
>--   LIBNET_LINK="-L`dirname $libnet_dir`/lib"
>--   LIBNET_CONFIG="$libnet_config_dir/libnet-config"
>--
>--
>--
>--
>--
>--fi
>-+LIBNET_INCLUDE="`$LIBNET_CONFIG --cflags`"
>-+LIBNET_LINK=""
>- 
>- if test "$LIBNET_LINK" != "-L/usr/lib" ; then
>-   LIBS="$LIBS $LIBNET_LINK"
>-@@ -4708,7 +4653,7 @@
>-   echo $ECHO_N "(cached) $ECHO_C" >&6
>- else
>-   ac_check_lib_save_LIBS=$LIBS
>--LIBS="-lnet  $LIBS"
>-+LIBS="`$LIBNET_CONFIG --libs` $LIBS"
>- cat >conftest.$ac_ext <<_ACEOF
>- /* confdefs.h.  */
>- _ACEOF
>Index: sysutils/heartbeat/Makefile
>===================================================================
>--- sysutils/heartbeat/Makefile	(revision 411360)
>+++ sysutils/heartbeat/Makefile	(working copy)
>@@ -41,8 +41,8 @@ INSTALL_TARGET=	install-strip
> USERS=		hacluster
> GROUPS=		haclient
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libnet11
>-LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet11
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> CONFIGURE_ARGS=	--localstatedir=/var \
> 		--with-miBsdir=${PREFIX}/snmp/mibs \
>Index: sysutils/heartbeat/files/patch-configure.in
>===================================================================
>--- sysutils/heartbeat/files/patch-configure.in	(revision 411360)
>+++ sysutils/heartbeat/files/patch-configure.in	(working copy)
>@@ -50,15 +50,6 @@
>  AC_CHECK_PROGS(MAKE, gmake make)
>  AC_MSG_CHECKING(for gmake or make)
>  if test x"${MAKE}" = x""; then
>-@@ -542,7 +538,7 @@
>- AC_PATH_PROGS(MAILCMD, mail, mailx)
>- AC_SUBST(MAILCMD)
>- AC_DEFINE_UNQUOTED(IFCONFIG, "$IFCONFIG", path to the ifconfig command)
>--AC_PATH_PROGS(LIBNETCONFIG, libnet-config)
>-+AC_PATH_PROGS(LIBNETCONFIG, libnet11-config)
>- AC_PATH_PROGS(GETENT, getent)
>- AC_PATH_PROGS(IP2UTIL, ip, /sbin/ip)
>- AC_PATH_PROGS(XML2CONFIG, xml2-config)
> @@ -1718,6 +1714,7 @@
>  AC_CHECK_SIZEOF(int)
>  AC_CHECK_SIZEOF(long)
>Index: sysutils/syslog-ng/Makefile
>===================================================================
>--- sysutils/syslog-ng/Makefile	(revision 411360)
>+++ sysutils/syslog-ng/Makefile	(working copy)
>@@ -68,10 +68,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
> 
> .if ${PORT_OPTIONS:MSPOOF}
> LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
>-LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
>-CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
>-CFLAGS+=		`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
>-LDFLAGS+=		`${LIBNET_CONFIG} --libs`
>+CONFIGURE_ARGS+=	--enable-spoof-source
> .else
> CONFIGURE_ARGS+=	--disable-spoof-source
> .endif
>@@ -126,8 +123,6 @@ CONFIGURE_ARGS+=        --disable-json
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \
>-		${WRKSRC}/configure
> 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
> 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
> 
>Index: sysutils/syslog-ng-devel/Makefile
>===================================================================
>--- sysutils/syslog-ng-devel/Makefile	(revision 411360)
>+++ sysutils/syslog-ng-devel/Makefile	(working copy)
>@@ -64,10 +64,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
> 
> .if ${PORT_OPTIONS:MSPOOF}
> LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
>-LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
>-CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
>-CFLAGS+=		`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
>-LDFLAGS+=		`${LIBNET_CONFIG} --libs`
>+CONFIGURE_ARGS+=	--enable-spoof-source
> .else
> CONFIGURE_ARGS+=	--disable-spoof-source
> .endif
>@@ -148,8 +145,6 @@ CONFIGURE_ARGS+=        --disable-python
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \
>-		${WRKSRC}/configure
> 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
> 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
> 
>Index: sysutils/syslog-ng34/Makefile
>===================================================================
>--- sysutils/syslog-ng34/Makefile	(revision 411360)
>+++ sysutils/syslog-ng34/Makefile	(working copy)
>@@ -65,10 +65,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
> 
> .if ${PORT_OPTIONS:MSPOOF}
> LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
>-LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
>-CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
>-CFLAGS+=		`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
>-LDFLAGS+=		`${LIBNET_CONFIG} --libs`
>+CONFIGURE_ARGS+=	--enable-spoof-source
> .else
> CONFIGURE_ARGS+=	--disable-spoof-source
> .endif
>@@ -121,7 +118,6 @@ CONFIGURE_ARGS+=        --disable-json
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure
> 	@${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.sample
> 	@${LN} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
> 
>Index: sysutils/syslog-ng35/Makefile
>===================================================================
>--- sysutils/syslog-ng35/Makefile	(revision 411360)
>+++ sysutils/syslog-ng35/Makefile	(working copy)
>@@ -69,10 +69,7 @@ CONFIGURE_ARGS+=	--disable-tcp-wrapper
> 
> .if ${PORT_OPTIONS:MSPOOF}
> LIB_DEPENDS+=		libnet.so:${PORTSDIR}/net/libnet
>-LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
>-CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
>-CFLAGS+=		`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
>-LDFLAGS+=		`${LIBNET_CONFIG} --libs`
>+CONFIGURE_ARGS+=	--enable-spoof-source
> .else
> CONFIGURE_ARGS+=	--disable-spoof-source
> .endif
>@@ -135,8 +132,6 @@ CONFIGURE_ARGS+=        --disable-json
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' \
>-		${WRKSRC}/configure
> 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
> 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
>

Actions: View | Diff

Attachments on bug 208122: 168372 | 168381