CVS commit: pkgsrc/games/woof

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jul  1 09:58:53 UTC 2022

Modified Files:
        pkgsrc/games/woof: Makefile distinfo
        pkgsrc/games/woof/patches: patch-data_CMakeLists.txt

Log Message:
games/woof: Honor PKGMANDIR on install

This should fix bulk build on SmartOS.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/games/woof/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/woof/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/woof/patches/patch-data_CMakeLists.txt

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

Modified files:

Index: pkgsrc/games/woof/Makefile
diff -u pkgsrc/games/woof/Makefile:1.34 pkgsrc/games/woof/Makefile:1.35
--- pkgsrc/games/woof/Makefile:1.34     Wed Jun 29 11:31:54 2022
+++ pkgsrc/games/woof/Makefile  Fri Jul  1 09:58:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2022/06/29 11:31:54 micha Exp $
+# $NetBSD: Makefile,v 1.35 2022/07/01 09:58:53 micha Exp $
 
 DISTNAME=      woof_10.0.0
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -22,10 +22,17 @@ WRKSRC=             ${WRKDIR}/woof-${DISTNAME}
 # DOOMWADDIR is intentionally shared with other Doom packages
 DOOMWADDIR=    share/doom
 
+# Install man page into PKGMANDIR hierarchy
+SUBST_CLASSES+=                mandir
+SUBST_STAGE.mandir=    pre-configure
+SUBST_MESSAGE.mandir=  Preparing data/CMakeLists.txt file ...
+SUBST_FILES.mandir=    data/CMakeLists.txt
+SUBST_VARS.mandir=     PKGMANDIR
+
 # Add DOOMWADDIR to search path
 SUBST_CLASSES+=                waddir
 SUBST_STAGE.waddir=    pre-configure
-SUBST_MESSAGE.waddir=  Preparing d_iwad.c file ...
+SUBST_MESSAGE.waddir=  Preparing src/d_iwad.c file ...
 SUBST_FILES.waddir=    src/d_iwad.c
 SUBST_SED.waddir=      -e 's,PKGSRC_PREFIX,"${PREFIX}",'
 SUBST_SED.waddir+=     -e 's,PKGSRC_DOOMWADDIR,"/${DOOMWADDIR}",'

Index: pkgsrc/games/woof/distinfo
diff -u pkgsrc/games/woof/distinfo:1.30 pkgsrc/games/woof/distinfo:1.31
--- pkgsrc/games/woof/distinfo:1.30     Wed Jun 29 11:31:54 2022
+++ pkgsrc/games/woof/distinfo  Fri Jul  1 09:58:53 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2022/06/29 11:31:54 micha Exp $
+$NetBSD: distinfo,v 1.31 2022/07/01 09:58:53 micha Exp $
 
 BLAKE2s (woof_10.0.0.tar.gz) = 05660fa1bb317f72f4703a27e98c777b895b961f1fdf1631f369c89f87b7a435
 SHA512 (woof_10.0.0.tar.gz) = 0db57d2b0817b0cb301753610ab382c05cc4db7ebb69ebe96200f90eeb285dcff8af5b800f0abfbdcc36a5b494c316bd503c7c445183e1d063bb1ec809429586
 Size (woof_10.0.0.tar.gz) = 7872336 bytes
-SHA1 (patch-data_CMakeLists.txt) = d75fe1b163bfb39488bdf7df5ca8656d4e790408
+SHA1 (patch-data_CMakeLists.txt) = de619ccaf29591a10ed0cf91262c6619f3a8c7ff
 SHA1 (patch-src_d__iwad.c) = e2e596d3f0eacfca8852afa329704c14dadf7889

Index: pkgsrc/games/woof/patches/patch-data_CMakeLists.txt
diff -u pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.1 pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.2
--- pkgsrc/games/woof/patches/patch-data_CMakeLists.txt:1.1     Wed Jun 29 11:31:54 2022
+++ pkgsrc/games/woof/patches/patch-data_CMakeLists.txt Fri Jul  1 09:58:53 2022
@@ -1,6 +1,6 @@
-$NetBSD: patch-data_CMakeLists.txt,v 1.1 2022/06/29 11:31:54 micha Exp $
+$NetBSD: patch-data_CMakeLists.txt,v 1.2 2022/07/01 09:58:53 micha Exp $
 
-Install man page into hierarchy "$PREFIX/man".
+Prepare to install man page into hierarchy "$PREFIX/$PKGMANDIR".
 Patch is not suitable for upstream.
 
 --- data/CMakeLists.txt.orig   2022-06-17 09:24:44.000000000 +0000
@@ -8,7 +8,7 @@ Patch is not suitable for upstream.
 @@ -1,5 +1,5 @@
  if(UNIX AND NOT APPLE)
 -    install(FILES woof.6 DESTINATION share/man/man6)
-+    install(FILES woof.6 DESTINATION man/man6)
++    install(FILES woof.6 DESTINATION @PKGMANDIR@/man6)
      install(FILES woof.desktop DESTINATION share/applications)
      install(FILES woof.png DESTINATION share/icons/hicolor/128x128/apps)
      install(FILES woof-setup.desktop DESTINATION share/applications)