 @@ -1,203 +1,259 @@
-$NetBSD: patch-aa,v 1.8 2010/02/23 20:37:06 spz Exp $
+$NetBSD: patch-aa,v 1.9 2011/10/17 20:14:50 spz Exp $
 --- configure.in.orig	2006-09-12 17:40:57.000000000 +0000
 +++ configure.in
-@@ -11,23 +11,23 @@ dnl initializing defaults
+@@ -13,7 +13,7 @@ case "${host_os}" in
  dnl I've seen a report that pthread support is shaky in FreeBSD 2.x releases
  case "${host_os}" in
      freebsd2* )
--	disable_thread=yes
+ 	disable_thread=yes
 +	enable_thread=no
      ;;
 -    solaris*|linux*|freebsd* )
 -	disable_thread=no
 +    solaris*|linux*|freebsd*|dragonfly*|netbsd* )
-+	enable_thread=yes
+ 	disable_thread=no
      ;;
      * )
--	disable_thread=yes
+@@ -21,17 +21,22 @@ case "${host_os}" in
 +	enable_thread=no
      ;;
  esac
- AC_ARG_ENABLE(thread,
+-AC_ARG_ENABLE(thread,
- [  --disable-thread        disable thread always],
+-[  --disable-thread        disable thread always],
 -[disable_thread=yes],)
 +[enable_thread=no],)
 -AC_ARG_ENABLE(thread,
- AC_ARG_ENABLE(thread,
+-[  --enable-thread         enable thread (on non-solaris platform)],
  [  --enable-thread         enable thread (on non-solaris platform)],
 -[disable_thread=no],)
 +[enable_thread=yes],)
 -AC_ARG_ENABLE(wall,
- AC_ARG_ENABLE(wall,
+-[  --disable-wall          disable -Wall option always],
- [  --disable-wall          disable -Wall option always],
+-[disable_wall=yes],)
-@@ -52,7 +52,7 @@ MODULES=""
++AC_ARG_ENABLE([thread],
 +AS_HELP_STRING([--enable-thread],[enable thread (on non-solaris platform)]))
++
 +AC_ARG_ENABLE([thread],
 +AS_HELP_STRING([--disable-thread],[disable thread always]))
++
 +AS_IF([test "x$enable_thread" = "xyes"], [
 +    disable_thread=no
 +])
 +AS_IF([test "x$enable_thread" = "xno"], [
 +    disable_thread=yes
 +])
++
++
 +AC_ARG_ENABLE([wall],
 +AS_HELP_STRING([--disable-wall],[disable -Wall option always]))
  pwd=`pwd`
  pwd=`basename $pwd`
@@ -52,7 +57,7 @@ MODULES=""
  EXTRA_INCLUDE_DIRS=""
  EXTRA_LIBS=""
 -CPPFLAGS="-DFUNCPROTO -I../../include"
 +CPPFLAGS="$CPPFLAGS -DFUNCPROTO -I../../include"
  dnl defining FUNCPROTO ensures that struct library uses portotype
  dnl we don't expect non-ANSI (K&R) C compilers to be used
  dnl Some compiles may define __STDC__ by itself which makes it enable,
-@@ -83,7 +83,7 @@ fi
+@@ -66,7 +71,7 @@ dnl    CFLAGS="-g -O"
  dnl fi
  AC_MSG_CHECKING(for -Wall option)
 -if test "$disable_wall" = yes; then
 +if test "x$enable_wall" = "xno"; then
     if test "$GCC" != "yes"; then
  dnl shut up SUN WorkShop Compilers
         CFLAGS="$CFLAGS -w"
@@ -83,7 +88,7 @@ fi
  QUANTIFY="quantify"
  PURIFY="purify"
 -AC_DEFUN(AC_FILE_EXIST, [
 +AC_DEFUN([AC_FILE_EXIST], [
  if test -f "$1" >/dev/null 2>&1; then
    ifelse([$2], , :, [$2])
    ifelse([$3], , , [else $3])
-@@ -109,28 +109,34 @@ dnl	fi
+@@ -109,33 +114,17 @@ dnl	fi
  esac
  case "${host_os}" in
 -    solaris* )
 -	CRYPT_LIB="-lcrypt"
 -    ;;
      bsdi* )
          LIBS="$LIBS -lipc"
      ;;
 -    freebsd*|netbsd*|openbsd* )
 -        if test "$disable_thread" != yes; then
 -		LDFLAGS="$LDFLAGS -pthread"
 -                THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
 -        fi
 -	CRYPT_LIB="-lcrypt"
 -        ac_pthrlib="c_r"
 -    ;;
 -    linux* )
 +    solaris*|freebsd*|dragonfly*|netbsd*|openbsd*|linux* )
  	CRYPT_LIB="-lcrypt"
 +	case "${host_os}" in
 +	    freebsd*|dragonfly*|openbsd* )
 +		if test "$enable_thread" = yes; then
 +		    LDFLAGS="$LDFLAGS $(PTHREAD_LDFLAGS)"
 +		    THREAD_CFLAGS="$(PTHREAD_CFLAGS)"
 +		    LIBS="$LIBS $(PTHREAD_LIBS)"
 +		fi
 +		ac_pthrlib="c_r"
 +	    ;;
 +	    netbsd* )
 +		if test "$enable_thread" = yes; then
 +		    LDFLAGS="$LDFLAGS $(PTHREAD_LDFLAGS)"
 +		    THREAD_CFLAGS="$(PTHREAD_CFLAGS)"
 +		    LIBS="$LIBS $(PTHREAD_LIBS)"
 +		fi
 +	    ;;
 +	esac
      ;;
      osf* )
  	if test $CC = "cc" ; then
-            CPPFLAGS="$CPPFLAGS -taso -pthread"
+-           CPPFLAGS="$CPPFLAGS -taso -pthread"
 +            CPPFLAGS="$CPPFLAGS -taso"
          fi
 -        if test "$disable_thread" != yes; then
-+        if test "$enable_thead" = yes; then
+-		LDFLAGS="$LDFLAGS -lc_r"
- 		LDFLAGS="$LDFLAGS -lc_r"
+-                THREAD_CFLAGS="-D_THREAD_SAFE"
-                 THREAD_CFLAGS="-D_THREAD_SAFE"
+-	fi
- 	fi
+         CPPFLAGS="$CPPFLAGS -L/usr/shlib"
-@@ -153,7 +159,7 @@ fi
+-        ac_pthrlib="pthreads"
      ;;
  esac
@@ -153,34 +142,44 @@ fi
  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_CHECKING(for thread support)
+-  AC_MSG_RESULT(disabled)
-   AC_MSG_RESULT(disabled)
+-else
- else
+-  if test ! -n "$ac_pthrlib"; then
-@@ -167,7 +173,7 @@ fi
+-    ac_pthrlib="pthread"
- AC_MSG_CHECKING(for thread support)
+-  fi;
- if test "$pthread" = yes; then
+-  AC_CHECK_LIB($ac_pthrlib, pthread_create, [
-   AC_MSG_RESULT(yes)
+-    AC_CHECK_HEADERS(pthread.h, [pthread="yes"])])
 -fi
+-
 -AC_MSG_CHECKING(for thread support)
 -if test "$pthread" = yes; then
 -  AC_MSG_RESULT(yes)
 -  AC_DEFINE(HAVE_LIBPTHREAD)
-+  AC_DEFINE([HAVE_LIBPTHREAD],[],[Define if you have pthread library (-lpthread)])
+-  CFLAGS="$CFLAGS $THREAD_CFLAGS"
-   CFLAGS="$CFLAGS $THREAD_CFLAGS"
+-  CPPFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $CPPFLAGS"
-   CPPFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $CPPFLAGS"
+-  QUANTIFY="$QUANTIFY -threads=yes -max-threads=80"
-   QUANTIFY="$QUANTIFY -threads=yes -max-threads=80"
+-  PURIFY="$PURIFY -threads=yes -max-threads=80"
-@@ -176,7 +182,7 @@ if test "$pthread" = yes; then
+-  THREADLIBS="-l$ac_pthrlib"
-   LIBS="$LIBS $THREADLIBS"
+-  LIBS="$LIBS $THREADLIBS"
- dnl at least FreeBSD 3.1 doesn't have this
+-dnl at least FreeBSD 3.1 doesn't have this
-   AC_CHECK_LIB($ac_pthrlib, pthread_attr_setscope,
+-  AC_CHECK_LIB($ac_pthrlib, pthread_attr_setscope,
 -	       AC_DEFINE(HAVE_PTHREAD_ATTR_SETSCOPE))
-+	       AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE],[],[Define if you have pthread_attr_setscope]))
+-  AC_CHECK_FUNCS(thr_setconcurrency)
-   AC_CHECK_FUNCS(thr_setconcurrency)
+-else
- else
+-  AC_MSG_RESULT(no)
-   AC_MSG_RESULT(no)
+-fi
-@@ -231,13 +237,13 @@ AC_PATH_PROG(SENDMAIL_PATH,sendmail,no,$
++AS_IF([test "x$disable_thread" = "xyes"],[
 +    AC_MSG_CHECKING(for thread support)
 +    AC_MSG_RESULT(disabled)
 +],[
 +    case "${host_os}" in
 +        osf*)
 +	    THREAD_CFLAGS="-D_THREAD_SAFE"
 +	;;
 +	*)
 +	    THREAD_CFLAGS="$PTHREAD_CFLAGS"
 +    esac
++
 +    ac_pthrlib="$PTHREAD_LIBS"
 +    if test ! -n "$ac_pthrlib"; then
 +	ac_pthrlib="pthread"
 +    fi
++
 +    THREADLIBS="$PTHREAD_LIBS"
 +    AC_CHECK_LIB($ac_pthrlib, pthread_create, [
 +	AC_CHECK_HEADERS(pthread.h, [pthread="yes"])])
++
 +    AC_MSG_CHECKING(for thread support)
 +    if test "$pthread" = yes; then
 +        AC_MSG_RESULT(yes)
 +        AC_DEFINE([HAVE_LIBPTHREAD],[],[Define if you have pthread library (-lpthread)])
 +        CFLAGS="$CFLAGS $THREAD_CFLAGS"
 +        CPPFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $CPPFLAGS"
 +        QUANTIFY="$QUANTIFY -threads=yes -max-threads=80"
 +        PURIFY="$PURIFY -threads=yes -max-threads=80"
 +        LIBS="$LIBS $THREADLIBS"
 +        dnl at least FreeBSD 3.1 doesn't have this
 +        AC_CHECK_LIB($ac_pthrlib, pthread_attr_setscope,
 +	   AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE],[],[Define if you have pthread_attr_setscope]))
 +        AC_CHECK_FUNCS(thr_setconcurrency)
 +    else
 +        AC_MSG_RESULT(no)
 +    fi
 +])
  dnl Checks for various functions
@@ -231,13 +230,13 @@ AC_PATH_PROG(SENDMAIL_PATH,sendmail,no,$
  if test $SENDMAIL_PATH = no; then
      SENDMAIL_PATH=""
  else
 -    AC_DEFINE(HAVE_SENDMAIL)
 +    AC_DEFINE([HAVE_SENDMAIL],[],[Define if you have any sendmail program])
  fi
  AC_PATH_PROG(MAIL_PATH,mail,no)
  if test $MAIL_PATH = no; then
      MAIL_PATH=""
  else
 -    AC_DEFINE(HAVE_MAIL)
 +    AC_DEFINE([HAVE_MAIL],[],[Define if you have the mail program])
  fi
  dnl Prefer GPG, second choice PGP version 5
-@@ -287,7 +293,7 @@ else
+@@ -287,7 +286,7 @@ else
  	PGPS_PATH=""
  	PGPV_PATH=""
  	PGPDIR=gpg
 -	AC_DEFINE(PGP)
 +	AC_DEFINE([PGP],[],[Define if you have any pgp program])
  fi
  AC_SUBST(PGP)
  AC_SUBST(PGPDIR)
-@@ -300,19 +306,19 @@ AC_PATH_PROG(GZIP_PATH,gzip,no)
+@@ -300,19 +299,19 @@ AC_PATH_PROG(GZIP_PATH,gzip,no)
  if test $GZIP_PATH = no; then
      GZIP_PATH=""
  else
 -    AC_DEFINE(HAVE_GZIP)
 +    AC_DEFINE([HAVE_GZIP],[],[Define if you have gzip])
  fi
  AC_PATH_PROG(IRRDCACHER_PATH,irrdcacher,no)
  if test $IRRDCACHER_PATH = no; then
      IRRDCACHER_PATH=""
  else
 -    AC_DEFINE(HAVE_IRRDCACHER)
 +    AC_DEFINE([HAVE_IRRDCACHER],[],[Define if you have irrdcacher])
  fi
  AC_PATH_PROG(WGET_PATH,wget,no)
  if test $WGET_PATH = no; then
      WGET_PATH=""
  else
 -    AC_DEFINE(HAVE_WGET)
 +    AC_DEFINE([HAVE_WGET],[],[Define if you have wget])
  fi
  AC_SUBST(SENDMAIL_PATH)
  AC_SUBST(MAIL_PATH)
-@@ -340,11 +346,11 @@ AC_STRUCT_TM
+@@ -340,11 +339,11 @@ AC_STRUCT_TM
  dnl u_char, u_int, u_short, and u_long
  AC_MSG_CHECKING([u_char, u_int, u_short, and u_long])
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[
 -  u_char c; u_int i; u_short s; u_long l;]])],[AC_DEFINE(HAVE_U_TYPES) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);
 +  u_char c; u_int i; u_short s; u_long l;]])],[AC_DEFINE([HAVE_U_TYPES],[],[Define if you have u_char, u_int, u_short, and u_long]) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);
  dnl Check for in6_addr structure definition
  AC_EGREP_HEADER(struct in6_addr, netinet/in.h,
 -                  AC_DEFINE(HAVE_STRUCT_IN6_ADDR))
 +                  AC_DEFINE([HAVE_STRUCT_IN6_ADDR],[],[Define if you have struct in6_addr]))
  dnl Checks for library functions.
  AC_CHECK_FUNCS(localtime_r strtok_r gethostbyname_r gethostbyaddr_r)
-@@ -358,12 +364,12 @@ AC_CHECK_FUNCS(mkdtemp)
+@@ -358,12 +357,12 @@ AC_CHECK_FUNCS(mkdtemp)
  AC_CHECK_FUNCS(snprintf)
  AC_CHECK_FUNCS(dirname basename)
 -AC_DEFUN(AC_TYPE_SOCKLEN_T,
 +AC_DEFUN([AC_TYPE_SOCKLEN_T],
  [AC_CACHE_CHECK(for socklen_t in sys/socket.h, ac_cv_type_socklen_t,
  [AC_EGREP_HEADER(socklen_t, sys/socket.h,
    ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])
  if test $ac_cv_type_socklen_t = no; then
 -  AC_DEFINE(socklen_t, int)
 +  AC_DEFINE([socklen_t], [int], [define socklen_t if necessary])
  fi
  ])

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.43 2010/06/30 04:58:30 spz Exp $
+# $NetBSD: Makefile,v 1.44 2011/10/17 20:14:50 spz Exp $
 DISTNAME=		irrd2.3.9
 PKGNAME=		irrd-2.3.9
 CATEGORIES=		net
 MASTER_SITES=		http://www.irrd.net/
 EXTRACT_SUFX=		.tgz
 MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.irrd.net/
 COMMENT=		Internet Routing Registry Daemon
 LICENSE=		original-bsd
 MAKE_JOBS_SAFE=		no
 @@ -27,31 +27,28 @@ PKG_SYSCONFSUBDIR=	irrd
 EGDIR=			${PREFIX}/share/examples/irrd
 DOCDIR=			${PREFIX}/share/doc/irrd
 CONF_FILES+=		${EGDIR}/irrd.conf ${PKG_SYSCONFDIR}/irrd.conf
 IRRD_USER=		irrd
 IRRD_GROUP=		irrd
 PKG_GROUPS=		${IRRD_USER}
 PKG_USERS=		${IRRD_USER:Q}:${IRRD_GROUP:Q}
 PKG_GECOS.${IRRD_USER}=	IRRd user
 RCD_SCRIPTS+=		irrd
 GNU_CONFIGURE=		yes
 #CONFIGURE_ARGS+=	--enable-thread
 #PTHREAD_OPTS+=		require
-PTHREAD_AUTO_VARS=	yes
+.include "options.mk"
 .include "../../mk/pthread.buildlink3.mk"
 REPLACE_PERL+=		programs/irrdcacher/irrdcacher
 REPLACE_PERL+=		programs/irrdcacher/ripe2rpsl
 FILES_SUBST+=		VARBASE=${VARBASE:Q}
 FILES_SUBST+=		DOCDIR=${DOCDIR:Q}
 FILES_SUBST+=		IRRD_USER=${IRRD_USER:Q}
 FILES_SUBST+=		IRRD_GROUP=${IRRD_GROUP:Q}
 INSTALLATION_DIRS+=	${PKGMANDIR}/man8
 INSTALLATION_DIRS+=	sbin
 INSTALLATION_DIRS+=	${EGDIR}
 INSTALLATION_DIRS+=	${DOCDIR}

 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.14 2010/06/30 04:58:30 spz Exp $
+$NetBSD: distinfo,v 1.15 2011/10/17 20:14:50 spz Exp $
 SHA1 (irrd2.3.9.tgz) = 73281b1f73bfa2267535d70906ff35c266083ec2
 RMD160 (irrd2.3.9.tgz) = de212320204cde0d05abf848e952f8f1bf06503d
 Size (irrd2.3.9.tgz) = 777722 bytes
-SHA1 (patch-aa) = 5b7c5c9c2183c19b188a98017f526bf71904b1d5
+SHA1 (patch-aa) = 5693308651203cdec0ff020e8864067300609fda
 SHA1 (patch-ad) = 313a1d44c4623123f7c2a37ff2740887fa32bdb2
 SHA1 (patch-ae) = c012cd8e34f9b492bc03593b3598de030c04849b
 SHA1 (patch-af) = aa14907291184040f16561e01ecb9775bcecd702
 SHA1 (patch-ag) = 9b23300fcaf1b1a48547fff2501f1e81ba86ed0c
 SHA1 (patch-ah) = 74a5e88dd79385ebb7bb3cb7a3cd6da46d26fd54
 SHA1 (patch-ai) = d256698195bc90727c54ddb3f55c14e0e4f0437f
 SHA1 (patch-aj) = c357f5da9f127978263b22220ea11e3e650eaaf0
 SHA1 (patch-ak) = 93a3d155ad981155c129358d91d1706eb952b65b