CVS commit: pkgsrc/mail/qsmtp

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jul  4 14:11:41 UTC 2020

Modified Files:
        pkgsrc/mail/qsmtp: Makefile PLIST distinfo
        pkgsrc/mail/qsmtp/patches: patch-CMakeLists.txt

Log Message:
Skip building and installing API docs with Doxygen, as suggested
by the author. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/qsmtp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/qsmtp/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/qsmtp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/qsmtp/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/mail/qsmtp/Makefile
diff -u pkgsrc/mail/qsmtp/Makefile:1.4 pkgsrc/mail/qsmtp/Makefile:1.5
--- pkgsrc/mail/qsmtp/Makefile:1.4      Mon Feb  3 18:59:55 2020
+++ pkgsrc/mail/qsmtp/Makefile  Sat Jul  4 14:11:40 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2020/02/03 18:59:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2020/07/04 14:11:40 schmonz Exp $
 
 DISTNAME=              Qsmtp-0.37
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}
 EXTRACT_SUFX=          .tar.xz
@@ -11,8 +11,6 @@ HOMEPAGE=             https://opensource.sf-tec.de/
 COMMENT=               Drop-in replacement for qmail-smtpd and qmail-remote
 LICENSE=               gnu-gpl-v2
 
-BUILD_DEPENDS+=                doxygen-[0-9]*:../../devel/doxygen
-
 USE_CMAKE=             yes
 CMAKE_ARGS+=           -DAUTOQMAIL=${QMAILDIR}
 CMAKE_ARGS+=           -DDOC_DESTINATION_DIRECTORY="share/doc/qsmtp/"

Index: pkgsrc/mail/qsmtp/PLIST
diff -u pkgsrc/mail/qsmtp/PLIST:1.1 pkgsrc/mail/qsmtp/PLIST:1.2
--- pkgsrc/mail/qsmtp/PLIST:1.1 Tue Jan  7 08:15:30 2020
+++ pkgsrc/mail/qsmtp/PLIST     Sat Jul  4 14:11:40 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/01/07 08:15:30 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/07/04 14:11:40 schmonz Exp $
 bin/Qremote
 bin/Qsmtpd
 bin/Qsurvey
@@ -14,236 +14,3 @@ share/doc/qsmtp/CREDITS
 share/doc/qsmtp/INSTALL
 share/doc/qsmtp/THOUGHTS
 share/doc/qsmtp/faq.html
-share/doc/qsmtp/html/addrparse_8c.html
-share/doc/qsmtp/html/addrparse_8h.html
-share/doc/qsmtp/html/addrparse_8h_source.html
-share/doc/qsmtp/html/addrsyntax_8c.html
-share/doc/qsmtp/html/annotated.html
-share/doc/qsmtp/html/antispam_8c.html
-share/doc/qsmtp/html/antispam_8h.html
-share/doc/qsmtp/html/antispam_8h_source.html
-share/doc/qsmtp/html/auth_8c.html
-share/doc/qsmtp/html/badcc_8c.html
-share/doc/qsmtp/html/badmailfrom_8c.html
-share/doc/qsmtp/html/base64_8c.html
-share/doc/qsmtp/html/base64_8h.html
-share/doc/qsmtp/html/base64_8h_source.html
-share/doc/qsmtp/html/bc_s.png
-share/doc/qsmtp/html/bdwn.png
-share/doc/qsmtp/html/boolean_8c.html
-share/doc/qsmtp/html/cdb_8c.html
-share/doc/qsmtp/html/cdb_8h.html
-share/doc/qsmtp/html/cdb_8h_source.html
-share/doc/qsmtp/html/check2822_8c.html
-share/doc/qsmtp/html/child_8c.html
-share/doc/qsmtp/html/classes.html
-share/doc/qsmtp/html/client_8c.html
-share/doc/qsmtp/html/client_8h.html
-share/doc/qsmtp/html/client_8h_source.html
-share/doc/qsmtp/html/closed.png
-share/doc/qsmtp/html/commands_8h.html
-share/doc/qsmtp/html/commands_8h_source.html
-share/doc/qsmtp/html/common__setup_8c.html
-share/doc/qsmtp/html/conn_8c.html
-share/doc/qsmtp/html/conn_8h.html
-share/doc/qsmtp/html/conn_8h_source.html
-share/doc/qsmtp/html/control_8c.html
-share/doc/qsmtp/html/control_8h.html
-share/doc/qsmtp/html/control_8h_source.html
-share/doc/qsmtp/html/data_8c.html
-share/doc/qsmtp/html/dir_000000.html
-share/doc/qsmtp/html/dir_000001.html
-share/doc/qsmtp/html/dir_000002.html
-share/doc/qsmtp/html/dir_000003.html
-share/doc/qsmtp/html/dir_000004.html
-share/doc/qsmtp/html/dir_000005.html
-share/doc/qsmtp/html/dir_000006.html
-share/doc/qsmtp/html/dir_000007.html
-share/doc/qsmtp/html/dir_000008.html
-share/doc/qsmtp/html/dir_000009.html
-share/doc/qsmtp/html/dir_000010.html
-share/doc/qsmtp/html/dir_000011.html
-share/doc/qsmtp/html/dir_000012.html
-share/doc/qsmtp/html/diropen_8h.html
-share/doc/qsmtp/html/diropen_8h_source.html
-share/doc/qsmtp/html/dns__helpers_8c.html
-share/doc/qsmtp/html/doc.png
-share/doc/qsmtp/html/doxygen.css
-share/doc/qsmtp/html/doxygen.png
-share/doc/qsmtp/html/dynsections.js
-share/doc/qsmtp/html/files.html
-share/doc/qsmtp/html/filters_2spf_8c.html
-share/doc/qsmtp/html/fmt_8c.html
-share/doc/qsmtp/html/fmt_8h.html
-share/doc/qsmtp/html/fmt_8h_source.html
-share/doc/qsmtp/html/folderclosed.png
-share/doc/qsmtp/html/folderopen.png
-share/doc/qsmtp/html/functions.html
-share/doc/qsmtp/html/functions_func.html
-share/doc/qsmtp/html/functions_vars.html
-share/doc/qsmtp/html/getfile_8c.html
-share/doc/qsmtp/html/globals.html
-share/doc/qsmtp/html/globals_b.html
-share/doc/qsmtp/html/globals_c.html
-share/doc/qsmtp/html/globals_d.html
-share/doc/qsmtp/html/globals_defs.html
-share/doc/qsmtp/html/globals_e.html
-share/doc/qsmtp/html/globals_enum.html
-share/doc/qsmtp/html/globals_eval.html
-share/doc/qsmtp/html/globals_f.html
-share/doc/qsmtp/html/globals_func.html
-share/doc/qsmtp/html/globals_func_b.html
-share/doc/qsmtp/html/globals_func_c.html
-share/doc/qsmtp/html/globals_func_d.html
-share/doc/qsmtp/html/globals_func_e.html
-share/doc/qsmtp/html/globals_func_f.html
-share/doc/qsmtp/html/globals_func_g.html
-share/doc/qsmtp/html/globals_func_h.html
-share/doc/qsmtp/html/globals_func_i.html
-share/doc/qsmtp/html/globals_func_l.html
-share/doc/qsmtp/html/globals_func_m.html
-share/doc/qsmtp/html/globals_func_n.html
-share/doc/qsmtp/html/globals_func_p.html
-share/doc/qsmtp/html/globals_func_q.html
-share/doc/qsmtp/html/globals_func_r.html
-share/doc/qsmtp/html/globals_func_s.html
-share/doc/qsmtp/html/globals_func_t.html
-share/doc/qsmtp/html/globals_func_u.html
-share/doc/qsmtp/html/globals_func_v.html
-share/doc/qsmtp/html/globals_func_w.html
-share/doc/qsmtp/html/globals_func_x.html
-share/doc/qsmtp/html/globals_g.html
-share/doc/qsmtp/html/globals_h.html
-share/doc/qsmtp/html/globals_i.html
-share/doc/qsmtp/html/globals_l.html
-share/doc/qsmtp/html/globals_m.html
-share/doc/qsmtp/html/globals_n.html
-share/doc/qsmtp/html/globals_p.html
-share/doc/qsmtp/html/globals_q.html
-share/doc/qsmtp/html/globals_r.html
-share/doc/qsmtp/html/globals_s.html
-share/doc/qsmtp/html/globals_t.html
-share/doc/qsmtp/html/globals_type.html
-share/doc/qsmtp/html/globals_u.html
-share/doc/qsmtp/html/globals_v.html
-share/doc/qsmtp/html/globals_vars.html
-share/doc/qsmtp/html/globals_w.html
-share/doc/qsmtp/html/globals_x.html
-share/doc/qsmtp/html/greeting_8c.html
-share/doc/qsmtp/html/greeting_8h.html
-share/doc/qsmtp/html/greeting_8h_source.html
-share/doc/qsmtp/html/index.html
-share/doc/qsmtp/html/ipme_8c.html
-share/doc/qsmtp/html/ipme_8h.html
-share/doc/qsmtp/html/ipme_8h_source.html
-share/doc/qsmtp/html/jquery.js
-share/doc/qsmtp/html/libowfatconn_8c.html
-share/doc/qsmtp/html/libowfatconn_8h.html
-share/doc/qsmtp/html/libowfatconn_8h_source.html
-share/doc/qsmtp/html/log_8c.html
-share/doc/qsmtp/html/log_8h.html
-share/doc/qsmtp/html/log_8h_source.html
-share/doc/qsmtp/html/match_8c.html
-share/doc/qsmtp/html/match_8h.html
-share/doc/qsmtp/html/match_8h_source.html
-share/doc/qsmtp/html/menu.js
-share/doc/qsmtp/html/menudata.js
-share/doc/qsmtp/html/mime_8c.html
-share/doc/qsmtp/html/mime_8h.html
-share/doc/qsmtp/html/mime_8h_source.html
-share/doc/qsmtp/html/mime__chars_8h.html
-share/doc/qsmtp/html/mime__chars_8h_source.html
-share/doc/qsmtp/html/mmap_8c.html
-share/doc/qsmtp/html/mmap_8h.html
-share/doc/qsmtp/html/mmap_8h_source.html
-share/doc/qsmtp/html/nav_f.png
-share/doc/qsmtp/html/nav_g.png
-share/doc/qsmtp/html/nav_h.png
-share/doc/qsmtp/html/netio_8c.html
-share/doc/qsmtp/html/netio_8h.html
-share/doc/qsmtp/html/netio_8h_source.html
-share/doc/qsmtp/html/open.png
-share/doc/qsmtp/html/qdns_8c.html
-share/doc/qsmtp/html/qdns_8h.html
-share/doc/qsmtp/html/qdns_8h_source.html
-share/doc/qsmtp/html/qdns__dane_8h.html
-share/doc/qsmtp/html/qdns__dane_8h_source.html
-share/doc/qsmtp/html/qmaildir_8h.html
-share/doc/qsmtp/html/qmaildir_8h_source.html
-share/doc/qsmtp/html/qrdata_8c.html
-share/doc/qsmtp/html/qrdata_8h.html
-share/doc/qsmtp/html/qrdata_8h_source.html
-share/doc/qsmtp/html/qremote_8c.html
-share/doc/qsmtp/html/qremote_8h.html
-share/doc/qsmtp/html/qremote_8h_source.html
-share/doc/qsmtp/html/qsauth_8h.html
-share/doc/qsmtp/html/qsauth_8h_source.html
-share/doc/qsmtp/html/qsauth__backend_8h.html
-share/doc/qsmtp/html/qsauth__backend_8h_source.html
-share/doc/qsmtp/html/qsauth__backend__cp_8c.html
-share/doc/qsmtp/html/qsdata_8h.html
-share/doc/qsmtp/html/qsdata_8h_source.html
-share/doc/qsmtp/html/qsmtpd_8c.html
-share/doc/qsmtp/html/qsmtpd_8h.html
-share/doc/qsmtp/html/qsmtpd_8h_source.html
-share/doc/qsmtp/html/queue_8c.html
-share/doc/qsmtp/html/queue_8h.html
-share/doc/qsmtp/html/queue_8h_source.html
-share/doc/qsmtp/html/qutf8_8h.html
-share/doc/qsmtp/html/qutf8_8h_source.html
-share/doc/qsmtp/html/rcpt__filters_8c.html
-share/doc/qsmtp/html/reply_8c.html
-share/doc/qsmtp/html/smtpbugs_8c.html
-share/doc/qsmtp/html/smtproutes_8c.html
-share/doc/qsmtp/html/spf_8c.html
-share/doc/qsmtp/html/splitbar.png
-share/doc/qsmtp/html/ssl__timeoutio_8c.html
-share/doc/qsmtp/html/ssl__timeoutio_8h.html
-share/doc/qsmtp/html/ssl__timeoutio_8h_source.html
-share/doc/qsmtp/html/sstring_8h.html
-share/doc/qsmtp/html/sstring_8h_source.html
-share/doc/qsmtp/html/starttls_8c.html
-share/doc/qsmtp/html/starttls_8h.html
-share/doc/qsmtp/html/starttls_8h_source.html
-share/doc/qsmtp/html/starttlsr_8c.html
-share/doc/qsmtp/html/starttlsr_8h.html
-share/doc/qsmtp/html/starttlsr_8h_source.html
-share/doc/qsmtp/html/status_8c.html
-share/doc/qsmtp/html/statuscodes_8h.html
-share/doc/qsmtp/html/statuscodes_8h_source.html
-share/doc/qsmtp/html/structauthcmd.html
-share/doc/qsmtp/html/structcstring.html
-share/doc/qsmtp/html/structdaneinfo.html
-share/doc/qsmtp/html/structdns__wc.html
-share/doc/qsmtp/html/structips.html
-share/doc/qsmtp/html/structrecip.html
-share/doc/qsmtp/html/structsmtpcomm.html
-share/doc/qsmtp/html/structstring.html
-share/doc/qsmtp/html/structuserconf.html
-share/doc/qsmtp/html/structxmitstat.html
-share/doc/qsmtp/html/sync_off.png
-share/doc/qsmtp/html/sync_on.png
-share/doc/qsmtp/html/syntax_8c.html
-share/doc/qsmtp/html/syntax_8h.html
-share/doc/qsmtp/html/syntax_8h_source.html
-share/doc/qsmtp/html/tab_a.png
-share/doc/qsmtp/html/tab_b.png
-share/doc/qsmtp/html/tab_h.png
-share/doc/qsmtp/html/tab_s.png
-share/doc/qsmtp/html/tabs.css
-share/doc/qsmtp/html/tls_8c.html
-share/doc/qsmtp/html/tls_8h.html
-share/doc/qsmtp/html/tls_8h_source.html
-share/doc/qsmtp/html/userconf_8h.html
-share/doc/qsmtp/html/userconf_8h_source.html
-share/doc/qsmtp/html/userfilters_8h.html
-share/doc/qsmtp/html/userfilters_8h_source.html
-share/doc/qsmtp/html/utf8_8c.html
-share/doc/qsmtp/html/version_8h.html
-share/doc/qsmtp/html/version_8h_source.html
-share/doc/qsmtp/html/vpop_8c.html
-share/doc/qsmtp/html/vpop_8h.html
-share/doc/qsmtp/html/vpop_8h_source.html
-share/doc/qsmtp/html/xtext_8c.html
-share/doc/qsmtp/html/xtext_8h.html
-share/doc/qsmtp/html/xtext_8h_source.html

Index: pkgsrc/mail/qsmtp/distinfo
diff -u pkgsrc/mail/qsmtp/distinfo:1.3 pkgsrc/mail/qsmtp/distinfo:1.4
--- pkgsrc/mail/qsmtp/distinfo:1.3      Fri Mar  6 20:50:24 2020
+++ pkgsrc/mail/qsmtp/distinfo  Sat Jul  4 14:11:40 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2020/03/06 20:50:24 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2020/07/04 14:11:40 schmonz Exp $
 
 SHA1 (Qsmtp-0.37.tar.xz) = 768567e10adf47d651735bd8e7289a6b8a18d24a
 RMD160 (Qsmtp-0.37.tar.xz) = abf841db63e94142f309fcac93c29a29c1a4d692
 SHA512 (Qsmtp-0.37.tar.xz) = 911d9d956ef7d0c6ad150745db489dd96eca0b665d99c0db648b4382c0d21fc759ad4a138e7adf69c6749574ad619114e7f06f62c131d0ae103e9b0493d39ef3
 Size (Qsmtp-0.37.tar.xz) = 250100 bytes
-SHA1 (patch-CMakeLists.txt) = ca780d4dfe778c359db03231b06382372e13a62f
+SHA1 (patch-CMakeLists.txt) = a764e2e2dd79043e9dd45fd213e95ab776a81299
 SHA1 (patch-include_qdns.h) = de5f47f62cb7482d1ed96814123f6f1abad4506b
 SHA1 (patch-qsmtpd_antispam.c) = 8df576496c31712e49f4679be172074d7712c089
 SHA1 (patch-qsmtpd_auth.c) = 48958cc70850e2016c755eb53c777998d1477018

Index: pkgsrc/mail/qsmtp/patches/patch-CMakeLists.txt
diff -u pkgsrc/mail/qsmtp/patches/patch-CMakeLists.txt:1.2 pkgsrc/mail/qsmtp/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/mail/qsmtp/patches/patch-CMakeLists.txt:1.2  Sun Jan 12 23:03:28 2020
+++ pkgsrc/mail/qsmtp/patches/patch-CMakeLists.txt      Sat Jul  4 14:11:41 2020
@@ -1,7 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2020/01/12 23:03:28 joerg Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2020/07/04 14:11:41 schmonz Exp $
 
 Support PKGMANDIR.
 Support explicit_memset on NetBSD.
+Skip building API docs with Doxygen.
 
 --- CMakeLists.txt.orig        2020-01-06 19:19:59.000000000 +0000
 +++ CMakeLists.txt
@@ -34,6 +35,32 @@ Support explicit_memset on NetBSD.
  set(CMAKE_REQUIRED_INCLUDES fcntl.h)
  CHECK_FUNCTION_EXISTS(openat HAS_OPENAT)
  unset(CMAKE_REQUIRED_INCLUDES)
+@@ -190,19 +194,19 @@ endif ()
+ option(BUILD_DOC "Build documentation" ON)
+ if (BUILD_DOC)
+       # API documentation
+-      find_package(Doxygen REQUIRED)
++      # find_package(Doxygen REQUIRED)
+ 
+-      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
++      # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+ 
+-      add_custom_target(docu ALL
+-                      COMMAND ${DOXYGEN_EXECUTABLE}
+-                      WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
++      #       add_custom_target(docu ALL
++      #               COMMAND ${DOXYGEN_EXECUTABLE}
++      #               WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ 
+       if (NOT DOC_DESTINATION_DIRECTORY)
+               set(DOC_DESTINATION_DIRECTORY "doc/")
+       endif ()
+ 
+-      install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${DOC_DESTINATION_DIRECTORY})
++      # install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${DOC_DESTINATION_DIRECTORY})
+ 
+       # general documentation
+       install(FILES
 @@ -220,8 +224,8 @@ if (BUILD_DOC)
        install(FILES
                ${CMAKE_CURRENT_BINARY_DIR}/Qremote.8