Attachment #229332 for bug #259683

View | Details | Raw Unified | Return to bug 259683
Collapse All | Expand All




# Created by: John Prather

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

USE_ANT=	yes
USE_JAVA=	yes
ALL_TARGET=	release
# 6.0.0
REVISION=	3375
# port build number, same as on DISTNAME
MAKE_ARGS=	-Drevision=${REVISION}
MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"

PLIST_SUB+=	PORTVERSION="${PORTVERSION}"

post-patch:
	@${REINPLACE_CMD} -e 's#prefix=\"usr#prefix=\"${PREFIX}#' \
		-e 's#icon=\".*/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \
		${WRKSRC}/build.xml

# Azul JRE FX has been disabled by removing the target:
# <antcall target="download-jre"/>
# in files/patch-build.xml patch.
do-install:
	@cd ${WRKSRC}/dist && ${FIND} . -type d \
		-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;

Lines 1-3 Link Here

(-)b/mail/davmail/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1600772850	1	TIMESTAMP = 1636219585
2	SHA256 (davmail-src-5.5.1-3299.tgz) = 63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508	2	SHA256 (davmail-src-6.0.0-3375.tgz) = 2d719188671f7a621c82ce7bc6d1d781ed18c8d52a9af23e7bc5288df2b649a5
3	SIZE (davmail-src-5.5.1-3299.tgz) = 20780537	3	SIZE (davmail-src-6.0.0-3375.tgz) = 21329359




--- build.xml.orig	2021-11-06 18:00:46 UTC
+++ build.xml
@@ -88,7 +88,7 @@
     </target>
 
     <target name="defaultrelease" unless="is.svn">

+	<property name="release" value="${version}-${revision}"/>
     </target>
 
     <target name="init" depends="check-encoding, check-java8, svnrelease, gitsvnrelease, defaultrelease">
@@ -412,7 +412,6 @@
                 <exclude name="lib/hamcrest-core-*.jar"/>
             </fileset>
         </zip>
-        <antcall target="download-jre"/>
         <zip file="dist/davmail-${release-name}-windows-standalone.zip">
             <fileset dir="dist">
                 <include name="jre/**"/>




%%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

%%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-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

%%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

%%DATADIR%%/lib/jcifs-1.3.14.jar
%%DATADIR%%/lib/jdom-1.0.jar
%%DATADIR%%/lib/jettison-1.4.0.jar
%%DATADIR%%/lib/junit-4.13.1.jar
%%DATADIR%%/lib/libgrowl-0.2.jar
%%DATADIR%%/lib/libgrowl.jnilib
%%DATADIR%%/lib/log4j-1.2.16.jar
%%DATADIR%%/lib/slf4j-api-1.7.25.jar
%%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar

%%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-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

%%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.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-6.2.0.jar
%%DATADIR%%/web/WEB-INF/web.xml
- 

Return to bug 259683

Lines 1-7 Link Here

(-)b/mail/davmail/Makefile (-5 / +7 lines)
1	# Created by: John Prather	1	# Created by: John Prather
2		2
3	PORTNAME= davmail	3	PORTNAME= davmail
4	PORTVERSION= 5.5.1	4	PORTVERSION= 6.0.0
5	CATEGORIES= mail java	5	CATEGORIES= mail java
6	MASTER_SITES= SF/davmail/davmail/${PORTVERSION}	6	MASTER_SITES= SF/davmail/davmail/${PORTVERSION}
7	DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}	7	DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}
Lines 18-25 NO_ARCH= yes Link Here
18	USE_ANT= yes	18	USE_ANT= yes
19	USE_JAVA= yes	19	USE_JAVA= yes
20	ALL_TARGET= release	20	ALL_TARGET= release
21	# 5.4.0	21	# 6.0.0
22	REVISION= 3299	22	REVISION= 3375
23	# port build number, same as on DISTNAME	23	# port build number, same as on DISTNAME
24	MAKE_ARGS= -Drevision=${REVISION}	24	MAKE_ARGS= -Drevision=${REVISION}
25	MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"	25	MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"
Lines 34-43 SUB_FILES= davmail.sh pkg-message Link Here
34	PLIST_SUB+= PORTVERSION="${PORTVERSION}"	34	PLIST_SUB+= PORTVERSION="${PORTVERSION}"
35		35
36	post-patch:	36	post-patch:
37	@${REINPLACE_CMD} -e 's#exec=\".*/davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \	37	@${REINPLACE_CMD} -e 's#prefix=\"usr#prefix=\"${PREFIX}#' \
38	-e 's#icon=\".*/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \
39	${WRKSRC}/build.xml	38	${WRKSRC}/build.xml
40		39
		40	# Azul JRE FX has been disabled by removing the target:
		41	# <antcall target="download-jre"/>
		42	# in files/patch-build.xml patch.
