[pkgsrc/trunk]: pkgsrc/net/ntop Optionally disable threading; work around for...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9dfdcda152ab
branches:  trunk
changeset: 490831:9dfdcda152ab
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Mar 21 12:42:45 2005 +0000

description:
Optionally disable threading; work around for PR#29323

diffstat:

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

diffs (53 lines):

diff -r c5da92932862 -r 9dfdcda152ab net/ntop/DESCR
--- a/net/ntop/DESCR    Mon Mar 21 12:42:40 2005 +0000
+++ b/net/ntop/DESCR    Mon Mar 21 12:42:45 2005 +0000
@@ -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 -r c5da92932862 -r 9dfdcda152ab net/ntop/Makefile
--- a/net/ntop/Makefile Mon Mar 21 12:42:40 2005 +0000
+++ b/net/ntop/Makefile Mon Mar 21 12:42:45 2005 +0000
@@ -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,9 +32,12 @@
 # ntop-3.x crashes with IPv6
 CONFIGURE_ARGS+=       --disable-ipv6
 
-PTHREAD_OPTS+=         require
+BUILDLINK_DEPENDS.libpcap+=    libpcap>=0.8.3
 
-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"
@@ -42,5 +45,4 @@
 .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"