svn commit: r411432 - in head: . Mk net net-mgmt/dhcp_probe net-mgmt/dhcp_probe/files net-mgmt/ettercap net-mgmt/isic net-mgmt/isic/files net-mgmt/packit net-mgmt/pixilate net/arp-sk net/arping net...
Tijl Coosemans
tijl at FreeBSD.org
Sun Mar 20 10:53:13 UTC 2016
Author: tijl
Date: Sun Mar 20 10:53:08 2016
New Revision: 411432
URL: https://svnweb.freebsd.org/changeset/ports/411432
Log:
Install net/libnet headers and libraries back in the location where other
ports expect it. The files were put in a different location to avoid a
conflict with net/libnet10 but this port has been removed a while ago now.
PR: 208122
Exp-run by: antoine
Approved by: portmgr (antoine)
Deleted:
head/net-mgmt/dhcp_probe/files/patch-Makefile.am
head/net/gspoof/files/
head/net/libnet/files/patch-Makefile.in
head/net/libnids-libnet11/
head/net/py-libnet/files/patch-setup.py
head/net/tcptraceroute-devel/files/
head/net/tcptraceroute/files/
head/security/dsniff/files/patch-configure.in
head/security/sasp/files/
Modified:
head/MOVED
head/Mk/bsd.port.mk
head/net-mgmt/dhcp_probe/Makefile
head/net-mgmt/ettercap/Makefile
head/net-mgmt/isic/Makefile
head/net-mgmt/isic/files/patch-isic.h
head/net-mgmt/packit/Makefile
head/net-mgmt/pixilate/Makefile
head/net/Makefile
head/net/arp-sk/Makefile
head/net/arping/Makefile
head/net/arprelease/Makefile
head/net/fonulator/Makefile
head/net/gspoof/Makefile
head/net/libfb/Makefile
head/net/libnet/Makefile
head/net/libnet/pkg-plist
head/net/libnids/Makefile
head/net/nast/Makefile
head/net/nast/files/patch-configure
head/net/netwib/Makefile
head/net/py-libnet/Makefile
head/net/pynids/Makefile
head/net/rtpbreak/Makefile
head/net/tcptraceroute-devel/Makefile
head/net/tcptraceroute/Makefile
head/net/vortex/Makefile
head/security/dsniff/Makefile
head/security/dsniff/files/patch-Makefile.in
head/security/firewalk/Makefile
head/security/ipguard/files/patch-Makefile
head/security/sasp/Makefile
head/security/scanlogd/Makefile
head/security/snort/Makefile
head/security/suricata/Makefile
head/security/unicornscan/Makefile
head/security/unicornscan/files/patch-libs__Makefile
head/security/unicornscan/files/patch-src-scan_progs-Makefile
head/security/unicornscan/files/patch-src__Makefile
head/security/unicornscan/files/patch-src__Makefile.inc
head/security/yersinia/Makefile
head/security/yersinia/files/patch-configure
head/sysutils/heartbeat/Makefile
head/sysutils/heartbeat/files/patch-configure.in
head/sysutils/syslog-ng-devel/Makefile
head/sysutils/syslog-ng/Makefile
head/sysutils/syslog-ng34/Makefile
head/sysutils/syslog-ng35/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Mar 20 10:07:29 2016 (r411431)
+++ head/MOVED Sun Mar 20 10:53:08 2016 (r411432)
@@ -8238,3 +8238,4 @@ devel/py-icu|devel/py-pyicu|2016-03-19|R
www/eaccelerator||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
devel/pecl-inclued||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
security/pecl-taint||2016-03-20|Has expired: cannot be installed: doesn't work with lang/php56 port (doesn't support PHP 5.5 5.6 70)
+net/libnids-libnet11|net/libnids|2016-03-20|Same content
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Sun Mar 20 10:07:29 2016 (r411431)
+++ head/Mk/bsd.port.mk Sun Mar 20 10:53:08 2016 (r411432)
@@ -1064,6 +1064,8 @@ LIB_DIRS?= /lib /usr/lib ${LOCALBASE}/l
STAGEDIR?= ${WRKDIR}/stage
NOTPHONY?=
MINIMAL_PKG_VERSION= 1.6.0
+LANG= C
+.export LANG
# make sure bmake treats -V as expected
.MAKE.EXPAND_VARIABLES= yes
@@ -1104,12 +1106,44 @@ STRIPBIN= ${STRIP_CMD}
.else
+# Look for files named "*.orig" under ${PATCH_WRKSRC} and (re-)generate
+# ${PATCHDIR}/patch-* files from them.
.if !target(makepatch)
makepatch:
- @${SETENV} WRKDIR=${WRKDIR} PATCHDIR=${PATCHDIR} \
- PATCH_WRKSRC=${PATCH_WRKSRC} \
- STRIP_COMPONENTS="${PATCH_STRIP:S/-p//}" \
- ${SH} ${SCRIPTSDIR}/smart_makepatch.sh
+ @${MKDIR} ${PATCHDIR}
+ @(cd ${PATCH_WRKSRC} && find -s * -type f -name '*.orig' | awk ' \
+ BEGIN { sep = "-" }; \
+ FILENAME == "-" { sub(/\.orig$$/, ""); list[n++] = $$0 }; \
+ FILENAME == "-" && index($$0, sep) { \
+ gsub(/-/, "_", sep) || gsub(/_/, "+", sep) || \
+ gsub(/\+/, "-", sep) && sep = sep "-" }; \
+ FILENAME != "-" && /^\+\+\+/ { \
+ sub(/^\.\//, "", $$2); patches[$$2] = FILENAME; \
+ if (index($$2, sep)) \
+ gsub(/-/, "_", sep) || gsub(/_/, "+", sep) || \
+ gsub(/\+/, "-", sep) && sep = sep "-" }; \
+ END { \
+ for (i in list) { \
+ p = list[i]; \
+ if (p in patches) system("${RM} " patches[p]); \
+ } \
+ for (i = 0; i < n; i++) { \
+ p = list[i]; \
+ if (p in patches) print p, patches[p]; \
+ else { \
+ gsub("/", sep, p); \
+ print list[i], "${PATCHDIR}/patch-" p; \
+ } \
+ } \
+ }' - `find -s ${PATCHDIR} -name 'patch-*'` | \
+ while read f p; do \
+ cmp -s $$f.orig $$f && continue; \
+ ${ECHO} ${DIFF} -udp $$f.orig $$f '>>' $$p; \
+ TZ=UTC ${DIFF} -udp $$f.orig $$f | ${SED} \
+ -e '/^---/s|\.[0-9]* +0000$$| UTC|' \
+ -e '/^+++/s|\([[:blank:]][-0-9:.+]*\)*$$||' \
+ >> $$p || ${TRUE}; \
+ done)
.endif
@@ -3215,6 +3249,14 @@ do-extract:
fi
.endif
+.if !target(extract-recursive)
+extract-recursive:
+ @${ECHO_MSG} "===> Extracting ${PKGNAME} and dependencies";
+ @for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
+ (cd $$dir; ${MAKE} extract); \
+ done
+.endif # extract-recursive
+
# Patch
.if !target(do-patch)
Modified: head/net-mgmt/dhcp_probe/Makefile
==============================================================================
--- head/net-mgmt/dhcp_probe/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net-mgmt/dhcp_probe/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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 at 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>
Modified: head/net-mgmt/ettercap/Makefile
==============================================================================
--- head/net-mgmt/ettercap/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net-mgmt/ettercap/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net-mgmt/isic/Makefile
==============================================================================
--- head/net-mgmt/isic/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net-mgmt/isic/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/net-mgmt/isic/files/patch-isic.h
==============================================================================
--- head/net-mgmt/isic/files/patch-isic.h Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net-mgmt/isic/files/patch-isic.h Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net-mgmt/packit/Makefile
==============================================================================
--- head/net-mgmt/packit/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net-mgmt/packit/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/net-mgmt/pixilate/Makefile
==============================================================================
--- head/net-mgmt/pixilate/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net-mgmt/pixilate/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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}
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -327,7 +327,6 @@
SUBDIR += libnetdude
SUBDIR += libnfs
SUBDIR += libnids
- SUBDIR += libnids-libnet11
SUBDIR += libnss-cache
SUBDIR += libnss-mysql
SUBDIR += liboauth
Modified: head/net/arp-sk/Makefile
==============================================================================
--- head/net/arp-sk/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/arp-sk/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net/arping/Makefile
==============================================================================
--- head/net/arping/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/arping/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net/arprelease/Makefile
==============================================================================
--- head/net/arprelease/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/arprelease/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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} && \
Modified: head/net/fonulator/Makefile
==============================================================================
--- head/net/fonulator/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/fonulator/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/net/gspoof/Makefile
==============================================================================
--- head/net/gspoof/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/gspoof/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net/libfb/Makefile
==============================================================================
--- head/net/libfb/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/libfb/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/net/libnet/Makefile
==============================================================================
--- head/net/libnet/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/libnet/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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 at 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 at prefix@/lib/${SHORT_NAME}|' \
- -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I at prefix@/include/${SHORT_NAME}|' \
+ -e 's|@LIBNET_CONFIG_LIBS@|@LIBNET_CONFIG_LIBS@ -L at prefix@/lib|' \
+ -e 's|@LIBNET_CONFIG_CFLAGS@|@LIBNET_CONFIG_CFLAGS@ -I at 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}/
Modified: head/net/libnet/pkg-plist
==============================================================================
--- head/net/libnet/pkg-plist Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/libnet/pkg-plist Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net/libnids/Makefile
==============================================================================
--- head/net/libnids/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/libnids/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net/nast/Makefile
==============================================================================
--- head/net/nast/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/nast/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/net/nast/files/patch-configure
==============================================================================
--- head/net/nast/files/patch-configure Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/nast/files/patch-configure Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
+
+ 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"
++ 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
+@@ -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"
--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
+@@ -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
-@@ -3045,8 +3001,8 @@ fi
+ fi
+@@ -3045,8 +3045,8 @@ fi
CFLAGS="-Wall -O2"
;;
Modified: head/net/netwib/Makefile
==============================================================================
--- head/net/netwib/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/netwib/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/net/py-libnet/Makefile
==============================================================================
--- head/net/py-libnet/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/py-libnet/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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} \
Modified: head/net/pynids/Makefile
==============================================================================
--- head/net/pynids/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/pynids/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -12,22 +12,12 @@ DIST_SUBDIR= python
MAINTAINER= corsmith at 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>
Modified: head/net/rtpbreak/Makefile
==============================================================================
--- head/net/rtpbreak/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/rtpbreak/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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}"
Modified: head/net/tcptraceroute-devel/Makefile
==============================================================================
--- head/net/tcptraceroute-devel/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/tcptraceroute-devel/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/net/tcptraceroute/Makefile
==============================================================================
--- head/net/tcptraceroute/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/tcptraceroute/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -19,6 +19,7 @@ OPTIONS_DEFINE= DOCS
PORTSCOUT= limit:^[0-9]
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-libnet=${LOCALBASE}
USES= gmake
PORTDOCS= *
Modified: head/net/vortex/Makefile
==============================================================================
--- head/net/vortex/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/net/vortex/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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:
Modified: head/security/dsniff/Makefile
==============================================================================
--- head/security/dsniff/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/dsniff/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/security/dsniff/files/patch-Makefile.in
==============================================================================
--- head/security/dsniff/files/patch-Makefile.in Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/dsniff/files/patch-Makefile.in Sun Mar 20 10:53:08 2016 (r411432)
@@ -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:
Modified: head/security/firewalk/Makefile
==============================================================================
--- head/security/firewalk/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/firewalk/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/security/ipguard/files/patch-Makefile
==============================================================================
--- head/security/ipguard/files/patch-Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/ipguard/files/patch-Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/security/sasp/Makefile
==============================================================================
--- head/security/sasp/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/sasp/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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>
Modified: head/security/scanlogd/Makefile
==============================================================================
--- head/security/scanlogd/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/scanlogd/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
Modified: head/security/snort/Makefile
==============================================================================
--- head/security/snort/Makefile Sun Mar 20 10:07:29 2016 (r411431)
+++ head/security/snort/Makefile Sun Mar 20 10:53:08 2016 (r411432)
@@ -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
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list