munge: Clean up Makefile

[Jason W. Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Sun May 12 22:02:39 2024 -0500
Changeset:	73d71aed66e00efdff1deb8779f454116411ece1

Modified Files:
	munge/Makefile
	munge/PLIST
	munge/PLIST.Darwin
Removed Files:
	munge/PLIST.SunOS

Log Message:
munge: Clean up Makefile

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

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

diffstat:
 munge/Makefile     | 28 ++++++++--------------------
 munge/PLIST        |  1 +
 munge/PLIST.Darwin |  1 +
 munge/PLIST.SunOS  |  3 ---
 4 files changed, 10 insertions(+), 23 deletions(-)

diffs:
diff --git a/munge/Makefile b/munge/Makefile
index 403d74bb5c..24fcab9f18 100644
--- a/munge/Makefile
+++ b/munge/Makefile
@@ -14,12 +14,13 @@ LICENSE=	gnu-gpl-v3
 USE_TOOLS+=		perl pkg-config
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INSTALLATION_DIRS+=	lib/pkgconfig
 
-MUNGE_DIR?=		${PREFIX}/var/lib/munge
-MUNGE_LOG_DIR?=		${PREFIX}/var/log/munge
-MUNGE_RUN_DIR?=		${PREFIX}/var/run/munge
-MUNGE_ETC_DIR?=		${PREFIX}/etc/munge
+.include "../../mk/bsd.prefs.mk"
+
+MUNGE_DIR?=		var/lib/munge
+MUNGE_LOG_DIR?=		var/log/munge
+MUNGE_RUN_DIR?=		var/run/munge
+MUNGE_ETC_DIR?=		etc/munge
 MUNGE_USER=		munge
 MUNGE_GROUP=		${MUNGE_USER}
 
@@ -35,20 +36,6 @@ OWN_DIRS_PERMS+=	${MUNGE_ETC_DIR} ${MUNGE_USER} ${MUNGE_GROUP} 0700
 
 RCD_SCRIPTS+=	munge
 
-# SUBST_CLASSES+=		init
-# 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=	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'
-
-.include "../../mk/bsd.prefs.mk"
-
 .if ${OPSYS} == Linux
 EGDIR=			${PREFIX}/share/examples/munge
 # Doesn't work on Lubuntu 23.  Using CONFIGURE_ARGS for now.
@@ -58,6 +45,7 @@ CONF_FILES+=		${EGDIR}/logrotate.conf ${PREFIX}/etc/logrotate.d/munge
 
 INSTALLATION_DIRS+=	${EGDIR} etc/logrotate.d
 CONFIGURE_ARGS+=	--with-sysconfigdir=${PREFIX}/etc/sysconfig
+AUTO_MKDIRS=		yes
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/etc/logrotate.d/munge \
@@ -68,7 +56,7 @@ post-install:
 
 .if ${OPSYS} == Darwin
 post-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/share/munge/Launchd
+	# ${MKDIR} ${DESTDIR}${PREFIX}/share/munge/Launchd
 	${INSTALL_DATA} ${FILESDIR}/*.plist \
 		${DESTDIR}${PREFIX}/share/munge/Launchd
 .endif
diff --git a/munge/PLIST b/munge/PLIST
index e31db05466..6606dec938 100644
--- a/munge/PLIST
+++ b/munge/PLIST
@@ -32,3 +32,4 @@ sbin/mungekey
 @pkgdir var/run/munge
 @pkgdir var/log/munge
 @pkgdir var/lib/munge
+@pkgdir etc/munge
diff --git a/munge/PLIST.Darwin b/munge/PLIST.Darwin
index 4b73a94d2b..52648f51a3 100644
--- a/munge/PLIST.Darwin
+++ b/munge/PLIST.Darwin
@@ -1 +1,2 @@
+@comment $NetBSD$
 share/munge/Launchd/org.pkgsrc.munged.plist
diff --git a/munge/PLIST.SunOS b/munge/PLIST.SunOS
deleted file mode 100644
index 060813be83..0000000000
--- a/munge/PLIST.SunOS
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-etc/init.d/munge
-etc/sysconfig/munge