diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/davmail/Makefile | 11 | ||||
| -rw-r--r-- | mail/davmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/davmail/files/patch-build.xml | 17 | ||||
| -rw-r--r-- | mail/davmail/files/patch-src__etc__davmail.properties | 11 | ||||
| -rw-r--r-- | mail/davmail/pkg-plist | 3 |
5 files changed, 23 insertions, 23 deletions
diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile index 51718d6f30ae..c351f2d24574 100644 --- a/mail/davmail/Makefile +++ b/mail/davmail/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= davmail -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.1 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -14,11 +14,12 @@ LICENSE= GPLv2 USES= dos2unix tar:tgz DOS2UNIX_FILES= build.xml +NO_ARCH= yes USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ ALL_TARGET= release -REVISION= 2303 +REVISION= 2343 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8" @@ -46,9 +47,9 @@ do-install: -not -name "*.rpm" \ -not -name "*.desktop" \ -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \; - @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail - @${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \ + ${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail + ${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \ ${STAGEDIR}${PREFIX}/etc/davmail.properties.sample - @${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include <bsd.port.mk> diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo index eaddf01e2a46..4674fee489d7 100644 --- a/mail/davmail/distinfo +++ b/mail/davmail/distinfo @@ -1,2 +1,2 @@ -SHA256 (davmail-src-4.5.1-2303.tgz) = 2621a5cbc81c06d0345ec05c93664a052e2e9d2d2bfda8e731a8fb94fd70f752 -SIZE (davmail-src-4.5.1-2303.tgz) = 22670415 +SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e +SIZE (davmail-src-4.6.1-2343.tgz) = 22659201 diff --git a/mail/davmail/files/patch-build.xml b/mail/davmail/files/patch-build.xml index 643b75d0a623..59fc2d7634ef 100644 --- a/mail/davmail/files/patch-build.xml +++ b/mail/davmail/files/patch-build.xml @@ -1,6 +1,6 @@ ---- build.xml.orig 2013-04-23 16:50:41.883412959 +0200 -+++ build.xml 2013-04-23 16:51:32.230415374 +0200 -@@ -58,7 +58,7 @@ +--- build.xml.orig 2015-05-23 02:27:12 UTC ++++ build.xml +@@ -59,7 +59,7 @@ </target> <target name="defaultrelease" unless="is.svn"> @@ -9,3 +9,14 @@ </target> <target name="init" depends="check-encoding, check-java6, svnrelease, defaultrelease"> +@@ -138,8 +138,8 @@ + toFile="dist/davmail.desktop" + name="DavMail" + comment="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway" +- exec="davmail" +- icon="/usr/share/davmail/davmail.png" ++ exec="/usr/local/bin/davmail" ++ icon="/usr/local/share/java/davmail/davmail.png" + categories="Network;" + genericname="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway" + /> diff --git a/mail/davmail/files/patch-src__etc__davmail.properties b/mail/davmail/files/patch-src__etc__davmail.properties deleted file mode 100644 index 75761bf13a2b..000000000000 --- a/mail/davmail/files/patch-src__etc__davmail.properties +++ /dev/null @@ -1,11 +0,0 @@ ---- src/etc/davmail.properties.orig 2014-06-03 18:17:10.000000000 -0400 -+++ src/etc/davmail.properties 2014-06-10 18:06:05.000000000 -0400 -@@ -58,7 +58,7 @@ - davmail.disableUpdateCheck=false - - # Send keepalive character during large folder and messages download --davmail.enableKeepalive=false -+davmail.enableKeepAlive=false - # Message count limit on folder retrieval - davmail.folderSizeLimit=0 - # Default windows domain for NTLM and basic authentication diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist index 1ec665114575..6288d8f2f2c1 100644 --- a/mail/davmail/pkg-plist +++ b/mail/davmail/pkg-plist @@ -14,6 +14,7 @@ share/applications/davmail.desktop %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl.jnilib %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar @@ -24,8 +25,6 @@ share/applications/davmail.desktop %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj/Localizable.strings %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns %%JAVASHAREDIR%%/davmail/davmail.jar %%JAVASHAREDIR%%/davmail/davmail.png |