Date: Tue, 14 Apr 2026 17:24:27 +0000 From: Oliver Lehmann <oliver@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7f2a46eb64ad - main - mail/sqwebmail: update to 3.6.1 Message-ID: <69de784b.33a9d.3ab86692@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by oliver: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f2a46eb64ad271f37766c8504345f70605fe46d commit 7f2a46eb64ad271f37766c8504345f70605fe46d Author: Oliver Lehmann <oliver@FreeBSD.org> AuthorDate: 2026-04-14 17:20:18 +0000 Commit: Oliver Lehmann <oliver@FreeBSD.org> CommitDate: 2026-04-14 17:24:18 +0000 mail/sqwebmail: update to 3.6.1 also: replace pcre dependency with pcre2 [PR] PR: 294476 --- mail/sqwebmail/Makefile | 13 +++------- mail/sqwebmail/distinfo | 6 ++--- mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h | 11 -------- .../files/patch-libs_rfc2045_testsuitecpp.C | 11 -------- .../files/patch-libs_rfc2045_testsuitecpp2.C | 29 ---------------------- 5 files changed, 6 insertions(+), 64 deletions(-) diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index f9bbfe3c7ebd..f346d599e893 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,5 +1,5 @@ PORTNAME= sqwebmail -PORTVERSION= 6.3.0 +PORTVERSION= 6.3.1 CATEGORIES= mail www MASTER_SITES= SF/courier/webmail/${PORTVERSION} @@ -13,7 +13,7 @@ BUILD_DEPENDS= courierauthconfig:security/courier-authlib-base \ gpg:security/gnupg RUN_DEPENDS= courierauthconfig:security/courier-authlib-base \ gpg:security/gnupg -LIB_DEPENDS= libpcre.so:devel/pcre \ +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libcourier-unicode.so:devel/courier-unicode \ libidn2.so:dns/libidn2 @@ -177,16 +177,9 @@ post-patch: @${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \ ${WRKSRC}/libs/maildir/configure .endif - @${REINPLACE_CMD} -e 's|LIBPCRE=-lpcre|LIBPCRE="-L${LOCALBASE}/lib -lpcre"|g' \ - ${WRKSRC}/libs/maildir/configure - @${REINPLACE_CMD} -e 's|@echo|echo|g' ${WRKSRC}/libs/maildir/configure - @${REINPLACE_CMD} -e 's|-lpcre|-L${LOCALBASE}/lib &|g' \ - ${WRKSRC}/libs/sqwebmail/Makefile.in - - @${REINPLACE_CMD} -e 's|\$$(testmaildirfilter_LDADD)|& \$$(LIBPCRE)|g; \ - s|$$(LINK) $$(maildirkw_LDFLAGS)|$$(CXXLINK) $$(maildirkw_LDFLAGS)|' \ + @${REINPLACE_CMD} -e 's|$$(LINK) $$(maildirkw_LDFLAGS)|$$(CXXLINK) $$(maildirkw_LDFLAGS)|' \ ${WRKSRC}/libs/maildir/Makefile.in @${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \ diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index 046a1b9b4299..fc691a07e429 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1760884299 -SHA256 (sqwebmail-6.3.0.tar.bz2) = e6548e4c974024f02b629d8a5090af3c7000faf2d52b28b87b11d48ae3a61be3 -SIZE (sqwebmail-6.3.0.tar.bz2) = 4087972 +TIMESTAMP = 1776186417 +SHA256 (sqwebmail-6.3.1.tar.bz2) = ee7b1febe8ab10cffcb3314ad592035013d692316d79b7b7d6ac6954b0a0e331 +SIZE (sqwebmail-6.3.1.tar.bz2) = 4076694 diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h b/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h deleted file mode 100644 index 36c6fd96cfb4..000000000000 --- a/mail/sqwebmail/files/patch-libs_rfc2045_rfc2045.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/rfc2045.h.orig 2025-10-06 09:00:04 UTC -+++ libs/rfc2045/rfc2045.h -@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder<out_iter, src_type>::decode( - - if (decode_header) - { -- typename rfc2045::entity::line_iter<crlf>::headers< -+ typename rfc2045::entity::line_iter<crlf>::template headers< - src_type> parser{e, src }; - - parser.name_lc=header_name_lc; diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C deleted file mode 100644 index 5d1494f61819..000000000000 --- a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp.C +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/rfc2045/testsuitecpp.C.orig 2025-10-04 09:00:12 UTC -+++ libs/rfc2045/testsuitecpp.C -@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t - auto b=s.begin(); - auto e=s.end(); - -- typename rfc2045::entity::line_iter<crlf>::iter< -+ typename rfc2045::entity::line_iter<crlf>::template iter< - std::string_view::iterator, - std::string_view::iterator - > diff --git a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C deleted file mode 100644 index bd49c3117802..000000000000 --- a/mail/sqwebmail/files/patch-libs_rfc2045_testsuitecpp2.C +++ /dev/null @@ -1,29 +0,0 @@ ---- libs/rfc2045/testsuitecpp2.C.orig 2025-09-10 09:00:12 UTC -+++ libs/rfc2045/testsuitecpp2.C -@@ -217,7 +217,7 @@ void test3() - auto b=std::istreambuf_iterator<char>{ss}; - auto e=std::istreambuf_iterator<char>{}; - -- typename rfc2045::entity::line_iter<crlf>::iter< -+ typename rfc2045::entity::line_iter<crlf>::template iter< - std::istreambuf_iterator<char>, - std::istreambuf_iterator<char> - > iter{b, e}; -@@ -310,7 +310,7 @@ void test4() - auto b=std::istreambuf_iterator<char>{ss}; - auto e=std::istreambuf_iterator<char>{}; - -- typename rfc2045::entity::line_iter<crlf>::iter< -+ typename rfc2045::entity::line_iter<crlf>::template iter< - std::istreambuf_iterator<char>, - std::istreambuf_iterator<char> - > iter{b, e}; -@@ -488,7 +488,7 @@ void test5() - auto b=std::istreambuf_iterator<char>{ss}; - auto e=std::istreambuf_iterator<char>{}; - -- typename rfc2045::entity::line_iter<crlf>::iter< -+ typename rfc2045::entity::line_iter<crlf>::template iter< - std::istreambuf_iterator<char>, - std::istreambuf_iterator<char> - > iter{b, e};home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69de784b.33a9d.3ab86692>