From f3899c9508e38d950064bc2fda55aeef562880d3 Mon Sep 17 00:00:00 2001
From: roam <roam@FreeBSD.org>
Date: Wed, 29 Oct 2003 14:13:08 +0000
Subject: Update to 1.18, for both security reasons (a vulnerability discovered
 by our very own rwatson@), and build fixes on -CURRENT.

Mostly submitted by:	krion
---
 net/libnids/Makefile                   | 31 +++++++++++++++++++------------
 net/libnids/distinfo                   |  2 +-
 net/libnids/files/patch-src::libnids.c | 12 ------------
 net/libnids/pkg-plist                  | 10 ++++++++++
 4 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 net/libnids/files/patch-src::libnids.c

(limited to 'net')

diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index e134ff12c723..c967466e1698 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -6,29 +6,36 @@
 #
 
 PORTNAME=	libnids
-PORTVERSION=	1.16
-PORTREVISION=	1
+PORTVERSION=	1.18
 CATEGORIES=	net security
-MASTER_SITES=	http://www.packetfactory.net/projects/libnids/dist/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	roam@FreeBSD.org
-COMMENT=	"Network monitoring library with TCP/IP reassembly"
+COMMENT=	Network monitoring library with TCP/IP reassembly
 
+.if defined(WITH_LIBNET_DEVEL)
+BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet-devel
+.else
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
+.endif
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN3=		libnids.3
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 		${INSTALL_DATA} ${WRKSRC}/src/nids.h ${PREFIX}/include
 		${INSTALL_DATA} ${WRKSRC}/src/libnids.a ${PREFIX}/lib
-		${INSTALL_DATA} ${WRKSRC}/src/libnids.3 ${PREFIX}/man/man3
+		${INSTALL_MAN} ${WRKSRC}/src/libnids.3 ${PREFIX}/man/man3
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in README doc/*
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}/
+.endfor
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/libnids/distinfo b/net/libnids/distinfo
index a10e765a4f55..c12210953927 100644
--- a/net/libnids/distinfo
+++ b/net/libnids/distinfo
@@ -1 +1 @@
-MD5 (libnids-1.16.tar.gz) = 95497093d0de330be12ddc658ad7decc
+MD5 (libnids-1.18.tar.gz) = 9ee6dcdfac97bae6fe611aa27d2594a5
diff --git a/net/libnids/files/patch-src::libnids.c b/net/libnids/files/patch-src::libnids.c
deleted file mode 100644
index 780e77d973c0..000000000000
--- a/net/libnids/files/patch-src::libnids.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/libnids.c.orig	Tue Oct  9 21:13:12 2001
-+++ src/libnids.c	Tue Oct  9 21:13:38 2001
-@@ -369,6 +369,9 @@
-       return 0;
-   }
-   switch ((linktype = pcap_datalink(desc))) {
-+  case DLT_NULL:
-+    linkoffset = 4;
-+    break;
-   case DLT_EN10MB:
-     linkoffset = 14;
-     break;
diff --git a/net/libnids/pkg-plist b/net/libnids/pkg-plist
index 529223a735f4..4aba9c55228b 100644
--- a/net/libnids/pkg-plist
+++ b/net/libnids/pkg-plist
@@ -1,2 +1,12 @@
 include/nids.h
 lib/libnids.a
+%%PORTDOCS%%%%DOCSDIR%%/API.html
+%%PORTDOCS%%%%DOCSDIR%%/API.txt
+%%PORTDOCS%%%%DOCSDIR%%/LINUX
+%%PORTDOCS%%%%DOCSDIR%%/NEW_LIBPCAP
+%%PORTDOCS%%%%DOCSDIR%%/PATCH
+%%PORTDOCS%%%%DOCSDIR%%/PERFORMANCE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TESTS
+%%PORTDOCS%%%%DOCSDIR%%/bugtraq_post
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit