From nobody Wed Dec 8 11:29:47 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 27E5D18DDC10; Wed, 8 Dec 2021 11:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J8FLz64tZz3J2K; Wed, 8 Dec 2021 11:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B0B7512985; Wed, 8 Dec 2021 11:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B8BTlf5025389; Wed, 8 Dec 2021 11:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B8BTl2T025388; Wed, 8 Dec 2021 11:29:47 GMT (envelope-from git) Date: Wed, 8 Dec 2021 11:29:47 GMT Message-Id: <202112081129.1B8BTl2T025388@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: a0081fe43827 - main - mail/davmail: update to 6.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0081fe438279ce396c8c266db07cf780ac43b8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638962987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B9T7wmT9WxX2w82Kr2x99C2+li+/C0Dee8yTGjwjVBc=; b=MArrK0e7iarPHT2a5CJIYeBmfcmWHsC/+dHI+2lZaBGYT21Rksg2CBS/uy3UibfZyUilMR llUKYOg3IifmD8w6UkYFvcQGnj3lOxVULVxeD5c+nw2ZNBIbOz3rES+Nj5w83vayI1eIKJ Hos9Q4GgsTAxrQL1dZiX4mp3tUw4iKakTKaDSneOFB07Fm3d6DHBDcjnSV7IPQOX0e/Zx2 g06HXshXN3iwWOhSsoPJdBaBjKu3dk4g2kWx3iegxPnLesx+xzASyU514Lz36echg1ZWoJ LWGjqN/t2kIj4afsvQngEXsAG6vxOAu6Co2pdWyIRGPdOzMrbmTYaAbuiDOs3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638962987; a=rsa-sha256; cv=none; b=t3F63LOzC0E0SkWWA6BPMYUipcQu4C3X73zT/cEySqnYo+icvU8QKz+bbqRJJVMPWJIPa2 5RsksCoKSUjX+8KHC1Xlwc34UJ/Lx0L6KkHeqt38M2k7g5h80TOx6tzEaAPt0mcicF4nSz tuAQWt/QBxtEqA0V95wr0+nEfWdCAWv/rVOWHvbx3+Ntt9ht7LYCa44ew6y9Me78aIv6VN wq5nXaaFE8ws7Gs14jG/SzU3ev4aiZJx+4fuE5wm8mPHwaHJi5YVwfL3KAGtKsbYX2qQXF FvX9CyV0QL2sRJXK4OQ5acgckXu+cfXoNo5oCY+lW9qo3iTzs6e2hijqiqkEQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0081fe438279ce396c8c266db07cf780ac43b8d commit a0081fe438279ce396c8c266db07cf780ac43b8d Author: Jose G. Juanino AuthorDate: 2021-12-08 11:28:15 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-08 11:29:32 +0000 mail/davmail: update to 6.0.0 Changelog: https://sourceforge.net/p/davmail/code/HEAD/tree/tags/6.0.0/RELEASE-NOTES.md PR: 259683 Reported by: Jose G. Juanino (maintainer) --- mail/davmail/Makefile | 12 +++++++----- mail/davmail/distinfo | 6 +++--- mail/davmail/files/patch-build.xml | 14 +++++++++++--- mail/davmail/pkg-plist | 18 +++++------------- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile index 8df08d9cb081..02523fdbb723 100644 --- a/mail/davmail/Makefile +++ b/mail/davmail/Makefile @@ -1,7 +1,7 @@ # Created by: John Prather PORTNAME= davmail -PORTVERSION= 5.5.1 +PORTVERSION= 6.0.0 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -18,8 +18,8 @@ NO_ARCH= yes USE_ANT= yes USE_JAVA= yes ALL_TARGET= release -# 5.4.0 -REVISION= 3299 +# 6.0.0 +REVISION= 3375 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8" @@ -34,10 +34,12 @@ SUB_FILES= davmail.sh pkg-message PLIST_SUB+= PORTVERSION="${PORTVERSION}" post-patch: - @${REINPLACE_CMD} -e 's#exec=\".*/davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \ - -e 's#icon=\".*/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \ + @${REINPLACE_CMD} -e 's#prefix=\"usr#prefix=\"${PREFIX}#' \ ${WRKSRC}/build.xml +# Azul JRE FX has been disabled by removing the target: +# +# in files/patch-build.xml patch. do-install: @cd ${WRKSRC}/dist && ${FIND} . -type d \ -exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \; diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo index e40329a20adc..c5c95413eb30 100644 --- a/mail/davmail/distinfo +++ b/mail/davmail/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600772850 -SHA256 (davmail-src-5.5.1-3299.tgz) = 63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508 -SIZE (davmail-src-5.5.1-3299.tgz) = 20780537 +TIMESTAMP = 1636219585 +SHA256 (davmail-src-6.0.0-3375.tgz) = 2d719188671f7a621c82ce7bc6d1d781ed18c8d52a9af23e7bc5288df2b649a5 +SIZE (davmail-src-6.0.0-3375.tgz) = 21329359 diff --git a/mail/davmail/files/patch-build.xml b/mail/davmail/files/patch-build.xml index 5602f6ff7983..4684f60df625 100644 --- a/mail/davmail/files/patch-build.xml +++ b/mail/davmail/files/patch-build.xml @@ -1,6 +1,6 @@ ---- build.xml.orig 2016-04-09 15:14:49 UTC +--- build.xml.orig 2021-11-06 18:00:46 UTC +++ build.xml -@@ -61,7 +61,7 @@ +@@ -88,7 +88,7 @@ @@ -8,4 +8,12 @@ + - + +@@ -412,7 +412,6 @@ + + + +- + + + diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist index 274e6513e486..9fe45d8075f5 100644 --- a/mail/davmail/pkg-plist +++ b/mail/davmail/pkg-plist @@ -6,7 +6,6 @@ share/applications/davmail.desktop %%DATADIR%%/DavMail.app/Contents/Java/activation-1.1.1.jar %%DATADIR%%/DavMail.app/Contents/Java/commons-codec-1.11.jar %%DATADIR%%/DavMail.app/Contents/Java/commons-collections-3.1.jar -%%DATADIR%%/DavMail.app/Contents/Java/commons-httpclient-3.1.jar %%DATADIR%%/DavMail.app/Contents/Java/commons-logging-1.0.4.jar %%DATADIR%%/DavMail.app/Contents/Java/davmail.jar %%DATADIR%%/DavMail.app/Contents/Java/htmlcleaner-2.21.jar @@ -19,17 +18,14 @@ share/applications/davmail.desktop %%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.14.jar %%DATADIR%%/DavMail.app/Contents/Java/jdom-1.0.jar %%DATADIR%%/DavMail.app/Contents/Java/jettison-1.4.0.jar -%%DATADIR%%/DavMail.app/Contents/Java/libgrowl-0.2.jar -%%DATADIR%%/DavMail.app/Contents/Java/libgrowl.jnilib %%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.16.jar %%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar %%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar %%DATADIR%%/DavMail.app/Contents/Java/sonarqube-ant-task-2.7.0.1612.jar %%DATADIR%%/DavMail.app/Contents/Java/stax-api-1.0.1.jar %%DATADIR%%/DavMail.app/Contents/Java/stax2-api-3.1.1.jar -%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-5.1.0.jar +%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-6.2.0.jar %%DATADIR%%/DavMail.app/Contents/MacOS/davmail -%%DATADIR%%/DavMail.app/Contents/MacOS/libgrowl.jnilib %%DATADIR%%/DavMail.app/Contents/Resources/tray.icns %%DATADIR%%/davmail %%DATADIR%%/davmail.jar @@ -37,7 +33,6 @@ share/applications/davmail.desktop %%DATADIR%%/lib/activation-1.1.1.jar %%DATADIR%%/lib/commons-codec-1.11.jar %%DATADIR%%/lib/commons-collections-3.1.jar -%%DATADIR%%/lib/commons-httpclient-3.1.jar %%DATADIR%%/lib/commons-logging-1.0.4.jar %%DATADIR%%/lib/hamcrest-core-1.3.jar %%DATADIR%%/lib/htmlcleaner-2.21.jar @@ -50,9 +45,7 @@ share/applications/davmail.desktop %%DATADIR%%/lib/jcifs-1.3.14.jar %%DATADIR%%/lib/jdom-1.0.jar %%DATADIR%%/lib/jettison-1.4.0.jar -%%DATADIR%%/lib/junit-4.12.jar -%%DATADIR%%/lib/libgrowl-0.2.jar -%%DATADIR%%/lib/libgrowl.jnilib +%%DATADIR%%/lib/junit-4.13.1.jar %%DATADIR%%/lib/log4j-1.2.16.jar %%DATADIR%%/lib/slf4j-api-1.7.25.jar %%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar @@ -60,13 +53,12 @@ share/applications/davmail.desktop %%DATADIR%%/lib/stax-api-1.0.1.jar %%DATADIR%%/lib/stax2-api-3.1.1.jar %%DATADIR%%/lib/winrun4j-0.4.5.jar -%%DATADIR%%/lib/woodstox-core-5.1.0.jar +%%DATADIR%%/lib/woodstox-core-6.2.0.jar %%DATADIR%%/version.txt %%DATADIR%%/web/WEB-INF/classes/davmail.properties %%DATADIR%%/web/WEB-INF/lib/activation-1.1.1.jar %%DATADIR%%/web/WEB-INF/lib/commons-codec-1.11.jar %%DATADIR%%/web/WEB-INF/lib/commons-collections-3.1.jar -%%DATADIR%%/web/WEB-INF/lib/commons-httpclient-3.1.jar %%DATADIR%%/web/WEB-INF/lib/commons-logging-1.0.4.jar %%DATADIR%%/web/WEB-INF/lib/davmail.jar %%DATADIR%%/web/WEB-INF/lib/hamcrest-core-1.3.jar @@ -80,12 +72,12 @@ share/applications/davmail.desktop %%DATADIR%%/web/WEB-INF/lib/jcifs-1.3.14.jar %%DATADIR%%/web/WEB-INF/lib/jdom-1.0.jar %%DATADIR%%/web/WEB-INF/lib/jettison-1.4.0.jar -%%DATADIR%%/web/WEB-INF/lib/junit-4.12.jar +%%DATADIR%%/web/WEB-INF/lib/junit-4.13.1.jar %%DATADIR%%/web/WEB-INF/lib/log4j-1.2.16.jar %%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar %%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar %%DATADIR%%/web/WEB-INF/lib/sonarqube-ant-task-2.7.0.1612.jar %%DATADIR%%/web/WEB-INF/lib/stax-api-1.0.1.jar %%DATADIR%%/web/WEB-INF/lib/stax2-api-3.1.1.jar -%%DATADIR%%/web/WEB-INF/lib/woodstox-core-5.1.0.jar +%%DATADIR%%/web/WEB-INF/lib/woodstox-core-6.2.0.jar %%DATADIR%%/web/WEB-INF/web.xml