4 files changed, 17 insertions, 18 deletions
diff --git a/auto/os/conf b/auto/os/conf
index 69813ce25..56bdd2219 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -2,20 +2,7 @@
 # Copyright (C) Igor Sysoev
 
 
-if test -z "$NGX_PLATFORM"; then
-    echo "checking for OS"
-
-    NGX_SYSTEM=`uname -s 2>/dev/null`
-    NGX_RELEASE=`uname -r 2>/dev/null`
-    NGX_MACHINE=`uname -m 2>/dev/null`
-
-    echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE"
-
-    NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE";
-
-else
-    echo "building for $NGX_PLATFORM"
-fi
+echo "checking for $NGX_SYSTEM specific features"
 
 case "$NGX_PLATFORM" in
 
diff --git a/auto/os/features b/auto/os/features
index 44c33cd31..3ec911087 100644
--- a/auto/os/features
+++ b/auto/os/features
@@ -92,6 +92,9 @@ fi
 
 if [ "$NGX_SYSTEM" = "NetBSD" ]; then
 
+    have=NGX_HAVE_TIMER_EVENT . auto/have
+    echo " + kqueue's EVFILT_TIMER found"
+
     # NetBSD 2.0 incompatibly defines kevent.udata as "intptr_t"
 
     cat << END >> $NGX_AUTO_CONFIG_H
diff --git a/auto/os/freebsd b/auto/os/freebsd
index e5451224a..870ec9241 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -37,7 +37,7 @@ fi
 # sendfile
 
 if [ $osreldate -gt 300007 ]; then
-    echo " + using sendfile()"
+    echo " + sendfile() found"
 
     have=NGX_HAVE_SENDFILE . auto/have
     CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
@@ -49,7 +49,7 @@ fi
 if [ \( $osreldate -lt 500000 -a $osreldate -ge 410000 \) \
      -o $osreldate -ge 500011 ]
 then
-    echo " + using kqueue"
+    echo " + kqueue found"
 
     have=NGX_HAVE_KQUEUE . auto/have
     have=NGX_HAVE_CLEAR_EVENT . auto/have
@@ -67,10 +67,19 @@ NGX_KQUEUE_CHECKED=YES
 if [ \( $version -lt 500000 -a $version -ge 430000 \) \
      -o $version -ge 500018 ]
 then
-    echo " + using kqueue's NOTE_LOWAT"
+    echo " + kqueue's NOTE_LOWAT found"
     have=NGX_HAVE_LOWAT_EVENT . auto/have
 fi
 
+# kqueue's EVFILT_TIMER
+
+if [ \( $version -lt 500000 -a $version -ge 440001 \) \
+     -o $version -ge 500023 ]
+then
+    echo " + kqueue's EVFILT_TIMER found"
+    have=NGX_HAVE_TIMER_EVENT . auto/have
+fi
+
 
 if [ $USE_THREADS = "rfork" ]; then
 
diff --git a/auto/os/linux b/auto/os/linux
index 32ef4cb8f..c31f848be 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -25,7 +25,7 @@ version=${version:-0}
 # enable the rt signals on Linux 2.2.19 and onward
 
 if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then
-    echo " + using rt signals"
+    echo " + rt signals found"
     have=NGX_HAVE_RTSIG . auto/have
     have=NGX_HAVE_POLL . auto/have
     EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE"