Attachment #157077 for bug #198297




# $FreeBSD$

PORTNAME=	davmail
PORTVERSION=	4.6.1
CATEGORIES=	mail java
MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}


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=	2343
# port build number, same as on DISTNAME
MAKE_ARGS=	-Drevision=${REVISION}
MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"

		-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 \
		${STAGEDIR}${PREFIX}/etc/davmail.properties.sample
	${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)mail/davmail/distinfo (-2 / +2 lines)
1	SHA256 (davmail-src-4.5.1-2303.tgz) = 2621a5cbc81c06d0345ec05c93664a052e2e9d2d2bfda8e731a8fb94fd70f752	1	SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e
2	SIZE (davmail-src-4.5.1-2303.tgz) = 22670415	2	SIZE (davmail-src-4.6.1-2343.tgz) = 22659201




--- build.xml.orig	2015-05-23 02:27:12 UTC
+++ build.xml
@@ -59,7 +59,7 @@
     </target>
 
     <target name="defaultrelease" unless="is.svn">

     </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"
                 />

Lines 1-11 Link Here

(-)mail/davmail/files/patch-src__etc__davmail.properties (-11 lines)
1	--- src/etc/davmail.properties.orig 2014-06-03 18:17:10.000000000 -0400
2	+++ src/etc/davmail.properties 2014-06-10 18:06:05.000000000 -0400
3	@@ -58,7 +58,7 @@
4	davmail.disableUpdateCheck=false
5
6	# Send keepalive character during large folder and messages download
7	-davmail.enableKeepalive=false
8	+davmail.enableKeepAlive=false
9	# Message count limit on folder retrieval
10	davmail.folderSizeLimit=0
11	# Default windows domain for NTLM and basic authentication

Return to bug 198297

Lines 2-8 Link Here

(-)mail/davmail/Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= davmail	4	PORTNAME= davmail
5	PORTVERSION= 4.5.1	5	PORTVERSION= 4.6.1
6	CATEGORIES= mail java	6	CATEGORIES= mail java
7	MASTER_SITES= SF/davmail/davmail/${PORTVERSION}	7	MASTER_SITES= SF/davmail/davmail/${PORTVERSION}
8	DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}	8	DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}
Lines 14-24 Link Here
14		14
15	USES= dos2unix tar:tgz	15	USES= dos2unix tar:tgz
16	DOS2UNIX_FILES= build.xml	16	DOS2UNIX_FILES= build.xml
		17	NO_ARCH= yes
17	USE_ANT= yes	18	USE_ANT= yes
18	USE_JAVA= yes	19	USE_JAVA= yes
19	JAVA_VERSION= 1.6+	20	JAVA_VERSION= 1.6+
20	ALL_TARGET= release	21	ALL_TARGET= release
21	REVISION= 2303	22	REVISION= 2343
22	# port build number, same as on DISTNAME	23	# port build number, same as on DISTNAME
23	MAKE_ARGS= -Drevision=${REVISION}	24	MAKE_ARGS= -Drevision=${REVISION}
24	MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"	25	MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"
Lines 46-54 Link Here
46	-not -name "*.rpm" \	47	-not -name "*.rpm" \
47	-not -name "*.desktop" \	48	-not -name "*.desktop" \
48	-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;	49	-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
49	@${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail	50	${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
50	@${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \	51	${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
51	${STAGEDIR}${PREFIX}/etc/davmail.properties.sample	52	${STAGEDIR}${PREFIX}/etc/davmail.properties.sample
52	@${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/	53	${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/
53		54
54	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)mail/davmail/files/patch-build.xml (-3 / +14 lines)
1	--- build.xml.orig 2013-04-23 16:50:41.883412959 +0200	1	--- build.xml.orig 2015-05-23 02:27:12 UTC
2	+++ build.xml 2013-04-23 16:51:32.230415374 +0200	2	+++ build.xml
3	@@ -58,7 +58,7 @@	3	@@ -59,7 +59,7 @@
4	</target>	4	</target>
5		5
6	<target name="defaultrelease" unless="is.svn">	6	<target name="defaultrelease" unless="is.svn">
Lines 9-11 Link Here
9	</target>	9	</target>
10		10
11	<target name="init" depends="check-encoding, check-java6, svnrelease, defaultrelease">	11	<target name="init" depends="check-encoding, check-java6, svnrelease, defaultrelease">
		12	@@ -138,8 +138,8 @@
		13	toFile="dist/davmail.desktop"
		14	name="DavMail"
		15	comment="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
		16	- exec="davmail"
		17	- icon="/usr/share/davmail/davmail.png"
		18	+ exec="/usr/local/bin/davmail"
		19	+ icon="/usr/local/share/java/davmail/davmail.png"
		20	categories="Network;"
		21	genericname="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
		22	/>

Lines 14-19 Link Here

(-)mail/davmail/pkg-plist (-2 / +1 lines)
14	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar	14	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar
15	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar	15	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar
16	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar	16	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar
		17	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl.jnilib
17	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar	18	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar
18	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar	19	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar
19	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar	20	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar
Lines 24-31 Link Here
24	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar	25	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar
25	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail	26	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail
26	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib	27	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib
27	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo
28	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj/Localizable.strings
29	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns	28	%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns
30	%%JAVASHAREDIR%%/davmail/davmail.jar	29	%%JAVASHAREDIR%%/davmail/davmail.jar
31	%%JAVASHAREDIR%%/davmail/davmail.png	30	%%JAVASHAREDIR%%/davmail/davmail.png