cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nagios-plugins 1.4.6

Browse Source 
fix LIB_DEPENDS and WANTLIB
This commit is contained in:
sturm 2007-02-07 18:16:40 +00:00
parent ca8ecab8d7
commit d60483a310
6 changed files with 67 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
net/nagios/plugins/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2006/12/01 06:14:10 sturm Exp $
# $OpenBSD: Makefile,v 1.17 2007/02/07 18:16:40 sturm Exp $
COMMENT-main= "nagios base plugins"
COMMENT-fping= "fping plugin"
@ -10,17 +10,17 @@ COMMENT-pgsql= "postgresql plugin"
COMMENT-samba= "samba plugin"
COMMENT-snmp= "plugins using snmp"
V= 1.4.5
V= 1.4.6
DISTNAME= nagios-plugins-${V}
PKGNAME-main= nagios-plugins-${V}p0
PKGNAME-fping= nagios-plugins-fping-${V}p0
PKGNAME-game= nagios-plugins-game-${V}p0
PKGNAME-ldap= nagios-plugins-ldap-${V}p0
PKGNAME-mysql= nagios-plugins-mysql-${V}p0
PKGNAME-ntp= nagios-plugins-ntp-${V}p0
PKGNAME-pgsql= nagios-plugins-pgsql-${V}p0
PKGNAME-samba= nagios-plugins-samba-${V}p0
PKGNAME-snmp= nagios-plugins-snmp-${V}p0
PKGNAME-main= nagios-plugins-${V}
PKGNAME-fping= nagios-plugins-fping-${V}
PKGNAME-game= nagios-plugins-game-${V}
PKGNAME-ldap= nagios-plugins-ldap-${V}
PKGNAME-mysql= nagios-plugins-mysql-${V}
PKGNAME-ntp= nagios-plugins-ntp-${V}
PKGNAME-pgsql= nagios-plugins-pgsql-${V}
PKGNAME-samba= nagios-plugins-samba-${V}
PKGNAME-snmp= nagios-plugins-snmp-${V}
CATEGORIES= net
HOMEPAGE= http://nagiosplug.sourceforge.net/
@ -84,37 +84,35 @@ BUILD_DEPENDS+= ::net/p5-Net-SNMP \
::net/net-snmp
.endif
WANTLIB= c crypto ssl
WANTLIB= c
LIB_DEPENDS-fping=
RUN_DEPENDS-fping= ::net/fping
LIB_DEPENDS-game=
RUN_DEPENDS-game= ::games/qstat
WANTLIB-ldap= ${WANTLIB} sasl2 asn1 com_err gssapi krb5
LIB_DEPENDS-ldap= lber,ldap:openldap-client-*:databases/openldap
WANTLIB-ldap= ${WANTLIB} asn1 com_err crypto gssapi krb5 sasl2 ssl
LIB_DEPENDS-ldap= lber,ldap:openldap-client-*:databases/openldap \
${LIB_DEPENDS}
WANTLIB-mysql= ${WANTLIB} m z
LIB_DEPENDS-mysql= mysqlclient:mysql-client-*:databases/mysql
WANTLIB-mysql= ${WANTLIB} crypto m ssl z
LIB_DEPENDS-mysql= mysqlclient:mysql-client-*:databases/mysql \
${LIB_DEPENDS}
LIB_DEPENDS-ntp=
WANTLIB-ntp= ${WANTLIB} m
RUN_DEPENDS-ntp= ::net/ntp
WANTLIB-pgsql= ${WANTLIB} crypto
LIB_DEPENDS-pgsql= pq:postgresql-client-*:databases/postgresql
LIB_DEPENDS-pgsql= pq:postgresql-client-*:databases/postgresql \
${LIB_DEPENDS}
LIB_DEPENDS-samba=
WANTLIB-samba=
RUN_DEPENDS-samba= ::net/samba
LIB_DEPENDS-snmp=
RUN_DEPENDS-snmp= ::net/net-snmp \
::net/p5-Net-SNMP
WANTLIB-main= ${WANTLIB} m
LIB_DEPENDS-main=
WANTLIB-main= ${WANTLIB} crypto m ssl
MODULES= gettext

8
net/nagios/plugins/distinfo
View File

