CVS commit: pkgsrc/security/gnupg2

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov  3 08:54:49 UTC 2024

Modified Files:
        pkgsrc/security/gnupg2: Makefile PLIST distinfo
        pkgsrc/security/gnupg2/patches: patch-doc_Makefile.in

Log Message:
gnupg2: Disable installation of HTML man pages

pkgsrc cannot handle normalizing the paths.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 pkgsrc/security/gnupg2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/gnupg2/PLIST
cvs rdiff -u -r1.87 -r1.88 pkgsrc/security/gnupg2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in

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

Modified files:

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.158 pkgsrc/security/gnupg2/Makefile:1.159
--- pkgsrc/security/gnupg2/Makefile:1.158       Fri Nov  1 12:54:13 2024
+++ pkgsrc/security/gnupg2/Makefile     Sun Nov  3 08:54:48 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.158 2024/11/01 12:54:13 wiz Exp $
+# $NetBSD: Makefile,v 1.159 2024/11/03 08:54:48 nia Exp $
 
 DISTNAME=      gnupg-2.4.6
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    security
 MASTER_SITES=  https://gnupg.org/ftp/gcrypt/gnupg/
 MASTER_SITES+= http://mirrors.dotsrc.org/gcrypt/gnupg/

Index: pkgsrc/security/gnupg2/PLIST
diff -u pkgsrc/security/gnupg2/PLIST:1.17 pkgsrc/security/gnupg2/PLIST:1.18
--- pkgsrc/security/gnupg2/PLIST:1.17   Tue Oct 29 15:25:58 2024
+++ pkgsrc/security/gnupg2/PLIST        Sun Nov  3 08:54:48 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2024/10/29 15:25:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.18 2024/11/03 08:54:48 nia Exp $
 ${PLIST.gnutls}bin/dirmngr
 ${PLIST.gnutls}bin/dirmngr-client
 bin/g13
@@ -49,7 +49,6 @@ man/man7/gnupg.7
 man/man8/addgnupghome.8
 man/man8/applygnupgdefaults.8
 man/man8/dirmngr.8
-man/manh/gnupg.7.html
 sbin/addgnupghome
 sbin/applygnupgdefaults
 sbin/g13-syshelp

Index: pkgsrc/security/gnupg2/distinfo
diff -u pkgsrc/security/gnupg2/distinfo:1.87 pkgsrc/security/gnupg2/distinfo:1.88
--- pkgsrc/security/gnupg2/distinfo:1.87        Tue Oct 29 15:25:58 2024
+++ pkgsrc/security/gnupg2/distinfo     Sun Nov  3 08:54:48 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.87 2024/10/29 15:25:58 ryoon Exp $
+$NetBSD: distinfo,v 1.88 2024/11/03 08:54:48 nia Exp $
 
 BLAKE2s (gnupg-2.4.6.tar.bz2) = 58a2095d27b93331d50402ebacd9054c32667fb873709e8e04db785b83553bcd
 SHA512 (gnupg-2.4.6.tar.bz2) = 192ae6cb18547e9c5fc4263dc968b548c1ce563ceb8cc2e651b264d4e5afa1cd99a2c1cdd80906faf5e0b0ca99cef76e003b1f7e73238f311a74a1de6c35b5cb
 Size (gnupg-2.4.6.tar.bz2) = 8011304 bytes
 SHA1 (patch-common_sysutils.c) = 569c12e21172c1521284922244b2f4f361c945d6
-SHA1 (patch-doc_Makefile.in) = 69bb70932d79e96d11922c9207d6d229695b449d
+SHA1 (patch-doc_Makefile.in) = 9b2a02dee28089236f293babba18e83d3cb3db76

Index: pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in
diff -u pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in:1.1 pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in:1.2
--- pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in:1.1    Tue Oct 29 15:25:58 2024
+++ pkgsrc/security/gnupg2/patches/patch-doc_Makefile.in        Sun Nov  3 08:54:49 2024
@@ -1,8 +1,10 @@
-$NetBSD: patch-doc_Makefile.in,v 1.1 2024/10/29 15:25:58 ryoon Exp $
+$NetBSD: patch-doc_Makefile.in,v 1.2 2024/11/03 08:54:49 nia Exp $
 
 * Handle --enable-gpg-is-gpg2 case.
+* Disable installation of HTML man pages.
+  pkgsrc cannot handle normalizing the paths.
 
---- doc/Makefile.in.orig       2024-10-29 15:14:22.312728237 +0000
+--- doc/Makefile.in.orig       2024-10-29 12:52:23.000000000 +0000
 +++ doc/Makefile.in
 @@ -517,18 +517,21 @@ AM_MAKEINFOFLAGS = -I $(srcdir) --css-re
  YAT2M_OPTIONS = -I $(srcdir) \
@@ -28,3 +30,12 @@ $NetBSD: patch-doc_Makefile.in,v 1.1 202
                  gpg-agent.1.html dirmngr.8.html scdaemon.1.html \
                  watchgnupg.1.html gpgconf.1.html addgnupghome.8.html \
                  gpg-preset-passphrase.1.html \
+@@ -1127,7 +1130,7 @@ install-info-am: $(INFO_DEPS)
+           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+         done; \
+       else : ; fi
+-install-man: install-man1 install-man7 install-man8 install-manh
++install-man: install-man1 install-man7 install-man8
+ 
+ install-pdf: install-pdf-am
+