munge: Work on utilizing CONF_FILES

[Jason W Bacon <bacon%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Dec 22 20:21:51 2020 -0600
Changeset:	4a3b27fcf2d8235cdd85c54a20b44cc5703de815

Modified Files:
	munge/Makefile
	munge/PLIST.Linux
	munge/buildlink3.mk
	munge/distinfo
	munge/patches/patch-src_etc_Makefile.in

Log Message:
munge: Work on utilizing CONF_FILES

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4a3b27fcf2d8235cdd85c54a20b44cc5703de815

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

diffstat:
 munge/Makefile                          | 12 ++++++++----
 munge/PLIST.Linux                       |  2 +-
 munge/buildlink3.mk                     |  2 +-
 munge/distinfo                          |  2 +-
 munge/patches/patch-src_etc_Makefile.in | 22 +++++++++++++++++++++-
 5 files changed, 32 insertions(+), 8 deletions(-)

diffs:
diff --git a/munge/Makefile b/munge/Makefile
index 426f00c6cc..23f0062d34 100644
--- a/munge/Makefile
+++ b/munge/Makefile
@@ -27,17 +27,21 @@ BUILD_DEFS+=	VARBASE
 RCD_SCRIPTS+=	munge
 
 SUBST_CLASSES+=		init
-SUBST_STAGE.init=	post-patch
-SUBST_FILES.init=	${WRKSRC}/src/etc/munge.sysvinit.init.in
+SUBST_STAGE.init=	pre-configure
+SUBST_FILES.init=	src/etc/munge.sysvinit.init.in
 SUBST_SED.init=		-e 's|USER="munge"|USER="daemon"|g'
 SUBST_SED.init+=	-e 's|GROUP="munge"|GROUP="daemon"|g'
 
 SUBST_CLASSES+=		systemd
-SUBST_STAGE.systemd=	post-patch
-SUBST_FILES.systemd=	${WRKSRC}/src/etc/munge.systemd.service.in
+SUBST_STAGE.systemd=	pre-configure
+SUBST_FILES.systemd=	src/etc/munge.systemd.service.in
 SUBST_SED.systemd=	-e 's|User=munge|User=daemon|g'
 SUBST_SED.systemd+=	-e 's|Group=munge|Group=daemon|g'
 
+EGDIR=			${PREFIX}/share/examples/munge
+CONF_FILES=		${EGDIR}/munge.systemd.sysconfig ${PKG_SYSCONFDIR}/sysconfig/munge
+#CONF_FILES=		etc/logrotate.d/munge
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/munge/PLIST.Linux b/munge/PLIST.Linux
index 473040b4dc..4ae0f7dbbe 100644
--- a/munge/PLIST.Linux
+++ b/munge/PLIST.Linux
@@ -1,4 +1,4 @@
 @comment $NetBSD: PLIST.Linux,v 1.4 2018/03/24 18:05:58 bacon Exp $
+share/examples/munge/munge.systemd.sysconfig
 etc/logrotate.d/munge
-etc/sysconfig/munge
 lib/systemd/system/munge.service
diff --git a/munge/buildlink3.mk b/munge/buildlink3.mk
index 9a20f1e2fb..360971d13c 100644
--- a/munge/buildlink3.mk
+++ b/munge/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	munge
 MUNGE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.munge+=	munge>=0.5.10
-BUILDLINK_PKGSRCDIR.munge?=	../../security/munge
+BUILDLINK_PKGSRCDIR.munge?=	../../wip/munge
 
 .endif	# MUNGE_BUILDLINK3_MK
 
diff --git a/munge/distinfo b/munge/distinfo
index f6f9de109b..1ef7d3dd6a 100644
--- a/munge/distinfo
+++ b/munge/distinfo
@@ -4,4 +4,4 @@ SHA1 (munge-0.5.14.tar.xz) = 7c11df405bbbb5fcdaece771488ffab3a94ddf20
 RMD160 (munge-0.5.14.tar.xz) = 787fcc12744476616849e4c05351407f308bbe51
 SHA512 (munge-0.5.14.tar.xz) = 742c9f2c1cf9f5b070f91fc6b9e74c5f2712c385bce6820c400e884fb6d78f86dea7ebe8e3918d056bf72e746a6af5481a1a8d9f0834a28836da90a42b4eb166
 Size (munge-0.5.14.tar.xz) = 439776 bytes
-SHA1 (patch-src_etc_Makefile.in) = 6f9732c892b51b9b4bc5cefeb4da0a2823f69a43
+SHA1 (patch-src_etc_Makefile.in) = 39c7f2f4584e1a909397a569fd65b7baedb7c192
diff --git a/munge/patches/patch-src_etc_Makefile.in b/munge/patches/patch-src_etc_Makefile.in
index 7ef18dd914..cb6bbd76df 100644
--- a/munge/patches/patch-src_etc_Makefile.in
+++ b/munge/patches/patch-src_etc_Makefile.in
@@ -3,12 +3,13 @@ $NetBSD$
 # pkgsrc hierarchy
 
 --- src/etc/Makefile.in.orig	2020-02-01 00:21:19.726062417 +0000
+--- src/etc/Makefile.in.orig	2020-01-14 20:44:31.000000000 +0000
 +++ src/etc/Makefile.in
 @@ -286,6 +286,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
-+sysconfexampledir = $(prefix)/share/examples/munge
++sysconfexampledir = $(prefix)/share/examples
  sysconfigdir = @sysconfigdir@
  systemdunitdir = @systemdunitdir@
  sysvinitddir = @sysvinitddir@
@@ -28,3 +29,22 @@ $NetBSD$
  	rmdir '$(DESTDIR)$(localstatedir)/lib/munge' 2>/dev/null || :
  	rmdir '$(DESTDIR)$(localstatedir)/log/munge' 2>/dev/null || :
  	rmdir '$(DESTDIR)$(runstatedir)/munge' 2>/dev/null || :
+@@ -659,13 +660,13 @@ uninstall-systemd:
+ 
+ install-systemd-sysconfig: munge.systemd.sysconfig
+ 	@if test 'x${systemdunitdir}' != x \
+-	      && test 'x$(sysconfigdir)' != x; then \
+-	  echo $(MKDIR_P) "'$(DESTDIR)$(sysconfigdir)'"; \
+-	  $(MKDIR_P) '$(DESTDIR)$(sysconfigdir)'; \
++	      && test 'x$(sysconfexampledir)' != x; then \
++	  echo $(MKDIR_P) "'$(DESTDIR)$(sysconfexampledir)'"; \
++	  $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)'; \
+ 	  echo $(INSTALL_DATA) "'$(builddir)/munge.systemd.sysconfig'" \
+-	      "'$(DESTDIR)$(sysconfigdir)/$(PACKAGE)'"; \
++	      "'$(DESTDIR)$(sysconfexampledir)/$(PACKAGE)'"; \
+ 	  $(INSTALL_DATA) '$(builddir)/munge.systemd.sysconfig' \
+-	      '$(DESTDIR)$(sysconfigdir)/$(PACKAGE)'; \
++	      '$(DESTDIR)$(sysconfexampledir)/$(PACKAGE)'; \
+ 	fi
+ 
+ uninstall-systemd-sysconfig: