head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.116 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.114 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.112 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.110 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.108 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.106 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.104 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.102 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.100 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.98 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.96 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.94 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.92 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.90 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.88 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.86 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.84 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.82 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.80 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.78 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.76 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.74 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.72 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.68 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.48 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.70 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.66 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.64 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.62 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.60 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.58 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.56 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.54 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.52 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.50 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.46 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.44 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.42 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.40 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.38 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.36 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.9.0.34 pkgsrc-2015Q4-base:1.9 pkgsrc-2015Q3:1.9.0.32 pkgsrc-2015Q3-base:1.9 pkgsrc-2015Q2:1.9.0.30 pkgsrc-2015Q2-base:1.9 pkgsrc-2015Q1:1.9.0.28 pkgsrc-2015Q1-base:1.9 pkgsrc-2014Q4:1.9.0.26 pkgsrc-2014Q4-base:1.9 pkgsrc-2014Q3:1.9.0.24 pkgsrc-2014Q3-base:1.9 pkgsrc-2014Q2:1.9.0.22 pkgsrc-2014Q2-base:1.9 pkgsrc-2014Q1:1.9.0.20 pkgsrc-2014Q1-base:1.9 pkgsrc-2013Q4:1.9.0.18 pkgsrc-2013Q4-base:1.9 pkgsrc-2013Q3:1.9.0.16 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.14 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.12 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.10 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.8 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.6 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.9.0.4 pkgsrc-2012Q1-base:1.9 pkgsrc-2011Q4:1.9.0.2 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q3:1.8.0.14 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.12 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.10 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.8 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.6 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.4 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.2 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.7.0.44 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.42 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.40 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.38 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.36 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.34 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.32 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.30 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.28 pkgsrc-2008Q1:1.7.0.26 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.24 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.22 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.20 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.18 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.16 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.14 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.12 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.10 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.8 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.6 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.4 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.2 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2011.10.17.20.14.50; author spz; state Exp; branches; next 1.8; 1.8 date 2010.02.23.20.37.06; author spz; state Exp; branches; next 1.7; 1.7 date 2004.12.31.23.01.33; author kim; state Exp; branches; next 1.6; 1.6 date 2004.12.31.22.31.51; author kim; state Exp; branches; next 1.5; 1.5 date 2004.12.31.21.38.52; author kristerw; state Exp; branches; next 1.4; 1.4 date 2002.09.01.15.30.12; author kim; state dead; branches; next 1.3; 1.3 date 2000.10.07.19.24.14; author kim; state Exp; branches; next 1.2; 1.2 date 2000.09.13.15.14.41; author fredb; state Exp; branches; next 1.1; 1.1 date 99.10.28.19.50.19; author kim; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.10.28.19.50.19; author kim; state Exp; branches; next ; desc @@ 1.9 log @teach the package options for cases where pthreads would be used, but are broken @ text @$NetBSD$ --- configure.in.orig 2006-09-12 17:40:57.000000000 +0000 +++ configure.in @@@@ -13,7 +13,7 @@@@ case "${host_os}" in freebsd2* ) disable_thread=yes ;; - solaris*|linux*|freebsd* ) + solaris*|linux*|freebsd*|dragonfly*|netbsd* ) disable_thread=no ;; * ) @@@@ -21,17 +21,22 @@@@ case "${host_os}" in ;; 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],) +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, @@@@ -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,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" ;; osf* ) if test $CC = "cc" ; then - CPPFLAGS="$CPPFLAGS -taso -pthread" + CPPFLAGS="$CPPFLAGS -taso" fi - if test "$disable_thread" != yes; then - LDFLAGS="$LDFLAGS -lc_r" - THREAD_CFLAGS="-D_THREAD_SAFE" - fi CPPFLAGS="$CPPFLAGS -L/usr/shlib" - 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 - AC_MSG_CHECKING(for thread support) - AC_MSG_RESULT(disabled) -else - if test ! -n "$ac_pthrlib"; then - ac_pthrlib="pthread" - fi; - AC_CHECK_LIB($ac_pthrlib, pthread_create, [ - 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) - 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" - THREADLIBS="-l$ac_pthrlib" - 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)) - AC_CHECK_FUNCS(thr_setconcurrency) -else - AC_MSG_RESULT(no) -fi +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 +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 +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 +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 ]], [[ - 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 +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.8 log @update irrd to version 2.3.9 fixes PR pkg/36813, PR pkg/38002, and the still relevant parts of pkg/36811 (IPv6 is no longer optional) @ text @d5 1 a5 3 @@@@ -11,23 +11,23 @@@@ dnl initializing defaults dnl I've seen a report that pthread support is shaky in FreeBSD 2.x releases case "${host_os}" in d7 1 a7 2 - disable_thread=yes + enable_thread=no a9 1 - disable_thread=no d11 1 a11 1 + enable_thread=yes d14 1 a14 2 - disable_thread=yes + enable_thread=no d18 2 a19 2 AC_ARG_ENABLE(thread, [ --disable-thread disable thread always], d21 3 a23 4 +[enable_thread=no],) AC_ARG_ENABLE(thread, [ --enable-thread enable thread (on non-solaris platform)], d25 24 a48 5 +[enable_thread=yes],) AC_ARG_ENABLE(wall, [ --disable-wall disable -Wall option always], @@@@ -52,7 +52,7 @@@@ MODULES="" d57 10 a66 1 @@@@ -83,7 +83,7 @@@@ fi d75 1 a75 1 @@@@ -109,28 +109,34 @@@@ dnl fi a95 17 + 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 d99 2 a100 1 CPPFLAGS="$CPPFLAGS -taso -pthread" d103 9 a111 5 + if test "$enable_thead" = yes; then LDFLAGS="$LDFLAGS -lc_r" THREAD_CFLAGS="-D_THREAD_SAFE" fi @@@@ -153,7 +159,7 @@@@ fi d116 13 a128 8 +if test "$enable_thread" != yes; then AC_MSG_CHECKING(for thread support) AC_MSG_RESULT(disabled) else @@@@ -167,7 +173,7 @@@@ fi AC_MSG_CHECKING(for thread support) if test "$pthread" = yes; then AC_MSG_RESULT(yes) d130 8 a137 8 + 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" @@@@ -176,7 +182,7 @@@@ if test "$pthread" = yes; then LIBS="$LIBS $THREADLIBS" dnl at least FreeBSD 3.1 doesn't have this AC_CHECK_LIB($ac_pthrlib, pthread_attr_setscope, d139 46 a184 5 + AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE],[],[Define if you have pthread_attr_setscope])) AC_CHECK_FUNCS(thr_setconcurrency) else AC_MSG_RESULT(no) @@@@ -231,13 +237,13 @@@@ AC_PATH_PROG(SENDMAIL_PATH,sendmail,no,$ d200 1 a200 1 @@@@ -287,7 +293,7 @@@@ else d209 1 a209 1 @@@@ -300,19 +306,19 @@@@ AC_PATH_PROG(GZIP_PATH,gzip,no) d232 1 a232 1 @@@@ -340,11 +346,11 @@@@ AC_STRUCT_TM d246 1 a246 1 @@@@ -358,12 +364,12 @@@@ AC_CHECK_FUNCS(mkdtemp) @ 1.7 log @Disable threads. @ text @d3 3 a5 3 --- configure.in.orig 2003-11-17 15:29:46.000000000 -0500 +++ configure.in 2004-12-31 17:55:25.000000000 -0500 @@@@ -10,27 +10,23 @@@@ d12 1 a12 1 solaris*|linux*|freebsd* ) d14 1 d26 4 a29 3 - -AC_ARG_ENABLE(thread, -[ --enable-thread enable thread (on non-solaris platform)], d31 1 a31 1 +) d35 1 a35 2 -[disable_wall=yes],) +) d37 24 a60 12 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 @@@@ d63 1 a63 1 freebsd*|netbsd*|openbsd* ) d65 8 a72 4 + if test "$enable_thread" = yes; then LDFLAGS="$LDFLAGS -pthread" THREAD_CFLAGS="-D_THREAD_SAFE -pthread" fi a73 1 - ac_pthrlib="c_r" d75 8 d84 5 a88 3 + ;; + * ) + ac_pthrlib="c_r" d92 1 a92 3 linux* ) CRYPT_LIB="-lcrypt" @@@@ -129,7 +131,7 @@@@ d101 1 a101 1 @@@@ -152,7 +154,7 @@@@ d110 95 @ 1.6 log @Upgrade to irrd-2.2.3: - RPSLng and IPv6 support @ text @d1 2 d4 50 a53 2 +++ configure.in 2004-12-31 17:19:53.000000000 -0500 @@@@ -120,7 +120,13 @@@@ d68 18 @ 1.5 log @A bug in the configure script made it partly ignore our request of --disable-thread. Fix this. This closes PR pkg/21553. Bump PKGREVISION. @ text @d1 17 a17 17 $NetBSD$ --- configure.orig Fri Dec 31 21:48:06 2004 +++ configure Fri Dec 31 21:48:59 2004 @@@@ -1036,12 +1036,6 @@@@ disable_thread=yes fi; -# Check whether --enable-thread or --disable-thread was given. -if test "${enable_thread+set}" = set; then - enableval="$enable_thread" - disable_thread=no -fi; - # Check whether --enable-wall or --disable-wall was given. if test "${enable_wall+set}" = set; then enableval="$enable_wall" @ 1.4 log @Upgrade to irrd-2.1.4 -- the old one did not compile anymore. Note: uses gnupg instead of pgp5 now. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2000/10/07 19:24:14 kim Exp $ d3 15 a17 80 It seems autoconf makes all switches "enable" even if the check is for a "disable" switch, which confuses the logic in configure.in and thus we disable the second test with the problematic default. Don't completely override CPPFLAGS so we get -I${LOCALBASE}/include there. Don't get anything from /usr/local ever! There is no support for PGP 2.6x in the source anymore. --- configure.in.orig Thu Aug 10 22:53:55 2000 +++ configure.in Sat Oct 7 04:02:30 2000 @@@@ -29,9 +29,9 @@@@ [ --disable-thread disable thread always], [disable_thread=yes],) -AC_ARG_ENABLE(thread, -[ --enable-thread enable thread (on non-solaris platform)], -[disable_thread=no],) +dnl AC_ARG_ENABLE(thread, +dnl [ --enable-thread enable thread (on non-solaris platform)], +dnl [disable_thread=no],) AC_ARG_ENABLE(mrouting, [ --disable-mrouting disable multicast routing always], @@@@ -76,7 +76,8 @@@@ EXTRA_INCLUDE_DIRS="" EXTRA_LIBS="" -CPPFLAGS="-DFUNCPROTO -I../../include" +#CPPFLAGS="-DFUNCPROTO -I../../include" +CPPFLAGS="-I../../include ${CPPFLAGS}" 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, @@@@ -311,12 +312,12 @@@@ dnl AC_CHECK_LIB(resolv, inet_pton, [LIBS="$LIBS -lresolv"]) -if test -d /usr/local/include; then - CPPFLAGS="$CPPFLAGS -I/usr/local/include" -fi -if test -d /usr/local/lib; then - LDFLAGS="$LDFLAGS -L/usr/local/lib" -fi +dnl if test -d /usr/local/include; then +dnl CPPFLAGS="$CPPFLAGS -I/usr/local/include" +dnl fi +dnl if test -d /usr/local/lib; then +dnl LDFLAGS="$LDFLAGS -L/usr/local/lib" +dnl fi dnl find flex and bixon AC_PATH_PROG(FLEX_PATH,flex,no) @@@@ -426,21 +427,16 @@@@ fi AC_PATH_PROG(PGPK_PATH,pgpk,no) if test $PGPK_PATH = no; then - PGPK_PATH="" + PGPK_PATH="" fi AC_PATH_PROG(PGPS_PATH,pgps,no) if test $PGPS_PATH = no; then - PGPS_PATH="" + PGPS_PATH="" fi AC_PATH_PROG(PGPV_PATH,pgpv,no) if test $PGPV_PATH = no; then - AC_PATH_PROG(PGPV_PATH,pgp,no) - if test $PGPV_PATH = no; then - PGPV_PATH="" - AC_DEFINE(PGP,0) - else - AC_DEFINE(PGP,26) - fi + PGPV_PATH="" + AC_DEFINE(PGP,0) else AC_DEFINE(PGP, 5) fi @ 1.3 log @Update to irrd-2.0.0.20000822 for Y2K. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Fix some configure goofiness: - - Don't pull in /sys/sys/include just for ipv6 support! - - Package wants "bison"; give it bison. - - Don't pull in "libpthreads" just becuase it exists on the build system. - - Likewise for "pgp", unless IRRD_USE_PGP is specified. Also, - - Rearrange package Makefile, so that only that which is "prefs" goes after ".include ../../mk/bsd.prefs.mk". TODO: - - Make the package use pgp5 or pgp2 by default? @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 1999/10/28 19:50:19 kim Exp $ d3 65 a67 12 --- configure.in.orig Mon Sep 6 14:31:59 1999 +++ configure.in Wed Sep 13 09:40:58 2000 @@@@ -39,7 +39,7 @@@@ CRYPT_LIB="-lcrypt" AC_DEFINE(USE_LOCKF) ;; - *freebsd*) IRRD_OPS_LIBS="" + *freebsd*|*netbsd*) IRRD_OPS_LIBS="" CRYPT_LIB="-lcrypt" AC_DEFINE(USE_FLOCK) ;; @@@@ -91,11 +91,12 @@@@ d73 7 a79 8 + AC_PATH_PROG(PGP_PATH,pgp,no) + if test $PGP_PATH = no; then PGPV_PATH="" AC_DEFINE(PGP,0) else + PGPV_PATH="$PGP_PATH" AC_DEFINE(PGP,26) fi d81 1 a81 33 @@@@ -178,18 +179,18 @@@@ ifelse([$4], , , [else $4]) fi]) -case "${host_os}" in - *bsdi* | *freebsd* | *netbsd* ) -dnl use kernel source if available - AC_DIR_EXIST(/sys/sys, [ - CPPFLAGS="$CPPFLAGS -I/sys" - IN_H="$IN_H /sys/netinet/in.h" - IF_H="$IF_H /sys/net/if.h"]) - ;; - * ) -dnl including header files under /sys makes SIOCGIFCONF confused on sunos. - ;; -esac +#case "${host_os}" in +# *bsdi* | *freebsd* | *netbsd* ) +#dnl use kernel source if available +# AC_DIR_EXIST(/sys/sys, [ +# CPPFLAGS="$CPPFLAGS -I/sys" +# IN_H="$IN_H /sys/netinet/in.h" +# IF_H="$IF_H /sys/net/if.h"]) +# ;; +# * ) +#dnl including header files under /sys makes SIOCGIFCONF confused on sunos. +# ;; +#esac dnl Add the ICMP code; we'll have to turn this into an interactive dnl question during the configure process later... @@@@ -302,9 +303,10 @@@@ AC_CHECK_HEADERS(gdbm.h, [exist_gdbm=yes],[exist_gdbm=no]) a82 40 -AC_CHECK_LIB(db, dbopen, [exist_db1=yes],[exist_db1=no]) -if test $exist_db1 = yes; then AC_CHECK_HEADERS(db.h, [exist_db1=yes],[exist_db1=no]) +if test $exist_db1 = yes; then +AC_CHECK_FUNC(dbopen,[db1_lib=no], + [AC_CHECK_LIB(db, dbopen, [DB_LIB="-ldb"],[exist_db1=no])]) fi AC_MSG_CHECKING(for GDBM preference) @@@@ -349,7 +351,6 @@@@ if test "$db1_pref" = "DB1"; then if test $exist_db1 = yes; then AC_DEFINE(USE_DB1) - DB_LIB="-ldb" db_check=done AC_MSG_RESULT(using DB1) fi @@@@ -371,7 +372,6 @@@@ if test "$db1_pref" != "NODB1"; then if test $exist_db1 = yes; then AC_DEFINE(USE_DB1) - DB_LIB="-ldb" db_check=done AC_MSG_RESULT(using DB1) fi @@@@ -435,6 +435,13 @@@@ AC_DEFINE(HAVE_LINUX_2_2_5_IPV6) ] ) + ;; + *netbsd0|*netbsd1.[0123]*|*netbsd1.4|*netbsd1.4.*|*netbsd1.4[A-J] ) + AC_MSG_RESULT(no) + ;; + *netbsd* ) + AC_DEFINE(HAVE_IPV6) + AC_MSG_RESULT(yes... NetBSD IPv6) ;; *solaris* ) AC_FILE_EXIST(/usr/ipv6/sbin/ifconfig, [ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- configure.in.orig Mon Sep 6 15:31:59 1999 +++ configure.in Fri Oct 22 19:03:11 1999 d29 31 @ 1.1.1.1 log @IRRd is a freely available streamlined, stand-alone Internet Routing Registry database server. IRRd supports both RIPE-181 and RPSL routing registry syntaxes. @ text @@