@ -1,4 +1,4 @@
MD5 (nagios-plugins-1.4.5.tar.gz) = 359afddaf6a8e3228a5130b60bed0f67
RMD160 (nagios-plugins-1.4.5.tar.gz) = 0b8463e223ede5dee444ffc24d3ea021cd301eb8
SHA1 (nagios-plugins-1.4.5.tar.gz) = 5b0501b2892108cfaa260c64015205d33a97a0c1
SIZE (nagios-plugins-1.4.5.tar.gz) = 1285997
MD5 (nagios-plugins-1.4.6.tar.gz) = ea79fa91092d709aa6b2e732b1d55541
RMD160 (nagios-plugins-1.4.6.tar.gz) = 9ec598e8de28cb962b87337789ab3f8d41ca3d11
SHA1 (nagios-plugins-1.4.6.tar.gz) = bcd87928ca9b01def8782877cb07e4977468a15c
SIZE (nagios-plugins-1.4.6.tar.gz) = 1349110

18
net/nagios/plugins/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.6 2006/11/11 17:17:43 sturm Exp $
--- configure.orig Wed Nov 1 22:24:09 2006
+++ configure Sat Nov 11 14:38:22 2006
@@ -24329,13 +24329,13 @@ if test "${with_pgsql+set}" = set; then
$OpenBSD: patch-configure,v 1.7 2007/02/07 18:16:40 sturm Exp $
--- configure.orig Mon Feb 5 14:18:34 2007
+++ configure Wed Feb 7 09:13:20 2007
@@ -20349,13 +20349,13 @@ if test "${with_pgsql+set}" = set; then
PGSQL=$withval
fi;
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.6 2006/11/11 17:17:43 sturm Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24392,12 +24392,12 @@ if test $ac_cv_lib_crypt_main = yes; the
@@ -20411,12 +20411,12 @@ if test $ac_cv_lib_crypt_main = yes; the
#define HAVE_LIBCRYPT 1
_ACEOF
@ -33,7 +33,7 @@ $OpenBSD: patch-configure,v 1.6 2006/11/11 17:17:43 sturm Exp $
LDFLAGS="$LDFLAGS -L$PGSQL/lib"
CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
fi
@@ -24408,7 +24408,7 @@ if test "${ac_cv_lib_pq_PQsetdbLogin+set
@@ -20427,7 +20427,7 @@ if test "${ac_cv_lib_pq_PQsetdbLogin+set
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -42,7 +42,7 @@ $OpenBSD: patch-configure,v 1.6 2006/11/11 17:17:43 sturm Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24927,16 +24927,16 @@ fi
@@ -20942,16 +20942,16 @@ fi
done
if [ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]; then
@ -65,7 +65,7 @@ $OpenBSD: patch-configure,v 1.6 2006/11/11 17:17:43 sturm Exp $
PGINCLUDE="-I$PGSQL/include"
fi
if test -z "$PGINCLUDE"; then
@@ -26866,7 +26866,7 @@ done
@@ -21804,7 +21804,7 @@ done
if test "$FOUNDINCLUDE" = "no"; then
_SAVEDCPPFLAGS="$CPPFLAGS"
@ -74,7 +74,7 @@ $OpenBSD: patch-configure,v 1.6 2006/11/11 17:17:43 sturm Exp $
unset ac_cv_header_krb5_h
for ac_header in krb5.h
@@ -27013,7 +27013,7 @@ if test `eval echo '${'$as_ac_Header'}'`
@@ -21950,7 +21950,7 @@ if test `eval echo '${'$as_ac_Header'}'`
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF

12
net/nagios/plugins/patches/patch-lib_regex_internal_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_regex_internal_h,v 1.1 2006/11/11 17:17:43 sturm Exp $
--- lib/regex_internal.h.orig Sat Nov 11 17:32:48 2006
+++ lib/regex_internal.h Sat Nov 11 17:32:59 2006
@@ -455,7 +455,7 @@ static unsigned int re_string_context_at
#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
-#include <alloca.h>
+#include <stdlib.h>
#ifndef _LIBC
# if HAVE_ALLOCA

21
net/nagios/plugins/patches/patch-plugins_check_swap_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-plugins_check_swap_c,v 1.1 2007/02/07 18:16:40 sturm Exp $
--- plugins/check_swap.c.orig Wed Feb 7 10:05:35 2007
+++ plugins/check_swap.c Wed Feb 7 10:06:28 2007
@@ -42,14 +42,14 @@ const char *email = "nagiosplug-devel@li
#include "utils.h"
#ifdef HAVE_DECL_SWAPCTL
+# ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+# endif
# ifdef HAVE_SYS_SWAP_H
# include <sys/swap.h>
# endif
# ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
-# endif
-# ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
# endif
#endif

12
net/nagios/plugins/patches/patch-po_Makefile_in_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2007/02/07 18:16:40 sturm Exp $
--- po/Makefile.in.in.orig Wed Feb 7 10:32:39 2007
+++ po/Makefile.in.in Wed Feb 7 10:33:24 2007
@@ -30,7 +30,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = ../mkinstalldirs
mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
GMSGFMT = @GMSGFMT@