svn commit: r412569 - in head/sysutils: . mcollective-puppet-agent mcollective-puppet-client mcollective-puppet-common

Romain Tartière romain at FreeBSD.org
Tue Apr 5 16:30:11 UTC 2016 

Author: romain
Date: Tue Apr  5 16:30:09 2016
New Revision: 412569
URL: https://svnweb.freebsd.org/changeset/ports/412569

Log:
  Refactor and update mcollective-puppet-agent.
  
  - Update to 1.10.0;
  - Split agent / client / common file as upstream does;
  - Take maintainership.
  
  PR:		169000
  Submitted by:	romain
  Approved by:	anes at anes.su (maintainer)

Added:
  head/sysutils/mcollective-puppet-client/
  head/sysutils/mcollective-puppet-client/Makefile   (contents, props changed)
  head/sysutils/mcollective-puppet-common/
  head/sysutils/mcollective-puppet-common/Makefile   (contents, props changed)
  head/sysutils/mcollective-puppet-common/distinfo   (contents, props changed)
  head/sysutils/mcollective-puppet-common/pkg-descr   (contents, props changed)
Deleted:
  head/sysutils/mcollective-puppet-agent/distinfo
  head/sysutils/mcollective-puppet-agent/pkg-descr
  head/sysutils/mcollective-puppet-agent/pkg-plist
Modified:
  head/sysutils/Makefile
  head/sysutils/mcollective-puppet-agent/Makefile

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Tue Apr  5 16:27:13 2016	(r412568)
+++ head/sysutils/Makefile	Tue Apr  5 16:30:09 2016	(r412569)
@@ -551,6 +551,8 @@
     SUBDIR += mcollective-nettest-common
     SUBDIR += mcollective-nrpe-agent
     SUBDIR += mcollective-puppet-agent
+    SUBDIR += mcollective-puppet-client
+    SUBDIR += mcollective-puppet-common
     SUBDIR += mcollective-service-agent
     SUBDIR += mcollective-service-client
     SUBDIR += mcollective-service-common

Modified: head/sysutils/mcollective-puppet-agent/Makefile
==============================================================================
--- head/sysutils/mcollective-puppet-agent/Makefile	Tue Apr  5 16:27:13 2016	(r412568)
+++ head/sysutils/mcollective-puppet-agent/Makefile	Tue Apr  5 16:30:09 2016	(r412569)
@@ -2,23 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	mcollective-puppet-agent
-PORTVERSION=	1.7.0
-CATEGORIES=	sysutils
 
-MAINTAINER=	anes at anes.su
-COMMENT=	Puppet agent manager for mcollective
+COMMENT=	MCollective agent to manage the Puppet Agent
 
-RUN_DEPENDS=	mcollective>=2:sysutils/mcollective
+# See MASTERDIR for MAINTAINER.
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	puppetlabs
+RUN_DEPENDS=	mcollective-puppet-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-puppet-common
 
-NO_BUILD=	yes
+MASTERDIR=	${.CURDIR}/../mcollective-puppet-common
 
-MCOLLECTIVEDIR=	${STAGEDIR}${PREFIX}/share/mcollective
+PLIST_FILES=	share/mcollective/agent/puppet.rb
 
 do-install:
-	@${MKDIR} ${MCOLLECTIVEDIR}
-	@cd ${WRKSRC} && ${PAX} -r -w . ${MCOLLECTIVEDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "agent/*.rb" ${STAGEDIR}${PREFIX}/share/mcollective
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"

Added: head/sysutils/mcollective-puppet-client/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/mcollective-puppet-client/Makefile	Tue Apr  5 16:30:09 2016	(r412569)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	mcollective-puppet-client
+
+COMMENT=	MCollective client to manage the Puppet Agent
+
+# See MASTERDIR for MAINTAINER.
+
+RUN_DEPENDS=	mcollective-puppet-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-puppet-common
+
+MASTERDIR=	${.CURDIR}/../mcollective-puppet-common
+
+PLIST_FILES=	share/mcollective/application/puppet.rb \
+		share/mcollective/aggregate/boolean_summary.ddl \
+		share/mcollective/aggregate/boolean_summary.rb
+
+do-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "aggregate application" ${STAGEDIR}${PREFIX}/share/mcollective
+
+.include "${MASTERDIR}/Makefile"

Added: head/sysutils/mcollective-puppet-common/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/mcollective-puppet-common/Makefile	Tue Apr  5 16:30:09 2016	(r412569)
@@ -0,0 +1,46 @@
+# $FreeBSD$
+
+PORTNAME?=	mcollective-puppet-common
+PORTVERSION=	1.10.0
+CATEGORIES=	sysutils
+
+MAINTAINER=	anes at anes.su
+COMMENT?=	MCollective common files to manage the Puppet Agent
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS?=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	puppetlabs
+GH_PROJECT=	mcollective-puppet-agent
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+PLIST_FILES?=	share/mcollective/agent/puppet.ddl \
+		share/mcollective/data/puppet_data.ddl \
+		share/mcollective/data/puppet_data.rb \
+		share/mcollective/data/resource_data.ddl \
+		share/mcollective/data/resource_data.rb \
+		share/mcollective/util/puppet_agent_mgr.rb \
+		share/mcollective/util/puppet_agent_mgr/mgr_v2.rb \
+		share/mcollective/util/puppet_agent_mgr/mgr_v3.rb \
+		share/mcollective/util/puppet_agent_mgr/mgr_windows.rb \
+		share/mcollective/util/puppet_server_address_validation.rb \
+		share/mcollective/util/puppetrunner.rb \
+		share/mcollective/validator/puppet_resource_validator.ddl \
+		share/mcollective/validator/puppet_resource_validator.rb \
+		share/mcollective/validator/puppet_server_address_validator.ddl \
+		share/mcollective/validator/puppet_server_address_validator.rb \
+		share/mcollective/validator/puppet_tags_validator.ddl \
+		share/mcollective/validator/puppet_tags_validator.rb \
+		share/mcollective/validator/puppet_variable_validator.ddl \
+		share/mcollective/validator/puppet_variable_validator.rb
+
+.if !target(do-install)
+do-install:
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "agent/*.ddl data util validator" ${STAGEDIR}${PREFIX}/share/mcollective
+.endif
+
+.include <bsd.port.mk>

Added: head/sysutils/mcollective-puppet-common/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/mcollective-puppet-common/distinfo	Tue Apr  5 16:30:09 2016	(r412569)
@@ -0,0 +1,2 @@
+SHA256 (puppetlabs-mcollective-puppet-agent-1.10.0_GH0.tar.gz) = 8b074bced98e70fdc668396516892c96aff0c83e79c3726f881ca221e947ea86
+SIZE (puppetlabs-mcollective-puppet-agent-1.10.0_GH0.tar.gz) = 44759

Added: head/sysutils/mcollective-puppet-common/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/mcollective-puppet-common/pkg-descr	Tue Apr  5 16:30:09 2016	(r412569)
@@ -0,0 +1,3 @@
+The mcollective puppet agent manages the puppet agent via MCollective.
+
+WWW: https://github.com/puppetlabs/mcollective-puppet-agent

More information about the svn-ports-head mailing list