Sat Mar 16 14:23:16 2024 UTC (71d)
courier-imap: Fix install on NetBSD


(tm)
diff -r1.31 -r1.32 pkgsrc/mail/courier-imap/distinfo
diff -r1.16 -r1.17 pkgsrc/mail/courier-imap/patches/patch-aa
cvs diff -r1.31 -r1.32 pkgsrc/mail/courier-imap/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/distinfo 2024/02/12 21:36:08 1.31
+++ pkgsrc/mail/courier-imap/distinfo 2024/03/16 14:23:15 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.31 2024/02/12 21:36:08 hans Exp $ 1$NetBSD: distinfo,v 1.32 2024/03/16 14:23:15 tm Exp $
2 2
3BLAKE2s (courier-imap-5.2.6.tar.bz2) = 6cb868eaca36847cde3a8e5f0e3f763bb211570f0f7d7ddcad5adb285b24ceb3 3BLAKE2s (courier-imap-5.2.6.tar.bz2) = 6cb868eaca36847cde3a8e5f0e3f763bb211570f0f7d7ddcad5adb285b24ceb3
4SHA512 (courier-imap-5.2.6.tar.bz2) = ee48ea5a5e043c3ce13027af2815ca07a1cba7d0ca328f8120ccc7f6134d18c610db202b2820c1dd589a427c1a3d096283c2f3fe9f9bd4815c9586dbe779d904 4SHA512 (courier-imap-5.2.6.tar.bz2) = ee48ea5a5e043c3ce13027af2815ca07a1cba7d0ca328f8120ccc7f6134d18c610db202b2820c1dd589a427c1a3d096283c2f3fe9f9bd4815c9586dbe779d904
5Size (courier-imap-5.2.6.tar.bz2) = 3411210 bytes 5Size (courier-imap-5.2.6.tar.bz2) = 3411210 bytes
6SHA1 (patch-aa) = 9a4a8dccb6a741fd3c31d81cc85856792d1e8c59 6SHA1 (patch-aa) = 8ac387e27517c0cc558a44e5ea3fd246fb3d3282
7SHA1 (patch-ad) = 1091c9a5991c746855db7fc4d3e2e744142b2e3c 7SHA1 (patch-ad) = 1091c9a5991c746855db7fc4d3e2e744142b2e3c
8SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c 8SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
9SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f 9SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f
10SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57 10SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
11SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d 11SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d
12SHA1 (patch-ak) = 3e40d53569b08e63bd7ca3876d0772544cd1d202 12SHA1 (patch-ak) = 3e40d53569b08e63bd7ca3876d0772544cd1d202
13SHA1 (patch-ao) = 8797dcc86822d3ef0bcd52ad4f1ea2c8ed23341d 13SHA1 (patch-ao) = 8797dcc86822d3ef0bcd52ad4f1ea2c8ed23341d
14SHA1 (patch-makeimapaccess) = d04fce2070cf9cc8db34794846e4b61dec5d3779 14SHA1 (patch-makeimapaccess) = d04fce2070cf9cc8db34794846e4b61dec5d3779
cvs diff -r1.16 -r1.17 pkgsrc/mail/courier-imap/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/courier-imap/patches/patch-aa 2024/02/12 21:36:09 1.16
+++ pkgsrc/mail/courier-imap/patches/patch-aa 2024/03/16 14:23:16 1.17
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-aa,v 1.16 2024/02/12 21:36:09 hans Exp $ 1$NetBSD: patch-aa,v 1.17 2024/03/16 14:23:16 tm Exp $
2 2
3--- Makefile.in.orig 2023-04-25 02:26:35.000000000 +0000 3--- Makefile.in.orig 2023-11-23 21:11:57.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -416,19 +416,18 @@ SUBDIRS = libs/numlib libs/bdbobj libs/g 5@@ -416,19 +416,18 @@ SUBDIRS = libs/numlib libs/bdbobj libs/g
6 libs/maildir libs/makedat libs/libhmac \ 6 libs/maildir libs/makedat libs/libhmac \
7 libs/waitlib libs/tcpd libs/rootcerts libs/imap 7 libs/waitlib libs/tcpd libs/rootcerts libs/imap
8  8
9-sbin_SCRIPTS = sharedindexinstall sharedindexsplit 9-sbin_SCRIPTS = sharedindexinstall sharedindexsplit
10+sbin_SCRIPTS =  10+sbin_SCRIPTS =
11 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS) 11 CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
12 databindir = $(datadir) 12 databindir = $(datadir)
13-databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams 13-databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
14-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \ 14-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
15- makeimapaccess makedat 15- makeimapaccess makedat
16- 16-
@@ -70,30 +70,31 @@ $NetBSD: patch-aa,v 1.16 2024/02/12 21:3 @@ -70,30 +70,31 @@ $NetBSD: patch-aa,v 1.16 2024/02/12 21:3
70+ cp libs/imap/courierpop3d.8 . 70+ cp libs/imap/courierpop3d.8 .
71  71
72 mkdhparams: libs/imap/mkdhparams 72 mkdhparams: libs/imap/mkdhparams
73 cp libs/imap/mkdhparams . 73 cp libs/imap/mkdhparams .
74@@ -1471,22 +1473,16 @@ quotawarnmsg.example: libs/maildir/quota 74@@ -1471,22 +1473,16 @@ quotawarnmsg.example: libs/maildir/quota
75 install-exec-local: 75 install-exec-local:
76 $(mkinstalldirs) $(DESTDIR)$(databindir) 76 $(mkinstalldirs) $(DESTDIR)$(databindir)
77 $(mkinstalldirs) $(DESTDIR)$(bindir) 77 $(mkinstalldirs) $(DESTDIR)$(bindir)
78- test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \ 78- test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
79- libs/tcpd/couriertls $(DESTDIR)$(bindir)/couriertls 79- libs/tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
80 $(mkinstalldirs) $(DESTDIR)$(sbindir) 80 $(mkinstalldirs) $(DESTDIR)$(sbindir)
81 for f in mkimapdcert mkpop3dcert mkdhparams; \ 81 for f in mkimapdcert mkpop3dcert mkdhparams; \
82 do rm -f $(DESTDIR)$(sbindir)/$$f ; \ 82 do rm -f $(DESTDIR)$(sbindir)/$$f ; \
83 $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done 83- $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
 84+ $(LN_S) `realpath $(DESTDIR)$(databindir)/$$f` $(DESTDIR)$(sbindir)/$$f ; done
84+ for f in imapd-ssl imapd pop3d pop3d-ssl; \ 85+ for f in imapd-ssl imapd pop3d pop3d-ssl; \
85+ do rm -f $(DESTDIR)$(sbindir)/$$f ; \ 86+ do rm -f $(DESTDIR)$(sbindir)/$$f ; \
86+ $(LN_S) `realpath --relative-to $(sbindir) -m $(databindir)/$$f.rc` $(DESTDIR)$(sbindir)/$$f ; done 87+ $(LN_S) `realpath $(DESTDIR)$(databindir)/$$f.rc` $(DESTDIR)$(sbindir)/$$f ; done
87 $(mkinstalldirs) $(DESTDIR)$(localstatedir) 88 $(mkinstalldirs) $(DESTDIR)$(localstatedir)
88  89
89 install-exec-hook: 90 install-exec-hook:
90- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example 91- chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
91- mkdir -p $(DESTDIR)$(sysconfdir)/shared 92- mkdir -p $(DESTDIR)$(sysconfdir)/shared
92- chmod 755 $(DESTDIR)$(sysconfdir)/shared 93- chmod 755 $(DESTDIR)$(sysconfdir)/shared
93- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp 94- mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
94- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp 95- chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
95- mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess 96- mkdir -p $(DESTDIR)$(sysconfdir)/imapaccess
96- chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess 97- chmod 755 $(DESTDIR)$(sysconfdir)/imapaccess
97  98
98 install-data-local: install-man 99 install-data-local: install-man
99 for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done 100 for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done