From owner-svn-ports-all@freebsd.org Sun Jun 5 16:59:55 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30884B69556; Sun, 5 Jun 2016 16:59:55 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 070551B08; Sun, 5 Jun 2016 16:59:54 +0000 (UTC) (envelope-from romain@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u55GxsBI082294; Sun, 5 Jun 2016 16:59:54 GMT (envelope-from romain@FreeBSD.org) Received: (from romain@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u55Gxr5L082288; Sun, 5 Jun 2016 16:59:53 GMT (envelope-from romain@FreeBSD.org) Message-Id: <201606051659.u55Gxr5L082288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: romain set sender to romain@FreeBSD.org using -f From: =?UTF-8?Q?Romain_Tarti=c3=a8re?= Date: Sun, 5 Jun 2016 16:59:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416403 - in head/sysutils: . mcollective-nrpe-agent mcollective-nrpe-client mcollective-nrpe-common X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jun 2016 16:59:55 -0000 Author: romain Date: Sun Jun 5 16:59:53 2016 New Revision: 416403 URL: https://svnweb.freebsd.org/changeset/ports/416403 Log: Update to 3.1.0 and split agent, client and common files. This follows upstream way of distributing the package, and allows installing only the needed parts on a system. PR: 208546 Submitted by: myself Approved by: maintainer stepped back Added: head/sysutils/mcollective-nrpe-client/ head/sysutils/mcollective-nrpe-client/Makefile (contents, props changed) head/sysutils/mcollective-nrpe-common/ head/sysutils/mcollective-nrpe-common/Makefile (contents, props changed) head/sysutils/mcollective-nrpe-common/distinfo (contents, props changed) head/sysutils/mcollective-nrpe-common/pkg-descr (contents, props changed) Deleted: head/sysutils/mcollective-nrpe-agent/distinfo head/sysutils/mcollective-nrpe-agent/pkg-descr Modified: head/sysutils/Makefile head/sysutils/mcollective-nrpe-agent/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Sun Jun 5 16:55:50 2016 (r416402) +++ head/sysutils/Makefile Sun Jun 5 16:59:53 2016 (r416403) @@ -554,6 +554,8 @@ SUBDIR += mcollective-nettest-client SUBDIR += mcollective-nettest-common SUBDIR += mcollective-nrpe-agent + SUBDIR += mcollective-nrpe-client + SUBDIR += mcollective-nrpe-common SUBDIR += mcollective-puppet-agent SUBDIR += mcollective-puppet-client SUBDIR += mcollective-puppet-common Modified: head/sysutils/mcollective-nrpe-agent/Makefile ============================================================================== --- head/sysutils/mcollective-nrpe-agent/Makefile Sun Jun 5 16:55:50 2016 (r416402) +++ head/sysutils/mcollective-nrpe-agent/Makefile Sun Jun 5 16:59:53 2016 (r416403) @@ -1,44 +1,19 @@ # $FreeBSD$ PORTNAME= mcollective-nrpe-agent -PORTVERSION= 20130805 -CATEGORIES= sysutils +PORTEPOCH= 1 -MAINTAINER= ports@FreeBSD.org -COMMENT= MCollective NRPE agent plugin +COMMENT= MCollective agent to interact with the NRPE monitoring system -RUN_DEPENDS= mcollective>=2:sysutils/mcollective +# See MASTERDIR for MAINTAINER. -USE_GITHUB= yes -GH_ACCOUNT= puppetlabs -GH_TAGNAME= ee29242 - -PLIST_FILES= share/mcollective/agent/nrpe.ddl \ - share/mcollective/agent/nrpe.rb \ - share/mcollective/aggregate/nagios_states.rb \ - share/mcollective/application/nrpe.rb \ - share/mcollective/data/nrpe_data.ddl \ - share/mcollective/data/nrpe_data.rb \ - sbin/check-mc-nrpe -PLIST_DIRS= share/mcollective/agent \ - share/mcollective/aggregate \ - share/mcollective/application \ - share/mcollective/data +RUN_DEPENDS= mcollective-nrpe-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-nrpe-common -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../mcollective-nrpe-common -do-install: +PLIST_FILES= share/mcollective/agent/nrpe.rb -.for dir in ${PLIST_DIRS} - ${MKDIR} ${STAGEDIR}${PREFIX}/${dir} -.endfor - - ${INSTALL_DATA} ${WRKSRC}/agent/nrpe.ddl ${STAGEDIR}${PREFIX}/share/mcollective/agent/ - ${INSTALL_DATA} ${WRKSRC}/agent/nrpe.rb ${STAGEDIR}${PREFIX}/share/mcollective/agent/ - ${INSTALL_DATA} ${WRKSRC}/aggregate/nagios_states.rb ${STAGEDIR}${PREFIX}/share/mcollective/aggregate/ - ${INSTALL_DATA} ${WRKSRC}/application/nrpe.rb ${STAGEDIR}${PREFIX}/share/mcollective/application/ - ${INSTALL_DATA} ${WRKSRC}/data/nrpe_data.ddl ${STAGEDIR}${PREFIX}/share/mcollective/data/ - ${INSTALL_DATA} ${WRKSRC}/data/nrpe_data.rb ${STAGEDIR}${PREFIX}/share/mcollective/data/ - ${INSTALL_SCRIPT} ${WRKSRC}/sbin/check-mc-nrpe ${STAGEDIR}${PREFIX}/sbin/ +do-install: + cd ${WRKSRC} && ${COPYTREE_SHARE} "agent/*.rb" ${STAGEDIR}${PREFIX}/share/mcollective -.include +.include "${MASTERDIR}/Makefile" Added: head/sysutils/mcollective-nrpe-client/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/mcollective-nrpe-client/Makefile Sun Jun 5 16:59:53 2016 (r416403) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PORTNAME= mcollective-nrpe-client + +COMMENT= MCollective client to interact with the NRPE monitoring system + +# See MASTERDIR for MAINTAINER. + +RUN_DEPENDS= mcollective-nrpe-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-nrpe-common + +MASTERDIR= ${.CURDIR}/../mcollective-nrpe-common + +PLIST_FILES= share/mcollective/aggregate/nagios_states.rb \ + share/mcollective/application/nrpe.rb + +do-install: + cd ${WRKSRC} && ${COPYTREE_SHARE} "aggregate/*.rb application/*.rb" ${STAGEDIR}${PREFIX}/share/mcollective + +.include "${MASTERDIR}/Makefile" Added: head/sysutils/mcollective-nrpe-common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/mcollective-nrpe-common/Makefile Sun Jun 5 16:59:53 2016 (r416403) @@ -0,0 +1,30 @@ +# $FreeBSD$ + +PORTNAME?= mcollective-nrpe-common +PORTVERSION= 3.1.0 +CATEGORIES= sysutils + +MAINTAINER= ports@FreeBSD.org +COMMENT?= MCollective common files to interact with the NRPE monitoring system + +LICENSE= APACHE20 + +RUN_DEPENDS?= mcollective>=2:${PORTSDIR}/sysutils/mcollective + +USE_GITHUB= yes +GH_ACCOUNT= puppetlabs +GH_PROJECT= mcollective-nrpe-agent + +NO_BUILD= yes +NO_ARCH= yes + +PLIST_FILES?= share/mcollective/agent/nrpe.ddl \ + share/mcollective/data/nrpe_data.ddl \ + share/mcollective/data/nrpe_data.rb + +.if !target(do-install) +do-install: + cd ${WRKSRC} && ${COPYTREE_SHARE} "agent/*.ddl data" ${STAGEDIR}${PREFIX}/share/mcollective +.endif + +.include Added: head/sysutils/mcollective-nrpe-common/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/mcollective-nrpe-common/distinfo Sun Jun 5 16:59:53 2016 (r416403) @@ -0,0 +1,2 @@ +SHA256 (puppetlabs-mcollective-nrpe-agent-3.1.0_GH0.tar.gz) = 7e3f3956af091a5041f0e87501433c6a42471d6a2a9c30fa19f7481a3107c6db +SIZE (puppetlabs-mcollective-nrpe-agent-3.1.0_GH0.tar.gz) = 12134 Added: head/sysutils/mcollective-nrpe-common/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/mcollective-nrpe-common/pkg-descr Sun Jun 5 16:59:53 2016 (r416403) @@ -0,0 +1,4 @@ +The mcollective package agent lets you install, uninstall, update, purge and +query the status of packages via MCollective. + +WWW: https://github.com/puppetlabs/mcollective-package-agent