git: 8f5b8813866d - main - mail/courier-imap: Update to 5.2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Mon, 12 Dec 2022 20:31:26 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8f5b8813866da297cba7b8b3fff9c4546a904ca1

commit 8f5b8813866da297cba7b8b3fff9c4546a904ca1
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-12-12 20:30:25 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-12-12 20:31:17 +0000

    mail/courier-imap: Update to 5.2.0
---
 mail/courier-imap/Makefile                |  4 ++--
 mail/courier-imap/distinfo                |  6 +++---
 mail/courier-imap/files/patch-Makefile.in | 26 +++++++++++++-------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index cfb086694f00..8b009227cc03 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	courier-imap
-PORTVERSION=	5.1.9
+PORTVERSION=	5.2.0
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
 		libcourierauth.so:security/courier-authlib-base \
-		libidn.so:dns/libidn \
+		libidn2.so:dns/libidn2 \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index a6511706fb69..2ceb3eca1281 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668436180
-SHA256 (courier-imap-5.1.9.tar.bz2) = 750cbcb0c8f9f902520f644403abfd48b09756deb6f65675fc9b90e3290c1683
-SIZE (courier-imap-5.1.9.tar.bz2) = 3409710
+TIMESTAMP = 1670179573
+SHA256 (courier-imap-5.2.0.tar.bz2) = c0c351a51f332010eea4298a0d446fc4fca506cb7364da37a1ce96193145fdf9
+SIZE (courier-imap-5.2.0.tar.bz2) = 3410809
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index ecc8b3e5932d..62693a6b3384 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2022-01-16 16:04:19 UTC
+--- Makefile.in.orig	2022-12-02 14:27:56 UTC
 +++ Makefile.in
-@@ -416,8 +416,7 @@ sbin_SCRIPTS = sharedindexinstall sharedindexsplit
+@@ -420,8 +420,7 @@ databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
  CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
  databindir = $(datadir)
  databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
@@ -10,27 +10,27 @@
  
  sbinPROGRAMS = imaplogin pop3login
  libexecPROGRAMS = makedatprog couriertcpd
-@@ -433,7 +432,7 @@ man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 
- EXTRA_DIST = README README.cygwin COPYING.GPL NEWS.html $(TEMPLFILES) \
- 	pgpkeys.txt sysconftool
+@@ -443,7 +442,7 @@ sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist po
+ 	packaging/debian/rules packaging/debian/source/format \
+ 	sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	quotawarnmsg.example
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
- HTML2TXT = links -dump -no-numbering -no-references
-@@ -815,8 +814,8 @@ install-man1: $(man_MANS)
+ HTML2TXT = elinks -dump -no-numbering -no-references
+@@ -832,8 +831,8 @@ install-man1: $(man_MANS)
  	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
  	while read files; do \
  	  test -z "$$files" || { \
 -	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
 -	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
 +	    echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man1dir)'"; \
-+	    %%INSTALL_MAN%% $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
++	     %%INSTALL_MAN%% $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
  	done; }
  
  uninstall-man1:
-@@ -851,15 +850,15 @@ install-man8: $(man_MANS)
+@@ -868,15 +867,15 @@ install-man8: $(man_MANS)
  	sed 'N;N;s,\n, ,g' | { \
  	list=; while read file base inst; do \
  	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
@@ -50,7 +50,7 @@
  	done; }
  
  uninstall-man8:
-@@ -1452,7 +1451,7 @@ pop3d.cnf: libs/imap/pop3d.cnf
+@@ -1468,7 +1467,7 @@ quotawarnmsg.example: libs/maildir/quotawarnmsg
  quotawarnmsg.example: libs/maildir/quotawarnmsg
  	cp -f $(srcdir)/libs/maildir/quotawarnmsg quotawarnmsg.example
  
@@ -59,12 +59,12 @@
  	$(mkinstalldirs) $(DESTDIR)$(databindir)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
  	test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
-@@ -1460,7 +1459,7 @@ install-exec-local:
+@@ -1476,7 +1475,7 @@ install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(sbindir)
  	for f in mkimapdcert mkpop3dcert mkdhparams; \
  		do rm -f $(DESTDIR)$(sbindir)/$$f ; \
--		$(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
-+		$(LN_S) $(DESTDIR)$(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
+-		$(LN_S) `realpath -m --relative-to $(sbindir)` $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
++		install -l rs $(DESTDIR)$(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
  
  install-exec-hook: