fix build

6 files changed, 11 insertions, 940 deletions

diff --git a/package/nagios-plugins/Makefile b/package/nagios-plugins/Makefile
index 9ef1f2689..eb95f694a 100644
--- a/package/nagios-plugins/Makefile
+++ b/package/nagios-plugins/Makefile
@@ -11,14 +11,17 @@ PKG_DESCR:=		Nagios plugins
 PKG_SECTION:=		net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nagiosplug/}
 
+PKG_HOST_DEPENDS:=	!darwin
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,NAGIOS_PLUGINS,nagios-plugins,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		ac_cv_lib_nsl_main=no
+
 nagios-plugins-install:
-	$(INSTALL_DIR) $(IDIR_NAGIOS_PLUGINS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/nagios-plugins \
-		$(IDIR_NAGIOS_PLUGINS)/usr/bin
+	$(INSTALL_DIR) $(IDIR_NAGIOS_PLUGINS)/usr/libexec
+	$(CP) $(WRKINST)/usr/libexec/* \
+		$(IDIR_NAGIOS_PLUGINS)/usr/libexec
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nagios-plugins/patches/patch-perlmods_Makefile b/package/nagios-plugins/patches/patch-perlmods_Makefile
deleted file mode 100644
index ad11babd5..000000000
--- a/package/nagios-plugins/patches/patch-perlmods_Makefile
+++ /dev/null
@@ -1,451 +0,0 @@
---- nagios-plugins-1.4.15.orig/perlmods/Makefile	2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/perlmods/Makefile	2011-12-03 12:13:10.000000000 +0100
-@@ -29,8 +29,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i386-apple-darwin9.8.0
--host_triplet = i386-apple-darwin9.8.0
-+build_triplet = i686-apple-darwin10
-+host_triplet = i586-openadk-linux-gnu
- subdir = perlmods
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -132,36 +132,36 @@ CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run aclocal-1.10
-+ACLOCAL = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run aclocal-1.10
- ALLOCA = 
- ALLOCA_H = alloca.h
--AMTAR = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run tar
-+AMTAR = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run tar
- APPLE_UNIVERSAL_BUILD = 0
--AR = ar
--ASM_SYMBOL_PREFIX = "_"
--AUTOCONF = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoconf
--AUTOHEADER = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoheader
--AUTOMAKE = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run automake-1.10
--AWK = awk
-+AR = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ar
-+ASM_SYMBOL_PREFIX = ""
-+AUTOCONF = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoconf
-+AUTOHEADER = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoheader
-+AUTOMAKE = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run automake-1.10
-+AWK = gawk
- BASENAME = /usr/bin/basename
--BITSIZEOF_PTRDIFF_T = 32
--BITSIZEOF_SIG_ATOMIC_T = 32
--BITSIZEOF_SIZE_T = 32
--BITSIZEOF_WCHAR_T = 32
--BITSIZEOF_WINT_T = 32
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
-+BITSIZEOF_PTRDIFF_T = 
-+BITSIZEOF_SIG_ATOMIC_T = 
-+BITSIZEOF_SIZE_T = 
-+BITSIZEOF_WCHAR_T = 
-+BITSIZEOF_WINT_T = 
-+CC = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
-+CPP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc -E
-+CPPFLAGS = -DNDEBUG
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
- DEPLIBS = 
--DSYMUTIL = dsymutil
-+DSYMUTIL = 
- DUMPBIN = 
--ECHO_C = \c
--ECHO_N = 
-+ECHO_C = 
-+ECHO_N = -n
- ECHO_T = 
- EGREP = /usr/bin/grep -E
- EMULTIHOP_HIDDEN = 
-@@ -172,19 +172,19 @@ EOVERFLOW_HIDDEN = 
- EOVERFLOW_VALUE = 
- ERRNO_H = 
- EXEEXT = 
--EXTRAS =  check_ldap check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
-+EXTRAS =  check_ide_smart check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
- EXTRAS_ROOT = 
- EXTRA_NETOBJS = 
- EXTRA_TEST = 
- FGREP = /usr/bin/grep -F
- FLOAT_H = 
--FLOORF_LIBM = 
-+FLOORF_LIBM = -lm
- GETADDRINFO_LIB = 
- GETHOSTNAME_LIB = 
--GETLOADAVG_LIBS = 
-+GETLOADAVG_LIBS = -lelf 
- GETOPT_H = getopt.h
- GETTEXT_MACRO_VERSION = 0.18
--GLIBC21 = no
-+GLIBC21 = yes
- GMSGFMT = /opt/local/bin/msgfmt
- GMSGFMT_015 = /opt/local/bin/msgfmt
- GNULIB_ACCEPT = 0
-@@ -425,7 +425,7 @@ HAVE_DECL_ATANL = 1
- HAVE_DECL_CEILF = 1
- HAVE_DECL_CEILL = 1
- HAVE_DECL_COSL = 1
--HAVE_DECL_ENVIRON = 0
-+HAVE_DECL_ENVIRON = 1
- HAVE_DECL_EXPL = 1
- HAVE_DECL_FLOORF = 1
- HAVE_DECL_FLOORL = 1
-@@ -436,7 +436,7 @@ HAVE_DECL_GAI_STRERROR = 1
- HAVE_DECL_GETADDRINFO = 1
- HAVE_DECL_GETDELIM = 1
- HAVE_DECL_GETLINE = 1
--HAVE_DECL_GETLOADAVG = 1
-+HAVE_DECL_GETLOADAVG = 0
- HAVE_DECL_GETLOGIN_R = 1
- HAVE_DECL_GETNAMEINFO = 1
- HAVE_DECL_GETPAGESIZE = 1
-@@ -456,8 +456,8 @@ HAVE_DECL_SINL = 1
- HAVE_DECL_SNPRINTF = 1
- HAVE_DECL_SQRTL = 1
- HAVE_DECL_STRDUP = 1
--HAVE_DECL_STRNDUP = 0
--HAVE_DECL_STRNLEN = 0
-+HAVE_DECL_STRNDUP = 1
-+HAVE_DECL_STRNLEN = 1
- HAVE_DECL_STRSIGNAL = 1
- HAVE_DECL_STRTOK_R = 1
- HAVE_DECL_TANL = 1
-@@ -550,9 +550,9 @@ HAVE_RENAMEAT = 1
- HAVE_RPMATCH = 1
- HAVE_SA_FAMILY_T = 1
- HAVE_SETENV = 1
--HAVE_SIGNED_SIG_ATOMIC_T = 1
--HAVE_SIGNED_WCHAR_T = 1
--HAVE_SIGNED_WINT_T = 1
-+HAVE_SIGNED_SIG_ATOMIC_T = 
-+HAVE_SIGNED_WCHAR_T = 
-+HAVE_SIGNED_WINT_T = 
- HAVE_SINL = 1
- HAVE_SLEEP = 1
- HAVE_SQRTL = 1
-@@ -568,13 +568,13 @@ HAVE_STRTOD = 1
- HAVE_STRTOLL = 1
- HAVE_STRTOULL = 1
- HAVE_STRUCT_ADDRINFO = 1
--HAVE_STRUCT_RANDOM_DATA = 0
-+HAVE_STRUCT_RANDOM_DATA = 1
- HAVE_STRUCT_SOCKADDR_STORAGE = 1
- HAVE_STRVERSCMP = 1
- HAVE_SYMLINK = 1
- HAVE_SYMLINKAT = 1
--HAVE_SYS_BITYPES_H = 0
--HAVE_SYS_INTTYPES_H = 0
-+HAVE_SYS_BITYPES_H = 
-+HAVE_SYS_INTTYPES_H = 
- HAVE_SYS_LOADAVG_H = 0
- HAVE_SYS_PARAM_H = 0
- HAVE_SYS_SOCKET_H = 1
-@@ -600,54 +600,54 @@ HAVE_WCTYPE_H = 1
- HAVE_WINSOCK2_H = 0
- HAVE_WINT_T = 1
- HAVE_WS2TCPIP_H = 0
--HAVE_XLOCALE_H = 1
-+HAVE_XLOCALE_H = 0
- HAVE__BOOL = 1
- HOSTENT_LIB = 
- HOSTNAME = /bin/hostname
- INCLUDE_NEXT = include_next
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
- INET_NTOP_LIB = 
--INSTALL = /usr/bin/install -c 
-+INSTALL = /Volumes/adk/openadk/scripts/install -c 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = $(install_sh) -c -s 
- INTLLIBS = 
--INTL_MACOSX_LIBS = -Wl,-framework -Wl,CoreFoundation
-+INTL_MACOSX_LIBS = 
- KMEM_GROUP = 
- KRBINCLUDE = 
--LD = /usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld
--LDAPINCLUDE = -I/usr/include/ldap
--LDAPLIBS = -lldap -llber
--LDFLAGS =  -L.
-+LD = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ld
-+LDAPINCLUDE = 
-+LDAPLIBS = 
-+LDFLAGS = -L/Volumes/adk/openadk/target_i586_uclibc/lib -L/Volumes/adk/openadk/target_i586_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i586_uclibc/usr/lib -L.
- LIBGNUTLS_CONFIG = 
- LIBGNU_LIBDEPS = 
- LIBGNU_LTLIBDEPS = 
- LIBICONV = -liconv
- LIBINTL = 
--LIBOBJS =  ${LIBOBJDIR}error$U.o
-+LIBOBJS =  ${LIBOBJDIR}strtod$U.o
- LIBS = -lpthread -ldl 
- LIBSOCKET = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
--LIPO = lipo
-+LIPO = 
- LN_S = ln -s
- LOCALCHARSET_TESTS_ENVIRONMENT = CHARSETALIASDIR="$(top_builddir)/gl"
--LOCALE_FR = fr_FR.ISO8859-1
--LOCALE_FR_UTF8 = fr_FR.UTF-8
-+LOCALE_FR = none
-+LOCALE_FR_UTF8 = none
- LOCALE_JA = ja_JP.eucJP
--LOCALE_ZH_CN = zh_CN.GB18030
-+LOCALE_ZH_CN = none
- LTLIBICONV = -liconv
- LTLIBINTL = 
--LTLIBOBJS =  ${LIBOBJDIR}error$U.lo
--MAKEINFO = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run makeinfo
-+LTLIBOBJS =  ${LIBOBJDIR}strtod$U.lo
-+MAKEINFO = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run makeinfo
- MATHLIBS = -lm
--MKDIR_P = ../build-aux/install-sh -c -d
-+MKDIR_P = /opt/local/bin/gmkdir -p
- MSGFMT = /opt/local/bin/msgfmt
- MSGFMT_015 = /opt/local/bin/msgfmt
- MSGMERGE = /opt/local/bin/msgmerge
--MYSQLCFLAGS = -I/usr/local/mysql/include  -Os -arch i386 -fno-common   -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT  -DDONT_DECLARE_CXA_PURE_VIRTUAL
--MYSQLINCLUDE = -I/usr/local/mysql/include
--MYSQLLIBS = -L/usr/local/mysql/lib -lmysqlclient -lz -lm
-+MYSQLCFLAGS = 
-+MYSQLINCLUDE = 
-+MYSQLLIBS = 
- NEED_SETGID = false
- NETINET_IN_H = 
- NEXT_ARPA_INET_H = <arpa/inet.h>
-@@ -692,13 +692,13 @@ NEXT_TIME_H = <time.h>
- NEXT_UNISTD_H = <unistd.h>
- NEXT_WCHAR_H = <wchar.h>
- NEXT_WCTYPE_H = <wctype.h>
--NM = /usr/bin/nm -p
--NMEDIT = nmedit
-+NM = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-nm
-+NMEDIT = 
- NP_RELEASE = 1.4.15
--OBJDUMP = false
-+OBJDUMP = i586-openadk-linux-objdump
- OBJEXT = o
--OTOOL = otool
--OTOOL64 = :
-+OTOOL = 
-+OTOOL64 = 
- PACKAGE = nagios-plugins
- PACKAGE_BUGREPORT = 
- PACKAGE_NAME = nagios-plugins
-@@ -728,21 +728,21 @@ PATH_TO_SWAP = 
- PATH_TO_SWAPINFO = 
- PATH_TO_UPTIME = /usr/bin/uptime
- PATH_TO_WHO = /usr/bin/who
--PERL = /usr/bin/perl
-+PERL = /opt/local/bin/perl
- PERLMODS_DIR = 
- PGINCLUDE = 
- PGLIBS = 
- PKG_ARCH = i386
- PLUGIN_TEST = t/check_by_ssh.t t/check_cluster.t t/check_dig.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t
- POSUB = 
--POW_LIB = 
-+POW_LIB = -lm
- PRAGMA_SYSTEM_HEADER = #pragma GCC system_header
- PST3CFLAGS = 
- PTHREAD_H_DEFINES_STRUCT_TIMESPEC = 0
- PTRDIFF_T_SUFFIX = 
- PYTHON = /usr/bin/python
- RADIUSLIBS = 
--RANLIB = ranlib
-+RANLIB = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ranlib
- RELEASE = 1
- REPLACE_BTOWC = 0
- REPLACE_CANONICALIZE_FILE_NAME = 0
-@@ -752,7 +752,7 @@ REPLACE_CHOWN = 0
- REPLACE_CLOSE = 0
- REPLACE_DPRINTF = 0
- REPLACE_DUP = 0
--REPLACE_DUP2 = 0
-+REPLACE_DUP2 = 1
- REPLACE_DUPLOCALE = 0
- REPLACE_FCHOWNAT = 0
- REPLACE_FCLOSE = 0
-@@ -796,19 +796,19 @@ REPLACE_MBSINIT = 0
- REPLACE_MBSNRTOWCS = 0
- REPLACE_MBSRTOWCS = 0
- REPLACE_MBSTATE_T = 0
--REPLACE_MEMCHR = 0
-+REPLACE_MEMCHR = 1
- REPLACE_MEMMEM = 0
- REPLACE_MKDIR = 0
- REPLACE_MKFIFO = 0
- REPLACE_MKNOD = 0
- REPLACE_MKSTEMP = 0
--REPLACE_MKTIME = 0
-+REPLACE_MKTIME = 1
- REPLACE_NAN = 0
- REPLACE_NANOSLEEP = GNULIB_PORTCHECK
- REPLACE_NL_LANGINFO = 0
- REPLACE_NULL = 0
- REPLACE_OBSTACK_PRINTF = 0
--REPLACE_OPEN = 1
-+REPLACE_OPEN = 0
- REPLACE_OPENAT = 0
- REPLACE_PERROR = 0
- REPLACE_POPEN = 0
-@@ -839,19 +839,19 @@ REPLACE_STRDUP = 0
- REPLACE_STRERROR = 0
- REPLACE_STRNCAT = 0
- REPLACE_STRNDUP = 0
--REPLACE_STRNLEN = 0
-+REPLACE_STRNLEN = 1
- REPLACE_STRSIGNAL = 0
--REPLACE_STRSTR = 0
-+REPLACE_STRSTR = 1
- REPLACE_STRTOD = 0
- REPLACE_STRTOK_R = 0
- REPLACE_SYMLINK = 0
--REPLACE_TIMEGM = 0
-+REPLACE_TIMEGM = 1
- REPLACE_TMPFILE = 0
- REPLACE_TRUNCL = 0
- REPLACE_TTYNAME_R = 0
- REPLACE_UNLINK = 0
- REPLACE_UNLINKAT = 0
--REPLACE_UNSETENV = 0
-+REPLACE_UNSETENV = 1
- REPLACE_USLEEP = 0
- REPLACE_UTIMENSAT = 0
- REPLACE_VASPRINTF = 0
-@@ -866,23 +866,23 @@ REPLACE_WCSRTOMBS = 0
- REPLACE_WCTOB = 0
- REPLACE_WCWIDTH = 0
- REPLACE_WRITE = 0
--REV_DATESTAMP = 2010.07.27.21.48
--REV_TIMESTAMP = 20100727214823
-+REV_DATESTAMP = 2011.12.03.12.12
-+REV_TIMESTAMP = 20111203121222
- SCRIPT_TEST = t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
--SED = /usr/bin/sed
-+SED = /Volumes/adk/openadk/scripts/sed
- SERVENT_LIB = 
- SET_MAKE = 
- SH = /bin/sh
--SHELL = /bin/sh
-+SHELL = /bin/bash
- SIG_ATOMIC_T_SUFFIX = 
--SIZE_T_SUFFIX = ul
--SOCKETLIBS =  -lresolv
-+SIZE_T_SUFFIX = 
-+SOCKETLIBS =  -lnsl -lresolv
- SSLINCLUDE = -I/usr/include
- SSLLIBS = -lssl -lcrypto
- STDBOOL_H = 
- STDDEF_H = 
--STDINT_H = stdint.h
--STRIP = strip
-+STDINT_H = 
-+STRIP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-strip
- SUPPORT = Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n
- SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = 0
- TIME_H_DEFINES_STRUCT_TIMESPEC = 1
-@@ -897,62 +897,62 @@ WINT_T_SUFFIX = 
- XGETTEXT = /opt/local/bin/xgettext
- XGETTEXT_015 = /opt/local/bin/xgettext
- XGETTEXT_EXTRA_OPTIONS =  --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format
--abs_builddir = /tmp/nagiosplugins/perlmods
--abs_srcdir = /tmp/nagiosplugins/perlmods
--abs_top_builddir = /tmp/nagiosplugins
--abs_top_srcdir = /tmp/nagiosplugins
--ac_ct_CC = gcc
-+abs_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_top_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+abs_top_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+ac_ct_CC = 
- ac_ct_DUMPBIN = 
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
--bindir = ${exec_prefix}/bin
--build = i386-apple-darwin9.8.0
--build_alias = 
--build_cpu = i386
--build_os = darwin9.8.0
-+bindir = /usr/bin
-+build = i686-apple-darwin10
-+build_alias = i686-apple-darwin10
-+build_cpu = i686
-+build_os = darwin10
- build_vendor = apple
- builddir = .
- check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp
--datadir = ${datarootdir}
-+datadir = /usr/share
- datarootdir = ${prefix}/share
- docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
- dvidir = ${docdir}
- exec_prefix = ${prefix}
--gl_LIBOBJS =  asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o error.o fcntl.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strndup.o strnlen.o vasnprintf.o xmalloc.o
--gl_LTLIBOBJS =  asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo error.lo fcntl.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strndup.lo strnlen.lo vasnprintf.lo xmalloc.lo
-+gl_LIBOBJS =  asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o dup2.o fcntl.o fd-safer.o getloadavg.o getopt.o getopt1.o memchr.o mktime.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strnlen.o strstr.o timegm.o unsetenv.o vasnprintf.o xmalloc.o
-+gl_LTLIBOBJS =  asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo dup2.lo fcntl.lo fd-safer.lo getloadavg.lo getopt.lo getopt1.lo memchr.lo mktime.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strnlen.lo strstr.lo timegm.lo unsetenv.lo vasnprintf.lo xmalloc.lo
- gltests_LIBOBJS = 
- gltests_LTLIBOBJS = 
- gltests_WITNESS = IN_NAGIOS_PLUGINS_GNULIB_TESTS
--host = i386-apple-darwin9.8.0
--host_alias = 
--host_cpu = i386
--host_os = darwin9.8.0
--host_vendor = apple
-+host = i586-openadk-linux-gnu
-+host_alias = i586-openadk-linux
-+host_cpu = i586
-+host_os = linux-gnu
-+host_vendor = openadk
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${datarootdir}/info
--install_sh = $(SHELL) /tmp/nagiosplugins/build-aux/install-sh
-+install_sh = $(SHELL) /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
-+libexecdir = /usr/libexec
- localedir = ${datarootdir}/locale
--localstatedir = ${prefix}/var
--lt_ECHO = /bin/echo
--mandir = ${datarootdir}/man
--mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
--np_mysql_config = /usr/local/mysql/bin/mysql_config
-+localstatedir = /var
-+lt_ECHO = echo
-+mandir = /usr/share/man
-+mkdir_p = /opt/local/bin/gmkdir -p
-+np_mysql_config = 
- oldincludedir = /usr/include
- pdfdir = ${docdir}
--prefix = /usr/local/nagios
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s&$$&&;s&^&&
- psdir = ${docdir}
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
- srcdir = .
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-openadk-linux
- top_builddir = ..
- top_srcdir = ..
- with_trusted_path = /bin:/sbin:/usr/bin:/usr/sbin
diff --git a/package/nagios-plugins/patches/patch-perlmods_Makefile.orig b/package/nagios-plugins/patches/patch-perlmods_Makefile.orig
deleted file mode 100644
index 218680da8..000000000
--- a/package/nagios-plugins/patches/patch-perlmods_Makefile.orig
+++ /dev/null
@@ -1,451 +0,0 @@
---- nagios-plugins-1.4.15.orig/perlmods/Makefile	2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/perlmods/Makefile	2011-12-03 12:09:09.000000000 +0100
-@@ -29,8 +29,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i386-apple-darwin9.8.0
--host_triplet = i386-apple-darwin9.8.0
-+build_triplet = i686-apple-darwin10
-+host_triplet = i586-openadk-linux-gnu
- subdir = perlmods
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -132,36 +132,36 @@ CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run aclocal-1.10
-+ACLOCAL = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run aclocal-1.10
- ALLOCA = 
- ALLOCA_H = alloca.h
--AMTAR = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run tar
-+AMTAR = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run tar
- APPLE_UNIVERSAL_BUILD = 0
--AR = ar
--ASM_SYMBOL_PREFIX = "_"
--AUTOCONF = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoconf
--AUTOHEADER = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run autoheader
--AUTOMAKE = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run automake-1.10
--AWK = awk
-+AR = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ar
-+ASM_SYMBOL_PREFIX = ""
-+AUTOCONF = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoconf
-+AUTOHEADER = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run autoheader
-+AUTOMAKE = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run automake-1.10
-+AWK = gawk
- BASENAME = /usr/bin/basename
--BITSIZEOF_PTRDIFF_T = 32
--BITSIZEOF_SIG_ATOMIC_T = 32
--BITSIZEOF_SIZE_T = 32
--BITSIZEOF_WCHAR_T = 32
--BITSIZEOF_WINT_T = 32
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS = 
-+BITSIZEOF_PTRDIFF_T = 
-+BITSIZEOF_SIG_ATOMIC_T = 
-+BITSIZEOF_SIZE_T = 
-+BITSIZEOF_WCHAR_T = 
-+BITSIZEOF_WINT_T = 
-+CC = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe
-+CPP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-gcc -E
-+CPPFLAGS = -DNDEBUG
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
- DEPLIBS = 
--DSYMUTIL = dsymutil
-+DSYMUTIL = 
- DUMPBIN = 
--ECHO_C = \c
--ECHO_N = 
-+ECHO_C = 
-+ECHO_N = -n
- ECHO_T = 
- EGREP = /usr/bin/grep -E
- EMULTIHOP_HIDDEN = 
-@@ -172,19 +172,19 @@ EOVERFLOW_HIDDEN = 
- EOVERFLOW_VALUE = 
- ERRNO_H = 
- EXEEXT = 
--EXTRAS =  check_ldap check_mysql check_mysql_query check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
-+EXTRAS =  check_ide_smart check_procs check_nagios check_dns check_hpjd check_snmp check_by_ssh check_dig check_nt
- EXTRAS_ROOT = 
- EXTRA_NETOBJS = 
- EXTRA_TEST = 
- FGREP = /usr/bin/grep -F
- FLOAT_H = 
--FLOORF_LIBM = 
-+FLOORF_LIBM = -lm
- GETADDRINFO_LIB = 
- GETHOSTNAME_LIB = 
--GETLOADAVG_LIBS = 
-+GETLOADAVG_LIBS = -lelf 
- GETOPT_H = getopt.h
- GETTEXT_MACRO_VERSION = 0.18
--GLIBC21 = no
-+GLIBC21 = yes
- GMSGFMT = /opt/local/bin/msgfmt
- GMSGFMT_015 = /opt/local/bin/msgfmt
- GNULIB_ACCEPT = 0
-@@ -425,7 +425,7 @@ HAVE_DECL_ATANL = 1
- HAVE_DECL_CEILF = 1
- HAVE_DECL_CEILL = 1
- HAVE_DECL_COSL = 1
--HAVE_DECL_ENVIRON = 0
-+HAVE_DECL_ENVIRON = 1
- HAVE_DECL_EXPL = 1
- HAVE_DECL_FLOORF = 1
- HAVE_DECL_FLOORL = 1
-@@ -436,7 +436,7 @@ HAVE_DECL_GAI_STRERROR = 1
- HAVE_DECL_GETADDRINFO = 1
- HAVE_DECL_GETDELIM = 1
- HAVE_DECL_GETLINE = 1
--HAVE_DECL_GETLOADAVG = 1
-+HAVE_DECL_GETLOADAVG = 0
- HAVE_DECL_GETLOGIN_R = 1
- HAVE_DECL_GETNAMEINFO = 1
- HAVE_DECL_GETPAGESIZE = 1
-@@ -456,8 +456,8 @@ HAVE_DECL_SINL = 1
- HAVE_DECL_SNPRINTF = 1
- HAVE_DECL_SQRTL = 1
- HAVE_DECL_STRDUP = 1
--HAVE_DECL_STRNDUP = 0
--HAVE_DECL_STRNLEN = 0
-+HAVE_DECL_STRNDUP = 1
-+HAVE_DECL_STRNLEN = 1
- HAVE_DECL_STRSIGNAL = 1
- HAVE_DECL_STRTOK_R = 1
- HAVE_DECL_TANL = 1
-@@ -550,9 +550,9 @@ HAVE_RENAMEAT = 1
- HAVE_RPMATCH = 1
- HAVE_SA_FAMILY_T = 1
- HAVE_SETENV = 1
--HAVE_SIGNED_SIG_ATOMIC_T = 1
--HAVE_SIGNED_WCHAR_T = 1
--HAVE_SIGNED_WINT_T = 1
-+HAVE_SIGNED_SIG_ATOMIC_T = 
-+HAVE_SIGNED_WCHAR_T = 
-+HAVE_SIGNED_WINT_T = 
- HAVE_SINL = 1
- HAVE_SLEEP = 1
- HAVE_SQRTL = 1
-@@ -568,13 +568,13 @@ HAVE_STRTOD = 1
- HAVE_STRTOLL = 1
- HAVE_STRTOULL = 1
- HAVE_STRUCT_ADDRINFO = 1
--HAVE_STRUCT_RANDOM_DATA = 0
-+HAVE_STRUCT_RANDOM_DATA = 1
- HAVE_STRUCT_SOCKADDR_STORAGE = 1
- HAVE_STRVERSCMP = 1
- HAVE_SYMLINK = 1
- HAVE_SYMLINKAT = 1
--HAVE_SYS_BITYPES_H = 0
--HAVE_SYS_INTTYPES_H = 0
-+HAVE_SYS_BITYPES_H = 
-+HAVE_SYS_INTTYPES_H = 
- HAVE_SYS_LOADAVG_H = 0
- HAVE_SYS_PARAM_H = 0
- HAVE_SYS_SOCKET_H = 1
-@@ -600,54 +600,54 @@ HAVE_WCTYPE_H = 1
- HAVE_WINSOCK2_H = 0
- HAVE_WINT_T = 1
- HAVE_WS2TCPIP_H = 0
--HAVE_XLOCALE_H = 1
-+HAVE_XLOCALE_H = 0
- HAVE__BOOL = 1
- HOSTENT_LIB = 
- HOSTNAME = /bin/hostname
- INCLUDE_NEXT = include_next
- INCLUDE_NEXT_AS_FIRST_DIRECTIVE = include_next
- INET_NTOP_LIB = 
--INSTALL = /usr/bin/install -c 
-+INSTALL = /Volumes/adk/openadk/scripts/install -c 
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = $(install_sh) -c -s 
- INTLLIBS = 
--INTL_MACOSX_LIBS = -Wl,-framework -Wl,CoreFoundation
-+INTL_MACOSX_LIBS = 
- KMEM_GROUP = 
- KRBINCLUDE = 
--LD = /usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld
--LDAPINCLUDE = -I/usr/include/ldap
--LDAPLIBS = -lldap -llber
--LDFLAGS =  -L.
-+LD = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ld
-+LDAPINCLUDE = 
-+LDAPLIBS = 
-+LDFLAGS = -L/Volumes/adk/openadk/target_i586_uclibc/lib -L/Volumes/adk/openadk/target_i586_uclibc/usr/lib -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i586_uclibc/usr/lib -L.
- LIBGNUTLS_CONFIG = 
- LIBGNU_LIBDEPS = 
- LIBGNU_LTLIBDEPS = 
- LIBICONV = -liconv
- LIBINTL = 
--LIBOBJS =  ${LIBOBJDIR}error$U.o
-+LIBOBJS =  ${LIBOBJDIR}strtod$U.o
- LIBS = -lpthread -ldl 
- LIBSOCKET = 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
--LIPO = lipo
-+LIPO = 
- LN_S = ln -s
- LOCALCHARSET_TESTS_ENVIRONMENT = CHARSETALIASDIR="$(top_builddir)/gl"
--LOCALE_FR = fr_FR.ISO8859-1
--LOCALE_FR_UTF8 = fr_FR.UTF-8
-+LOCALE_FR = none
-+LOCALE_FR_UTF8 = none
- LOCALE_JA = ja_JP.eucJP
--LOCALE_ZH_CN = zh_CN.GB18030
-+LOCALE_ZH_CN = none
- LTLIBICONV = -liconv
- LTLIBINTL = 
--LTLIBOBJS =  ${LIBOBJDIR}error$U.lo
--MAKEINFO = ${SHELL} /tmp/nagiosplugins/build-aux/missing --run makeinfo
-+LTLIBOBJS =  ${LIBOBJDIR}strtod$U.lo
-+MAKEINFO = ${SHELL} /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/missing --run makeinfo
- MATHLIBS = -lm
--MKDIR_P = ../build-aux/install-sh -c -d
-+MKDIR_P = /opt/local/bin/gmkdir -p
- MSGFMT = /opt/local/bin/msgfmt
- MSGFMT_015 = /opt/local/bin/msgfmt
- MSGMERGE = /opt/local/bin/msgmerge
--MYSQLCFLAGS = -I/usr/local/mysql/include  -Os -arch i386 -fno-common   -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT  -DDONT_DECLARE_CXA_PURE_VIRTUAL
--MYSQLINCLUDE = -I/usr/local/mysql/include
--MYSQLLIBS = -L/usr/local/mysql/lib -lmysqlclient -lz -lm
-+MYSQLCFLAGS = 
-+MYSQLINCLUDE = 
-+MYSQLLIBS = 
- NEED_SETGID = false
- NETINET_IN_H = 
- NEXT_ARPA_INET_H = <arpa/inet.h>
-@@ -692,13 +692,13 @@ NEXT_TIME_H = <time.h>
- NEXT_UNISTD_H = <unistd.h>
- NEXT_WCHAR_H = <wchar.h>
- NEXT_WCTYPE_H = <wctype.h>
--NM = /usr/bin/nm -p
--NMEDIT = nmedit
-+NM = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-nm
-+NMEDIT = 
- NP_RELEASE = 1.4.15
--OBJDUMP = false
-+OBJDUMP = i586-openadk-linux-objdump
- OBJEXT = o
--OTOOL = otool
--OTOOL64 = :
-+OTOOL = 
-+OTOOL64 = 
- PACKAGE = nagios-plugins
- PACKAGE_BUGREPORT = 
- PACKAGE_NAME = nagios-plugins
-@@ -728,21 +728,21 @@ PATH_TO_SWAP = 
- PATH_TO_SWAPINFO = 
- PATH_TO_UPTIME = /usr/bin/uptime
- PATH_TO_WHO = /usr/bin/who
--PERL = /usr/bin/perl
-+PERL = /opt/local/bin/perl
- PERLMODS_DIR = 
- PGINCLUDE = 
- PGLIBS = 
- PKG_ARCH = i386
- PLUGIN_TEST = t/check_by_ssh.t t/check_cluster.t t/check_dig.t t/check_disk.t t/check_dns.t t/check_dummy.t t/check_fping.t t/check_ftp.t t/check_hpjd.t t/check_http.t t/check_imap.t t/check_jabber.t t/check_load.t t/check_mysql.t t/check_mysql_query.t t/check_nagios.t t/check_ntp.t t/check_ping.t t/check_pop.t t/check_procs.t t/check_smtp.t t/check_snmp.t t/check_swap.t t/check_tcp.t t/check_time.t t/check_udp.t t/check_users.t t/negate.t
- POSUB = 
--POW_LIB = 
-+POW_LIB = -lm
- PRAGMA_SYSTEM_HEADER = #pragma GCC system_header
- PST3CFLAGS = 
- PTHREAD_H_DEFINES_STRUCT_TIMESPEC = 0
- PTRDIFF_T_SUFFIX = 
- PYTHON = /usr/bin/python
- RADIUSLIBS = 
--RANLIB = ranlib
-+RANLIB = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-ranlib
- RELEASE = 1
- REPLACE_BTOWC = 0
- REPLACE_CANONICALIZE_FILE_NAME = 0
-@@ -752,7 +752,7 @@ REPLACE_CHOWN = 0
- REPLACE_CLOSE = 0
- REPLACE_DPRINTF = 0
- REPLACE_DUP = 0
--REPLACE_DUP2 = 0
-+REPLACE_DUP2 = 1
- REPLACE_DUPLOCALE = 0
- REPLACE_FCHOWNAT = 0
- REPLACE_FCLOSE = 0
-@@ -796,19 +796,19 @@ REPLACE_MBSINIT = 0
- REPLACE_MBSNRTOWCS = 0
- REPLACE_MBSRTOWCS = 0
- REPLACE_MBSTATE_T = 0
--REPLACE_MEMCHR = 0
-+REPLACE_MEMCHR = 1
- REPLACE_MEMMEM = 0
- REPLACE_MKDIR = 0
- REPLACE_MKFIFO = 0
- REPLACE_MKNOD = 0
- REPLACE_MKSTEMP = 0
--REPLACE_MKTIME = 0
-+REPLACE_MKTIME = 1
- REPLACE_NAN = 0
- REPLACE_NANOSLEEP = GNULIB_PORTCHECK
- REPLACE_NL_LANGINFO = 0
- REPLACE_NULL = 0
- REPLACE_OBSTACK_PRINTF = 0
--REPLACE_OPEN = 1
-+REPLACE_OPEN = 0
- REPLACE_OPENAT = 0
- REPLACE_PERROR = 0
- REPLACE_POPEN = 0
-@@ -839,19 +839,19 @@ REPLACE_STRDUP = 0
- REPLACE_STRERROR = 0
- REPLACE_STRNCAT = 0
- REPLACE_STRNDUP = 0
--REPLACE_STRNLEN = 0
-+REPLACE_STRNLEN = 1
- REPLACE_STRSIGNAL = 0
--REPLACE_STRSTR = 0
-+REPLACE_STRSTR = 1
- REPLACE_STRTOD = 0
- REPLACE_STRTOK_R = 0
- REPLACE_SYMLINK = 0
--REPLACE_TIMEGM = 0
-+REPLACE_TIMEGM = 1
- REPLACE_TMPFILE = 0
- REPLACE_TRUNCL = 0
- REPLACE_TTYNAME_R = 0
- REPLACE_UNLINK = 0
- REPLACE_UNLINKAT = 0
--REPLACE_UNSETENV = 0
-+REPLACE_UNSETENV = 1
- REPLACE_USLEEP = 0
- REPLACE_UTIMENSAT = 0
- REPLACE_VASPRINTF = 0
-@@ -866,23 +866,23 @@ REPLACE_WCSRTOMBS = 0
- REPLACE_WCTOB = 0
- REPLACE_WCWIDTH = 0
- REPLACE_WRITE = 0
--REV_DATESTAMP = 2010.07.27.21.48
--REV_TIMESTAMP = 20100727214823
-+REV_DATESTAMP = 2011.12.03.12.08
-+REV_TIMESTAMP = 20111203120820
- SCRIPT_TEST = t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
--SED = /usr/bin/sed
-+SED = /Volumes/adk/openadk/scripts/sed
- SERVENT_LIB = 
- SET_MAKE = 
- SH = /bin/sh
--SHELL = /bin/sh
-+SHELL = /bin/bash
- SIG_ATOMIC_T_SUFFIX = 
--SIZE_T_SUFFIX = ul
--SOCKETLIBS =  -lresolv
-+SIZE_T_SUFFIX = 
-+SOCKETLIBS =  -lnsl -lresolv
- SSLINCLUDE = -I/usr/include
- SSLLIBS = -lssl -lcrypto
- STDBOOL_H = 
- STDDEF_H = 
--STDINT_H = stdint.h
--STRIP = strip
-+STDINT_H = 
-+STRIP = /Volumes/adk/openadk/host_i586_uclibc/bin/i586-openadk-linux-uclibc-strip
- SUPPORT = Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n
- SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = 0
- TIME_H_DEFINES_STRUCT_TIMESPEC = 1
-@@ -897,62 +897,62 @@ WINT_T_SUFFIX = 
- XGETTEXT = /opt/local/bin/xgettext
- XGETTEXT_015 = /opt/local/bin/xgettext
- XGETTEXT_EXTRA_OPTIONS =  --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format
--abs_builddir = /tmp/nagiosplugins/perlmods
--abs_srcdir = /tmp/nagiosplugins/perlmods
--abs_top_builddir = /tmp/nagiosplugins
--abs_top_srcdir = /tmp/nagiosplugins
--ac_ct_CC = gcc
-+abs_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/perlmods
-+abs_top_builddir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+abs_top_srcdir = /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15
-+ac_ct_CC = 
- ac_ct_DUMPBIN = 
- am__include = include
- am__leading_dot = .
- am__quote = 
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
--bindir = ${exec_prefix}/bin
--build = i386-apple-darwin9.8.0
--build_alias = 
--build_cpu = i386
--build_os = darwin9.8.0
-+bindir = /usr/bin
-+build = i686-apple-darwin10
-+build_alias = i686-apple-darwin10
-+build_cpu = i686
-+build_os = darwin10
- build_vendor = apple
- builddir = .
- check_tcp_ssl = check_simap check_spop check_jabber check_nntps check_ssmtp
--datadir = ${datarootdir}
-+datadir = /usr/share
- datarootdir = ${prefix}/share
- docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
- dvidir = ${docdir}
- exec_prefix = ${prefix}
--gl_LIBOBJS =  asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o error.o fcntl.o fd-safer.o fsusage.o getopt.o getopt1.o mountlist.o open.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strndup.o strnlen.o vasnprintf.o xmalloc.o
--gl_LTLIBOBJS =  asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo error.lo fcntl.lo fd-safer.lo fsusage.lo getopt.lo getopt1.lo mountlist.lo open.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strndup.lo strnlen.lo vasnprintf.lo xmalloc.lo
-+gl_LIBOBJS =  asnprintf.o basename.o basename-lgpl.o c-strtod.o cloexec.o creat-safer.o dirname.o dirname-lgpl.o dup-safer.o dup2.o fcntl.o fd-safer.o getloadavg.o getopt.o getopt1.o memchr.o mktime.o mountlist.o open-safer.o pipe-safer.o printf-args.o printf-parse.o regex.o safe-read.o safe-write.o setenv.o sha1.o stat.o stripslash.o strnlen.o strstr.o timegm.o unsetenv.o vasnprintf.o xmalloc.o
-+gl_LTLIBOBJS =  asnprintf.lo basename.lo basename-lgpl.lo c-strtod.lo cloexec.lo creat-safer.lo dirname.lo dirname-lgpl.lo dup-safer.lo dup2.lo fcntl.lo fd-safer.lo getloadavg.lo getopt.lo getopt1.lo memchr.lo mktime.lo mountlist.lo open-safer.lo pipe-safer.lo printf-args.lo printf-parse.lo regex.lo safe-read.lo safe-write.lo setenv.lo sha1.lo stat.lo stripslash.lo strnlen.lo strstr.lo timegm.lo unsetenv.lo vasnprintf.lo xmalloc.lo
- gltests_LIBOBJS = 
- gltests_LTLIBOBJS = 
- gltests_WITNESS = IN_NAGIOS_PLUGINS_GNULIB_TESTS
--host = i386-apple-darwin9.8.0
--host_alias = 
--host_cpu = i386
--host_os = darwin9.8.0
--host_vendor = apple
-+host = i586-openadk-linux-gnu
-+host_alias = i586-openadk-linux
-+host_cpu = i586
-+host_os = linux-gnu
-+host_vendor = openadk
- htmldir = ${docdir}
- includedir = ${prefix}/include
- infodir = ${datarootdir}/info
--install_sh = $(SHELL) /tmp/nagiosplugins/build-aux/install-sh
-+install_sh = $(SHELL) /Volumes/adk/openadk/build_pcengines-alix2d2_i586_uclibc/w-nagios-plugins-1.4.15-1/nagios-plugins-1.4.15/build-aux/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
-+libexecdir = /usr/libexec
- localedir = ${datarootdir}/locale
--localstatedir = ${prefix}/var
--lt_ECHO = /bin/echo
--mandir = ${datarootdir}/man
--mkdir_p = $(top_builddir)/build-aux/install-sh -c -d
--np_mysql_config = /usr/local/mysql/bin/mysql_config
-+localstatedir = /var
-+lt_ECHO = echo
-+mandir = /usr/share/man
-+mkdir_p = /opt/local/bin/gmkdir -p
-+np_mysql_config = 
- oldincludedir = /usr/include
- pdfdir = ${docdir}
--prefix = /usr/local/nagios
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s&$$&&;s&^&&
- psdir = ${docdir}
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
- srcdir = .
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-openadk-linux
- top_builddir = ..
- top_srcdir = ..
- with_trusted_path = /bin:/sbin:/usr/bin:/usr/sbin
diff --git a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo b/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo
deleted file mode 100644
index 196c4bc1d..000000000
--- a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo
+++ /dev/null
@@ -1,16 +0,0 @@
---- nagios-plugins-1.4.15.orig/pkg/solaris/pkginfo	2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/pkg/solaris/pkginfo	2011-12-03 12:13:10.000000000 +0100
-@@ -2,11 +2,11 @@ PKG="NAGplugin"
- NAME="nagios-plugins"
- DESC="Nagios network monitoring plugins"
- ARCH="i386"
--VERSION="1.4.15,REV=2010.07.27.21.48"
-+VERSION="1.4.15,REV=2011.12.03.12.12"
- CATEGORY="application"
- VENDOR="Nagios Plugin Development Team"
- EMAIL="nagiosplug-devel@lists.sourceforge.net"
--PSTAMP="nag20100727214823"
-+PSTAMP="nag20111203121222"
- BASEDIR="/"
- CLASSES="none"
- 
diff --git a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig b/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig
deleted file mode 100644
index 152a0c36b..000000000
--- a/package/nagios-plugins/patches/patch-pkg_solaris_pkginfo.orig
+++ /dev/null
@@ -1,16 +0,0 @@
---- nagios-plugins-1.4.15.orig/pkg/solaris/pkginfo	2010-07-27 22:49:27.000000000 +0200
-+++ nagios-plugins-1.4.15/pkg/solaris/pkginfo	2011-12-03 12:09:09.000000000 +0100
-@@ -2,11 +2,11 @@ PKG="NAGplugin"
- NAME="nagios-plugins"
- DESC="Nagios network monitoring plugins"
- ARCH="i386"
--VERSION="1.4.15,REV=2010.07.27.21.48"
-+VERSION="1.4.15,REV=2011.12.03.12.08"
- CATEGORY="application"
- VENDOR="Nagios Plugin Development Team"
- EMAIL="nagiosplug-devel@lists.sourceforge.net"
--PSTAMP="nag20100727214823"
-+PSTAMP="nag20111203120820"
- BASEDIR="/"
- CLASSES="none"
- 
diff --git a/package/nagios-plugins/patches/patch-plugins_Makefile_in b/package/nagios-plugins/patches/patch-plugins_Makefile_in
index 2cdb325fd..a22bcc070 100644
--- a/package/nagios-plugins/patches/patch-plugins_Makefile_in
+++ b/package/nagios-plugins/patches/patch-plugins_Makefile_in
@@ -1,14 +1,16 @@
 --- nagios-plugins-1.4.15.orig/plugins/Makefile.in	2010-07-27 22:48:10.000000000 +0200
-+++ nagios-plugins-1.4.15/plugins/Makefile.in	2011-12-03 12:15:23.000000000 +0100
-@@ -31,7 +31,7 @@ PRE_UNINSTALL = :
++++ nagios-plugins-1.4.15/plugins/Makefile.in	2011-12-03 13:26:49.709669796 +0100
+@@ -31,8 +31,8 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
 -libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
+-	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
 +libexec_PROGRAMS = check_cluster$(EXEEXT) \
- 	check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
++	check_dummy$(EXEEXT) check_http$(EXEEXT) \
  	check_load$(EXEEXT) check_mrtg$(EXEEXT) \
  	check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
+ 	check_ntp_peer$(EXEEXT) check_nwstat$(EXEEXT) \
 @@ -46,7 +46,7 @@ EXTRA_PROGRAMS = check_mysql$(EXEEXT) ch
  	check_game$(EXEEXT) check_dig$(EXEEXT) check_nagios$(EXEEXT) \
  	check_by_ssh$(EXEEXT) check_dns$(EXEEXT) check_nt$(EXEEXT) \