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,134 +1,136 @@ # 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} MAINTAINER= madpilot@FreeBSD.org COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes LICENSE= GPLv3 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 USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl CONFLICTS= courier imap-uw panda-imap GNU_CONFIGURE= yes CONFIGURE_ENV= REHASH=${SCRIPTDIR}/c_rehash MAKE_ENV:= ${CONFIGURE_ENV} ALL_TARGET= all makeimapaccess makedat SUB_FILES= pkg-message SUB_LIST= CONFDIR=${CONFDIR} # # options available: # # WITH_SYSLOG_FACILITY: The syslogfacility to use # OPTIONS_DEFINE= GDBM GNUTLS INOTIFY IPV6 TRASHQUOTA GNUTLS_DESC= Use GnuTLS instead of OpenSSL (Enables SNI) INOTIFY_DESC= Inotify support for IDLE command TRASHQUOTA_DESC= Include deleted mails in the quota .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt) .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt" .endif CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ --enable-unicode \ --disable-root-check \ --with-locking-method=fcntl \ --with-notice=unicode GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_USES= pkgconfig INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify IPV6_CONFIGURE_OFF= --without-ipv6 TRASHQUOTA_CONFIGURE_ON=--with-trashquota .include .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif .if ${PORT_OPTIONS:MSYSLOG_FACILITY} CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY} .endif .if ${PORT_OPTIONS:MAUTH_USERDB} .if ${PORT_OPTIONS:MGDBM} CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB} LIB_DEPENDS+= libgdbm.so:databases/gdbm .else CONFIGURE_ARGS+=--with-db=db --with-userdb=${USERDB} .endif .endif EXTRA_DOCS= AUTHORS INSTALL NEWS \ libs/imap/ChangeLog \ libs/imap/README \ libs/imap/README.proxy \ libs/maildir/README.imapkeywords.html \ libs/maildir/README.maildirfilter.html \ libs/maildir/README.maildirquota.txt \ libs/maildir/README.sharedfolders.txt \ libs/tcpd/README.couriertls \ 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: @${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& ${LOCALBASE}/lib/libinotify.a /usr/lib/libpthread.a|' \ ${WRKSRC}/libs/maildir/Makefile.in \ ${WRKSRC}/libs/imap/Makefile.in post-configure-INOTIFY-on: @${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h @${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h post-install: ${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/ .for i in imapd pop3d ${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for a in ${EXTRA_DOCS} ${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR} .endfor .include 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,52 +1,70 @@ ---- 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 -binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \ - makeimapaccess makedat +binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw 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 \ - 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 -@@ -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" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man1dir)'"; \ + %%INSTALL_MAN%% $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ 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 \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ + echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ fi; \ done; \ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ while read files; do \ test -z "$$files" || { \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ + echo " %%INSTALL_MAN%% $$files '$(DESTDIR)$(man8dir)'"; \ + %%INSTALL_MAN%% $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ 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: