munge: Fix CONF_FILES and PLIST

[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 22:33:17 2020 -0600
Changeset:	da3506f8ebfa1a1e938e080f00002eabc3a05b42

Modified Files:
	munge/Makefile
	munge/PLIST.Linux
	munge/distinfo
	munge/patches/patch-src_etc_Makefile.in
Removed Files:
	munge/PLIST.old

Log Message:
munge: Fix CONF_FILES and PLIST

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

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

diffstat:
 munge/Makefile                          |  7 +++++--
 munge/PLIST.Linux                       |  4 ++--
 munge/PLIST.old                         | 35 ---------------------------------
 munge/distinfo                          |  2 +-
 munge/patches/patch-src_etc_Makefile.in | 18 ++++++++++++++++-
 5 files changed, 25 insertions(+), 41 deletions(-)

diffs:
diff --git a/munge/Makefile b/munge/Makefile
index 23f0062d34..37c936f919 100644
--- a/munge/Makefile
+++ b/munge/Makefile
@@ -38,9 +38,12 @@ 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'
 
+# FIXME: Patch to use etc/munge.systemd.sysconfig and in place of
+# etc/sysconfig/munge and etc/munge.logrotate.conf in place of
+# etc/logrotate.d/munge
 EGDIR=			${PREFIX}/share/examples/munge
-CONF_FILES=		${EGDIR}/munge.systemd.sysconfig ${PKG_SYSCONFDIR}/sysconfig/munge
-#CONF_FILES=		etc/logrotate.d/munge
+CONF_FILES=		${EGDIR}/munge.systemd.sysconfig ${PKG_SYSCONFDIR}/munge.systemd.sysconfig
+CONF_FILES+=		${EGDIR}/munge.logrotate.conf ${PKG_SYSCONFDIR}/munge.logrotate.conf
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/munge/PLIST.Linux b/munge/PLIST.Linux
index 4ae0f7dbbe..5d4e2ae8fa 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
 lib/systemd/system/munge.service
+share/examples/munge/munge.logrotate.conf
+share/examples/munge/munge.systemd.sysconfig
diff --git a/munge/PLIST.old b/munge/PLIST.old
deleted file mode 100644
index ba878b3398..0000000000
--- a/munge/PLIST.old
+++ /dev/null
@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2018/03/24 18:05:58 bacon Exp $
-bin/munge
-bin/remunge
-bin/unmunge
-include/munge.h
-lib/libmunge.la
-lib/pkgconfig/munge.pc
-lib/systemd/system/munge.service
-lib/tmpfiles.d/munge.conf
-man/man1/munge.1
-man/man1/remunge.1
-man/man1/unmunge.1
-man/man3/munge.3
-man/man3/munge_ctx.3
-man/man3/munge_ctx_copy.3
-man/man3/munge_ctx_create.3
-man/man3/munge_ctx_destroy.3
-man/man3/munge_ctx_get.3
-man/man3/munge_ctx_set.3
-man/man3/munge_ctx_strerror.3
-man/man3/munge_decode.3
-man/man3/munge_encode.3
-man/man3/munge_enum.3
-man/man3/munge_enum_int_to_str.3
-man/man3/munge_enum_is_valid.3
-man/man3/munge_enum_str_to_int.3
-man/man3/munge_strerror.3
-man/man7/munge.7
-man/man8/munged.8
-man/man8/mungekey.8
-sbin/munged
-sbin/mungekey
-@pkgdir var/run/munge
-@pkgdir var/log/munge
-@pkgdir var/lib/munge
diff --git a/munge/distinfo b/munge/distinfo
index 1ef7d3dd6a..8e4422488f 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) = 39c7f2f4584e1a909397a569fd65b7baedb7c192
+SHA1 (patch-src_etc_Makefile.in) = 982d71a405f07b46eabbd35a1cf3f98f4f97dbc7
diff --git a/munge/patches/patch-src_etc_Makefile.in b/munge/patches/patch-src_etc_Makefile.in
index cb6bbd76df..a6a1778d33 100644
--- a/munge/patches/patch-src_etc_Makefile.in
+++ b/munge/patches/patch-src_etc_Makefile.in
@@ -13,7 +13,7 @@ $NetBSD$
  sysconfigdir = @sysconfigdir@
  systemdunitdir = @systemdunitdir@
  sysvinitddir = @sysvinitddir@
-@@ -598,13 +599,13 @@ install-data-hook: install-dirs install-
+@@ -598,25 +599,25 @@ install-data-hook: install-dirs install-
  uninstall-local: uninstall-dirs uninstall-logrotate uninstall-pkgconfig uninstall-systemd uninstall-sysvinit
  
  install-dirs:
@@ -29,6 +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 || :
+ 
+ install-logrotate: munge.logrotate.conf
+ 	@if test 'x$(logrotateddir)' != x; then \
+-	  echo $(MKDIR_P) "'$(DESTDIR)$(logrotateddir)'"; \
+-	  $(MKDIR_P) '$(DESTDIR)$(logrotateddir)'; \
++	  echo $(MKDIR_P) "'$(DESTDIR)$(sysconfexampledir)'"; \
++	  $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)'; \
+ 	  echo $(INSTALL_DATA) "'$(builddir)/munge.logrotate.conf'" \
+-	      "'$(DESTDIR)$(logrotateddir)/$(PACKAGE)'"; \
++	      "'$(DESTDIR)$(sysconfexampledir)/$(PACKAGE)'"; \
+ 	  $(INSTALL_DATA) '$(builddir)/munge.logrotate.conf' \
+-	      '$(DESTDIR)$(logrotateddir)/$(PACKAGE)'; \
++	      '$(DESTDIR)$(sysconfexampledir)/$(PACKAGE)'; \
+ 	fi
+ 
+ uninstall-logrotate:
 @@ -659,13 +660,13 @@ uninstall-systemd:
  
  install-systemd-sysconfig: munge.systemd.sysconfig