svn commit: r316399 - in head/mail/davmail: . files
Emanuel Haupt
ehaupt at FreeBSD.org
Wed Apr 24 00:08:37 UTC 2013
Author: ehaupt
Date: Wed Apr 24 00:08:36 2013
New Revision: 316399
URL: http://svnweb.freebsd.org/changeset/ports/316399
Log:
- Update to 4.2.1
- Remove CR/LF from build.xml
- Use x11-toolkits/swt-devel which does not depend on vulnerable libxul version
- Get rid of CR/LF's
PR: 178082
Approved by: John Prather <john.c.prather at gmail.com> (maintainer)
Modified:
head/mail/davmail/Makefile
head/mail/davmail/distinfo
head/mail/davmail/files/patch-build.xml
head/mail/davmail/pkg-plist
Modified: head/mail/davmail/Makefile
==============================================================================
--- head/mail/davmail/Makefile Tue Apr 23 22:37:59 2013 (r316398)
+++ head/mail/davmail/Makefile Wed Apr 24 00:08:36 2013 (r316399)
@@ -1,9 +1,8 @@
# Created by: John Prather
-#
# $FreeBSD$
PORTNAME= davmail
-PORTVERSION= 4.1.0
+PORTVERSION= 4.2.1
CATEGORIES= mail java
MASTER_SITES= SF/davmail/davmail/${PORTVERSION}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -14,15 +13,17 @@ COMMENT= POP/IMAP/SMTP/Caldav/Carddav/LD
LICENSE= GPLv2
-RUN_DEPENDS= swt>=3.5:${PORTSDIR}/x11-toolkits/swt
+RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel
+USE_DOS2UNIX= build.xml
USE_ANT= yes
USE_JAVA= yes
JAVA_VERSION= 1.6+
ALL_TARGET= release
-REVISION= 2042
+REVISION= 2089
# port build number, same as on DISTNAME
MAKE_ARGS= -Drevision=${REVISION}
+MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Modified: head/mail/davmail/distinfo
==============================================================================
--- head/mail/davmail/distinfo Tue Apr 23 22:37:59 2013 (r316398)
+++ head/mail/davmail/distinfo Wed Apr 24 00:08:36 2013 (r316399)
@@ -1,2 +1,2 @@
-SHA256 (davmail-src-4.1.0-2042.tgz) = eb0bec08e125b891ab6302ac5b86ac9a5e5b58bbd7fa178a00f5380b62cd58c5
-SIZE (davmail-src-4.1.0-2042.tgz) = 22433512
+SHA256 (davmail-src-4.2.1-2089.tgz) = 03d2a9d19723c03e253218f6de404580664741e9eb0afb7240703241b619af6a
+SIZE (davmail-src-4.2.1-2089.tgz) = 22503303
Modified: head/mail/davmail/files/patch-build.xml
==============================================================================
--- head/mail/davmail/files/patch-build.xml Tue Apr 23 22:37:59 2013 (r316398)
+++ head/mail/davmail/files/patch-build.xml Wed Apr 24 00:08:36 2013 (r316399)
@@ -1,11 +1,11 @@
---- ./build.xml.orig 2012-01-13 19:17:31.000000000 -0800
-+++ ./build.xml 2012-01-13 19:46:34.000000000 -0800
-@@ -47,7 +47,7 @@
- </target>
-
- <target name="defaultrelease" unless="is.svn">
-- <property name="release" value="${version}"/>
+--- 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 @@
+ </target>
+
+ <target name="defaultrelease" unless="is.svn">
+- <property name="release" value="${version}"/>
+ <property name="release" value="${version}-${revision}"/>
- </target>
-
- <target name="init" depends="check-java6, svnrelease, defaultrelease">
+ </target>
+
+ <target name="init" depends="check-encoding, check-java6, svnrelease, defaultrelease">
Modified: head/mail/davmail/pkg-plist
==============================================================================
--- head/mail/davmail/pkg-plist Tue Apr 23 22:37:59 2013 (r316398)
+++ head/mail/davmail/pkg-plist Wed Apr 24 00:08:36 2013 (r316399)
@@ -6,7 +6,6 @@ etc/davmail.properties.sample
%%JAVASHAREDIR%%/davmail/lib/log4j-1.2.16.jar
%%JAVASHAREDIR%%/davmail/lib/commons-collections-3.1.jar
%%JAVASHAREDIR%%/davmail/lib/junit-3.8.1.jar
-%%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-1.4.jar
%%JAVASHAREDIR%%/davmail/lib/commons-codec-1.3.jar
%%JAVASHAREDIR%%/davmail/lib/libgrowl-0.2.jar
%%JAVASHAREDIR%%/davmail/lib/mail-1.4.3.jar
@@ -17,13 +16,18 @@ etc/davmail.properties.sample
%%JAVASHAREDIR%%/davmail/lib/jcifs-1.3.14.jar
%%JAVASHAREDIR%%/davmail/lib/jdom-1.0.jar
%%JAVASHAREDIR%%/davmail/lib/slf4j-api-1.3.1.jar
-%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.1.jar
%%JAVASHAREDIR%%/davmail/lib/xercesImpl-2.8.1.jar
%%JAVASHAREDIR%%/davmail/lib/commons-httpclient-3.1.jar
%%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.4.jar
%%JAVASHAREDIR%%/davmail/lib/woodstox-core-asl-4.1.2.jar
%%JAVASHAREDIR%%/davmail/lib/stax-api-1.0.1.jar
%%JAVASHAREDIR%%/davmail/lib/stax2-api-3.1.1.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/htmlcleaner-2.2.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jackrabbit-webdav-2.4.3.jar
+%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.2.jar
+%%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-2.4.3.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.2.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jackrabbit-webdav-2.4.3.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/classes/davmail.properties
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/davmail.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/libgrowl-0.2.jar
@@ -34,10 +38,8 @@ etc/davmail.properties.sample
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jdom-1.0.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/log4j-1.2.16.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-api-1.3.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.1.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-log4j12-1.3.1.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/xercesImpl-2.8.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jackrabbit-webdav-1.4.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-collections-3.1.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-httpclient-3.1.jar
%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcifs-1.3.14.jar
@@ -54,8 +56,6 @@ etc/davmail.properties.sample
%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-collections-3.1.jar
%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-httpclient-3.1.jar
%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-logging-1.0.4.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/htmlcleaner-2.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jackrabbit-webdav-1.4.jar
%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jcharset-1.3.jar
%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jcifs-1.3.14.jar
%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jdom-1.0.jar
More information about the svn-ports-all
mailing list