Sat Jul 4 14:11:41 2020 UTC ()
Skip building and installing API docs with Doxygen, as suggested
by the author. Bump PKGREVISION.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/mail/qsmtp/Makefile
diff -r1.1 -r1.2 pkgsrc/mail/qsmtp/PLIST
diff -r1.3 -r1.4 pkgsrc/mail/qsmtp/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/qsmtp/patches/patch-CMakeLists.txt

cvs diff -r1.4 -r1.5 pkgsrc/mail/qsmtp/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qsmtp/Makefile 2020/02/03 18:59:55 1.4
+++ pkgsrc/mail/qsmtp/Makefile 2020/07/04 14:11:40 1.5
@@ -1,27 +1,25 @@ @@ -1,27 +1,25 @@
1# $NetBSD: Makefile,v 1.4 2020/02/03 18:59:55 schmonz Exp $ 1# $NetBSD: Makefile,v 1.5 2020/07/04 14:11:40 schmonz Exp $
2 2
3DISTNAME= Qsmtp-0.37 3DISTNAME= Qsmtp-0.37
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://opensource.sf-tec.de/Qsmtp/ 10HOMEPAGE= https://opensource.sf-tec.de/Qsmtp/
11COMMENT= Drop-in replacement for qmail-smtpd and qmail-remote 11COMMENT= Drop-in replacement for qmail-smtpd and qmail-remote
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen 
15 
16USE_CMAKE= yes 14USE_CMAKE= yes
17CMAKE_ARGS+= -DAUTOQMAIL=${QMAILDIR} 15CMAKE_ARGS+= -DAUTOQMAIL=${QMAILDIR}
18CMAKE_ARGS+= -DDOC_DESTINATION_DIRECTORY="share/doc/qsmtp/" 16CMAKE_ARGS+= -DDOC_DESTINATION_DIRECTORY="share/doc/qsmtp/"
19CMAKE_ARGS.Darwin+= -DALLOW_INSECURE_BZERO=ON 17CMAKE_ARGS.Darwin+= -DALLOW_INSECURE_BZERO=ON
20 18
21BUILD_DEFS+= QMAILDIR 19BUILD_DEFS+= QMAILDIR
22 20
23TEST_TARGET= test 21TEST_TARGET= test
24 22
25.include "../../devel/libowfat/buildlink3.mk" 23.include "../../devel/libowfat/buildlink3.mk"
26.include "../../security/openssl/buildlink3.mk" 24.include "../../security/openssl/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/mail/qsmtp/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/qsmtp/PLIST 2020/01/07 08:15:30 1.1
+++ pkgsrc/mail/qsmtp/PLIST 2020/07/04 14:11:40 1.2
@@ -1,249 +1,16 @@ @@ -1,249 +1,16 @@
1@comment $NetBSD: PLIST,v 1.1 2020/01/07 08:15:30 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2020/07/04 14:11:40 schmonz Exp $
2bin/Qremote 2bin/Qremote
3bin/Qsmtpd 3bin/Qsmtpd
4bin/Qsurvey 4bin/Qsurvey
5bin/addipbl 5bin/addipbl
6bin/clearpass 6bin/clearpass
7bin/qpencode 7bin/qpencode
8bin/sendremote 8bin/sendremote
9bin/testspf 9bin/testspf
10man/man5/filterconf.5 10man/man5/filterconf.5
11man/man8/Qremote.8 11man/man8/Qremote.8
12man/man8/Qsmtpd.8 12man/man8/Qsmtpd.8
13share/doc/qsmtp/CREDITS 13share/doc/qsmtp/CREDITS
14share/doc/qsmtp/INSTALL 14share/doc/qsmtp/INSTALL
15share/doc/qsmtp/THOUGHTS 15share/doc/qsmtp/THOUGHTS
16share/doc/qsmtp/faq.html 16share/doc/qsmtp/faq.html
17share/doc/qsmtp/html/addrparse_8c.html 
18share/doc/qsmtp/html/addrparse_8h.html 
19share/doc/qsmtp/html/addrparse_8h_source.html 
20share/doc/qsmtp/html/addrsyntax_8c.html 
21share/doc/qsmtp/html/annotated.html 
22share/doc/qsmtp/html/antispam_8c.html 
23share/doc/qsmtp/html/antispam_8h.html 
24share/doc/qsmtp/html/antispam_8h_source.html 
25share/doc/qsmtp/html/auth_8c.html 
26share/doc/qsmtp/html/badcc_8c.html 
27share/doc/qsmtp/html/badmailfrom_8c.html 
28share/doc/qsmtp/html/base64_8c.html 
29share/doc/qsmtp/html/base64_8h.html 
30share/doc/qsmtp/html/base64_8h_source.html 
31share/doc/qsmtp/html/bc_s.png 
32share/doc/qsmtp/html/bdwn.png 
33share/doc/qsmtp/html/boolean_8c.html 
34share/doc/qsmtp/html/cdb_8c.html 
35share/doc/qsmtp/html/cdb_8h.html 
36share/doc/qsmtp/html/cdb_8h_source.html 
37share/doc/qsmtp/html/check2822_8c.html 
38share/doc/qsmtp/html/child_8c.html 
39share/doc/qsmtp/html/classes.html 
40share/doc/qsmtp/html/client_8c.html 
41share/doc/qsmtp/html/client_8h.html 
42share/doc/qsmtp/html/client_8h_source.html 
43share/doc/qsmtp/html/closed.png 
44share/doc/qsmtp/html/commands_8h.html 
45share/doc/qsmtp/html/commands_8h_source.html 
46share/doc/qsmtp/html/common__setup_8c.html 
47share/doc/qsmtp/html/conn_8c.html 
48share/doc/qsmtp/html/conn_8h.html 
49share/doc/qsmtp/html/conn_8h_source.html 
50share/doc/qsmtp/html/control_8c.html 
51share/doc/qsmtp/html/control_8h.html 
52share/doc/qsmtp/html/control_8h_source.html 
53share/doc/qsmtp/html/data_8c.html 
54share/doc/qsmtp/html/dir_000000.html 
55share/doc/qsmtp/html/dir_000001.html 
56share/doc/qsmtp/html/dir_000002.html 
57share/doc/qsmtp/html/dir_000003.html 
58share/doc/qsmtp/html/dir_000004.html 
59share/doc/qsmtp/html/dir_000005.html 
60share/doc/qsmtp/html/dir_000006.html 
61share/doc/qsmtp/html/dir_000007.html 
62share/doc/qsmtp/html/dir_000008.html 
63share/doc/qsmtp/html/dir_000009.html 
64share/doc/qsmtp/html/dir_000010.html 
65share/doc/qsmtp/html/dir_000011.html 
66share/doc/qsmtp/html/dir_000012.html 
67share/doc/qsmtp/html/diropen_8h.html 
68share/doc/qsmtp/html/diropen_8h_source.html 
69share/doc/qsmtp/html/dns__helpers_8c.html 
70share/doc/qsmtp/html/doc.png 
71share/doc/qsmtp/html/doxygen.css 
72share/doc/qsmtp/html/doxygen.png 
73share/doc/qsmtp/html/dynsections.js 
74share/doc/qsmtp/html/files.html 
75share/doc/qsmtp/html/filters_2spf_8c.html 
76share/doc/qsmtp/html/fmt_8c.html 
77share/doc/qsmtp/html/fmt_8h.html 
78share/doc/qsmtp/html/fmt_8h_source.html 
79share/doc/qsmtp/html/folderclosed.png 
80share/doc/qsmtp/html/folderopen.png 
81share/doc/qsmtp/html/functions.html 
82share/doc/qsmtp/html/functions_func.html 
83share/doc/qsmtp/html/functions_vars.html 
84share/doc/qsmtp/html/getfile_8c.html 
85share/doc/qsmtp/html/globals.html 
86share/doc/qsmtp/html/globals_b.html 
87share/doc/qsmtp/html/globals_c.html 
88share/doc/qsmtp/html/globals_d.html 
89share/doc/qsmtp/html/globals_defs.html 
90share/doc/qsmtp/html/globals_e.html 
91share/doc/qsmtp/html/globals_enum.html 
92share/doc/qsmtp/html/globals_eval.html 
93share/doc/qsmtp/html/globals_f.html 
94share/doc/qsmtp/html/globals_func.html 
95share/doc/qsmtp/html/globals_func_b.html 
96share/doc/qsmtp/html/globals_func_c.html 
97share/doc/qsmtp/html/globals_func_d.html 
98share/doc/qsmtp/html/globals_func_e.html 
99share/doc/qsmtp/html/globals_func_f.html 
100share/doc/qsmtp/html/globals_func_g.html 
101share/doc/qsmtp/html/globals_func_h.html 
102share/doc/qsmtp/html/globals_func_i.html 
103share/doc/qsmtp/html/globals_func_l.html 
104share/doc/qsmtp/html/globals_func_m.html 
105share/doc/qsmtp/html/globals_func_n.html 
106share/doc/qsmtp/html/globals_func_p.html 
107share/doc/qsmtp/html/globals_func_q.html 
108share/doc/qsmtp/html/globals_func_r.html 
109share/doc/qsmtp/html/globals_func_s.html 
110share/doc/qsmtp/html/globals_func_t.html 
111share/doc/qsmtp/html/globals_func_u.html 
112share/doc/qsmtp/html/globals_func_v.html 
113share/doc/qsmtp/html/globals_func_w.html 
114share/doc/qsmtp/html/globals_func_x.html 
115share/doc/qsmtp/html/globals_g.html 
116share/doc/qsmtp/html/globals_h.html 
117share/doc/qsmtp/html/globals_i.html 
118share/doc/qsmtp/html/globals_l.html 
119share/doc/qsmtp/html/globals_m.html 
120share/doc/qsmtp/html/globals_n.html 
121share/doc/qsmtp/html/globals_p.html 
122share/doc/qsmtp/html/globals_q.html 
123share/doc/qsmtp/html/globals_r.html 
124share/doc/qsmtp/html/globals_s.html 
125share/doc/qsmtp/html/globals_t.html 
126share/doc/qsmtp/html/globals_type.html 
127share/doc/qsmtp/html/globals_u.html 
128share/doc/qsmtp/html/globals_v.html 
129share/doc/qsmtp/html/globals_vars.html 
130share/doc/qsmtp/html/globals_w.html 
131share/doc/qsmtp/html/globals_x.html 
132share/doc/qsmtp/html/greeting_8c.html 
133share/doc/qsmtp/html/greeting_8h.html 
134share/doc/qsmtp/html/greeting_8h_source.html 
135share/doc/qsmtp/html/index.html 
136share/doc/qsmtp/html/ipme_8c.html 
137share/doc/qsmtp/html/ipme_8h.html 
138share/doc/qsmtp/html/ipme_8h_source.html 
139share/doc/qsmtp/html/jquery.js 
140share/doc/qsmtp/html/libowfatconn_8c.html 
141share/doc/qsmtp/html/libowfatconn_8h.html 
142share/doc/qsmtp/html/libowfatconn_8h_source.html 
143share/doc/qsmtp/html/log_8c.html 
144share/doc/qsmtp/html/log_8h.html 
145share/doc/qsmtp/html/log_8h_source.html 
146share/doc/qsmtp/html/match_8c.html 
147share/doc/qsmtp/html/match_8h.html 
148share/doc/qsmtp/html/match_8h_source.html 
149share/doc/qsmtp/html/menu.js 
150share/doc/qsmtp/html/menudata.js 
151share/doc/qsmtp/html/mime_8c.html 
152share/doc/qsmtp/html/mime_8h.html 
153share/doc/qsmtp/html/mime_8h_source.html 
154share/doc/qsmtp/html/mime__chars_8h.html 
155share/doc/qsmtp/html/mime__chars_8h_source.html 
156share/doc/qsmtp/html/mmap_8c.html 
157share/doc/qsmtp/html/mmap_8h.html 
158share/doc/qsmtp/html/mmap_8h_source.html 
159share/doc/qsmtp/html/nav_f.png 
160share/doc/qsmtp/html/nav_g.png 
161share/doc/qsmtp/html/nav_h.png 
162share/doc/qsmtp/html/netio_8c.html 
163share/doc/qsmtp/html/netio_8h.html 
164share/doc/qsmtp/html/netio_8h_source.html 
165share/doc/qsmtp/html/open.png 
166share/doc/qsmtp/html/qdns_8c.html 
167share/doc/qsmtp/html/qdns_8h.html 
168share/doc/qsmtp/html/qdns_8h_source.html 
169share/doc/qsmtp/html/qdns__dane_8h.html 
170share/doc/qsmtp/html/qdns__dane_8h_source.html 
171share/doc/qsmtp/html/qmaildir_8h.html 
172share/doc/qsmtp/html/qmaildir_8h_source.html 
173share/doc/qsmtp/html/qrdata_8c.html 
174share/doc/qsmtp/html/qrdata_8h.html 
175share/doc/qsmtp/html/qrdata_8h_source.html 
176share/doc/qsmtp/html/qremote_8c.html 
177share/doc/qsmtp/html/qremote_8h.html 
178share/doc/qsmtp/html/qremote_8h_source.html 
179share/doc/qsmtp/html/qsauth_8h.html 
180share/doc/qsmtp/html/qsauth_8h_source.html 
181share/doc/qsmtp/html/qsauth__backend_8h.html 
182share/doc/qsmtp/html/qsauth__backend_8h_source.html 
183share/doc/qsmtp/html/qsauth__backend__cp_8c.html 
184share/doc/qsmtp/html/qsdata_8h.html 
185share/doc/qsmtp/html/qsdata_8h_source.html 
186share/doc/qsmtp/html/qsmtpd_8c.html 
187share/doc/qsmtp/html/qsmtpd_8h.html 
188share/doc/qsmtp/html/qsmtpd_8h_source.html 
189share/doc/qsmtp/html/queue_8c.html 
190share/doc/qsmtp/html/queue_8h.html 
191share/doc/qsmtp/html/queue_8h_source.html 
192share/doc/qsmtp/html/qutf8_8h.html 
193share/doc/qsmtp/html/qutf8_8h_source.html 
194share/doc/qsmtp/html/rcpt__filters_8c.html 
195share/doc/qsmtp/html/reply_8c.html 
196share/doc/qsmtp/html/smtpbugs_8c.html 
197share/doc/qsmtp/html/smtproutes_8c.html 
198share/doc/qsmtp/html/spf_8c.html 
199share/doc/qsmtp/html/splitbar.png 
200share/doc/qsmtp/html/ssl__timeoutio_8c.html 
201share/doc/qsmtp/html/ssl__timeoutio_8h.html 
202share/doc/qsmtp/html/ssl__timeoutio_8h_source.html 
203share/doc/qsmtp/html/sstring_8h.html 
204share/doc/qsmtp/html/sstring_8h_source.html 
205share/doc/qsmtp/html/starttls_8c.html 
206share/doc/qsmtp/html/starttls_8h.html 
207share/doc/qsmtp/html/starttls_8h_source.html 
208share/doc/qsmtp/html/starttlsr_8c.html 
209share/doc/qsmtp/html/starttlsr_8h.html 
210share/doc/qsmtp/html/starttlsr_8h_source.html 
211share/doc/qsmtp/html/status_8c.html 
212share/doc/qsmtp/html/statuscodes_8h.html 
213share/doc/qsmtp/html/statuscodes_8h_source.html 
214share/doc/qsmtp/html/structauthcmd.html 
215share/doc/qsmtp/html/structcstring.html 
216share/doc/qsmtp/html/structdaneinfo.html 
217share/doc/qsmtp/html/structdns__wc.html 
218share/doc/qsmtp/html/structips.html 
219share/doc/qsmtp/html/structrecip.html 
220share/doc/qsmtp/html/structsmtpcomm.html 
221share/doc/qsmtp/html/structstring.html 
222share/doc/qsmtp/html/structuserconf.html 
223share/doc/qsmtp/html/structxmitstat.html 
224share/doc/qsmtp/html/sync_off.png 
225share/doc/qsmtp/html/sync_on.png 
226share/doc/qsmtp/html/syntax_8c.html 
227share/doc/qsmtp/html/syntax_8h.html 
228share/doc/qsmtp/html/syntax_8h_source.html 
229share/doc/qsmtp/html/tab_a.png 
230share/doc/qsmtp/html/tab_b.png 
231share/doc/qsmtp/html/tab_h.png 
232share/doc/qsmtp/html/tab_s.png 
233share/doc/qsmtp/html/tabs.css 
234share/doc/qsmtp/html/tls_8c.html 
235share/doc/qsmtp/html/tls_8h.html 
236share/doc/qsmtp/html/tls_8h_source.html 
237share/doc/qsmtp/html/userconf_8h.html 
238share/doc/qsmtp/html/userconf_8h_source.html 
239share/doc/qsmtp/html/userfilters_8h.html 
240share/doc/qsmtp/html/userfilters_8h_source.html 
241share/doc/qsmtp/html/utf8_8c.html 
242share/doc/qsmtp/html/version_8h.html 
243share/doc/qsmtp/html/version_8h_source.html 
244share/doc/qsmtp/html/vpop_8c.html 
245share/doc/qsmtp/html/vpop_8h.html 
246share/doc/qsmtp/html/vpop_8h_source.html 
247share/doc/qsmtp/html/xtext_8c.html 
248share/doc/qsmtp/html/xtext_8h.html 
249share/doc/qsmtp/html/xtext_8h_source.html 

cvs diff -r1.3 -r1.4 pkgsrc/mail/qsmtp/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qsmtp/distinfo 2020/03/06 20:50:24 1.3
+++ pkgsrc/mail/qsmtp/distinfo 2020/07/04 14:11:40 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.3 2020/03/06 20:50:24 schmonz Exp $ 1$NetBSD: distinfo,v 1.4 2020/07/04 14:11:40 schmonz Exp $
2 2
3SHA1 (Qsmtp-0.37.tar.xz) = 768567e10adf47d651735bd8e7289a6b8a18d24a 3SHA1 (Qsmtp-0.37.tar.xz) = 768567e10adf47d651735bd8e7289a6b8a18d24a
4RMD160 (Qsmtp-0.37.tar.xz) = abf841db63e94142f309fcac93c29a29c1a4d692 4RMD160 (Qsmtp-0.37.tar.xz) = abf841db63e94142f309fcac93c29a29c1a4d692
5SHA512 (Qsmtp-0.37.tar.xz) = 911d9d956ef7d0c6ad150745db489dd96eca0b665d99c0db648b4382c0d21fc759ad4a138e7adf69c6749574ad619114e7f06f62c131d0ae103e9b0493d39ef3 5SHA512 (Qsmtp-0.37.tar.xz) = 911d9d956ef7d0c6ad150745db489dd96eca0b665d99c0db648b4382c0d21fc759ad4a138e7adf69c6749574ad619114e7f06f62c131d0ae103e9b0493d39ef3
6Size (Qsmtp-0.37.tar.xz) = 250100 bytes 6Size (Qsmtp-0.37.tar.xz) = 250100 bytes
7SHA1 (patch-CMakeLists.txt) = ca780d4dfe778c359db03231b06382372e13a62f 7SHA1 (patch-CMakeLists.txt) = a764e2e2dd79043e9dd45fd213e95ab776a81299
8SHA1 (patch-include_qdns.h) = de5f47f62cb7482d1ed96814123f6f1abad4506b 8SHA1 (patch-include_qdns.h) = de5f47f62cb7482d1ed96814123f6f1abad4506b
9SHA1 (patch-qsmtpd_antispam.c) = 8df576496c31712e49f4679be172074d7712c089 9SHA1 (patch-qsmtpd_antispam.c) = 8df576496c31712e49f4679be172074d7712c089
10SHA1 (patch-qsmtpd_auth.c) = 48958cc70850e2016c755eb53c777998d1477018 10SHA1 (patch-qsmtpd_auth.c) = 48958cc70850e2016c755eb53c777998d1477018
11SHA1 (patch-qsmtpd_data.c) = 94a8c51a63c1d6db2433c932388bbac260f462c2 11SHA1 (patch-qsmtpd_data.c) = 94a8c51a63c1d6db2433c932388bbac260f462c2
12SHA1 (patch-tests_mmap__test.c) = a39835b6fba0a183e8ff47bdeb7f26889cbb4b53 12SHA1 (patch-tests_mmap__test.c) = a39835b6fba0a183e8ff47bdeb7f26889cbb4b53
13SHA1 (patch-tests_qsdata__test.c) = 8b07628c00c05edee79fd6918ce6bc1a24747ebb 13SHA1 (patch-tests_qsdata__test.c) = 8b07628c00c05edee79fd6918ce6bc1a24747ebb

cvs diff -r1.2 -r1.3 pkgsrc/mail/qsmtp/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/mail/qsmtp/patches/Attic/patch-CMakeLists.txt 2020/01/12 23:03:28 1.2
+++ pkgsrc/mail/qsmtp/patches/Attic/patch-CMakeLists.txt 2020/07/04 14:11:41 1.3
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2020/01/12 23:03:28 joerg Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.3 2020/07/04 14:11:41 schmonz Exp $
2 2
3Support PKGMANDIR. 3Support PKGMANDIR.
4Support explicit_memset on NetBSD. 4Support explicit_memset on NetBSD.
 5Skip building API docs with Doxygen.
5 6
6--- CMakeLists.txt.orig 2020-01-06 19:19:59.000000000 +0000 7--- CMakeLists.txt.orig 2020-01-06 19:19:59.000000000 +0000
7+++ CMakeLists.txt 8+++ CMakeLists.txt
8@@ -7,7 +7,7 @@ project(Qsmtp 9@@ -7,7 +7,7 @@ project(Qsmtp
9  10
10 option(CHECK_MEMORY "Add memory access checks" OFF) 11 option(CHECK_MEMORY "Add memory access checks" OFF)
11  12
12-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") 13-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
13+set (CMAKE_MODULE_PATH "/data/scratch/mail/qsmtp/work/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") 14+set (CMAKE_MODULE_PATH "/data/scratch/mail/qsmtp/work/.buildlink/cmake-Modules" ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
14  15
15 set(CMAKE_C_STANDARD 99) 16 set(CMAKE_C_STANDARD 99)
16 set(CMAKE_C_STANDARD_REQUIRED On) 17 set(CMAKE_C_STANDARD_REQUIRED On)
17@@ -95,7 +95,8 @@ endif () 18@@ -95,7 +95,8 @@ endif ()
@@ -24,24 +25,50 @@ Support explicit_memset on NetBSD. @@ -24,24 +25,50 @@ Support explicit_memset on NetBSD.
24 set(CMAKE_REQUIRED_INCLUDES bsd/string.h) 25 set(CMAKE_REQUIRED_INCLUDES bsd/string.h)
25 find_library(LIBBSD NAMES bsd) 26 find_library(LIBBSD NAMES bsd)
26 if (LIBBSD) 27 if (LIBBSD)
27@@ -111,6 +112,9 @@ if (NOT HAS_EXP_BZERO) 28@@ -111,6 +112,9 @@ if (NOT HAS_EXP_BZERO)
28 add_definitions(-DINSECURE_BZERO) 29 add_definitions(-DINSECURE_BZERO)
29 endif () 30 endif ()
30 endif () 31 endif ()
31+if (HAS_EXP_MEMSET) 32+if (HAS_EXP_MEMSET)
32+ add_definitions(-DHAS_EXP_MEMSET) 33+ add_definitions(-DHAS_EXP_MEMSET)
33+endif () 34+endif ()
34 set(CMAKE_REQUIRED_INCLUDES fcntl.h) 35 set(CMAKE_REQUIRED_INCLUDES fcntl.h)
35 CHECK_FUNCTION_EXISTS(openat HAS_OPENAT) 36 CHECK_FUNCTION_EXISTS(openat HAS_OPENAT)
36 unset(CMAKE_REQUIRED_INCLUDES) 37 unset(CMAKE_REQUIRED_INCLUDES)
 38@@ -190,19 +194,19 @@ endif ()
 39 option(BUILD_DOC "Build documentation" ON)
 40 if (BUILD_DOC)
 41 # API documentation
 42- find_package(Doxygen REQUIRED)
 43+ # find_package(Doxygen REQUIRED)
 44
 45- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 46+ # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 47
 48- add_custom_target(docu ALL
 49- COMMAND ${DOXYGEN_EXECUTABLE}
 50- WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 51+ # add_custom_target(docu ALL
 52+ # COMMAND ${DOXYGEN_EXECUTABLE}
 53+ # WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 54
 55 if (NOT DOC_DESTINATION_DIRECTORY)
 56 set(DOC_DESTINATION_DIRECTORY "doc/")
 57 endif ()
 58
 59- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${DOC_DESTINATION_DIRECTORY})
 60+ # install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${DOC_DESTINATION_DIRECTORY})
 61
 62 # general documentation
 63 install(FILES
37@@ -220,8 +224,8 @@ if (BUILD_DOC) 64@@ -220,8 +224,8 @@ if (BUILD_DOC)
38 install(FILES 65 install(FILES
39 ${CMAKE_CURRENT_BINARY_DIR}/Qremote.8 66 ${CMAKE_CURRENT_BINARY_DIR}/Qremote.8
40 ${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd.8 67 ${CMAKE_CURRENT_BINARY_DIR}/Qsmtpd.8
41- DESTINATION man/man8) 68- DESTINATION man/man8)
42+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8) 69+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
43 install(FILES 70 install(FILES
44 ${CMAKE_CURRENT_BINARY_DIR}/filterconf.5 71 ${CMAKE_CURRENT_BINARY_DIR}/filterconf.5
45- DESTINATION man/man5) 72- DESTINATION man/man5)
46+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man5) 73+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man5)
47 endif () 74 endif ()