crispy-doom: Fix PLIST and man page sections

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: crispy-doom: Fix PLIST and man page sections
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Tue, 25 Aug 2020 11:42:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Tue Aug 25 13:42:30 2020 +0200
Changeset:	3034822ab5e04ae3000de61cc7d6e1d877a011b6

Modified Files:
	crispy-doom/Makefile
	crispy-doom/PLIST
	crispy-doom/TODO
Added Files:
	crispy-doom/COMMIT_MSG

Log Message:
crispy-doom: Fix PLIST and man page sections

Add commit message.

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

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

diffstat:
 crispy-doom/COMMIT_MSG |  4 ++++
 crispy-doom/Makefile   | 55 +++++++++++++++++++++++++++++++++++++++++++-------
 crispy-doom/PLIST      | 31 ++++++++++++++++++++++------
 crispy-doom/TODO       | 13 +++++++++---
 4 files changed, 87 insertions(+), 16 deletions(-)

diffs:
diff --git a/crispy-doom/COMMIT_MSG b/crispy-doom/COMMIT_MSG
new file mode 100644
index 0000000000..d6e4809277
--- /dev/null
+++ b/crispy-doom/COMMIT_MSG
@@ -0,0 +1,4 @@
+Crispy Doom is a friendly fork of Chocolate Doom that provides a higher
+display resolution, removes the static limits of the Doom engine and offers
+further optional visual, tactical and physical enhancements while remaining
+entirely config file, savegame, netplay and demo compatible with the original.
diff --git a/crispy-doom/Makefile b/crispy-doom/Makefile
index 83f5d1b8bb..b76fc4508a 100644
--- a/crispy-doom/Makefile
+++ b/crispy-doom/Makefile
@@ -11,14 +11,21 @@ HOMEPAGE=	https://github.com/fabiangreffrath/crispy-doom/
 COMMENT=	Limit-removing enhanced-resolution Doom source port
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES=	c99
-USE_TOOLS+=	autoconf automake pkg-config
+.include "../../mk/bsd.prefs.mk"
 
-GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/crispy-doom-${DISTNAME}
+USE_LANGUAGES=		c99
+USE_TOOLS+=		autoconf automake pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		ac_cv_prog_HAVE_PYTHON=python${PYVERSSUFFIX}
+PYTHON_FOR_BUILD_ONLY=	tool
+REPLACE_PYTHON=		man/docgen
+REPLACE_PYTHON+=	man/simplecpp
 
 # DOOMWADDIR is intentionally shared with other Doom packages
-DOOMWADDIR=	share/doom
+DOOMWADDIR=		share/doom
+INSTALLATION_DIRS+=	share/doc/crispy-doom
+INSTALLATION_DIRS+=	share/icons/hicolor/48x48/apps
+INSTALLATION_DIRS+=	${PKGMANDIR}/man4
 
 # Add DOOMWADDIR to search path
 SUBST_CLASSES+=		waddir
@@ -28,13 +35,46 @@ SUBST_FILES.waddir=	src/d_iwad.c
 SUBST_SED.waddir=	-e 's,PKGSRC_PREFIX,"${PREFIX}",'
 SUBST_SED.waddir+=	-e 's,PKGSRC_DOOMWADDIR,"/${DOOMWADDIR}",'
 
-do-configure:
-	cd ${WRKSRC} && ./autogen.sh
+# Man pages with documentation of file formats should go to section 4 on
+# SysV based systems. IRIX and OSF/1 are treated with BSD style by intent.
+PLIST_VARS+=	bsd sysv
+.if ${OPSYS} == "AIX" || ${OPSYS} == "HPUX" || ${OPSYS} == "SunOS"
+PLIST.sysv=	yes
+.else
+PLIST.bsd=	yes
+.endif
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -fi
 	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
 		${DESTDIR}${PREFIX}/share/doc/crispy-doom/INSTALL.pkgsrc
+	${INSTALL_DATA} ${WRKSRC}/pkg/osx/Resources/app.png \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/48x48/apps/crispy-doom.png
+	${MV} ${DESTDIR}${PREFIX}/share/applications/io.github.fabiangreffrath.Doom.desktop \
+		${DESTDIR}${PREFIX}/share/applications/crispy-doom.desktop
+	${MV} ${DESTDIR}${PREFIX}/share/applications/io.github.fabiangreffrath.Heretic.desktop \
+		${DESTDIR}${PREFIX}/share/applications/crispy-heretic.desktop
+	${MV} ${DESTDIR}${PREFIX}/share/applications/io.github.fabiangreffrath.Setup.desktop \
+		${DESTDIR}${PREFIX}/share/applications/crispy-setup.desktop
+	${MV} ${DESTDIR}${PREFIX}/share/applications/screensavers/io.github.fabiangreffrath.Doom_Screensaver.desktop \
+		${DESTDIR}${PREFIX}/share/applications/screensavers/crispy-doom_Screensaver.desktop
+	${MV} ${DESTDIR}${PREFIX}/share/metainfo/io.github.fabiangreffrath.Doom.metainfo.xml \
+		${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}/man5/crispy-doom.cfg.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/crispy-doom.cfg.4
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/crispy-heretic.cfg.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/crispy-heretic.cfg.4
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/default.cfg.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/default.cfg.4
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/heretic.cfg.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man4/heretic.cfg.4
+.endif
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
@@ -42,6 +82,7 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../net/SDL2_net/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
diff --git a/crispy-doom/PLIST b/crispy-doom/PLIST
index 59c3a4b623..be0c2b1790 100644
--- a/crispy-doom/PLIST
+++ b/crispy-doom/PLIST
@@ -4,19 +4,38 @@ bin/crispy-doom-setup
 bin/crispy-heretic
 bin/crispy-heretic-setup
 bin/crispy-server
-share/applications/io.github.fabiangreffrath.Doom.desktop
-share/applications/io.github.fabiangreffrath.Heretic.desktop
-share/applications/io.github.fabiangreffrath.Setup.desktop
-share/applications/screensavers/io.github.fabiangreffrath.Doom_Screensaver.desktop
+${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-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
+man/man6/crispy-heretic.6
+share/applications/crispy-doom.desktop
+share/applications/crispy-heretic.desktop
+share/applications/crispy-setup.desktop
+share/applications/screensavers/crispy-doom_Screensaver.desktop
+share/bash-completion/completions/crispy-doom
+share/bash-completion/completions/crispy-heretic
+share/doc/crispy-doom/CMDLINE.doom
 share/doc/crispy-doom/COPYING.md
 share/doc/crispy-doom/ChangeLog
+share/doc/crispy-doom/INSTALL.doom
 share/doc/crispy-doom/INSTALL.pkgsrc
 share/doc/crispy-doom/NEWS.md
 share/doc/crispy-doom/NOT-BUGS.md
 share/doc/crispy-doom/PHILOSOPHY.md
 share/doc/crispy-doom/README.Music.md
 share/doc/crispy-doom/README.md
+share/doc/crispy-heretic/CMDLINE.heretic
+share/doc/crispy-heretic/INSTALL.heretic
 share/icons/hicolor/128x128/apps/crispy-doom.png
 share/icons/hicolor/128x128/apps/crispy-setup.png
-share/metainfo/io.github.fabiangreffrath.Doom.metainfo.xml
-share/metainfo/io.github.fabiangreffrath.Heretic.metainfo.xml
+share/icons/hicolor/48x48/apps/crispy-doom.png
+share/metainfo/crispy-doom.metainfo.xml
+share/metainfo/crispy-heretic.metainfo.xml
diff --git a/crispy-doom/TODO b/crispy-doom/TODO
index bd1aa9952e..227bb79e16 100644
--- a/crispy-doom/TODO
+++ b/crispy-doom/TODO
@@ -1,5 +1,12 @@
 Vulnerabilites to investigate:
-- CVE-2020-14983
-  => Fixed in 5.9.0
+[X] CVE-2020-14983
+    => Fixed in 5.9.0 (inherited fix from Chocolate Doom)
 
-Package has Python problems.
+Fails without Python:
+[X] Issue reported upstrem
+    => Fixed in Git commit ab1a38d8e902baebc7183fb511bd58c50e2b4571
+[X] Add tool dependency for Python
+
+[X] Add commit message
+[X] Fix PLIST
+[X] Fix man page sections (4 vs. 5 for file format pages on different OS)
Prev by Date: zoneminder: Add patch for perl language issue
Next by Date: proj: Update to 7.1.0 (from RC)
Previous by Thread: zoneminder: Add patch for perl language issue
Next by Thread: proj: Update to 7.1.0 (from RC)
Indexes:
Home | Main Index | Thread Index | Old Index