mail/courier-imap: Update to 5.1.5

- Add new dependency
- Fix absolute symlinks

3 files changed, 30 insertions, 10 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 12a60df21758..8daa568f4e3d 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,7 +1,7 @@
 # Created by: Neil Blakey-Milner
 
 PORTNAME=	courier-imap
-PORTVERSION=	5.1.4
+PORTVERSION=	5.1.5
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -15,7 +15,8 @@ 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
+		libidn.so:dns/libidn \
+		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
 		tar:bzip2
@@ -109,6 +110,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/libs/liblock/configure
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
+		-e 's|@LN_S@|${RLN}|' \
 		${WRKSRC}/Makefile.in
 
 post-patch-INOTIFY-on:
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index 6802bbd18102..04a3cce684cd 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627935156
-SHA256 (courier-imap-5.1.4.tar.bz2) = e6f30f0fadd4fce2e55c12181ba84334bd5fbc4d45f09419070a50d219da0167
-SIZE (courier-imap-5.1.4.tar.bz2) = 3363196
+TIMESTAMP = 1642362515
+SHA256 (courier-imap-5.1.5.tar.bz2) = dcb9a6fde14bfedf825cd2e9df8276bc6dc344395774c5f3e1c837eb0e6c94fa
+SIZE (courier-imap-5.1.5.tar.bz2) = 3364314
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index 0415259661c8..ecc8b3e5932d 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-04-25 13:49:07 UTC
+--- Makefile.in.orig	2022-01-16 16:04:19 UTC
 +++ Makefile.in
-@@ -395,8 +395,7 @@ sbin_SCRIPTS = sharedindexinstall shared
+@@ -416,8 +416,7 @@ sbin_SCRIPTS = sharedindexinstall sharedindexsplit
  CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
  databindir = $(datadir)
  databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
@@ -10,7 +10,7 @@
  
  sbinPROGRAMS = imaplogin pop3login
  libexecPROGRAMS = makedatprog couriertcpd
-@@ -412,7 +411,7 @@ man_MANS = couriertcpd.1 deliverquota.8 
+@@ -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
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
@@ -19,7 +19,7 @@
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
  HTML2TXT = links -dump -no-numbering -no-references
-@@ -793,8 +792,8 @@ install-man1: $(man_MANS)
+@@ -815,8 +814,8 @@ install-man1: $(man_MANS)
  	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
  	while read files; do \
  	  test -z "$$files" || { \
@@ -30,7 +30,7 @@
  	done; }
  
  uninstall-man1:
-@@ -829,15 +828,15 @@ install-man8: $(man_MANS)
+@@ -851,15 +850,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,3 +50,21 @@
  	done; }
  
  uninstall-man8:
+@@ -1452,7 +1451,7 @@ pop3d.cnf: libs/imap/pop3d.cnf
+ quotawarnmsg.example: libs/maildir/quotawarnmsg
+ 	cp -f $(srcdir)/libs/maildir/quotawarnmsg quotawarnmsg.example
+ 
+-install-exec-local:
++install-exec-local: install-databinSCRIPTS
+ 	$(mkinstalldirs) $(DESTDIR)$(databindir)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	test ! -x libs/tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
+@@ -1460,7 +1459,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
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)
+ 
+ install-exec-hook: