CVS commit: pkgsrc/sysutils/puppet

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Apr 28 14:54:53 UTC 2022

Modified Files:
        pkgsrc/sysutils/puppet: Makefile PLIST

Log Message:
puppet: Fix up SMF install on SunOS.

There's no way that this package is working correctly anywhere though, there
are many broken paths.  It needs quite a bit of love, and an update.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/sysutils/puppet/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/puppet/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/puppet/Makefile
diff -u pkgsrc/sysutils/puppet/Makefile:1.53 pkgsrc/sysutils/puppet/Makefile:1.54
--- pkgsrc/sysutils/puppet/Makefile:1.53        Tue Dec 14 14:47:28 2021
+++ pkgsrc/sysutils/puppet/Makefile     Thu Apr 28 14:54:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2021/12/14 14:47:28 taca Exp $
+# $NetBSD: Makefile,v 1.54 2022/04/28 14:54:53 jperkin Exp $
 
 DISTNAME=              puppet-7.13.1
 CATEGORIES=            sysutils
@@ -27,6 +27,12 @@ USE_LANAUGES=                # none
 PKG_SYSCONFSUBDIR=     puppet
 RCD_SCRIPTS=           puppetd puppetmasterd
 
+SMF_SRCDIR=            ${WRKSRC}/ext/solaris/smf
+SMF_MANIFEST=          puppet.xml
+SMF_METHODS=           puppet
+SMF_METHOD_SRC.puppet= ${SMF_SRCDIR}/puppet
+SMF_NAME=              puppet
+
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure
 SUBST_FILES.prefix=    install.rb
@@ -37,8 +43,6 @@ SUBST_FILES.prefix+=  lib/puppet/face/mod
 SUBST_FILES.prefix+=   lib/puppet/face/module/upgrade.rb
 SUBST_FILES.prefix+=   lib/puppet/reference/configuration.rb
 SUBST_FILES.prefix+=   lib/puppet/util/run_mode.rb
-SUBST_FILES.prefix+=   ext/solaris/smf/puppet
-SUBST_FILES.prefix+=   ext/solaris/smf/puppet.xml
 SUBST_FILES.prefix+=   man/man5/puppet.conf.5
 SUBST_FILES.prefix+=   man/man8/puppet-apply.8
 SUBST_FILES.prefix+=   man/man8/puppet-module.8
@@ -46,7 +50,14 @@ SUBST_FILES.prefix+= man/man8/puppet-par
 SUBST_FILES.prefix+=   spec/unit/util/run_mode_spec.rb
 SUBST_FILES.prefix+=   spec/unit/util/selinux_spec.rb
 SUBST_SED.prefix=      -e "s|/etc/puppet|${PKG_SYSCONFDIR}|g"
-SUBST_SED.prefix+=     -e "s|/opt/csw/lib|${PREFIX}/lib|g"
+
+SUBST_CLASSES+=                smf
+SUBST_STAGE.smf=       pre-configure
+SUBST_FILES.smf+=      ext/solaris/smf/puppet
+SUBST_FILES.smf+=      ext/solaris/smf/puppet.xml
+SUBST_SED.smf=         -e "s,/etc/puppetlabs/puppet,${PKG_SYSCONFDIR},g"
+SUBST_SED.smf+=                -e "s,/opt/puppetlabs/bin/puppet,${PREFIX}/bin/puppet${RUBY_SUFFIX},g"
+SUBST_SED.smf+=                -e "s,network/puppet,${SMF_PREFIX}/puppet,g"
 
 SUBST_CLASSES+=                sufx
 SUBST_STAGE.sufx=      pre-configure
@@ -73,7 +84,6 @@ CONF_FILES=           ${EGDIR}/puppet.conf ${PKG_
 #PKG_GECOS.${PUPPET_USER}=     Puppet configuration management pseudo-user
 
 PLIST_SUBST+=          EGDIR=${EGDIR}
-PLIST_VARS+=           sunos
 
 BUILD_DEFS+=           VARBASE
 INSTALLATION_DIRS+=    ${EGDIR}
@@ -83,14 +93,6 @@ INSTALLATION_DIRS+=  ${EGDIR}
 #PUPPET_GROUP?=                puppet
 #PUPPET_USER?=         puppet
 
-.if ${OPSYS} == "SunOS"
-INSTALLATION_DIRS+=    lib/svc/method ${EGDIR}/svc
-CONF_DIRS+=            ${VARBASE}/svc/manifest
-CONF_FILES+=           ${EGDIR}/svc/puppetd.xml ${VARBASE}/svc/manifest/puppetd.xml
-CONF_FILES+=           ${EGDIR}/svc/puppetmasterd.xml ${VARBASE}/svc/manifest/puppetmasterd.xml
-PLIST.sunos=           yes
-.endif
-
 pre-configure:
        cd ${WRKSRC}/bin && ${CHMOD} ${BINMODE} puppet
 
@@ -106,16 +108,6 @@ pre-build:
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/examples/puppet.conf                  \
                ${DESTDIR}${PREFIX}/${EGDIR}
-.if ${OPSYS} == "SunOS"
-       ${INSTALL_DATA} ${WRKSRC}/ext/solaris/smf/puppetd.xml           \
-               ${DESTDIR}${PREFIX}/${EGDIR}/svc
-       ${INSTALL_DATA} ${WRKSRC}/ext/solaris/smf/puppetmasterd.xml     \
-               ${DESTDIR}${PREFIX}/${EGDIR}/svc
-       ${INSTALL_SCRIPT} ${WRKSRC}/ext/solaris/smf/svc-puppetd         \
-               ${DESTDIR}${PREFIX}/lib/svc/method
-       ${INSTALL_SCRIPT} ${WRKSRC}/ext/solaris/smf/svc-puppetmasterd   \
-               ${DESTDIR}${PREFIX}/lib/svc/method
-.endif
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/puppet/PLIST
diff -u pkgsrc/sysutils/puppet/PLIST:1.33 pkgsrc/sysutils/puppet/PLIST:1.34
--- pkgsrc/sysutils/puppet/PLIST:1.33   Tue Dec 14 14:47:28 2021
+++ pkgsrc/sysutils/puppet/PLIST        Thu Apr 28 14:54:53 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2021/12/14 14:47:28 taca Exp $
+@comment $NetBSD: PLIST,v 1.34 2022/04/28 14:54:53 jperkin Exp $
 bin/puppet${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CODEOWNERS
@@ -2341,7 +2341,3 @@ ${GEM_LIBDIR}/tasks/parser.rake
 ${GEM_LIBDIR}/tasks/yard.rake
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
 ${EGDIR}/puppet.conf
-${PLIST.sunos}lib/svc/method/svc-puppetd
-${PLIST.sunos}lib/svc/method/svc-puppetmasterd
-${PLIST.sunos}${EGDIR}/svc/puppet
-${PLIST.sunos}${EGDIR}/svc/puppet.xml