diff options
| author | jlam <jlam@pkgsrc.org> | 2017-08-07 09:42:32 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2017-08-07 09:42:32 +0000 |
| commit | 66c9781f4e38b074c7384ed1b50e03fc6d736517 (patch) | |
| tree | 7af3ba7bb716916821d4230cbaedf59b9c5dedee /sysutils/mcollective | |
| parent | 1b0134425112fefd56fc06ef61d2221aa3ff3efa (diff) | |
| download | pkgsrc-66c9781f4e38b074c7384ed1b50e03fc6d736517.tar.gz | |
Use PKG_SYSCONF* variables properly in sysutils/mcollective.
Set PKG_SYSCONFSUBDIR to "mcollective" so that all config files are
found in the "mcollective" subdirectory of ${PKG_SYSCONFBASE}.
Add ${PKG_SYSCONFDIR}/ssl to OWN_DIRS since it must be created at
package installation time.
Don't list directories outside of ${PREFIX} in INSTALLATION_DIRS
since INSTALLATION_DIRS are only created when the package is
installed into the destdir-staging directory.
Bump the PKGREVISION due to fixes in the package install scripts.
-------------------------------------------------------------------
Diffstat (limited to 'sysutils/mcollective')
| -rw-r--r-- | sysutils/mcollective/Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile index cc88db3b507..61c70e6975e 100644 --- a/sysutils/mcollective/Makefile +++ b/sysutils/mcollective/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2012/10/23 19:51:12 asau Exp $ +# $NetBSD: Makefile,v 1.3 2017/08/07 09:42:32 jlam Exp $ # DISTNAME= mcollective-2.1.1 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/mcollective/ EXTRACT_SUFX= .tgz @@ -26,13 +27,15 @@ EGDIR= ${PREFIX}/share/examples/mcollective INSTALLATION_DIRS= bin sbin share/doc/mcollective share/mcollective INSTALLATION_DIRS+= ${RUBY_VENDORLIB}/mcollective -INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/mcollective -INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}/mcollective/ssl ${EGDIR} +INSTALLATION_DIRS+= ${EGDIR} + +PKG_SYSCONFSUBDIR= mcollective +OWN_DIRS= ${PKG_SYSCONFDIR}/ssl CONF_FILES+= ${EGDIR}/server.cfg.dist \ - ${PKG_SYSCONFDIR}/mcollective/server.cfg + ${PKG_SYSCONFDIR}/server.cfg CONF_FILES+= ${EGDIR}/client.cfg.dist \ - ${PKG_SYSCONFDIR}/mcollective/client.cfg + ${PKG_SYSCONFDIR}/client.cfg SUBST_CLASSES+= confpath SUBST_FILES.confpath= ${WRKSRC}/bin/mcollectived \ @@ -41,7 +44,7 @@ SUBST_FILES.confpath= ${WRKSRC}/bin/mcollectived \ ${WRKSRC}/lib/mcollective/config.rb \ ${WRKSRC}/lib/mcollective/util.rb \ ${WRKSRC}/lib/mcollective/rpc.rb -SUBST_SED.confpath= -e "s,/etc/mcollective,${PKG_SYSCONFDIR}/mcollective," +SUBST_SED.confpath= -e "s,/etc/mcollective,${PKG_SYSCONFDIR}," SUBST_STAGE.confpath= post-patch SUBST_CLASSES+= sharepath |