aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dns/dnshijacker/Makefile12
-rw-r--r--graphics/p5-Image-Grab/Makefile3
-rw-r--r--net-mgmt/angst/Makefile16
-rw-r--r--net-mgmt/cdpd/Makefile11
-rw-r--r--net-mgmt/ettercap/Makefile19
-rw-r--r--net-mgmt/gps/Makefile20
-rw-r--r--net-mgmt/isic/Makefile11
-rw-r--r--net-mgmt/knowlan/Makefile15
-rw-r--r--net-mgmt/packit/Makefile25
-rw-r--r--net-mgmt/pixilate/Makefile21
-rw-r--r--net-mgmt/scdp/Makefile14
-rw-r--r--net-mgmt/sing/Makefile11
-rw-r--r--net-mgmt/tcpreplay/Makefile16
-rw-r--r--net/arp-sk/Makefile15
-rw-r--r--net/arping/Makefile11
-rw-r--r--net/arprelease/Makefile12
-rw-r--r--net/despoof/Makefile21
-rw-r--r--net/despoof/pkg-plist4
-rw-r--r--net/gspoof/Makefile12
-rw-r--r--net/gspoof/files/patch-configure30
-rw-r--r--net/libnet-devel/Makefile23
-rw-r--r--net/libnet-devel/files/patch-Makefile.in10
-rw-r--r--net/libnet-devel/files/patch-include__Makefile.in11
-rw-r--r--net/libnet-devel/files/patch-include__libnet__Makefile.in11
-rw-r--r--net/libnet-devel/files/patch-libnet-config.in13
-rw-r--r--net/libnet-devel/files/patch-src__Makefile.in20
-rw-r--r--net/libnet-devel/pkg-plist30
-rw-r--r--net/libnet/Makefile12
-rw-r--r--net/libnet/files/patch-include__Makefile.in11
-rw-r--r--net/libnet/files/patch-include__libnet__Makefile.in11
-rw-r--r--net/libnet/files/patch-libnet-config.in13
-rw-r--r--net/libnet/files/patch-src__Makefile.in11
-rw-r--r--net/libnet/pkg-plist22
-rw-r--r--net/libnet10/Makefile24
-rw-r--r--net/libnet10/files/patch-Makefile.in24
-rw-r--r--net/libnet10/files/patch-aa29
-rw-r--r--net/libnet10/files/patch-ab20
-rw-r--r--net/libnet10/files/patch-libnet-config.in13
-rw-r--r--net/libnet10/pkg-plist62
-rw-r--r--net/libnids/Makefile18
-rw-r--r--net/nast/Makefile26
-rw-r--r--net/nast/files/patch-configure57
-rw-r--r--net/nemesis/Makefile10
-rw-r--r--net/netwib/Makefile13
-rw-r--r--net/py-libnet/Makefile10
-rw-r--r--net/pynids/Makefile30
-rw-r--r--net/pynids/files/patch-setup.py17
-rw-r--r--net/tcptraceroute-devel/Makefile10
-rw-r--r--net/tcptraceroute-devel/files/patch-Makefile6
-rw-r--r--net/tcptraceroute/Makefile10
-rw-r--r--net/tcptraceroute/files/patch-Makefile6
-rw-r--r--net/ttlscan/Makefile8
-rw-r--r--net/xboxproxy/Makefile12
-rw-r--r--net/xboxproxy/files/patch-configure32
-rw-r--r--net/xipdump/Makefile14
-rw-r--r--security/dsniff/Makefile49
-rw-r--r--security/dsniff/files/patch-aa11
-rw-r--r--security/dsniff/files/patch-pcaputil.c14
-rw-r--r--security/fiked/Makefile11
-rw-r--r--security/firewalk/Makefile12
-rw-r--r--security/ipguard/Makefile13
-rw-r--r--security/labrea/Makefile12
-rw-r--r--security/sasp/Makefile5
-rw-r--r--security/sasp/files/patch-Makefile11
-rw-r--r--security/snort/Makefile25
-rw-r--r--security/unicornscan/Makefile13
-rw-r--r--security/unicornscan/files/patch-libs::Makefile6
-rw-r--r--security/unicornscan/files/patch-src::Makefile10
-rw-r--r--security/unicornscan/files/patch-src::Makefile.inc16
-rw-r--r--security/vida/Makefile12
-rw-r--r--security/yersinia/Makefile11
-rw-r--r--security/yersinia/files/patch-configure78
-rw-r--r--security/zombiezapper/Makefile8
-rw-r--r--sysutils/heartbeat/Makefile12
-rw-r--r--sysutils/heartbeat2/Makefile12
75 files changed, 943 insertions, 346 deletions
diff --git a/dns/dnshijacker/Makefile b/dns/dnshijacker/Makefile
index abfb07968f30..16e5685028fb 100644
--- a/dns/dnshijacker/Makefile
+++ b/dns/dnshijacker/Makefile
@@ -7,19 +7,21 @@
PORTNAME= dnshijacker
PORTVERSION= 1.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns security
MASTER_SITES= http://pedram.redhive.com/downloads/
MAINTAINER= lx@redundancy.redundancy.org
COMMENT= A tool to hijack DNS requests
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-LDFLAGS+= -lpcap -lnet
+LDFLAGS+= -lpcap `${LIBNET_CONFIG} --libs`
PLIST_FILES= bin/dnshijacker
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
.if !defined(NOPORTDOCS)
PORTDOCS= README
.endif
@@ -27,8 +29,8 @@ PORTDOCS= README
do-build:
cd ${WRKSRC} && \
${CC} ${PORTNAME}.c ${CFLAGS} -I${LOCALBASE}/include \
- -L${LOCALBASE}/lib ${LDFLAGS} `libnet-config --defines` \
- `libnet-config --cflags` -o ${PORTNAME}
+ -L${LOCALBASE}/lib ${LDFLAGS} `${LIBNET_CONFIG} --defines` \
+ `${LIBNET_CONFIG} --cflags` -o ${PORTNAME}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/dnshijacker ${PREFIX}/bin
diff --git a/graphics/p5-Image-Grab/Makefile b/graphics/p5-Image-Grab/Makefile
index 4b0e41e7b267..b7050863d1df 100644
--- a/graphics/p5-Image-Grab/Makefile
+++ b/graphics/p5-Image-Grab/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Image-Grab
PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Image
@@ -21,7 +21,6 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-D
${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
${SITE_PERL}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
- libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 \
${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net-mgmt/angst/Makefile b/net-mgmt/angst/Makefile
index 248b6c911500..110fc8a3a8a8 100644
--- a/net-mgmt/angst/Makefile
+++ b/net-mgmt/angst/Makefile
@@ -8,7 +8,7 @@
PORTNAME= angst
PORTVERSION= 0.4b
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
${MASTER_SITE_PACKETSTORM:S:%SUBDIR%:sniffers/angst:}
@@ -17,17 +17,19 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= An active sniffer
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
-
-LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet-config
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
MAN8= angst.8
PLIST_FILES= sbin/angst
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
post-patch:
- @${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
- s,^CFLAGS,#CFLAGS,g ; \
- s,libnet-config,${LIBNET_CONFIG},g" ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -Ee \
+ 's,^(CC|CFLAGS).*,#&,; \
+ s,libnet-config,${LIBNET_CONFIG},; \
+ s,--defines,& --cflags,' \
+ ${WRKSRC}/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin
diff --git a/net-mgmt/cdpd/Makefile b/net-mgmt/cdpd/Makefile
index 318f6f46b757..428221735b3c 100644
--- a/net-mgmt/cdpd/Makefile
+++ b/net-mgmt/cdpd/Makefile
@@ -6,17 +6,24 @@
PORTNAME= cdpd
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= ftp://ftp.lexa.ru/pub/domestic/snar/
MAINTAINER= ports@FreeBSD.org
COMMENT= CDPdaemon - sends Cisco Discovery Protocol announces over ethernet
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
GNU_CONFIGURE= yes
+CFLAGS+= `${LIBNET_CONFIG} --cflags`
MAN8= cdpd.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG:T}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.mk>
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 3a64b1b3fd4a..b84c42e51d99 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ettercap
PORTVERSION= 0.7.3
DISTVERSIONPREFIX= NG-
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= net-mgmt security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mnag@FreeBSD.org
COMMENT= A network sniffer/interceptor/injector/logger for switched LANs
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
OPTIONS= GTK "Build with GTK2+ GUI" on \
ICONV "Build with support for UTF-8" on \
@@ -36,13 +36,16 @@ DOCS= AUTHORS CHANGELOG README README.BINARIES README.BUGS \
README.CVS README.PLATFORMS THANKS TODO TODO.TESTING \
doc/capture doc/decoders doc/dissectors doc/threads
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
.include <bsd.port.pre.mk>
CFLAGS+= ${PTHREAD_CFLAGS}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+= --enable-plugins --with-libnet=${LOCALBASE}
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+ LIBS="${LDFLAGS}"
+CONFIGURE_ARGS+= --enable-plugins
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.if ${OSVERSION} < 502111
@@ -88,8 +91,12 @@ CONFIGURE_ARGS+= --without-openssl
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -Ee \
+ 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|; \
+ s|test -f /usr/include/libnet\.h|${TRUE}|; \
+ s|(LNETINC=).*|\1"`${LIBNET_CONFIG} --cflags`"|; \
+ s|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -E -e 's|(^pkgdatadir.+=).+|\1 ${DATADIR}|' \
${WRKSRC}/share/Makefile.in
diff --git a/net-mgmt/gps/Makefile b/net-mgmt/gps/Makefile
index 20b231758f0d..3f268c97d6db 100644
--- a/net-mgmt/gps/Makefile
+++ b/net-mgmt/gps/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gps
PORTVERSION= 0.9.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= http://www.bsd-geek.de/FreeBSD/distfiles/
DISTNAME= ${PORTNAME}-${PORTVERSION}-FRC
@@ -16,14 +16,24 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-FRC
MAINTAINER= lars.engels@0x20.net
COMMENT= Ghost Port Scan
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+.include <bsd.port.pre.mk>
+
post-patch:
- @${REINPLACE_CMD} -e "s,-Wall -O3,${CFLAGS},g" ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|-Wall -O3|${CFLAGS}|; \
+ s|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e \
+ 's|libnet-config|${LIBNET_CONFIG}|; \
+ s|--defines|& --cflags|' \
+ ${WRKSRC}/Makefile.in
.if !defined(NOPORTDOCS)
post-install:
@@ -31,4 +41,4 @@ post-install:
${CP} ${WRKSRC}/docs/* ${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-mgmt/isic/Makefile b/net-mgmt/isic/Makefile
index 381810a88b66..2db223097ea9 100644
--- a/net-mgmt/isic/Makefile
+++ b/net-mgmt/isic/Makefile
@@ -7,6 +7,7 @@
PORTNAME= isic
PORTVERSION= 0.07
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,10 +16,18 @@ EXTRACT_SUFX= .tgz
MAINTAINER= wxs@atarininja.org
COMMENT= IP Stack Integrity Checker
-BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
GNU_CONFIGURE= yes
MAN1= isic.1
+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>
diff --git a/net-mgmt/knowlan/Makefile b/net-mgmt/knowlan/Makefile
index 96f932070dde..acf8be08d61a 100644
--- a/net-mgmt/knowlan/Makefile
+++ b/net-mgmt/knowlan/Makefile
@@ -7,17 +7,28 @@
PORTNAME= knowlan
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.enderunix.org/knowlan/
MAINTAINER= ofsen@enderunix.org
COMMENT= ARP-based LAN IP and MAC Address Extractor
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
HAS_CONFIGURE= yes
CONFIGURE_ENV= PREFIX="${PREFIX}" LOCALBASE="${LOCALBASE}"
+CFLAGS+= `${LIBNET_CONFIG} --cflags`
+
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e \
+ '95d; 102d; 116,117d; \
+ s|libnet-config|${LIBNET_CONFIG}|; \
+ s|$${LOCALBASE}/lib/libnet.a|`${LIBNET_CONFIG} --libs`|; \
+ s|gcc|${CC}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/knowlan ${PREFIX}/sbin
diff --git a/net-mgmt/packit/Makefile b/net-mgmt/packit/Makefile
index df114749328a..23886e6f339d 100644
--- a/net-mgmt/packit/Makefile
+++ b/net-mgmt/packit/Makefile
@@ -7,7 +7,7 @@
PORTNAME= packit
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://packit.sourceforge.net/downloads/
EXTRACT_SUFX= .tgz
@@ -15,16 +15,16 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Network auditing tool
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags`"
-LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet-config
MAN8= packit.8
PLIST_FILES= sbin/packit
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
.if defined(WITHOUT_CAPTURE)
CONFIGURE_ARGS+= --without-capture
@@ -33,13 +33,8 @@ CONFIGURE_ARGS+= --without-capture
CONFIGURE_ARGS+= --without-injection
.endif
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} ""#######################################################
- @${ECHO_MSG} ""
- @${ECHO_MSG} "You need ${PORTSDIR}/net/libnet to build this port
- @${ECHO_MSG} ""
- @${ECHO_MSG} ""#######################################################
- @${ECHO_MSG} ""
+post-patch:
+ @${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index 38a3cdd50378..fd21bcf9c904 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -6,7 +6,7 @@
PORTNAME= pixilate
PORTVERSION= 0.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= winfingerprint
@@ -14,25 +14,28 @@ MASTER_SITE_SUBDIR= winfingerprint
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates packets to match a list of Cisco PIX access lists
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
WRKSRC= ${WRKDIR}/pixilate
-LIBNET_CONFIG= ${LOCALBASE}/bin/libnet-config
-CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
-CFLAGS+= -I${LOCALBASE}/include
-LIBS= `${LIBNET_CONFIG} --libs`
-GNU_CONFIGURE= yes
-USE_AUTOTOOLS= automake:15 autoconf:253
+USE_AUTOTOOLS= automake:15 autoconf:259
AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}" CPPFLAGS="-I${LOCALBASE}/include"
+#CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}" CPPFLAGS="-I${LOCALBASE}/include"
MAN1= pixilate.1
PORTDOCS= README
PLIST_FILES= bin/pixilate
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|libnet-config|${LIBNET_CONFIG}|; \
+ s|--defines`|& `${LIBNET_CONFIG} --cflags`|' \
+ ${WRKSRC}/configure.ac
+
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
diff --git a/net-mgmt/scdp/Makefile b/net-mgmt/scdp/Makefile
index 1e225ffc565f..1d209646614e 100644
--- a/net-mgmt/scdp/Makefile
+++ b/net-mgmt/scdp/Makefile
@@ -6,7 +6,7 @@
PORTNAME= scdp
PORTVERSION= 1.0.b
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scdp
@@ -15,13 +15,19 @@ DISTNAME= scdp-${PORTVERSION:S/.b/b/}
MAINTAINER= arved@FreeBSD.org
COMMENT= "Tool that sends CDP (CISCO Discovery Protocol) Packets"
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-PLIST_FILES= bin/scdp
-GNU_CONFIGURE= yes
USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= libnet_config="${LIBNET_CONFIG}"
+CFLAGS+= `${LIBNET_CONFIG} --cflags`
+PLIST_FILES= bin/scdp
+
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
post-patch:
${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/scdp.c
+ ${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile
index 40f633a9e96d..52d6307567fb 100644
--- a/net-mgmt/sing/Makefile
+++ b/net-mgmt/sing/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sing
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -17,14 +17,17 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for sending customized ICMP packets
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --with-libnet-prefix=${LOCALBASE} --with-libpcap-prefix=/usr
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-libpcap-prefix=/usr
+CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --defines` \
+ `${LIBNET_CONFIG} --cflags`" LIBS="`${LIBNET_CONFIG} --libs`"
MAN8= sing.8
PLIST_FILES= sbin/sing
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
post-extract:
@${RM} -rf ${WRKSRC}/libpcap-* ;\
${RM} -rf ${WRKSRC}/Libnet-*
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 36d1b830796f..fce858982c9c 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tcpreplay
PORTVERSION= 2.3.5
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,18 +15,27 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= laszlof@FreeBSD.org
COMMENT= A tool to replay saved packet capture files
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet \
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
GNU_CONFIGURE= yes
-# Pickup correct pcap.h; CFLAGS gets overwritten
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --with-libpcap=${LOCALBASE} \
--without-pcapnav-config
+CFLAGS+= `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
MAN1= capinfo.1 tcpprep.1 pcapmerge.1 flowreplay.1
MAN8= tcpreplay.8
PLIST_FILES= bin/capinfo bin/pcapmerge bin/tcpprep sbin/tcpreplay bin/flowreplay
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
+post-patch:
+ @${REINPLACE_CMD} -Ee \
+ 's|-pipe -Wall|$$CFLAGS &|; \
+ s|^(foundnet=)no|\1yes|; \
+ s|\$$LNETLIB|`${LIBNET_CONFIG} --libs`|; \
+ s|\$$LNETINCDIR/||' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.mk>
diff --git a/net/arp-sk/Makefile b/net/arp-sk/Makefile
index b4806b8fece4..bc9ed3bfce7a 100644
--- a/net/arp-sk/Makefile
+++ b/net/arp-sk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= arp-sk
PORTVERSION= 0.0.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://sid.rstack.org/arp-sk/files/
EXTRACT_SUFX= .tgz
@@ -16,15 +16,24 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A tool designed to manipulate ARP tables of all kinds of equipment
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
GNU_CONFIGURE= yes
+CFLAGS+= `${LIBNET_CONFIG} --cflags`
MAN1= arp-sk.1
PLIST_FILES= sbin/arp-sk
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
post-patch:
- @${REINPLACE_CMD} -e "s, -pedantic -g,," ${WRKSRC}/configure
+ @${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 ${PREFIX}/sbin
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 64c9f73f54cd..6d252be275c8 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -7,27 +7,30 @@
PORTNAME= arping
PORTVERSION= 2.05
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.habets.pp.se/pub/synscan/
MAINTAINER= gavin.atkinson@ury.york.ac.uk
COMMENT= ARP level "ping" utility
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
LDFLAGS+= -lpcap
MAN8= arping.8
PLIST_FILES= sbin/arping
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
do-build:
cd ${WRKSRC} && \
${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
- -DUSE_NETIF=1 -DFREEBSD=1 -c `libnet-config --defines` \
- `libnet-config --cflags` ${PORTNAME}.c && \
+ -DUSE_NETIF=1 -DFREEBSD=1 -c `${LIBNET_CONFIG} --defines` \
+ `${LIBNET_CONFIG} --cflags` ${PORTNAME}.c && \
${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
-DUSE_NETIF=1 -DFREEBSD=1 -o ${PORTNAME} ${PORTNAME}.o \
- `libnet-config --libs` ${LDFLAGS}
+ `${LIBNET_CONFIG} --libs` ${LDFLAGS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arping ${PREFIX}/sbin
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index 71fa99e54495..9e7d92bc7bc8 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -7,7 +7,7 @@
PORTNAME= arprelease
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,19 +15,19 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Libnet tool to flush arp cache entries from devices (eg. routers)
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_FILES= bin/arprelease
-LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet-config
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
do-build:
(cd ${WRKSRC} && \
- ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib \
- -o arprelease arprelease.c \
- `${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --libs`)
+ ${CC} ${CFLAGS} `${LIBNET_CONFIG} --defines` \
+ `${LIBNET_CONFIG} --cflags` -o arprelease arprelease.c \
+ `${LIBNET_CONFIG} --libs`)
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arprelease ${PREFIX}/bin
diff --git a/net/despoof/Makefile b/net/despoof/Makefile
index 347b4c01c8a3..9ad19be9b7a9 100644
--- a/net/despoof/Makefile
+++ b/net/despoof/Makefile
@@ -7,7 +7,7 @@
PORTNAME= despoof
PORTVERSION= 0.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net security
MASTER_SITES= http://www.bindview.com/Resources/RAZOR/Files/ \
${MASTER_SITE_PACKETSTORM}
@@ -17,11 +17,24 @@ EXTRACT_SUFX= .tgz
MAINTAINER= roam@FreeBSD.org
COMMENT= Command-line anti-spoofing detection utility
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
+
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|-I$${LOCALBASE}/include ||; \
+ s|-L$${LOCALBASE}/lib ||; \
+ s|--defines|& --cflags|; \
+ s|libnet-config|${LIBNET_CONFIG}|; \
+ s|-lnet |`${LIBNET_CONFIG} --libs` |' \
+ ${WRKSRC}/${MAKEFILE}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/despoof ${PREFIX}/bin
- ${MKDIR} ${PREFIX}/share/doc/despoof
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/despoof
+.if !defined(NOPORTDOCS)
+ ${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
.include <bsd.port.mk>
diff --git a/net/despoof/pkg-plist b/net/despoof/pkg-plist
index 649e235a9c9b..d0a161f4f02c 100644
--- a/net/despoof/pkg-plist
+++ b/net/despoof/pkg-plist
@@ -1,3 +1,3 @@
bin/despoof
-share/doc/despoof/README
-@dirrm share/doc/despoof
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index d3447339a29d..a6c35c3090ca 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gspoof
PORTVERSION= 3.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,15 +16,19 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Console/GTK+ TCP/IP Packets Forger
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
USE_GNOME= gnometarget gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libnet-prefix=${LOCALBASE}
+
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
post-patch:
- @${REINPLACE_CMD} -e 's|-Wall -O2|$${CFLAGS}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|-Wall -O2|$${CFLAGS}|g; \
+ s|libnet-config|${LIBNET_CONFIG}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's|-Wall -O2|@CFLAGS@|g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local/share|${PREFIX}/share|g ; \
s|/usr/share|${X11BASE}/share|g' ${WRKSRC}/gtk.c
diff --git a/net/gspoof/files/patch-configure b/net/gspoof/files/patch-configure
new file mode 100644
index 000000000000..9721ae803bb6
--- /dev/null
+++ b/net/gspoof/files/patch-configure
@@ -0,0 +1,30 @@
+--- ./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!
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index 4ef7cabdbe0e..dd445dff8fb3 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -7,43 +7,48 @@
PORTNAME= libnet
PORTVERSION= 1.1.3.r1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.packetfactory.net/libnet/dist/
-PKGNAMESUFFIX= -devel
+PKGNAMESUFFIX= ${SHORT_VER}-devel
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r1$//}-RC-01
MAINTAINER= ports@FreeBSD.org
COMMENT= A C library for creating IP packets (development version)
-CONFLICTS= libnet*-1.*
-
-DEPRECATED= distfile and homepage disappeared
-EXPIRATION_DATE= 2007-01-04
-
+USE_LDCONFIG= yes
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}${SHORT_VER}
+EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${SHORT_VER}
DOCS= README doc/BUGS doc/CHANGELOG doc/CONTRIB doc/COPYING \
doc/DESIGN_NOTES doc/MIGRATION doc/PACKET_BUILDING doc/PORTED \
doc/RAWSOCKET_NON_SEQUITUR doc/TODO
EXAMPLES= sample/*.c
+SHORT_VER= 113
+
.include <bsd.port.pre.mk>
post-patch:
.if ${OSVERSION} < 500000
- ${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|g" \
+ ${REINPLACE_CMD} -e "s|stdint\.h|inttypes.h|g" \
${WRKSRC}/include/libnet/libnet-types.h
.else
${DO_NADA}
.endif
post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/libnet-config ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/libnet-config \
+ ${PREFIX}/bin/libnet${SHORT_VER}-config
@${MKDIR} ${EXAMPLESDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+ @cd ${PREFIX}/lib && \
+ ${LN} -sf libnet${SHORT_VER}/libnet.so libnet-1.1.3.so.1 && \
+ ${LN} -sf libnet-1.1.3.so.1 libnet-1.1.3.so
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
diff --git a/net/libnet-devel/files/patch-Makefile.in b/net/libnet-devel/files/patch-Makefile.in
new file mode 100644
index 000000000000..59863e03e93c
--- /dev/null
+++ b/net/libnet-devel/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- ./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:
diff --git a/net/libnet-devel/files/patch-include__Makefile.in b/net/libnet-devel/files/patch-include__Makefile.in
new file mode 100644
index 000000000000..e427c836bb55
--- /dev/null
+++ b/net/libnet-devel/files/patch-include__Makefile.in
@@ -0,0 +1,11 @@
+--- ./include/Makefile.in.orig Thu Dec 2 21:27:37 2004
++++ ./include/Makefile.in Sat Sep 30 21:22:18 2006
+@@ -171,7 +171,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+-includedir = @includedir@
++includedir = @includedir@/libnet113
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
diff --git a/net/libnet-devel/files/patch-include__libnet__Makefile.in b/net/libnet-devel/files/patch-include__libnet__Makefile.in
new file mode 100644
index 000000000000..aa25fbe63ea8
--- /dev/null
+++ b/net/libnet-devel/files/patch-include__libnet__Makefile.in
@@ -0,0 +1,11 @@
+--- ./include/libnet/Makefile.in.orig Thu Dec 2 21:27:37 2004
++++ ./include/libnet/Makefile.in Sat Sep 30 21:23:15 2006
+@@ -163,7 +163,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+-includedir = @includedir@
++includedir = @includedir@/libnet113
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
diff --git a/net/libnet-devel/files/patch-libnet-config.in b/net/libnet-devel/files/patch-libnet-config.in
new file mode 100644
index 000000000000..5e99ee54fa5a
--- /dev/null
+++ b/net/libnet-devel/files/patch-libnet-config.in
@@ -0,0 +1,13 @@
+--- ./libnet-config.in.orig Sat Jan 3 17:31:00 2004
++++ ./libnet-config.in Sat Sep 30 21:20:02 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/libnet113"
++libnet_libs="@LIBNET_CONFIG_LIBS@ -L@prefix@/lib/libnet113 -lnet"
+
+ usage()
+ {
diff --git a/net/libnet-devel/files/patch-src__Makefile.in b/net/libnet-devel/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..e7032b79c724
--- /dev/null
+++ b/net/libnet-devel/files/patch-src__Makefile.in
@@ -0,0 +1,20 @@
+--- ./src/Makefile.in.orig Thu Dec 2 21:27:39 2004
++++ ./src/Makefile.in Sat Sep 30 22:47:10 2006
+@@ -205,7 +205,7 @@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = @libdir@/libnet113
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+@@ -273,7 +273,7 @@
+ libnet_write.c
+
+ libnet_la_LIBADD = @LTLIBOBJS@
+-libnet_la_LDFLAGS = -version-info 1:3:1 -Wl
++libnet_la_LDFLAGS = -version-info 1:3:1 -Wl -soname=libnet-1.1.3.so.1
+ all: all-am
+
+ .SUFFIXES:
diff --git a/net/libnet-devel/pkg-plist b/net/libnet-devel/pkg-plist
index 6fb0e60ec242..4fae456a596a 100644
--- a/net/libnet-devel/pkg-plist
+++ b/net/libnet-devel/pkg-plist
@@ -1,15 +1,17 @@
-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.la
-lib/libnet.so
-lib/libnet.so.1
+bin/libnet113-config
+include/libnet113/libnet.h
+include/libnet113/libnet/libnet-asn1.h
+include/libnet113/libnet/libnet-functions.h
+include/libnet113/libnet/libnet-headers.h
+include/libnet113/libnet/libnet-macros.h
+include/libnet113/libnet/libnet-structures.h
+include/libnet113/libnet/libnet-types.h
+lib/libnet113/libnet.a
+lib/libnet113/libnet.la
+lib/libnet113/libnet.so
+lib/libnet113/libnet.so.1
+lib/libnet-1.1.3.so
+lib/libnet-1.1.3.so.1
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/CONTRIB
@@ -67,4 +69,6 @@ lib/libnet.so.1
%%EXAMPLESDIR%%/udp2.c
@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/libnet
+@dirrm lib/libnet113
+@dirrm include/libnet113/libnet
+@dirrm include/libnet113
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
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
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 76103a1eb6e7..7b63389a8c1a 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libnids
PORTVERSION= 1.21
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,19 +20,23 @@ OPTIONS= LIBNET "Include code requiring libnet" ON \
GLIB2 "Use GLIB2 for multiprocessing support" ON
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+MAN3= libnids.3
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_LIBNET)
.if !defined(WITHOUT_LIBNET10)
-BUILD_DEPENDS+= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
.else
-BUILD_DEPENDS+= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
.endif
.else
CONFIGURE_ARGS+= --disable-libnet
@@ -44,7 +48,11 @@ LIB_DEPENDS+= glib-2.0:${PORTSDIR}/devel/glib20
CONFIGURE_ARGS+= --disable-libglib
.endif
-MAN3= libnids.3
+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 ${PREFIX}/include
diff --git a/net/nast/Makefile b/net/nast/Makefile
index 23e1b799c308..9a384d2d86e1 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nast
PORTVERSION= 0.2.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://download.berlios.de/${PORTNAME}/ \
http://voodoo.bawue.com/download/
@@ -16,33 +16,27 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Nast is a packet sniffer
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
-
-LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet-config
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
MAN8= nast.8
GNU_CONFIGURE= yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}"
USE_GMAKE= yes
PLIST_FILES= bin/nast
-.include <bsd.port.pre.mk>
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} ""#######################################################
- @${ECHO_MSG} ""
- @${ECHO_MSG} "You need ${PORTSDIR}/net/libnet-devel to build this port
- @${ECHO_MSG} ""
- @${ECHO_MSG} ""#######################################################
- @${ECHO_MSG} ""
+.include <bsd.port.pre.mk>
post-patch:
- @${REINPLACE_CMD} -e 's|CFLAGS="-Wall -O2 -pthread"||g' \
- ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|CFLAGS="-Wall -O2 -pthread"||g; \
+ s|libnet-config|${LIBNET_CONFIG}|; \
+ s|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/net/nast/files/patch-configure b/net/nast/files/patch-configure
new file mode 100644
index 000000000000..a2fd431efbcb
--- /dev/null
+++ b/net/nast/files/patch-configure
@@ -0,0 +1,57 @@
+--- ./configure.orig Wed Sep 27 18:27:36 2006
++++ ./configure Wed Sep 27 19:04:20 2006
+@@ -2337,52 +2337,8 @@
+ #
+
+ 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
+- filechk="yes" ; LDFLAGS="-L/usr/local/lib"; CPPFLAGS="-I/usr/local/include"
+-fi
+-
+-fi
++CPPFLAGS="`libnet-config --cflags`"
++LDFLAGS="`libnet-config --libs`"
+
+ if test "$filechk" = "no"; then { { echo "$as_me:$LINENO: error:
+
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 30d67a8cda47..b34ccf3cf42e 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nemesis
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= molter@tin.it
COMMENT= Command-line network packet creation and injection suite
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libnet-includes="${LOCALBASE}/include" \
@@ -27,4 +27,10 @@ MAN1= nemesis-arp.1 nemesis-dns.1 nemesis-ethernet.1 nemesis-icmp.1 \
nemesis-tcp.1 nemesis-udp.1 nemesis.1
PLIST_FILES= bin/nemesis
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.mk>
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index 7fabc2e24f94..fc755928fd24 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -7,6 +7,7 @@
PORTNAME= netwib
PORTVERSION= 5.35.0
+PORTREVISION= 1
CATEGORIES= net devel ipv6
MASTER_SITES= http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
http://membres.lycos.fr/lauconstantin/common/netw/netwib/download/v5/ \
@@ -16,7 +17,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_htm
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Netwib network programming library
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
@@ -32,10 +33,20 @@ MAN3+= netwib${SHORTPORTVERSION}.3 netwib${SHORTPORTVERSION}_dat.3 \
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} \
-e 's|%%PREFIX%%|${PREFIX}|' \
-e 's|%%CFLAGS%%|${CFLAGS}|' \
+ -e 's|gcc|${CC}|' \
${WRKSRC}/config.dat
(cd ${WRKSRC} ; ${SH} ${WRKSRC}/genemake )
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index c9498089b520..b482f9ebeeda 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libnet
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pylibnet
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Python module for the libnet packet construction library
BUILD_DEPENDS= ${LOCALBASE}/bin/swig1.1:${PORTSDIR}/devel/swig11 \
- libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+ ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/src
@@ -27,13 +27,15 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKE_ARGS= SWIG=${LOCALBASE}/bin/swig1.1 \
LIBNET_INCLUDES=-I${LOCALBASE}/include \
PYTHON_INCLUDES=-I${PYTHON_INCLUDEDIR} \
- CFLAGS="${CFLAGS} `libnet-config --defines` -fPIC" \
- LIBNET_LIB=${LOCALBASE}/lib/libnet.a \
+ CFLAGS="${CFLAGS} `${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --cflags` -fPIC" \
+ LIBNET_LIB="`${LIBNET_CONFIG} --libs`" \
CC=${CC}
PLIST_FILES= lib/%%PYTHON_VERSION%%/site-packages/libnet.py \
lib/%%PYTHON_VERSION%%/site-packages/libnetcmodule.so
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
diff --git a/net/pynids/Makefile b/net/pynids/Makefile
index 84ff78016213..8d4f8b27060c 100644
--- a/net/pynids/Makefile
+++ b/net/pynids/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pynids
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net python
MASTER_SITES= http://pilcrow.madison.wi.us/pynids/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,8 @@ DIST_SUBDIR= python
MAINTAINER= corsmith@gmail.com
COMMENT= Python interface to libnids
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+PATCH_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS:= ${PATCH_DEPENDS}
USE_PYTHON= yes
USE_PYDISTUTILS= yes
@@ -27,10 +28,31 @@ CFLAGS+= -fPIC
PLIST_FILES= %%PYTHON_SITELIBDIR%%/nidsmodule.so
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-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} xf libnids-1.19.tar
+
post-patch:
${CP} -f ${TEMPLATES}/config.guess ${WRKSRC}
${CHMOD} a+rx ${WRKSRC}/config.guess
${CP} -f ${TEMPLATES}/config.sub ${WRKSRC}
${CHMOD} a+rx ${WRKSRC}/config.sub
-
-.include <bsd.port.mk>
+ @${REINPLACE_CMD} -e \
+ 's|/usr/local/include|${LIBNET_CFLAGS:S/-I//}|; \
+ s|/usr/local/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}"|; \
+ s|gcc|${CC}|' \
+ ${WRKSRC}/libnids-1.19/configure
+
+.include <bsd.port.post.mk>
diff --git a/net/pynids/files/patch-setup.py b/net/pynids/files/patch-setup.py
index e8db653b4cce..c72e1e256e8f 100644
--- a/net/pynids/files/patch-setup.py
+++ b/net/pynids/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig Tue Feb 1 06:50:11 2005
-+++ setup.py Sun Aug 7 00:08:43 2005
+--- ./setup.py.orig Tue Feb 1 02:50:11 2005
++++ ./setup.py Sat Sep 30 17:49:08 2006
@@ -9,7 +9,7 @@
from distutils.core import setup, Extension
from distutils.command.build import build # nidsMaker
@@ -9,10 +9,19 @@
pathjoin = os.path.join
-@@ -38,6 +38,8 @@
+@@ -32,12 +32,15 @@
+ def buildNids(self):
+ # extremely crude package builder
+ try:
+- os.stat(self.NIDSDIR)
++ os.stat(self.NIDSDIR + '/.done')
+ return None # assume already built
+ except OSError:
pass
- spawn(['tar', '-xf', self.NIDSTAR], search_path = 1)
+- spawn(['tar', '-xf', self.NIDSTAR], search_path = 1)
++ spawn(['touch', self.NIDSDIR + '/.done'], search_path = 1)
++
+ shutil.copyfile("config.guess",pathjoin(self.NIDSDIR,"config.guess"))
+ shutil.copyfile("config.sub",pathjoin(self.NIDSDIR,"config.sub"))
os.chdir(self.NIDSDIR)
diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile
index b1aa9cd585d3..85a40f770c37 100644
--- a/net/tcptraceroute-devel/Makefile
+++ b/net/tcptraceroute-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tcptraceroute
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ \
http://sunpoet.net/distfiles/
@@ -15,10 +15,16 @@ MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ \
MAINTAINER= sunpoet@sunpoet.net
COMMENT= A traceroute implementation using TCP packets
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
MAN8= tcptraceroute.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
+ ${WRKSRC}/${MAKEFILE}
+
post-install:
@${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute
diff --git a/net/tcptraceroute-devel/files/patch-Makefile b/net/tcptraceroute-devel/files/patch-Makefile
index 6564b05352a2..f137ff657f9d 100644
--- a/net/tcptraceroute-devel/files/patch-Makefile
+++ b/net/tcptraceroute-devel/files/patch-Makefile
@@ -9,8 +9,8 @@
-DESTDIR=/usr/local/bin
+CC?= cc
+CFLAGS?= -O -pipe -Wall
-+LNETINC= -I${LOCALBASE}/include
-+LNETLIB= -L${LOCALBASE}/lib
++LNETINC= `libnet-config --cflags`
++LNETLIB= `libnet-config --libs`
+
+BINDIR= ${PREFIX}/sbin
+MANDIR= ${PREFIX}/man
@@ -22,7 +22,7 @@
+ $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \
-o tcptraceroute tcptraceroute.c \
- `libnet-config --libs` -lpcap
-+ $(LNETLIB) `libnet-config --libs` -lpcap
++ $(LNETLIB) -lpcap
static:
$(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static"
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index b1aa9cd585d3..85a40f770c37 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tcptraceroute
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ \
http://sunpoet.net/distfiles/
@@ -15,10 +15,16 @@ MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ \
MAINTAINER= sunpoet@sunpoet.net
COMMENT= A traceroute implementation using TCP packets
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
MAN8= tcptraceroute.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|' \
+ ${WRKSRC}/${MAKEFILE}
+
post-install:
@${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute
diff --git a/net/tcptraceroute/files/patch-Makefile b/net/tcptraceroute/files/patch-Makefile
index 6564b05352a2..f137ff657f9d 100644
--- a/net/tcptraceroute/files/patch-Makefile
+++ b/net/tcptraceroute/files/patch-Makefile
@@ -9,8 +9,8 @@
-DESTDIR=/usr/local/bin
+CC?= cc
+CFLAGS?= -O -pipe -Wall
-+LNETINC= -I${LOCALBASE}/include
-+LNETLIB= -L${LOCALBASE}/lib
++LNETINC= `libnet-config --cflags`
++LNETLIB= `libnet-config --libs`
+
+BINDIR= ${PREFIX}/sbin
+MANDIR= ${PREFIX}/man
@@ -22,7 +22,7 @@
+ $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \
-o tcptraceroute tcptraceroute.c \
- `libnet-config --libs` -lpcap
-+ $(LNETLIB) `libnet-config --libs` -lpcap
++ $(LNETLIB) -lpcap
static:
$(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static"
diff --git a/net/ttlscan/Makefile b/net/ttlscan/Makefile
index 3b192bcc0744..19ce50d55220 100644
--- a/net/ttlscan/Makefile
+++ b/net/ttlscan/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ttlscan
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.wormulon.net/files/ttlscan/
@@ -16,13 +16,15 @@ MAINTAINER= mich@FreeBSD.org
COMMENT= A tcp based scanner, showing ttl responses
BUILD_DEPENDS= ${LOCALBASE}/include/dnet.h:${PORTSDIR}/net/libdnet \
- libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+ ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
LDFLAGS+= -lpcap -ldnet
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
do-build:
(cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -D_XOPEN_SOURCE \
- `libnet-config --defines` ${PORTNAME}.c -o ${PORTNAME} `libnet-config --libs` ${LDFLAGS})
+ `${LIBNET_CONFIG} --defines --cflags` ${PORTNAME}.c -o ${PORTNAME} `${LIBNET_CONFIG} --libs` ${LDFLAGS})
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/net/xboxproxy/Makefile b/net/xboxproxy/Makefile
index a93ef509d8cb..f85797679ec7 100644
--- a/net/xboxproxy/Makefile
+++ b/net/xboxproxy/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xboxproxy
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.csh.rit.edu/~psionic/projects/xboxproxy/
DISTNAME= proxy-${PORTVERSION}
@@ -14,13 +14,15 @@ DISTNAME= proxy-${PORTVERSION}
MAINTAINER= ports@mawer.org
COMMENT= A proxy for the XBox system link protocol
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=xbox
PLIST_FILES= bin/xboxproxy
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
@@ -28,4 +30,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
CONFIGURE_ARGS+= --with-pcap=${LOCALBASE}
.endif
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|libnet-config|${LIBNET_CONFIG}|g; \
+ s|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.include <bsd.port.post.mk>
diff --git a/net/xboxproxy/files/patch-configure b/net/xboxproxy/files/patch-configure
new file mode 100644
index 000000000000..709d3a1753e6
--- /dev/null
+++ b/net/xboxproxy/files/patch-configure
@@ -0,0 +1,32 @@
+--- ./configure.orig Thu Oct 6 23:51:26 2005
++++ ./configure Wed Sep 27 17:29:04 2006
+@@ -2867,7 +2867,7 @@
+
+ # Checks for libraries.
+ LIBNET_LDFLAGS="`libnet-config --libs`"
+-LIBNET_CFLAGS="`libnet-config --defines` -D__GLIBC__"
++LIBNET_CFLAGS="`libnet-config --defines` `libnet-config --cflags` -D__GLIBC__"
+
+ # Checks for header files.
+
+@@ -5111,19 +5111,7 @@
+ as_ac_File=`echo "ac_cv_file_${dirname}/lib/libnet.a" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for ${dirname}/lib/libnet.a" >&5
+ echo $ECHO_N "checking for ${dirname}/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 "${dirname}/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
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 1781c589fe59..057eb15bf772 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xipdump
PORTVERSION= 1.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.lse.epita.fr/twiki/pub/Projects/XipDump/
EXTRACT_SUFX= .tgz
@@ -15,20 +15,20 @@ EXTRACT_SUFX= .tgz
MAINTAINER= umeno@rr.iij4u.or.jp
COMMENT= Displays ip packets using X window
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
USE_X_PREFIX= yes
-LIBNET_CONFIG= ${LOCALBASE}/bin/libnet-config
-CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines`
-CFLAGS+= -I${LOCALBASE}/include
-LIBS= `${LIBNET_CONFIG} --libs`
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${LIBS}"
+CONFIGURE_ENV= LDFLAGS="`${LIBNET_CONFIG} --libs`"
+CFLAGS+= `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` \
+ -I/usr/include
PLIST= ${WRKDIR}/PLIST
MAN8= xipdump.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
post-build:
@${CP} ${PKGDIR}/pkg-plist ${PLIST}
@(cd ${WRKSRC}/data; ${FIND} pkc pkt ! -type d | \
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index f1aec322ad1c..4ad97b3de80f 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -7,31 +7,60 @@
PORTNAME= dsniff
PORTVERSION= 2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://naughty.monkey.org/~dugsong/dsniff/
MAINTAINER= ports@FreeBSD.org
COMMENT= Various sniffing utilities for penetration testing
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 \
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10 \
${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
-BROKEN= Depends on incompatible versions of libnet
-
GNU_CONFIGURE= yes
+WANT_GNOME= yes
+
+OPTIONS= X11 "Enable X11 support" on
+
+MAN8= arpspoof.8 dsniff.8 macof.8 mailsnarf.8 tcpkill.8 \
+ tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
+ sshmitm.8 webmitm.8
-MAN8= arpspoof.8 dsniff.8 macof.8 mailsnarf.8 tcpkill.8 \
- tcpnice.8 urlsnarf.8 filesnarf.8 dnsspoof.8 msgsnarf.8 \
- sshmitm.8 webmitm.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+.include <bsd.port.pre.mk>
+
+# If net/libnids has been compiled with the GLIB2 option then this port needs
+# the corresponding library and additional linker flags.
+.if exists(${LOCALBASE}/lib/libnids.a)
+LIBNIDS_GLIB2!= nm -u ${LOCALBASE}/lib/libnids.a | ${GREP} g_thread_init
+.endif
+
+.if !empty(LIBNIDS_GLIB2)
+USE_GNOME+= glib20
+.endif
.if !defined(WITHOUT_X11)
USE_XLIB= yes
PLIST_SUB+= X11=''
-MAN8+= webspy.8
+MAN8+= webspy.8
.else
-CONFIGURE_ARGS+= --without-x
+CONFIGURE_ARGS+=--without-x
PLIST_SUB+= X11='@comment '
.endif
-.include <bsd.port.mk>
+post-patch:
+ @${REINPLACE_CMD} -Ee \
+ 's|libnet-config|${LIBNET_CONFIG:T}|; \
+ s|test -f \$${prefix}/include/libnet.h|${TRUE}|; \
+ s|(LNETINC=).*|\1"`${LIBNET_CONFIG} --cflags`"|; \
+ s|(LNETLIB=).*|\1"`${LIBNET_CONFIG} --libs`"|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+.if !empty(LIBNIDS_GLIB2)
+pre-configure:
+ @${REINPLACE_CMD} -e 's|@NIDSLIB@|& `pkg-config --libs gthread-2.0`|' \
+ ${WRKSRC}/Makefile.in
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/dsniff/files/patch-aa b/security/dsniff/files/patch-aa
deleted file mode 100644
index a992259189b1..000000000000
--- a/security/dsniff/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Fri Dec 22 16:30:32 2000
-+++ Makefile.in Fri Dec 22 16:30:50 2000
-@@ -37,7 +37,7 @@
- X11INC = @X_CFLAGS@
- X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
-
--INCS = -I. $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
-+INCS = -I. -I/usr/include $(NIDSINC) $(PCAPINC) $(LNETINC) $(DBINC) $(SSLINC) $(X11INC) \
- -I$(srcdir)/missing
- LIBS = @LIBS@ -L$(srcdir) -lmissing
-
diff --git a/security/dsniff/files/patch-pcaputil.c b/security/dsniff/files/patch-pcaputil.c
new file mode 100644
index 000000000000..c8cc52011716
--- /dev/null
+++ b/security/dsniff/files/patch-pcaputil.c
@@ -0,0 +1,14 @@
+--- ./pcaputil.c.orig Tue Nov 14 12:51:08 2000
++++ ./pcaputil.c Mon Sep 25 16:26:13 2006
+@@ -13,9 +13,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <err.h>
+-#include <pcap.h>
++#include </usr/include/pcap.h>
+ #ifdef BSD
+-#include <pcap-int.h>
++#include </usr/include/pcap-int.h>
+ #endif
+ #include "pcaputil.h"
+
diff --git a/security/fiked/Makefile b/security/fiked/Makefile
index 7e992dbe0892..fb6c8b874c5e 100644
--- a/security/fiked/Makefile
+++ b/security/fiked/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fiked
PORTVERSION= 0.0.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://dragon.roe.ch/bitsnpieces/fiked/ \
http://home.tiscalinet.ch/roe/fiked/
@@ -16,7 +17,7 @@ COMMENT= A fake IKE PSK+XAUTH daemon based on VPNC
LIB_DEPENDS= gcrypt.13:${PORTSDIR}/security/libgcrypt
.if !defined(WITHOUT_LIBNET)
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
.endif
USE_BZIP2= yes
@@ -29,8 +30,14 @@ PLIST_FILES= bin/fiked
MAN1= fiked.1
PORTDOCS= README NEWS
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
post-patch:
- @${REINPLACE_CMD} -e 's|=-g|=|' ${WRKSRC}/${MAKEFILE}
+ @${REINPLACE_CMD} -e \
+ 's|=-g|=|; \
+ s|-lnet|`${LIBNET_CONFIG} --libs`|; \
+ s|-DWITH_LIBNET|& `${LIBNET_CONFIG} --cflags`|' \
+ ${WRKSRC}/${MAKEFILE}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/fiked ${PREFIX}/bin
diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile
index dd8e73049871..b94440e40952 100644
--- a/security/firewalk/Makefile
+++ b/security/firewalk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= firewalk
PORTVERSION= 5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= http://www.packetfactory.net/firewalk/dist/
EXTRACT_SUFX= .tgz
@@ -16,16 +16,22 @@ MAINTAINER= onatan@gmail.com
COMMENT= A remote firewall auditing tool
BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet \
- libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+ ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/Firewalk
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include `${LIBNET_CONFIG} --cflags`" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN8= firewalk.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/firewalk ${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${MANPREFIX}/man/man8/
diff --git a/security/ipguard/Makefile b/security/ipguard/Makefile
index a5a20b028af9..e2651af0175e 100644
--- a/security/ipguard/Makefile
+++ b/security/ipguard/Makefile
@@ -7,14 +7,14 @@
PORTNAME= ipguard
PORTVERSION= 0.04
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security net
MASTER_SITES= http://ipguard.deep.perm.ru/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool designed to protect LAN IP adress space by ARP spoofing
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
MAN8= ipguard.8
@@ -24,7 +24,14 @@ MAKE_ARGS+= ETHERS=${ETHERS}
SUB_FILES= pkg-message
SUB_LIST= ETHERS=${ETHERS}
-PKGMESSAGE= ${WRKDIR}/pkg-message
+
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -Ee \
+ 's|libnet-config|${LIBNET_CONFIG}|; \
+ s|^(INCLUDES=).*|\1`${LIBNET_CONFIG} --cflags`|' \
+ ${WRKSRC}/${MAKEFILE}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ipguard ${PREFIX}/sbin
diff --git a/security/labrea/Makefile b/security/labrea/Makefile
index 883d3e05dab7..3084e9dd2ffe 100644
--- a/security/labrea/Makefile
+++ b/security/labrea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= LaBrea
PORTVERSION= 2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://freebsd.rogness.net/ports/labrea/
DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/g}
@@ -16,7 +16,15 @@ EXTRACT_SUFX= .tgz
MAINTAINER= nick@rogness.net
COMMENT= Security tarpit defense tool
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
+
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|libnet-config|${LIBNET_CONFIG}|; \
+ s|--defines|& --cflags|' \
+ ${WRKSRC}/${MAKEFILE}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/LaBrea ${PREFIX}/bin
diff --git a/security/sasp/Makefile b/security/sasp/Makefile
index ebe373c6e3bc..09496e5b92a3 100644
--- a/security/sasp/Makefile
+++ b/security/sasp/Makefile
@@ -16,9 +16,12 @@ MASTER_SITE_SUBDIR= ahze
MAINTAINER= sviat@OpenGEEKS.it
COMMENT= A tool that permits to use a gateway whatever IP we have
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
NO_WRKSUBDIR= yes
+MAKE_ENV= LIBNET_CONFIG="${LIBNET_CONFIG}"
PLIST_FILES= sbin/sasp
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
.include <bsd.port.mk>
diff --git a/security/sasp/files/patch-Makefile b/security/sasp/files/patch-Makefile
new file mode 100644
index 000000000000..7ec25d4b7c98
--- /dev/null
+++ b/security/sasp/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- ./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 ${PREFIX}/sbin
+ clean:
+ rm -rf *.o
diff --git a/security/snort/Makefile b/security/snort/Makefile
index d4082231fab8..46bd022e9671 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -49,6 +49,19 @@ DOCS= RELEASE.NOTES doc/AUTHORS doc/BUGS doc/CREDITS \
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-sf_snort_plugin_api.h
.endif
+.if defined(WITH_FLEXRESP)
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+.elif defined(WITH_FLEXRESP2)
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+.endif
+
+.if exists(${LIBNET_CONFIG})
+LIBNET_CFLAGS!= ${LIBNET_CONFIG} --cflags
+LIBNET_LIBS!= ${LIBNET_CONFIG} --libs
+LIBNET_INCDIR= ${LIBNET_CFLAGS:M-I*:S/-I//}
+LIBNET_LIBDIR= ${LIBNET_CFLAGS:M-L*:S/-L//}
+.endif
+
.if !defined(WITHOUT_DYNAMIC)
USE_AUTOTOOLS= libtool:15
USE_LDCONFIG= yes
@@ -62,21 +75,21 @@ PLIST_SUB+= DYNAMIC="@comment "
.if defined(WITH_FLEXRESP2)
IGNORE= options FLEXRESP and FLEXRESP2 are mutually exclusive
.endif
-BUILD_DEPENDS+= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
CONFIGURE_ARGS+= --enable-flexresp \
- --with-libnet-includes=${LOCALBASE}/include \
- --with-libnet-libraries=${LOCALBASE}/lib
+ --with-libnet-includes=${LIBNET_INCDIR} \
+ --with-libnet-libraries=${LIBNET_LIBDIR}
.endif
.if defined(WITH_FLEXRESP2)
BROKEN= FLEXRESP2 patch file does not incorporate cleanly
PATCH_SITES+= http://cerberus.sourcefire.com/~jeff/archives/snort/sp_respond2/
PATCHFILES+= sp_respond2.diff.gz
-BUILD_DEPENDS+= libnet*>=1.1.2.1,1:${PORTSDIR}/net/libnet \
+BUILD_DEPENDS+= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
libdnet*>=1.10_1:${PORTSDIR}/net/libdnet
CONFIGURE_ARGS+= --enable-flexresp2 \
- --with-libnet-includes=${LOCALBASE}/include \
- --with-libnet-libraries=${LOCALBASE}/lib
+ --with-libnet-includes=${LIBNET_INCDIR} \
+ --with-libnet-libraries=${LIBNET_LIBDIR}
.endif
.if defined(WITH_MYSQL)
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
diff --git a/security/vida/Makefile b/security/vida/Makefile
index 3e8635cd9308..059fa7514985 100644
--- a/security/vida/Makefile
+++ b/security/vida/Makefile
@@ -7,23 +7,25 @@
PORTNAME= vida
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://vidatapipe.sourceforge.net/
MAINTAINER= mich@FreeBSD.org
COMMENT= Vida is a multi-datapipe handler
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-LDFLAGS+= -pthread -lncurses -lpcap -lnet
+LDFLAGS+= ${PTHREAD_LIBS} -lncurses -lpcap `${LIBNET_CONFIG} --libs`
WRKSRC= ${WRKDIR}/${PORTNAME}
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
+
do-build:
cd ${WRKSRC} && \
- ${CC} -I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS} vida.c funz.c dnshijacking.c \
- ${LDFLAGS} `libnet-config --defines` -o ${PORTNAME}
+ ${CC} `${LIBNET_CONFIG} --defines --cflags` ${CFLAGS} \
+ vida.c funz.c dnshijacking.c ${LDFLAGS} -o ${PORTNAME}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/security/yersinia/Makefile b/security/yersinia/Makefile
index 70db8301fe6f..d053c67a531e 100644
--- a/security/yersinia/Makefile
+++ b/security/yersinia/Makefile
@@ -7,14 +7,14 @@
PORTNAME= yersinia
PORTVERSION= 0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.yersinia.net/download/
MAINTAINER= se@FreeBSD.org
COMMENT= Layer 2 vulnerability scanner (switches, spanning tree, 802.1q ...)
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
.if !defined(WITHOUT_GTK)
.if exists(${LOCALBASE}/include/gtk-2.0/gtk/gtk.h)
@@ -30,6 +30,9 @@ 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
.include <bsd.port.pre.mk>
@@ -41,6 +44,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
MAN8= yersinia.8
PLIST_FILES= sbin/yersinia
+post-patch:
+ @${REINPLACE_CMD} -e 's|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${WRKSRC}/src/Makefile.in
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/yersinia ${PREFIX}/sbin/
${INSTALL_MAN} ${WRKSRC}/yersinia.8 ${PREFIX}/man/man8/
diff --git a/security/yersinia/files/patch-configure b/security/yersinia/files/patch-configure
index 4ac604b2c151..7f22632cd561 100644
--- a/security/yersinia/files/patch-configure
+++ b/security/yersinia/files/patch-configure
@@ -1,5 +1,5 @@
---- configure~ Sun Jun 18 17:24:36 2006
-+++ configure Mon Jul 10 17:43:09 2006
+--- ./configure.orig Sun Jun 18 12:24:36 2006
++++ ./configure Fri Sep 29 15:04:21 2006
@@ -2971,7 +2971,8 @@
@@ -19,3 +19,77 @@
else
pcap_dir="$dir"
fi
+@@ -3997,62 +3998,8 @@
+
+
+
+-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 or --without-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"
+@@ -4067,7 +4014,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
diff --git a/security/zombiezapper/Makefile b/security/zombiezapper/Makefile
index f0fac0011c24..d60ef13982fb 100644
--- a/security/zombiezapper/Makefile
+++ b/security/zombiezapper/Makefile
@@ -7,7 +7,7 @@
PORTNAME= zombiezapper
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://razor.bindview.com/tools/files/
DISTNAME= zombie-${PORTVERSION}
@@ -16,13 +16,13 @@ EXTRACT_SUFX= .tgz
MAINTAINER= roam@FreeBSD.org
COMMENT= Send a terminate command to Trinoo/TFN/Stacheldracht DDoS agents
-BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10/
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-LIBNETCONF= ${LOCALBASE}/bin/libnet-config
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet10-config
do-build:
cd ${WRKSRC} && \
- ${CC} ${CFLAGS} -o zz zz.c `${LIBNETCONF} --cflags` `${LIBNETCONF} --defines` `${LIBNETCONF} --libs` -L${LOCALBASE}/lib -I${LOCALBASE}/include
+ ${CC} ${CFLAGS} -o zz zz.c `${LIBNET_CONFIG} --cflags` `${LIBNET_CONFIG} --defines` `${LIBNET_CONFIG} --libs`
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/zz ${PREFIX}/bin/
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 06fbbeb4ad1a..70b130adf47c 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -7,14 +7,14 @@
PORTNAME= heartbeat
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://linux-ha.org/download/
MAINTAINER= scott-ports@tummy.com
COMMENT= Subsystem for High-Availability Clustering
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \
xml2.5:${PORTSDIR}/textproc/libxml2
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-fatal-warnings \
--with-initdir=${PREFIX}/etc/rc.d \
--localstatedir=/var \
--with-group-id=275 --with-ccmuser-id=275
+CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --cflags`"
SUB_FILES= pkg-install
PKGDEINSTALL= ${PKGINSTALL}
@@ -36,6 +37,8 @@ MAN1= cl_status.1 hb_standby.1 hb_takeover.1
MAN8= apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \
stonith.8 supervise-ldirectord-config.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
@@ -47,6 +50,11 @@ post-patch:
${WRKSRC}/heartbeat/Makefile.in \
${WRKSRC}/ldirectord/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|libnet-config|${LIBNET_CONFIG}|; \
+ s|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.if ${OSVERSION} < 500000
@${REINPLACE_CMD} -e 's|<sys/\(resource.h\)>|"\1"|' \
${WRKSRC}/lib/clplumbing/coredumps.c
diff --git a/sysutils/heartbeat2/Makefile b/sysutils/heartbeat2/Makefile
index 06fbbeb4ad1a..70b130adf47c 100644
--- a/sysutils/heartbeat2/Makefile
+++ b/sysutils/heartbeat2/Makefile
@@ -7,14 +7,14 @@
PORTNAME= heartbeat
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://linux-ha.org/download/
MAINTAINER= scott-ports@tummy.com
COMMENT= Subsystem for High-Availability Clustering
-BUILD_DEPENDS= libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \
xml2.5:${PORTSDIR}/textproc/libxml2
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-fatal-warnings \
--with-initdir=${PREFIX}/etc/rc.d \
--localstatedir=/var \
--with-group-id=275 --with-ccmuser-id=275
+CONFIGURE_ENV= CPPFLAGS="`${LIBNET_CONFIG} --cflags`"
SUB_FILES= pkg-install
PKGDEINSTALL= ${PKGINSTALL}
@@ -36,6 +37,8 @@ MAN1= cl_status.1 hb_standby.1 hb_takeover.1
MAN8= apphbd.8 heartbeat.8 ldirectord.8 meatclient.8 \
stonith.8 supervise-ldirectord-config.8
+LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
@@ -47,6 +50,11 @@ post-patch:
${WRKSRC}/heartbeat/Makefile.in \
${WRKSRC}/ldirectord/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|libnet-config|${LIBNET_CONFIG}|; \
+ s|-lnet|`${LIBNET_CONFIG} --libs`|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
.if ${OSVERSION} < 500000
@${REINPLACE_CMD} -e 's|<sys/\(resource.h\)>|"\1"|' \
${WRKSRC}/lib/clplumbing/coredumps.c