Index: GIDs
===================================================================
--- GIDs (revision 413678)
+++ GIDs (working copy)
@@ -193,6 +193,7 @@
radmind:*:506:
skkserv:*:507:
pwhois:*:512:
+davmail:*:521:
nullmail:*:522:
freevo:*:523:
dkimproxy:*:525:
Index: UIDs
===================================================================
--- UIDs (revision 413678)
+++ UIDs (working copy)
@@ -201,6 +201,7 @@
radmind:*:506:506::0:0:radmind User:/var/radmind:/usr/sbin/nologin
skkserv:*:507:507::0:0:skkserv User:/nonexistent:/usr/sbin/nologin
pwhois:*:512:512::0:0:pwhoisd User:/nonexistent:/usr/sbin/nologin
+davmail:*:521:521::0:0:Davmail Exchange Gateway:/nonexistent:/usr/sbin/nologin
nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh
freevo:*:523:523::0:0:Freevo User:/var/db/freevo:/bin/sh
dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin
Index: mail/davmail/Makefile
===================================================================
--- mail/davmail/Makefile (revision 414597)
+++ mail/davmail/Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= davmail
-PORTVERSION= 4.6.1
+PORTVERSION= 4.7.2
CATEGORIES= mail java
MASTER_SITES= SF/davmail/davmail/${PORTVERSION}
DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -19,7 +19,7 @@
USE_JAVA= yes
JAVA_VERSION= 1.6+
ALL_TARGET= release
-REVISION= 2343
+REVISION= 2427 # 4.7.2
# port build number, same as on DISTNAME
MAKE_ARGS= -Drevision=${REVISION}
MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8"
@@ -39,6 +39,8 @@
-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;
@cd ${WRKSRC}/dist && ${FIND} . -type f \
-not -name "*.deb" \
+ -not -name "*.md5" \
+ -not -name "*.MD5" \
-not -name "*.tgz" \
-not -name "*.exe" \
-not -name "swt-*.jar" \
@@ -47,6 +49,8 @@
-not -name "*.rpm" \
-not -name "*.desktop" \
-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
+ @${FIND} ${STAGEDIR}/${DATADIR} -depth -empty -type d \
+ -exec ${RMDIR} \{} +
${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail
${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
${STAGEDIR}${PREFIX}/etc/davmail.properties.sample
Index: mail/davmail/distinfo
===================================================================
--- mail/davmail/distinfo (revision 414597)
+++ mail/davmail/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (davmail-src-4.6.1-2343.tgz) = 1e6f5c88469416276fd7301990ddaa048dd177eb90e3348ae8d54b22df38997e
-SIZE (davmail-src-4.6.1-2343.tgz) = 22659201
+SHA256 (davmail-src-4.7.2-2427.tgz) = bf66cd4e735329d9862c8e01c9749e2d21d5beddc8090545d705b9aa8d04dbe7
+SIZE (davmail-src-4.7.2-2427.tgz) = 22682341
Index: mail/davmail/files/davmail.in
===================================================================
--- mail/davmail/files/davmail.in (revision 414597)
+++ mail/davmail/files/davmail.in (working copy)
@@ -22,7 +22,10 @@
: ${davmail_enable="NO"}
: ${davmail_config="%%PREFIX%%/etc/davmail.properties"}
+: ${davmail_user="davmail"}
+: ${davmail_group="davmail"}
+start_precmd="${name}_prestart"
start_cmd="${name}_start"
davmail_procname()
@@ -35,13 +38,21 @@
pidfile="/var/run/davmail.pid"
required_files=${davmail_config}
+command="/usr/sbin/daemon"
+command_args="-p ${pidfile} %%LOCALBASE%%/bin/java -cp '%%DATA_DIR%%/davmail.jar:%%DATA_DIR%%/lib/*' davmail.DavGateway '${davmail_config}'"
+
davmail_daemon()
{
- %%LOCALBASE%%/bin/java \
- -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \
- davmail.DavGateway "${davmail_config}" & echo -n $! > ${pidfile}
+ su -m davmail -c "env -i PATH=${PATH} ${command} ${command_args}"
}
+davmail_prestart()
+{
+ if [ ! -d "/var/run/davmail" ]; then
+ install -d -o "${davmail_user}" -g "${davmail_group}" -m 750 "${pidfiledir}"
+ fi
+}
+
davmail_start()
{
if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
Index: mail/davmail/files/patch-build.xml
===================================================================
--- mail/davmail/files/patch-build.xml (revision 414597)
+++ mail/davmail/files/patch-build.xml (working copy)
@@ -1,14 +1,6 @@
---- build.xml.orig 2015-07-04 15:28:32.000000000 -0700
-+++ build.xml 2015-07-04 15:28:59.000000000 -0700
-@@ -26,6 +26,7 @@
-
-
-
-+
-
-
-
-@@ -59,7 +60,7 @@
+--- build.xml.orig 2016-04-09 15:14:49 UTC
++++ build.xml
+@@ -61,7 +61,7 @@