From 86ca5195d053467ee926664be5db1530012a996a Mon Sep 17 00:00:00 2001
From: Michael Baeuerle <micha@NetBSD.org>
Date: Thu, 27 Aug 2020 18:16:56 +0200
Subject: [PATCH] crispy-doom: Fix man page names

---
 crispy-doom/Makefile | 14 +++++++++++++-
 crispy-doom/PLIST    |  6 ++----
 crispy-doom/TODO     |  3 ++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/crispy-doom/Makefile b/crispy-doom/Makefile
index 343d2e9414..db89413bc6 100644
--- a/crispy-doom/Makefile
+++ b/crispy-doom/Makefile
@@ -61,7 +61,8 @@ pre-configure:
 	cd ${WRKSRC} && autoreconf -fi
 	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
 
-# Rename the XDG files to the style of chocolate-doom
+# Rename XDG files to the style of chocolate-doom
+# Rename man pages so that they don't collide with chocolate-doom
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
 		${DESTDIR}${PREFIX}/share/doc/crispy-doom/INSTALL.pkgsrc
@@ -79,6 +80,17 @@ post-install:
 		${DESTDIR}${PREFIX}/share/metainfo/crispy-doom.metainfo.xml
 	${MV} ${DESTDIR}${PREFIX}/share/metainfo/io.github.fabiangreffrath.Heretic.metainfo.xml \
 		${DESTDIR}${PREFIX}/share/metainfo/crispy-heretic.metainfo.xml
+.if defined(PLIST.sysv)
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/default.cfg.4 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/crispy-default.cfg.4
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/heretic.cfg.4 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/crispy-heretic.cfg.4
+.else
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/default.cfg.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/crispy-default.cfg.5
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/heretic.cfg.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/crispy-heretic.cfg.5
+.endif
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
diff --git a/crispy-doom/PLIST b/crispy-doom/PLIST
index be0c2b1790..408293050c 100644
--- a/crispy-doom/PLIST
+++ b/crispy-doom/PLIST
@@ -4,14 +4,12 @@ bin/crispy-doom-setup
 bin/crispy-heretic
 bin/crispy-heretic-setup
 bin/crispy-server
+${PLIST.sysv}man/man4/crispy-default.cfg.4
 ${PLIST.sysv}man/man4/crispy-doom.cfg.4
 ${PLIST.sysv}man/man4/crispy-heretic.cfg.4
-${PLIST.sysv}man/man4/default.cfg.4
-${PLIST.sysv}man/man4/heretic.cfg.4
+${PLIST.bsd}man/man5/crispy-default.cfg.5
 ${PLIST.bsd}man/man5/crispy-doom.cfg.5
 ${PLIST.bsd}man/man5/crispy-heretic.cfg.5
-${PLIST.bsd}man/man5/default.cfg.5
-${PLIST.bsd}man/man5/heretic.cfg.5
 man/man6/crispy-doom-setup.6
 man/man6/crispy-doom.6
 man/man6/crispy-heretic-setup.6
diff --git a/crispy-doom/TODO b/crispy-doom/TODO
index 65844596bf..6a732146e6 100644
--- a/crispy-doom/TODO
+++ b/crispy-doom/TODO
@@ -10,4 +10,5 @@ Fails without Python:
 [X] Add commit message
 [X] Fix PLIST
 [X] Fix man page sections (4 vs. 5 for file format pages on different OS)
-[ ] Fix man page default.cfg conflict with chocolate-doom
+[X] Fix man page default.cfg conflict with chocolate-doom
+[X] Rename man page heretic.cfg to crispy-heretic.cfg