CVS commit: pkgsrc/mail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Feb 28 15:42:06 UTC 2024

Modified Files:
        pkgsrc/mail/vmailmgr-base: distinfo
        pkgsrc/mail/vmailmgr-base/patches: patch-doc_Makefile.am
        pkgsrc/mail/vmailmgr-docs: Makefile

Log Message:
vmailmgr-docs: skip PDFs, not installed anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/vmailmgr-base/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/mail/vmailmgr-base/patches/patch-doc_Makefile.am
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/vmailmgr-docs/Makefile

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

Modified files:

Index: pkgsrc/mail/vmailmgr-base/distinfo
diff -u pkgsrc/mail/vmailmgr-base/distinfo:1.3 pkgsrc/mail/vmailmgr-base/distinfo:1.4
--- pkgsrc/mail/vmailmgr-base/distinfo:1.3      Tue Feb 27 19:13:43 2024
+++ pkgsrc/mail/vmailmgr-base/distinfo  Wed Feb 28 15:42:05 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/02/27 19:13:43 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2024/02/28 15:42:05 schmonz Exp $
 
 BLAKE2s (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 6e83ecea2a0defebd20323fbe9833dc1d4e63e8e2d4c6d904c9558ba32cc9a59
 SHA512 (vmailmgr-526d53c1d0e604ec29ada61b79485ceeb8b978cd-526d53c1d0e604ec29ada61b79485ceeb8b978cd.tar.gz) = 
9d717b4b9ae763509d8192c40167606acdc56622d8f9351c763140f5b2573d6c2c1364c33003e1649d2b0d628aadab03690ade20f9e3210c5b44a89237bdd62b
@@ -13,7 +13,7 @@ SHA1 (patch-configure.ac) = a3bd54716955
 SHA1 (patch-daemon_Makefile.am) = 4a0a2bbcc25371ae412c5b64b577a2194a84f2e4
 SHA1 (patch-daemon_main.cc) = e93f2b06b26920ec9dd8aaf8e4029792b9042284
 SHA1 (patch-doc_HOWTO.texi) = 29a8e8413d653e6901c520ecf38d4febfe7a9845
-SHA1 (patch-doc_Makefile.am) = cd16ee93a4209411fdd478d66401dd00fa765013
+SHA1 (patch-doc_Makefile.am) = 0fa6a568960c43ceb0868495653944e4acee0212
 SHA1 (patch-lib_cli++_main.cc) = cfa961d73e61fa5bd6ef20efefe77d773f8ef951
 SHA1 (patch-lib_fdbuf_fdbuf.h) = 2607bb82c4d9123df0a94b30fc5930db6429010d
 SHA1 (patch-lib_mergelib.sh) = 59cdc1e5896331195f1d693a7cad4f7f6f7ec8e4

Index: pkgsrc/mail/vmailmgr-base/patches/patch-doc_Makefile.am
diff -u pkgsrc/mail/vmailmgr-base/patches/patch-doc_Makefile.am:1.1 pkgsrc/mail/vmailmgr-base/patches/patch-doc_Makefile.am:1.2
--- pkgsrc/mail/vmailmgr-base/patches/patch-doc_Makefile.am:1.1 Sun Feb 25 12:09:22 2024
+++ pkgsrc/mail/vmailmgr-base/patches/patch-doc_Makefile.am     Wed Feb 28 15:42:05 2024
@@ -1,7 +1,9 @@
-$NetBSD: patch-doc_Makefile.am,v 1.1 2024/02/25 12:09:22 schmonz Exp $
+$NetBSD: patch-doc_Makefile.am,v 1.2 2024/02/28 15:42:05 schmonz Exp $
 
 Avoid "warning: ignoring prerequisites on suffix rule definition"
 
+Avoid building PDFs that aren't installed anyway.
+
 --- doc/Makefile.am.orig       2015-09-01 16:03:21.000000000 +0000
 +++ doc/Makefile.am
 @@ -7,10 +7,10 @@ noinst_TXTS = HOWTO.txt FAQ.txt \
@@ -17,10 +19,12 @@ Avoid "warning: ignoring prerequisites o
        $(man_MANS) \
        $(noinst_PODS) \
        $(noinst_TEXINFOS) \
-@@ -31,6 +31,7 @@ TEXI2INFO = texi2any --info --no-split -
+@@ -30,7 +30,8 @@ TEXI2PDF = texi2pdf --clean --quiet
+ TEXI2INFO = texi2any --info --no-split --number-sections
  TEXI2TXT = texi2any --plaintext
  
- all: $(noinst_HTMLS) $(noinst_PDFS) $(noinst_TXTS) $(noinst_MISC)
+-all: $(noinst_HTMLS) $(noinst_PDFS) $(noinst_TXTS) $(noinst_MISC)
++all: $(noinst_HTMLS) $(noinst_TXTS)
 +man: $(man_MANS)
  
  dist-hook:

Index: pkgsrc/mail/vmailmgr-docs/Makefile
diff -u pkgsrc/mail/vmailmgr-docs/Makefile:1.1 pkgsrc/mail/vmailmgr-docs/Makefile:1.2
--- pkgsrc/mail/vmailmgr-docs/Makefile:1.1      Sun Feb 25 12:09:23 2024
+++ pkgsrc/mail/vmailmgr-docs/Makefile  Wed Feb 28 15:42:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/02/25 12:09:23 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2024/02/28 15:42:06 schmonz Exp $
 
 .include "../../mail/vmailmgr/Makefile.common"
 
@@ -27,5 +27,4 @@ do-install:
                ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/doc/vmailmgr/`basename $$f`; \
        done
 
-.include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"