Disable threads.

3 files changed, 77 insertions, 9 deletions

diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 672be4a63e1..8531c46f4a6 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/12/31 22:31:51 kim Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/31 23:01:33 kim Exp $
 
 DISTNAME=		irrd2.2.3
 PKGNAME=		irrd-2.2.3
@@ -20,11 +20,11 @@ USE_PERL5=		# defined
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
-PTHREAD_AUTO_VARS=	yes
-PTHREAD_OPTS+=		require
+#PTHREAD_AUTO_VARS=	yes
+#PTHREAD_OPTS+=		require
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-thread
+CONFIGURE_ARGS+=	--disable-thread
 CONFIGURE_ENV+=		EGREP=${EGREP}
 CONFIGURE_ENV+=		YACC=${YACC}
 
@@ -67,5 +67,5 @@ post-install:
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.include "../../mk/pthread.buildlink3.mk"
+#.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index 74ca7a2e1bf..7fca5eab990 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/12/31 22:31:51 kim Exp $
+$NetBSD: distinfo,v 1.7 2004/12/31 23:01:33 kim Exp $
 
 SHA1 (irrd2.2.3.tgz) = 5f1ceb19c630146f5325d475bdf2e04eb5ef187c
 Size (irrd2.2.3.tgz) = 689216 bytes
-SHA1 (patch-aa) = 2a2b77842047d870e926cea86010adda7b4ad2af
+SHA1 (patch-aa) = 3059131bad8df2071ae64ea5e9d0c6f858a7ae2e
diff --git a/net/irrd/patches/patch-aa b/net/irrd/patches/patch-aa
index ab27090263e..6475d9d76e2 100644
--- a/net/irrd/patches/patch-aa
+++ b/net/irrd/patches/patch-aa
@@ -1,6 +1,56 @@
+$NetBSD: patch-aa,v 1.7 2004/12/31 23:01:33 kim Exp $
+
 --- configure.in.orig	2003-11-17 15:29:46.000000000 -0500
-+++ configure.in	2004-12-31 17:19:53.000000000 -0500
-@@ -120,7 +120,13 @@
++++ configure.in	2004-12-31 17:55:25.000000000 -0500
+@@ -10,27 +10,23 @@
+ dnl I've seen a report that pthread support is shaky in FreeBSD 2.x releases
+ case "${host_os}" in
+     freebsd2* )
+-	disable_thread=yes
++	enable_thread=no
+     ;;
+     solaris*|linux*|freebsd* )
+-	disable_thread=no
++	enable_thread=yes
+     ;;
+     * ) 
+-	disable_thread=yes
++	enable_thread=no
+     ;;
+ esac
+ 
+ AC_ARG_ENABLE(thread,
+ [  --disable-thread        disable thread always],
+-[disable_thread=yes],)
+-
+-AC_ARG_ENABLE(thread,
+-[  --enable-thread         enable thread (on non-solaris platform)],
+-[disable_thread=no],)
++)
+ 
+ AC_ARG_ENABLE(wall,
+ [  --disable-wall          disable -Wall option always],
+-[disable_wall=yes],)
++)
+ 
+ pwd=`pwd`
+ pwd=`basename $pwd`
+@@ -65,7 +61,7 @@
+ dnl fi
+ 
+ AC_MSG_CHECKING(for -Wall option)
+-if test "$disable_wall" = yes; then
++if test "$enable_wall" != yes; then
+    if test "$GCC" != "yes"; then
+ dnl shut up SUN WorkShop Compilers
+        CFLAGS="$CFLAGS -w"
+@@ -115,12 +111,18 @@
+         LIBS="$LIBS -lipc"
+     ;;
+     freebsd*|netbsd*|openbsd* )
+-        if test "$disable_thread" != yes; then
++        if test "$enable_thread" = yes; then
+ 		LDFLAGS="$LDFLAGS -pthread"
                  THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
          fi
  	CRYPT_LIB="-lcrypt"
@@ -15,3 +65,21 @@
      ;;
      linux* )
  	CRYPT_LIB="-lcrypt"
+@@ -129,7 +131,7 @@
+ 	if test $CC = "cc" ; then
+            CPPFLAGS="$CPPFLAGS -taso -pthread"
+         fi
+-        if test "$disable_thread" != yes; then
++        if test "$enable_thead" = yes; then
+ 		LDFLAGS="$LDFLAGS -lc_r"
+                 THREAD_CFLAGS="-D_THREAD_SAFE"
+ 	fi
+@@ -152,7 +154,7 @@
+ AC_SUBST(MAKEDEPCLEAN)
+ 
+ dnl Checks for pthread libraries. (linux has pthread.h only, so ...)
+-if test "$disable_thread" = yes; then
++if test "$enable_thread" != yes; then
+   AC_MSG_CHECKING(for thread support)
+   AC_MSG_RESULT(disabled)
+ else