diff options
32 files changed, 264 insertions, 104 deletions
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index a22f55280c09..39430cd5a9c0 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -7,10 +7,10 @@ PORTNAME= nagios PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nagios -DISTNAME= nagios-1.0 MAINTAINER= blaz@si.FreeBSD.org COMMENT= Extremely powerful network monitoring system @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${PREFIX}/var/nagios \ + --localstatedir=/var/spool/nagios \ --prefix=${PREFIX} .if defined(WITH_MYSQL) @@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \ .endif .if defined(WITH_POSTGRES) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata @@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode -pre-fetch: - @${SH} ${SCRIPTDIR}/checkps - pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/net-mgmt/nagios/files/patch-xcddb.c b/net-mgmt/nagios/files/patch-xcddb.c new file mode 100644 index 000000000000..34bc8dc1759a --- /dev/null +++ b/net-mgmt/nagios/files/patch-xcddb.c @@ -0,0 +1,11 @@ +--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xcddb.c Thu Mar 6 23:14:25 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XCDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios/files/patch-xdddb.c b/net-mgmt/nagios/files/patch-xdddb.c new file mode 100644 index 000000000000..f1a942e7ae45 --- /dev/null +++ b/net-mgmt/nagios/files/patch-xdddb.c @@ -0,0 +1,11 @@ +--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xdddb.c Thu Mar 6 23:15:54 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XDDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios/files/patch-xeddb.c b/net-mgmt/nagios/files/patch-xeddb.c new file mode 100644 index 000000000000..2aaaa7db9043 --- /dev/null +++ b/net-mgmt/nagios/files/patch-xeddb.c @@ -0,0 +1,11 @@ +--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002 ++++ xdata/xeddb.c Thu Mar 6 23:16:01 2003 +@@ -44,7 +44,7 @@ + #endif + + #ifdef USE_XEDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios/files/patch-xrddb.c b/net-mgmt/nagios/files/patch-xrddb.c new file mode 100644 index 000000000000..0f850674b63c --- /dev/null +++ b/net-mgmt/nagios/files/patch-xrddb.c @@ -0,0 +1,11 @@ +--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xrddb.c Thu Mar 6 23:16:14 2003 +@@ -43,7 +43,7 @@ + #endif + + #ifdef USE_XRDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios/files/patch-xsddb.c b/net-mgmt/nagios/files/patch-xsddb.c new file mode 100644 index 000000000000..e9e1d169cc76 --- /dev/null +++ b/net-mgmt/nagios/files/patch-xsddb.c @@ -0,0 +1,11 @@ +--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002 ++++ xdata/xsddb.c Thu Mar 6 23:16:27 2003 +@@ -48,7 +48,7 @@ + #endif + + #ifdef USE_XSDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index e595f0d3e9b5..2f1a32523a20 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -1,9 +1,9 @@ @exec mkdir -p %D/share/nagios/ssi -@exec mkdir -p %D/var/nagios/archives -@exec mkdir -p %D/var/nagios/rw -@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw -@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives -@exec chown nagios:nogroup %D/var/nagios/rw +@exec mkdir -p /var/spool/nagios/archives +@exec mkdir -p /var/spool/nagios/rw +@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw +@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives +@exec chown nagios:nogroup /var/spool/nagios/rw bin/nagios etc/nagios/cgi.cfg-sample etc/nagios/checkcommands.cfg-sample @@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css @dirrm share/nagios/ssi @dirrm share/nagios/stylesheets @dirrm share/nagios -@unexec rmdir %D/var/nagios/archives 2>/dev/null || true -@unexec rmdir %D/var/nagios/rw 2>/dev/null || true -@unexec rmdir %D/var/nagios 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true +@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true +@unexec rmdir /var/spool/nagios 2>/dev/null || true diff --git a/net-mgmt/nagios/scripts/checkps b/net-mgmt/nagios/scripts/checkps deleted file mode 100644 index 6014bfca04cb..000000000000 --- a/net-mgmt/nagios/scripts/checkps +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -/bin/ps 999999 2>&1 >/dev/null -if [ $? = 0 ]; then - echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime" - echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will" - echo "return an error code if a PID does not exist. Nagios needs this!" - exit -else - echo "Great, you have a working ps(1)! Nagios can build." -fi diff --git a/net-mgmt/nagios12/Makefile b/net-mgmt/nagios12/Makefile index a22f55280c09..39430cd5a9c0 100644 --- a/net-mgmt/nagios12/Makefile +++ b/net-mgmt/nagios12/Makefile @@ -7,10 +7,10 @@ PORTNAME= nagios PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nagios -DISTNAME= nagios-1.0 MAINTAINER= blaz@si.FreeBSD.org COMMENT= Extremely powerful network monitoring system @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${PREFIX}/var/nagios \ + --localstatedir=/var/spool/nagios \ --prefix=${PREFIX} .if defined(WITH_MYSQL) @@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \ .endif .if defined(WITH_POSTGRES) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata @@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode -pre-fetch: - @${SH} ${SCRIPTDIR}/checkps - pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/net-mgmt/nagios12/files/patch-xcddb.c b/net-mgmt/nagios12/files/patch-xcddb.c new file mode 100644 index 000000000000..34bc8dc1759a --- /dev/null +++ b/net-mgmt/nagios12/files/patch-xcddb.c @@ -0,0 +1,11 @@ +--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xcddb.c Thu Mar 6 23:14:25 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XCDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios12/files/patch-xdddb.c b/net-mgmt/nagios12/files/patch-xdddb.c new file mode 100644 index 000000000000..f1a942e7ae45 --- /dev/null +++ b/net-mgmt/nagios12/files/patch-xdddb.c @@ -0,0 +1,11 @@ +--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xdddb.c Thu Mar 6 23:15:54 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XDDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios12/files/patch-xeddb.c b/net-mgmt/nagios12/files/patch-xeddb.c new file mode 100644 index 000000000000..2aaaa7db9043 --- /dev/null +++ b/net-mgmt/nagios12/files/patch-xeddb.c @@ -0,0 +1,11 @@ +--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002 ++++ xdata/xeddb.c Thu Mar 6 23:16:01 2003 +@@ -44,7 +44,7 @@ + #endif + + #ifdef USE_XEDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios12/files/patch-xrddb.c b/net-mgmt/nagios12/files/patch-xrddb.c new file mode 100644 index 000000000000..0f850674b63c --- /dev/null +++ b/net-mgmt/nagios12/files/patch-xrddb.c @@ -0,0 +1,11 @@ +--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xrddb.c Thu Mar 6 23:16:14 2003 +@@ -43,7 +43,7 @@ + #endif + + #ifdef USE_XRDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios12/files/patch-xsddb.c b/net-mgmt/nagios12/files/patch-xsddb.c new file mode 100644 index 000000000000..e9e1d169cc76 --- /dev/null +++ b/net-mgmt/nagios12/files/patch-xsddb.c @@ -0,0 +1,11 @@ +--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002 ++++ xdata/xsddb.c Thu Mar 6 23:16:27 2003 +@@ -48,7 +48,7 @@ + #endif + + #ifdef USE_XSDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist index e595f0d3e9b5..2f1a32523a20 100644 --- a/net-mgmt/nagios12/pkg-plist +++ b/net-mgmt/nagios12/pkg-plist @@ -1,9 +1,9 @@ @exec mkdir -p %D/share/nagios/ssi -@exec mkdir -p %D/var/nagios/archives -@exec mkdir -p %D/var/nagios/rw -@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw -@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives -@exec chown nagios:nogroup %D/var/nagios/rw +@exec mkdir -p /var/spool/nagios/archives +@exec mkdir -p /var/spool/nagios/rw +@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw +@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives +@exec chown nagios:nogroup /var/spool/nagios/rw bin/nagios etc/nagios/cgi.cfg-sample etc/nagios/checkcommands.cfg-sample @@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css @dirrm share/nagios/ssi @dirrm share/nagios/stylesheets @dirrm share/nagios -@unexec rmdir %D/var/nagios/archives 2>/dev/null || true -@unexec rmdir %D/var/nagios/rw 2>/dev/null || true -@unexec rmdir %D/var/nagios 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true +@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true +@unexec rmdir /var/spool/nagios 2>/dev/null || true diff --git a/net-mgmt/nagios12/scripts/checkps b/net-mgmt/nagios12/scripts/checkps deleted file mode 100644 index 6014bfca04cb..000000000000 --- a/net-mgmt/nagios12/scripts/checkps +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -/bin/ps 999999 2>&1 >/dev/null -if [ $? = 0 ]; then - echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime" - echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will" - echo "return an error code if a PID does not exist. Nagios needs this!" - exit -else - echo "Great, you have a working ps(1)! Nagios can build." -fi diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index a22f55280c09..39430cd5a9c0 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -7,10 +7,10 @@ PORTNAME= nagios PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nagios -DISTNAME= nagios-1.0 MAINTAINER= blaz@si.FreeBSD.org COMMENT= Extremely powerful network monitoring system @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${PREFIX}/var/nagios \ + --localstatedir=/var/spool/nagios \ --prefix=${PREFIX} .if defined(WITH_MYSQL) @@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \ .endif .if defined(WITH_POSTGRES) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata @@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode -pre-fetch: - @${SH} ${SCRIPTDIR}/checkps - pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/net-mgmt/nagios2/files/patch-xcddb.c b/net-mgmt/nagios2/files/patch-xcddb.c new file mode 100644 index 000000000000..34bc8dc1759a --- /dev/null +++ b/net-mgmt/nagios2/files/patch-xcddb.c @@ -0,0 +1,11 @@ +--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xcddb.c Thu Mar 6 23:14:25 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XCDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios2/files/patch-xdddb.c b/net-mgmt/nagios2/files/patch-xdddb.c new file mode 100644 index 000000000000..f1a942e7ae45 --- /dev/null +++ b/net-mgmt/nagios2/files/patch-xdddb.c @@ -0,0 +1,11 @@ +--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xdddb.c Thu Mar 6 23:15:54 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XDDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios2/files/patch-xeddb.c b/net-mgmt/nagios2/files/patch-xeddb.c new file mode 100644 index 000000000000..2aaaa7db9043 --- /dev/null +++ b/net-mgmt/nagios2/files/patch-xeddb.c @@ -0,0 +1,11 @@ +--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002 ++++ xdata/xeddb.c Thu Mar 6 23:16:01 2003 +@@ -44,7 +44,7 @@ + #endif + + #ifdef USE_XEDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios2/files/patch-xrddb.c b/net-mgmt/nagios2/files/patch-xrddb.c new file mode 100644 index 000000000000..0f850674b63c --- /dev/null +++ b/net-mgmt/nagios2/files/patch-xrddb.c @@ -0,0 +1,11 @@ +--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xrddb.c Thu Mar 6 23:16:14 2003 +@@ -43,7 +43,7 @@ + #endif + + #ifdef USE_XRDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios2/files/patch-xsddb.c b/net-mgmt/nagios2/files/patch-xsddb.c new file mode 100644 index 000000000000..e9e1d169cc76 --- /dev/null +++ b/net-mgmt/nagios2/files/patch-xsddb.c @@ -0,0 +1,11 @@ +--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002 ++++ xdata/xsddb.c Thu Mar 6 23:16:27 2003 +@@ -48,7 +48,7 @@ + #endif + + #ifdef USE_XSDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist index e595f0d3e9b5..2f1a32523a20 100644 --- a/net-mgmt/nagios2/pkg-plist +++ b/net-mgmt/nagios2/pkg-plist @@ -1,9 +1,9 @@ @exec mkdir -p %D/share/nagios/ssi -@exec mkdir -p %D/var/nagios/archives -@exec mkdir -p %D/var/nagios/rw -@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw -@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives -@exec chown nagios:nogroup %D/var/nagios/rw +@exec mkdir -p /var/spool/nagios/archives +@exec mkdir -p /var/spool/nagios/rw +@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw +@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives +@exec chown nagios:nogroup /var/spool/nagios/rw bin/nagios etc/nagios/cgi.cfg-sample etc/nagios/checkcommands.cfg-sample @@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css @dirrm share/nagios/ssi @dirrm share/nagios/stylesheets @dirrm share/nagios -@unexec rmdir %D/var/nagios/archives 2>/dev/null || true -@unexec rmdir %D/var/nagios/rw 2>/dev/null || true -@unexec rmdir %D/var/nagios 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true +@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true +@unexec rmdir /var/spool/nagios 2>/dev/null || true diff --git a/net-mgmt/nagios2/scripts/checkps b/net-mgmt/nagios2/scripts/checkps deleted file mode 100644 index 6014bfca04cb..000000000000 --- a/net-mgmt/nagios2/scripts/checkps +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -/bin/ps 999999 2>&1 >/dev/null -if [ $? = 0 ]; then - echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime" - echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will" - echo "return an error code if a PID does not exist. Nagios needs this!" - exit -else - echo "Great, you have a working ps(1)! Nagios can build." -fi diff --git a/net/nagios/Makefile b/net/nagios/Makefile index a22f55280c09..39430cd5a9c0 100644 --- a/net/nagios/Makefile +++ b/net/nagios/Makefile @@ -7,10 +7,10 @@ PORTNAME= nagios PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nagios -DISTNAME= nagios-1.0 MAINTAINER= blaz@si.FreeBSD.org COMMENT= Extremely powerful network monitoring system @@ -34,7 +34,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \ --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ --sysconfdir=${PREFIX}/etc/nagios \ - --localstatedir=${PREFIX}/var/nagios \ + --localstatedir=/var/spool/nagios \ --prefix=${PREFIX} .if defined(WITH_MYSQL) @@ -45,8 +45,7 @@ CONFIGURE_ARGS+=--with-mysql-lib=${LOCALBASE}/lib/mysql \ .endif .if defined(WITH_POSTGRES) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ --with-pgsql-inc=${LOCALBASE}/pgsql \ --with-pgsql-xdata @@ -54,9 +53,6 @@ CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/pgsql \ INSTALL_TARGET= all install config install-config install-daemoninit install-commandmode -pre-fetch: - @${SH} ${SCRIPTDIR}/checkps - pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/net/nagios/files/patch-xcddb.c b/net/nagios/files/patch-xcddb.c new file mode 100644 index 000000000000..34bc8dc1759a --- /dev/null +++ b/net/nagios/files/patch-xcddb.c @@ -0,0 +1,11 @@ +--- xdata/xcddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xcddb.c Thu Mar 6 23:14:25 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XCDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net/nagios/files/patch-xdddb.c b/net/nagios/files/patch-xdddb.c new file mode 100644 index 000000000000..f1a942e7ae45 --- /dev/null +++ b/net/nagios/files/patch-xdddb.c @@ -0,0 +1,11 @@ +--- xdata/xdddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xdddb.c Thu Mar 6 23:15:54 2003 +@@ -51,7 +51,7 @@ + #endif + + #ifdef USE_XDDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net/nagios/files/patch-xeddb.c b/net/nagios/files/patch-xeddb.c new file mode 100644 index 000000000000..2aaaa7db9043 --- /dev/null +++ b/net/nagios/files/patch-xeddb.c @@ -0,0 +1,11 @@ +--- xdata/xeddb.c.orig Tue Feb 26 05:04:09 2002 ++++ xdata/xeddb.c Thu Mar 6 23:16:01 2003 +@@ -44,7 +44,7 @@ + #endif + + #ifdef USE_XEDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net/nagios/files/patch-xrddb.c b/net/nagios/files/patch-xrddb.c new file mode 100644 index 000000000000..0f850674b63c --- /dev/null +++ b/net/nagios/files/patch-xrddb.c @@ -0,0 +1,11 @@ +--- xdata/xrddb.c.orig Thu May 16 04:46:11 2002 ++++ xdata/xrddb.c Thu Mar 6 23:16:14 2003 +@@ -43,7 +43,7 @@ + #endif + + #ifdef USE_XRDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net/nagios/files/patch-xsddb.c b/net/nagios/files/patch-xsddb.c new file mode 100644 index 000000000000..e9e1d169cc76 --- /dev/null +++ b/net/nagios/files/patch-xsddb.c @@ -0,0 +1,11 @@ +--- xdata/xsddb.c.orig Thu Nov 14 03:51:34 2002 ++++ xdata/xsddb.c Thu Mar 6 23:16:27 2003 +@@ -48,7 +48,7 @@ + #endif + + #ifdef USE_XSDPGSQL +-#include <pgsql/libpq-fe.h> ++#include <libpq-fe.h> + #endif + + diff --git a/net/nagios/pkg-plist b/net/nagios/pkg-plist index e595f0d3e9b5..2f1a32523a20 100644 --- a/net/nagios/pkg-plist +++ b/net/nagios/pkg-plist @@ -1,9 +1,9 @@ @exec mkdir -p %D/share/nagios/ssi -@exec mkdir -p %D/var/nagios/archives -@exec mkdir -p %D/var/nagios/rw -@exec chmod 775 %D/var/nagios %D/var/nagios/archives %D/var/nagios/rw -@exec chown nagios:nagios %D/var/nagios %D/var/nagios/archives -@exec chown nagios:nogroup %D/var/nagios/rw +@exec mkdir -p /var/spool/nagios/archives +@exec mkdir -p /var/spool/nagios/rw +@exec chmod 775 /var/spool/nagios /var/spool/nagios/archives /var/spool/nagios/rw +@exec chown nagios:nagios /var/spool/nagios /var/spool/nagios/archives +@exec chown nagios:nogroup /var/spool/nagios/rw bin/nagios etc/nagios/cgi.cfg-sample etc/nagios/checkcommands.cfg-sample @@ -309,7 +309,6 @@ share/nagios/stylesheets/trends.css @dirrm share/nagios/ssi @dirrm share/nagios/stylesheets @dirrm share/nagios -@unexec rmdir %D/var/nagios/archives 2>/dev/null || true -@unexec rmdir %D/var/nagios/rw 2>/dev/null || true -@unexec rmdir %D/var/nagios 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@unexec rmdir /var/spool/nagios/archives 2>/dev/null || true +@unexec rmdir /var/spool/nagios/rw 2>/dev/null || true +@unexec rmdir /var/spool/nagios 2>/dev/null || true diff --git a/net/nagios/scripts/checkps b/net/nagios/scripts/checkps deleted file mode 100644 index 6014bfca04cb..000000000000 --- a/net/nagios/scripts/checkps +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -/bin/ps 999999 2>&1 >/dev/null -if [ $? = 0 ]; then - echo "You need to upgrade to RELENG_3, RELENG_4, or HEAD sometime" - echo "after July 8, 2000 around 5:15AM UTC, so that ps(1) will" - echo "return an error code if a PID does not exist. Nagios needs this!" - exit -else - echo "Great, you have a working ps(1)! Nagios can build." -fi |