From owner-svn-ports-all@FreeBSD.ORG Mon Jun 30 17:52:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3D772A1; Mon, 30 Jun 2014 17:52:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0DD32266; Mon, 30 Jun 2014 17:52:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5UHqScS028682; Mon, 30 Jun 2014 17:52:28 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5UHqRmF028673; Mon, 30 Jun 2014 17:52:27 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201406301752.s5UHqRmF028673@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 30 Jun 2014 17:52:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359893 - in head/mail/davmail: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2014 17:52:29 -0000 Author: jkim Date: Mon Jun 30 17:52:27 2014 New Revision: 359893 URL: http://svnweb.freebsd.org/changeset/ports/359893 QAT: https://qat.redports.org/buildarchive/r359893/ Log: - Update to 4.5.0. - Fix rc script to properly start and stop. - Install a real sample file for davmail.properties. - Fix a minor typo in the sample file. - Use @sample for plist instead of rolling our own. PR: 190973 Approved by: john.c.prather@gmail.com (maintainer, timeout > 2 weeks) Added: head/mail/davmail/files/patch-src__etc__davmail.properties (contents, props changed) Deleted: head/mail/davmail/files/davmail.properties.sample Modified: head/mail/davmail/Makefile head/mail/davmail/distinfo head/mail/davmail/files/davmail.in head/mail/davmail/files/davmail.sh.in head/mail/davmail/pkg-plist Modified: head/mail/davmail/Makefile ============================================================================== --- head/mail/davmail/Makefile Mon Jun 30 17:52:23 2014 (r359892) +++ head/mail/davmail/Makefile Mon Jun 30 17:52:27 2014 (r359893) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= davmail -PORTVERSION= 4.4.1 +PORTVERSION= 4.5.0 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -19,7 +19,7 @@ USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ ALL_TARGET= release -REVISION= 2225 +REVISION= 2292 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8" @@ -48,8 +48,8 @@ do-install: -not -name "*.desktop" \ -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \; @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail - @${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \ - ${STAGEDIR}${PREFIX}/etc + @${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \ + ${STAGEDIR}${PREFIX}/etc/davmail.properties.sample @${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include Modified: head/mail/davmail/distinfo ============================================================================== --- head/mail/davmail/distinfo Mon Jun 30 17:52:23 2014 (r359892) +++ head/mail/davmail/distinfo Mon Jun 30 17:52:27 2014 (r359893) @@ -1,2 +1,2 @@ -SHA256 (davmail-src-4.4.1-2225.tgz) = 76c4957d45f8b968543407c1ea4512eecb5d63a57b84bbc679851bc15d939132 -SIZE (davmail-src-4.4.1-2225.tgz) = 22229902 +SHA256 (davmail-src-4.5.0-2292.tgz) = dfcdcd9cee39651bbaa3de750bc79277db09a13d1f19a5d970aaca3054782b57 +SIZE (davmail-src-4.5.0-2292.tgz) = 22669968 Modified: head/mail/davmail/files/davmail.in ============================================================================== --- head/mail/davmail/files/davmail.in Mon Jun 30 17:52:23 2014 (r359892) +++ head/mail/davmail/files/davmail.in Mon Jun 30 17:52:27 2014 (r359893) @@ -25,10 +25,23 @@ load_rc_config $name start_cmd="${name}_start" -procname="*/java" +davmail_procname() +{ + JAVAVM_DRYRUN=yes "%%PREFIX%%/bin/java" | \ + /usr/bin/awk -F= '{if ($1=="JAVAVM_PROG") print $2}' 2> /dev/null +} + +procname="$(davmail_procname)" pidfile="/var/run/davmail.pid" required_files=${davmail_config} +davmail_daemon() +{ + %%PREFIX%%/bin/java \ + -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \ + davmail.DavGateway "${davmail_config}" & echo -n $! > ${pidfile} +} + davmail_start() { if [ -z "$rc_fast" -a -n "$rc_pid" ]; then @@ -36,8 +49,7 @@ davmail_start() return 1 fi echo "Starting ${name}." - CLASSPATH="$BASE/lib/*" - ((java -cp "%%DATADIR%%/davmail.jar:$CLASSPATH" davmail.DavGateway ${davmail_config} & echo -n $! > ${pidfile}) 2>&1 | logger -p daemon.info -t davmail) & + { davmail_daemon 2>&1 | /usr/bin/logger -p daemon.info -t davmail; } & } run_rc_command "$1" Modified: head/mail/davmail/files/davmail.sh.in ============================================================================== --- head/mail/davmail/files/davmail.sh.in Mon Jun 30 17:52:23 2014 (r359892) +++ head/mail/davmail/files/davmail.sh.in Mon Jun 30 17:52:27 2014 (r359893) @@ -1,5 +1,5 @@ #!/bin/sh # $FreeBSD$ -BASE="%%DATADIR%%" -CLASSPATH="$BASE/lib/*" -exec java -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1 +exec %%PREFIX%%/bin/java \ + -cp "%%DATADIR%%/davmail.jar:%%DATADIR%%/lib/*" \ + davmail.DavGateway "$@" Added: head/mail/davmail/files/patch-src__etc__davmail.properties ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/davmail/files/patch-src__etc__davmail.properties Mon Jun 30 17:52:27 2014 (r359893) @@ -0,0 +1,11 @@ +--- src/etc/davmail.properties.orig 2014-06-03 18:17:10.000000000 -0400 ++++ src/etc/davmail.properties 2014-06-10 18:06:05.000000000 -0400 +@@ -58,7 +58,7 @@ + davmail.disableUpdateCheck=false + + # Send keepalive character during large folder and messages download +-davmail.enableKeepalive=false ++davmail.enableKeepAlive=false + # Message count limit on folder retrieval + davmail.folderSizeLimit=0 + # Default windows domain for NTLM and basic authentication Modified: head/mail/davmail/pkg-plist ============================================================================== --- head/mail/davmail/pkg-plist Mon Jun 30 17:52:23 2014 (r359892) +++ head/mail/davmail/pkg-plist Mon Jun 30 17:52:27 2014 (r359893) @@ -1,7 +1,5 @@ bin/davmail -@unexec if cmp -s %D/etc/davmail.properties.sample %D/etc/davmail.properties; then rm -f %D/etc/davmail.properties ; fi -etc/davmail.properties.sample -@exec if [ ! -f %D/etc/davmail.properties ] ; then cp -p %D/%F %B/davmail.properties; fi +@sample etc/davmail.properties.sample share/applications/davmail.desktop %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info.plist %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/activation-1.1.1.jar @@ -51,7 +49,7 @@ share/applications/davmail.desktop %%JAVASHAREDIR%%/davmail/lib/slf4j-log4j12-1.3.1.jar %%JAVASHAREDIR%%/davmail/lib/stax-api-1.0.1.jar %%JAVASHAREDIR%%/davmail/lib/stax2-api-3.1.1.jar -%%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.4.jar +%%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.5.jar %%JAVASHAREDIR%%/davmail/lib/woodstox-core-asl-4.1.2.jar %%JAVASHAREDIR%%/davmail/lib/xercesImpl-2.8.1.jar %%JAVASHAREDIR%%/davmail/version.txt