41	do-install:	43	do-install:
42	@cd ${WRKSRC}/dist && ${FIND} . -type d \	44	@cd ${WRKSRC}/dist && ${FIND} . -type d \
43	-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;	45	-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;

Lines 1-6 Link Here

(-)b/mail/davmail/files/patch-build.xml (-3 / +11 lines)
1	--- build.xml.orig 2016-04-09 15:14:49 UTC	1	--- build.xml.orig 2021-11-06 18:00:46 UTC
2	+++ build.xml	2	+++ build.xml
3	@@ -61,7 +61,7 @@	3	@@ -88,7 +88,7 @@
4	</target>	4	</target>
5		5
6	<target name="defaultrelease" unless="is.svn">	6	<target name="defaultrelease" unless="is.svn">
Lines 8-11 Link Here
8	+ <property name="release" value="${version}-${revision}"/>	8	+ <property name="release" value="${version}-${revision}"/>
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-java8, svnrelease, gitsvnrelease, defaultrelease">
		12	@@ -412,7 +412,6 @@
		13	<exclude name="lib/hamcrest-core-*.jar"/>
		14	</fileset>
		15	</zip>
		16	- <antcall target="download-jre"/>
		17	<zip file="dist/davmail-${release-name}-windows-standalone.zip">
		18	<fileset dir="dist">
		19	<include name="jre/**"/>

Lines 6-12 share/applications/davmail.desktop Link Here

