From b662b2910cecab57670e94349f285c9585de490c Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 2 May 2012 13:40:09 +0000 Subject: [PATCH] Install send_nsca in usr/local/sbin so it's in a typical path, it's a standalone utility anyway so libexec isn't really the right place for it. Keep a symlink around to avoid breaking existing installations. --- net/nagios/nsca/Makefile | 9 +++++---- net/nagios/nsca/pkg/PLIST-client | 3 ++- net/nagios/nsca/pkg/PLIST-main | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/net/nagios/nsca/Makefile b/net/nagios/nsca/Makefile index 467836c7183..37d1884cb4a 100644 --- a/net/nagios/nsca/Makefile +++ b/net/nagios/nsca/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2012/04/28 10:51:44 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2012/05/02 13:40:09 sthen Exp $ COMMENT-main= nagios service check acceptor COMMENT-client= nagios service check acceptor - client @@ -10,11 +10,11 @@ WRKDIST= ${WRKDIR}/icinga-nsca PKGNAME-main= nsca-${VERSION} PKGNAME-client= nsca-client-${VERSION} CATEGORIES= net -REVISION = 1 +REVISION= 2 HOMEPAGE= http://www.nagios.org/ -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -46,7 +46,8 @@ do-regress: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/libexec/nagios - ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${PREFIX}/libexec/nagios/ + ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${PREFIX}/sbin/ + ln -s ${TRUEPREFIX}/sbin/send_nsca ${PREFIX}/libexec/nagios/ ${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${PREFIX}/sbin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nsca ${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg \ diff --git a/net/nagios/nsca/pkg/PLIST-client b/net/nagios/nsca/pkg/PLIST-client index ed28fc83afa..17cfc778447 100644 --- a/net/nagios/nsca/pkg/PLIST-client +++ b/net/nagios/nsca/pkg/PLIST-client @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST-client,v 1.1.1.1 2006/03/13 18:18:22 bernd Exp $ +@comment $OpenBSD: PLIST-client,v 1.2 2012/05/02 13:40:10 sthen Exp $ libexec/nagios/ libexec/nagios/send_nsca +@bin sbin/send_nsca share/examples/nsca/ share/examples/nsca/send_nsca.cfg @sample ${SYSCONFDIR}/send_nsca.cfg diff --git a/net/nagios/nsca/pkg/PLIST-main b/net/nagios/nsca/pkg/PLIST-main index 62e42447b64..8e092f20152 100644 --- a/net/nagios/nsca/pkg/PLIST-main +++ b/net/nagios/nsca/pkg/PLIST-main @@ -1,6 +1,6 @@ -@comment $OpenBSD: PLIST-main,v 1.2 2011/11/12 00:49:49 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2012/05/02 13:40:10 sthen Exp $ @pkgpath net/nagios/nsca -sbin/nsca +@bin sbin/nsca share/doc/nsca/ share/doc/nsca/README share/doc/nsca/SECURITY