CVS commit: pkgsrc/misc/vym

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Dec 18 12:31:30 UTC 2024

Modified Files:
        pkgsrc/misc/vym: Makefile distinfo
Added Files:
        pkgsrc/misc/vym/patches: patch-CMakeLists.txt

Log Message:
vym: Fix portability of man page installation.

This package actually honours PKGMANDIR and uses CMAKE_INSTALL_MANDIR
in the upstream code, but this was negated in several SUBSTs that
were inserted into the package Makefile, resulting in installation
failing on anything where PKGMANDIR isn't "man" (most things other
than NetBSD use "share/man").

Remove the SUBSTs and fix installation in another way.

See the pkgsrc guide for information on how MANCOMPRESSED can
handle .gz man pages automatically.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/misc/vym/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/vym/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/vym/patches/patch-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/misc/vym/Makefile
diff -u pkgsrc/misc/vym/Makefile:1.86 pkgsrc/misc/vym/Makefile:1.87
--- pkgsrc/misc/vym/Makefile:1.86       Thu Nov 14 22:20:54 2024
+++ pkgsrc/misc/vym/Makefile    Wed Dec 18 12:31:30 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2024/11/14 22:20:54 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2024/12/18 12:31:30 nia Exp $
 
 DISTNAME=              vym-2.9.31
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=insilmaril/}
 GITHUB_TAG=            da30b21109544ee0596ebf4d9738b5fed69b3cc4
@@ -16,7 +16,9 @@ DEPENDS+=             unzip-[0-9]*:../../archivers/
 DEPENDS+=              zip-[0-9]*:../../archivers/zip
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            bash:run pkg-config gmake gzip
+USE_TOOLS+=            bash:run pkg-config gmake
+
+MANCOMPRESSED=         yes
 
 REPLACE_BASH+=         scripts/vivym
 
@@ -31,31 +33,6 @@ SUBST_MESSAGE.flags= Fix path to flags
 SUBST_FILES.flags=     src/main.cpp src/mainwindow.cpp
 SUBST_VARS.flags=      PREFIX
 
-SUBST_CLASSES+=                man-gz
-SUBST_STAGE.man-gz=    pre-configure
-SUBST_MESSAGE.man-gz=  Fix installing gzipped man page
-SUBST_FILES.man-gz=    CMakeLists.txt
-SUBST_SED.man-gz=      -e 's;doc/vym.1.gz;doc/vym.1;g'
-
-# 'CMAKE_CONFIGURE_ARGS+=      -DCMAKE_INSTALL_MANDIR=man/man1' seems to be ignored
-SUBST_CLASSES+=                        cmake-mandir
-SUBST_STAGE.cmake-mandir=      pre-configure
-SUBST_MESSAGE.cmake-mandir=    Fix man page path
-SUBST_FILES.cmake-mandir=      CMakeLists.txt
-SUBST_SED.cmake-mandir=                -e 's;\$${CMAKE_INSTALL_MANDIR};$$\{CMAKE_INSTALL_PREFIX\}/man/man1;g'
-
-SUBST_CLASSES+=                man-bin
-SUBST_STAGE.man-bin=   post-build
-SUBST_MESSAGE.man-bin= Fixing bin path in man page
-SUBST_FILES.man-bin=   doc/vym.1
-SUBST_SED.man-bin=     -e 's;/usr/bin/;${PREFIX}/bin/;g'
-
-SUBST_CLASSES+=                man-doc
-SUBST_STAGE.man-doc=   post-build
-SUBST_MESSAGE.man-doc= Fixing doc path in man page
-SUBST_FILES.man-doc=   doc/vym.1
-SUBST_SED.man-doc=     -e 's;/usr/share/doc/packages/vym;${PREFIX}/share/doc/vym;g'
-
 SUBST_CLASSES+=                pdf-path
 SUBST_STAGE.pdf-path=  pre-configure
 SUBST_MESSAGE.pdf-path=        Fix installing pdf files in share/doc/vym/doc
@@ -72,9 +49,6 @@ CMAKE_CONFIGURE_ARGS+=                -DCMAKE_INSTALL_
 CMAKE_CONFIGURE_ARGS+=         -DCMAKE_INSTALL_DOCDIR=share/doc/vym
 #CMAKE_CONFIGURE_ARGS+=                -DCMAKE_INSTALL_MANDIR=man/man1
 
-post-extract:
-       ${GZIP_CMD} -d ${WRKSRC}/doc/vym.1.gz
-
 .include "../../devel/cmake/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/ruby/buildlink3.mk"

Index: pkgsrc/misc/vym/distinfo
diff -u pkgsrc/misc/vym/distinfo:1.13 pkgsrc/misc/vym/distinfo:1.14
--- pkgsrc/misc/vym/distinfo:1.13       Sun Oct 13 09:45:24 2024
+++ pkgsrc/misc/vym/distinfo    Wed Dec 18 12:31:30 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.13 2024/10/13 09:45:24 bsiegert Exp $
+$NetBSD: distinfo,v 1.14 2024/12/18 12:31:30 nia Exp $
 
 BLAKE2s (vym-2.9.31-da30b21109544ee0596ebf4d9738b5fed69b3cc4.tar.gz) = 56d8316213f5e1c33302900150351ed402fc8eb43a7cc764c7d5e2bb9c39224e
 SHA512 (vym-2.9.31-da30b21109544ee0596ebf4d9738b5fed69b3cc4.tar.gz) = f5b87e6d3d3a3047fb7c9355b4549bc4668d8d24a3a33ffa024b40d6f8d970a575ab5db81c718811eebed2a1ea7422fc170568dd568a8a5374ae305d0e58fe99
 Size (vym-2.9.31-da30b21109544ee0596ebf4d9738b5fed69b3cc4.tar.gz) = 8741639 bytes
+SHA1 (patch-CMakeLists.txt) = 684be5b9b8123ac2866f9fab050d22a6d082d271
 SHA1 (patch-src_main.cpp) = dd6fe34545ccec49a10152da98c250ae411f5062
 SHA1 (patch-src_mainwindow.cpp) = d33e76b358591aace24b7c55ff55ce1ab7601658

Added files:

Index: pkgsrc/misc/vym/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/misc/vym/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Dec 18 12:31:31 2024
+++ pkgsrc/misc/vym/patches/patch-CMakeLists.txt        Wed Dec 18 12:31:30 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/12/18 12:31:30 nia Exp $
+
+Install man page to proper directory.
+
+--- CMakeLists.txt.orig        2024-12-18 12:17:33.482709233 +0000
++++ CMakeLists.txt
+@@ -161,7 +161,7 @@ add_dependencies(vym make-translations-d
+ 
+ install(DIRECTORY demos DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+ install(DIRECTORY doc DESTINATION ${CMAKE_INSTALL_DOCDIR} FILES_MATCHING PATTERN "*.pdf")
+-install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR})
++install(FILES doc/vym.1.gz DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install(FILES README.md LICENSE.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ install(DIRECTORY exports flags icons macros ${CMAKE_BINARY_DIR}/translations scripts styles DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+