From d78394063de3c31fb76f72ad4b9c425143aa4782 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Mon, 21 Mar 2005 12:42:45 +0000
Subject: Optionally disable threading; work around for PR#29323

---
 net/ntop/DESCR    |  8 ++++----
 net/ntop/Makefile | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'net')

diff --git a/net/ntop/DESCR b/net/ntop/DESCR
index 795945b59b2..846082c0668 100644
--- a/net/ntop/DESCR
+++ b/net/ntop/DESCR
@@ -1,15 +1,15 @@
 ntop is a network traffic probe that shows the network usage, similar to what
 the popular top Unix command does. ntop is based on libpcap and it has been
 written in a portable way in order to virtually run on every Unix platform and
-on Win32 as well. 
+on Win32 as well.
 
 ntop users can use a web browser (e.g. netscape) to navigate through ntop (that
 acts as a web server) traffic information and get a dump of the network status.
 In the latter case, ntop can be seen as a simple RMON-like agent with an
 embedded web interface.
 
-The use of: 
-- a web interface 
-- limited configuration and administration via the web interface 
+The use of:
+- a web interface
+- limited configuration and administration via the web interface
 - reduced CPU and memory usage (they vary according to network size and traffic)
 make ntop easy to use and suitable for monitoring various kind of networks.
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 2b7e6d62d11..7916cc84969 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/01/26 16:41:02 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/03/21 12:42:45 adam Exp $
 
 DISTNAME=	ntop-3.1
 PKGREVISION=	3
@@ -32,15 +32,17 @@ CONFIGURE_ARGS+=	--with-zlib-root=${BUILDLINK_PREFIX.zlib}
 # ntop-3.x crashes with IPv6
 CONFIGURE_ARGS+=	--disable-ipv6
 
-PTHREAD_OPTS+=		require
-
 BUILDLINK_DEPENDS.libpcap+=	libpcap>=0.8.3
 
+.include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+=	--disable-mt
+.endif
+
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../graphics/gdchart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/gdome2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3