(-)b/mail/davmail/pkg-plist (-14 / +5 lines)
6	%%DATADIR%%/DavMail.app/Contents/Java/activation-1.1.1.jar	6	%%DATADIR%%/DavMail.app/Contents/Java/activation-1.1.1.jar
7	%%DATADIR%%/DavMail.app/Contents/Java/commons-codec-1.11.jar	7	%%DATADIR%%/DavMail.app/Contents/Java/commons-codec-1.11.jar
8	%%DATADIR%%/DavMail.app/Contents/Java/commons-collections-3.1.jar	8	%%DATADIR%%/DavMail.app/Contents/Java/commons-collections-3.1.jar
9	%%DATADIR%%/DavMail.app/Contents/Java/commons-httpclient-3.1.jar
10	%%DATADIR%%/DavMail.app/Contents/Java/commons-logging-1.0.4.jar	9	%%DATADIR%%/DavMail.app/Contents/Java/commons-logging-1.0.4.jar
11	%%DATADIR%%/DavMail.app/Contents/Java/davmail.jar	10	%%DATADIR%%/DavMail.app/Contents/Java/davmail.jar
12	%%DATADIR%%/DavMail.app/Contents/Java/htmlcleaner-2.21.jar	11	%%DATADIR%%/DavMail.app/Contents/Java/htmlcleaner-2.21.jar
Lines 19-35 share/applications/davmail.desktop Link Here
19	%%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.14.jar	18	%%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.14.jar
20	%%DATADIR%%/DavMail.app/Contents/Java/jdom-1.0.jar	19	%%DATADIR%%/DavMail.app/Contents/Java/jdom-1.0.jar
21	%%DATADIR%%/DavMail.app/Contents/Java/jettison-1.4.0.jar	20	%%DATADIR%%/DavMail.app/Contents/Java/jettison-1.4.0.jar
22	%%DATADIR%%/DavMail.app/Contents/Java/libgrowl-0.2.jar
23	%%DATADIR%%/DavMail.app/Contents/Java/libgrowl.jnilib
24	%%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.16.jar	21	%%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.16.jar
25	%%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar	22	%%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar
26	%%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar	23	%%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar
27	%%DATADIR%%/DavMail.app/Contents/Java/sonarqube-ant-task-2.7.0.1612.jar	24	%%DATADIR%%/DavMail.app/Contents/Java/sonarqube-ant-task-2.7.0.1612.jar
28	%%DATADIR%%/DavMail.app/Contents/Java/stax-api-1.0.1.jar	25	%%DATADIR%%/DavMail.app/Contents/Java/stax-api-1.0.1.jar
29	%%DATADIR%%/DavMail.app/Contents/Java/stax2-api-3.1.1.jar	26	%%DATADIR%%/DavMail.app/Contents/Java/stax2-api-3.1.1.jar
30	%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-5.1.0.jar	27	%%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-6.2.0.jar
31	%%DATADIR%%/DavMail.app/Contents/MacOS/davmail	28	%%DATADIR%%/DavMail.app/Contents/MacOS/davmail
32	%%DATADIR%%/DavMail.app/Contents/MacOS/libgrowl.jnilib
33	%%DATADIR%%/DavMail.app/Contents/Resources/tray.icns	29	%%DATADIR%%/DavMail.app/Contents/Resources/tray.icns
34	%%DATADIR%%/davmail	30	%%DATADIR%%/davmail
35	%%DATADIR%%/davmail.jar	31	%%DATADIR%%/davmail.jar
Lines 37-43 share/applications/davmail.desktop Link Here
37	%%DATADIR%%/lib/activation-1.1.1.jar	33	%%DATADIR%%/lib/activation-1.1.1.jar
38	%%DATADIR%%/lib/commons-codec-1.11.jar	34	%%DATADIR%%/lib/commons-codec-1.11.jar
39	%%DATADIR%%/lib/commons-collections-3.1.jar	35	%%DATADIR%%/lib/commons-collections-3.1.jar
40	%%DATADIR%%/lib/commons-httpclient-3.1.jar
41	%%DATADIR%%/lib/commons-logging-1.0.4.jar	36	%%DATADIR%%/lib/commons-logging-1.0.4.jar
42	%%DATADIR%%/lib/hamcrest-core-1.3.jar	37	%%DATADIR%%/lib/hamcrest-core-1.3.jar
43	%%DATADIR%%/lib/htmlcleaner-2.21.jar	38	%%DATADIR%%/lib/htmlcleaner-2.21.jar
Lines 50-58 share/applications/davmail.desktop Link Here
50	%%DATADIR%%/lib/jcifs-1.3.14.jar	45	%%DATADIR%%/lib/jcifs-1.3.14.jar
51	%%DATADIR%%/lib/jdom-1.0.jar	46	%%DATADIR%%/lib/jdom-1.0.jar
52	%%DATADIR%%/lib/jettison-1.4.0.jar	47	%%DATADIR%%/lib/jettison-1.4.0.jar
53	%%DATADIR%%/lib/junit-4.12.jar	48	%%DATADIR%%/lib/junit-4.13.1.jar
54	%%DATADIR%%/lib/libgrowl-0.2.jar
55	%%DATADIR%%/lib/libgrowl.jnilib
56	%%DATADIR%%/lib/log4j-1.2.16.jar	49	%%DATADIR%%/lib/log4j-1.2.16.jar
57	%%DATADIR%%/lib/slf4j-api-1.7.25.jar	50	%%DATADIR%%/lib/slf4j-api-1.7.25.jar
58	%%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar	51	%%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar
Lines 60-72 share/applications/davmail.desktop Link Here
60	%%DATADIR%%/lib/stax-api-1.0.1.jar	53	%%DATADIR%%/lib/stax-api-1.0.1.jar
61	%%DATADIR%%/lib/stax2-api-3.1.1.jar	54	%%DATADIR%%/lib/stax2-api-3.1.1.jar
62	%%DATADIR%%/lib/winrun4j-0.4.5.jar	55	%%DATADIR%%/lib/winrun4j-0.4.5.jar
63	%%DATADIR%%/lib/woodstox-core-5.1.0.jar	56	%%DATADIR%%/lib/woodstox-core-6.2.0.jar
64	%%DATADIR%%/version.txt	57	%%DATADIR%%/version.txt
65	%%DATADIR%%/web/WEB-INF/classes/davmail.properties	58	%%DATADIR%%/web/WEB-INF/classes/davmail.properties
66	%%DATADIR%%/web/WEB-INF/lib/activation-1.1.1.jar	59	%%DATADIR%%/web/WEB-INF/lib/activation-1.1.1.jar
67	%%DATADIR%%/web/WEB-INF/lib/commons-codec-1.11.jar	60	%%DATADIR%%/web/WEB-INF/lib/commons-codec-1.11.jar
68	%%DATADIR%%/web/WEB-INF/lib/commons-collections-3.1.jar	61	%%DATADIR%%/web/WEB-INF/lib/commons-collections-3.1.jar
69	%%DATADIR%%/web/WEB-INF/lib/commons-httpclient-3.1.jar
70	%%DATADIR%%/web/WEB-INF/lib/commons-logging-1.0.4.jar	62	%%DATADIR%%/web/WEB-INF/lib/commons-logging-1.0.4.jar
71	%%DATADIR%%/web/WEB-INF/lib/davmail.jar	63	%%DATADIR%%/web/WEB-INF/lib/davmail.jar
72	%%DATADIR%%/web/WEB-INF/lib/hamcrest-core-1.3.jar	64	%%DATADIR%%/web/WEB-INF/lib/hamcrest-core-1.3.jar
Lines 80-91 share/applications/davmail.desktop Link Here
80	%%DATADIR%%/web/WEB-INF/lib/jcifs-1.3.14.jar	72	%%DATADIR%%/web/WEB-INF/lib/jcifs-1.3.14.jar
81	%%DATADIR%%/web/WEB-INF/lib/jdom-1.0.jar	73	%%DATADIR%%/web/WEB-INF/lib/jdom-1.0.jar
82	%%DATADIR%%/web/WEB-INF/lib/jettison-1.4.0.jar	74	%%DATADIR%%/web/WEB-INF/lib/jettison-1.4.0.jar
83	%%DATADIR%%/web/WEB-INF/lib/junit-4.12.jar	75	%%DATADIR%%/web/WEB-INF/lib/junit-4.13.1.jar
84	%%DATADIR%%/web/WEB-INF/lib/log4j-1.2.16.jar	76	%%DATADIR%%/web/WEB-INF/lib/log4j-1.2.16.jar
85	%%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar	77	%%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar
86	%%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar	78	%%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar
87	%%DATADIR%%/web/WEB-INF/lib/sonarqube-ant-task-2.7.0.1612.jar	79	%%DATADIR%%/web/WEB-INF/lib/sonarqube-ant-task-2.7.0.1612.jar
88	%%DATADIR%%/web/WEB-INF/lib/stax-api-1.0.1.jar	80	%%DATADIR%%/web/WEB-INF/lib/stax-api-1.0.1.jar
89	%%DATADIR%%/web/WEB-INF/lib/stax2-api-3.1.1.jar	81	%%DATADIR%%/web/WEB-INF/lib/stax2-api-3.1.1.jar
90	%%DATADIR%%/web/WEB-INF/lib/woodstox-core-5.1.0.jar	82	%%DATADIR%%/web/WEB-INF/lib/woodstox-core-6.2.0.jar
91	%%DATADIR%%/web/WEB-INF/web.xml	83	%%DATADIR%%/web/WEB-INF/web.xml
92	-