Attachment #171096 for bug #209354

Lines 193-198 Link Here

(-)GIDs (+1 lines)
193	radmind:*:506:	193	radmind:*:506:
194	skkserv:*:507:	194	skkserv:*:507:
195	pwhois:*:512:	195	pwhois:*:512:
		196	davmail:*:521:
196	nullmail:*:522:	197	nullmail:*:522:
197	freevo:*:523:	198	freevo:*:523:
198	dkimproxy:*:525:	199	dkimproxy:*:525:

Lines 201-206 Link Here

(-)UIDs (+1 lines)
201	radmind:*:506:506::0:0:radmind User:/var/radmind:/usr/sbin/nologin	201	radmind:*:506:506::0:0:radmind User:/var/radmind:/usr/sbin/nologin
202	skkserv:*:507:507::0:0:skkserv User:/nonexistent:/usr/sbin/nologin	202	skkserv:*:507:507::0:0:skkserv User:/nonexistent:/usr/sbin/nologin
203	pwhois:*:512:512::0:0:pwhoisd User:/nonexistent:/usr/sbin/nologin	203	pwhois:*:512:512::0:0:pwhoisd User:/nonexistent:/usr/sbin/nologin
		204	davmail:*:521:521::0:0:Davmail Exchange Gateway:/nonexistent:/usr/sbin/nologin
204	nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh	205	nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh
205	freevo:*:523:523::0:0:Freevo User:/var/db/freevo:/bin/sh	206	freevo:*:523:523::0:0:Freevo User:/var/db/freevo:/bin/sh
206	dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin	207	dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin

Lines 2-8 Link Here

(-)mail/davmail/Makefile (-2 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= davmail	4	PORTNAME= davmail
5	PORTVERSION= 4.6.1	5	PORTVERSION= 4.7.2
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 19-29 Link Here
19	USE_JAVA= yes	19	USE_JAVA= yes
20	JAVA_VERSION= 1.6+	20	JAVA_VERSION= 1.6+
21	ALL_TARGET= release	21	ALL_TARGET= release
22	REVISION= 2343	22	REVISION= 2427 # 4.7.2
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"
26		26
		27	USERS= davmail
		28	GROUPS= davmail
		29
27	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	30	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
28		31
29	USE_RC_SUBR= davmail	32	USE_RC_SUBR= davmail
Lines 39-44 Link Here
39	-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;	42	-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;
40	@cd ${WRKSRC}/dist && ${FIND} . -type f \	43	@cd ${WRKSRC}/dist && ${FIND} . -type f \
41	-not -name "*.deb" \	44	-not -name "*.deb" \
		45	-not -name "*.md5" \
		46	-not -name "*.MD5" \
42	-not -name "*.tgz" \	47	-not -name "*.tgz" \
43	-not -name "*.exe" \	48	-not -name "*.exe" \
44	-not -name "swt-*.jar" \	49	-not -name "swt-*.jar" \
Lines 47-52 Link Here
47	-not -name "*.rpm" \	52	-not -name "*.rpm" \
48	-not -name "*.desktop" \	53	-not -name "*.desktop" \
49	-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;	54	-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
		55	@${FIND} ${STAGEDIR}/${DATADIR} -depth -empty -type d \
		56	-exec ${RMDIR} \{} +
50	${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail	57	${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
51	${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \	58	${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
52	${STAGEDIR}${PREFIX}/etc/davmail.properties.sample	59	${STAGEDIR}${PREFIX}/etc/davmail.properties.sample

Lines 1-2 Link Here

(-)mail/davmail/distinfo (-2 / +2 lines)
1	SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e	1	SHA256 (davmail-src-4.7.2-2427.tgz) = bf66cd4e735329d9862c8e01c9749e2d21d5beddc8090545d705b9aa8d04dbe7
2	SIZE (davmail-src-4.6.1-2343.tgz) = 22659201	2	SIZE (davmail-src-4.7.2-2427.tgz) = 22682341

Lines 22-28 Link Here

(-)mail/davmail/files/davmail.in (-4 / +16 lines)
22		22
23	: ${davmail_enable="NO"}	23	: ${davmail_enable="NO"}
24	: ${davmail_config="%%PREFIX%%/etc/davmail.properties"}	24	: ${davmail_config="%%PREFIX%%/etc/davmail.properties"}
		25	: ${davmail_user="davmail"}
		26	: ${davmail_group="davmail"}
25		27
		28	start_precmd="${name}_prestart"
26	start_cmd="${name}_start"	29	start_cmd="${name}_start"
27		30
28	davmail_procname()	31	davmail_procname()
Lines 31-47 Link Here
31	/usr/bin/awk -F= '{if ($1=="JAVAVM_PROG") print $2}' 2> /dev/null	34	/usr/bin/awk -F= '{if ($1=="JAVAVM_PROG") print $2}' 2> /dev/null
32	}	35	}
33		36
		37	pidfiledir="/var/run/davmail"
		38	pidfile="${pidfiledir}/davmail.pid"
34	procname="$(davmail_procname)"	39	procname="$(davmail_procname)"
35	pidfile="/var/run/davmail.pid"
36	required_files=${davmail_config}	40	required_files=${davmail_config}
37		41
		42	command="/usr/sbin/daemon"
		43	command_args="-p ${pidfile} %%LOCALBASE%%/bin/java -cp '%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*' davmail.DavGateway '${davmail_config}'"
		44
38	davmail_daemon()	45	davmail_daemon()
39	{	46	{
40	%%LOCALBASE%%/bin/java \	47	su -m ${davmail_user} -c "env -i PATH=${PATH} ${command} ${command_args}"
41	-cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \
42	davmail.DavGateway "${davmail_config}" & echo -n $! > ${pidfile}
43	}	48	}
44		49
		50	davmail_prestart()
		51	{
		52	if [ ! -d "${pidfiledir}" ]; then
		53	install -d -o "${davmail_user}" -g "${davmail_group}" -m 750 "${pidfiledir}"
		54	fi
		55	}
		56
45	davmail_start()	57	davmail_start()
46	{	58	{
47	if [ -z "$rc_fast" -a -n "$rc_pid" ]; then	59	if [ -z "$rc_fast" -a -n "$rc_pid" ]; then




--- build.xml.orig	2016-04-09 15:14:49 UTC
+++ build.xml
@@ -61,7 +61,7 @@
         <or>
             <equals arg1="${ant.java.version}" arg2="1.6"/>
             <equals arg1="${ant.java.version}" arg2="1.7"/>
+            <equals arg1="${ant.java.version}" arg2="1.8"/>
         </or>
     </condition>
 
@@ -59,7 +60,7 @@
     </target>
 
     <target name="defaultrelease" unless="is.svn">

Return to bug 209354

Lines 1-14 Link Here

(-)mail/davmail/files/patch-build.xml (-11 / +3 lines)
1	--- build.xml.orig 2015-07-04 15:28:32.000000000 -0700	1	--- build.xml.orig 2016-04-09 15:14:49 UTC
2	+++ build.xml 2015-07-04 15:28:59.000000000 -0700	2	+++ build.xml
3	@@ -26,6 +26,7 @@	3	@@ -61,7 +61,7 @@
4	<or>
5	<equals arg1="${ant.java.version}" arg2="1.6"/>
6	<equals arg1="${ant.java.version}" arg2="1.7"/>
7	+ <equals arg1="${ant.java.version}" arg2="1.8"/>
8	</or>
9	</condition>
10
11	@@ -59,7 +60,7 @@
12	</target>	4	</target>
13		5
14	<target name="defaultrelease" unless="is.svn">	6	<target name="defaultrelease" unless="is.svn">