From owner-svn-ports-all@FreeBSD.ORG Fri Jun 6 18:01:11 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 A5ACFF75; Fri, 6 Jun 2014 18:01:11 +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 76CBC2D7B; Fri, 6 Jun 2014 18:01:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s56I1Bi8065114; Fri, 6 Jun 2014 18:01:11 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s56I1A4G065104; Fri, 6 Jun 2014 18:01:10 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201406061801.s56I1A4G065104@svn.freebsd.org> From: Matthias Andree Date: Fri, 6 Jun 2014 18:01:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356827 - 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: Fri, 06 Jun 2014 18:01:11 -0000 Author: mandree Date: Fri Jun 6 18:01:10 2014 New Revision: 356827 URL: http://svnweb.freebsd.org/changeset/ports/356827 QAT: https://qat.redports.org/buildarchive/r356827/ Log: - update to 4.4.1; see release notes: http://sourceforge.net/projects/davmail/files/davmail/4.4.1/releasenotes.txt/view - various general port modernizations: - stagify - USE_DOS2UNIX -> USES=dos2unix - fix procname in rc.d/davmail so 'service davmail stop' works - log to syslog in rc.d/davmail instead of /var/log/davmail-error.log (the latter grows forever unless one manually adds an entry to newsyslog, and even then, rotation of the shell redirection file becomes a problem) - in both rc.d/davmail and bin/davmail, use "$BASE/lib/*" for CLASSPATH instead of iterating over all the jar files separately adding all of them to CLASSPATH and passing that on the command line (makes for a long command line). [see http://download.java.net/jdk7u6/docs/technotes/tools/solaris/classpath.html] - in bin/davmail, exec java to avoid an extra shell process lying around - remove swt PR: 187796 Submitted by: John Hein Approved by: john.c.prather@gmail.com (maintainer) 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 Fri Jun 6 17:52:34 2014 (r356826) +++ head/mail/davmail/Makefile Fri Jun 6 18:01:10 2014 (r356827) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= davmail -PORTVERSION= 4.2.1 +PORTVERSION= 4.4.1 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -13,15 +13,13 @@ COMMENT= POP/IMAP/SMTP/Caldav/Carddav/LD LICENSE= GPLv2 -RUN_DEPENDS= ${JAVALIBDIR}/swt-devel.jar:${PORTSDIR}/x11-toolkits/swt-devel - USES= dos2unix DOS2UNIX_FILES= build.xml USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ ALL_TARGET= release -REVISION= 2089 +REVISION= 2225 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} MAKE_ENV+= "ANT_OPTS=-Dfile.encoding=UTF-8" @@ -31,7 +29,6 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_RC_SUBR= davmail SUB_FILES= davmail.sh -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's#exec=\"davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \ -e 's#icon=\"/usr/share/davmail/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \ @@ -39,7 +36,7 @@ post-patch: do-install: @cd ${WRKSRC}/dist && ${FIND} . -type d \ - -exec ${MKDIR} ${DATADIR}/\{} \; + -exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \; @cd ${WRKSRC}/dist && ${FIND} . -type f \ -not -name "*.deb" \ -not -name "*.tgz" \ @@ -49,16 +46,10 @@ do-install: -not -name "*.war" \ -not -name "*.rpm" \ -not -name "*.desktop" \ - -exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \; - @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${PREFIX}/bin/davmail + -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \; + @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${STAGEDIR}${PREFIX}/bin/davmail @${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \ - ${PREFIX}/etc - @${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${PREFIX}/share/applications/ - -post-install: - @if [ ! -f ${PREFIX}/etc/davmail.properties ]; then \ - ${CP} -p ${PREFIX}/etc/davmail.properties.sample \ - ${PREFIX}/etc/davmail.properties ; \ - fi + ${STAGEDIR}${PREFIX}/etc + @${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include Modified: head/mail/davmail/distinfo ============================================================================== --- head/mail/davmail/distinfo Fri Jun 6 17:52:34 2014 (r356826) +++ head/mail/davmail/distinfo Fri Jun 6 18:01:10 2014 (r356827) @@ -1,2 +1,2 @@ -SHA256 (davmail-src-4.2.1-2089.tgz) = 03d2a9d19723c03e253218f6de404580664741e9eb0afb7240703241b619af6a -SIZE (davmail-src-4.2.1-2089.tgz) = 22503303 +SHA256 (davmail-src-4.4.1-2225.tgz) = 76c4957d45f8b968543407c1ea4512eecb5d63a57b84bbc679851bc15d939132 +SIZE (davmail-src-4.4.1-2225.tgz) = 22229902 Modified: head/mail/davmail/files/davmail.in ============================================================================== --- head/mail/davmail/files/davmail.in Fri Jun 6 17:52:34 2014 (r356826) +++ head/mail/davmail/files/davmail.in Fri Jun 6 18:01:10 2014 (r356827) @@ -25,7 +25,7 @@ load_rc_config $name start_cmd="${name}_start" -procname="java" +procname="*/java" pidfile="/var/run/davmail.pid" required_files=${davmail_config} @@ -36,9 +36,8 @@ davmail_start() return 1 fi echo "Starting ${name}." - for i in %%DATADIR%%/lib/*; do export CLASSPATH=$CLASSPATH:$i; done - java -cp %%DATADIR%%/davmail.jar:$CLASSPATH:%%JAVAJARDIR%%/swt.jar davmail.DavGateway ${davmail_config} >> /var/log/davmail-error.log 2>&1 & - echo -n $! > ${pidfile} + CLASSPATH="$BASE/lib/*" + ((java -cp "%%DATADIR%%/davmail.jar:$CLASSPATH" davmail.DavGateway ${davmail_config} & echo -n $! > ${pidfile}) 2>&1 | 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 Fri Jun 6 17:52:34 2014 (r356826) +++ head/mail/davmail/files/davmail.sh.in Fri Jun 6 18:01:10 2014 (r356827) @@ -1,5 +1,5 @@ #!/bin/sh # $FreeBSD$ BASE="%%DATADIR%%" -for i in $BASE/lib/*; do export CLASSPATH=$CLASSPATH:$i; done -java -cp $BASE/davmail.jar:$CLASSPATH:%%JAVASHAREDIR%%/classes/swt.jar davmail.DavGateway $1 +CLASSPATH="$BASE/lib/*" +exec java -cp $BASE/davmail.jar:$CLASSPATH davmail.DavGateway $1 Modified: head/mail/davmail/pkg-plist ============================================================================== --- head/mail/davmail/pkg-plist Fri Jun 6 17:52:34 2014 (r356826) +++ head/mail/davmail/pkg-plist Fri Jun 6 18:01:10 2014 (r356827) @@ -2,84 +2,84 @@ 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 -%%JAVASHAREDIR%%/davmail/lib/slf4j-log4j12-1.3.1.jar -%%JAVASHAREDIR%%/davmail/lib/log4j-1.2.16.jar -%%JAVASHAREDIR%%/davmail/lib/commons-collections-3.1.jar -%%JAVASHAREDIR%%/davmail/lib/junit-3.8.1.jar +share/applications/davmail.desktop +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info.plist +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/activation-1.1.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-codec-1.3.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-collections-3.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-httpclient-3.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-logging-1.0.4.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/davmail.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/htmlcleaner-2.2.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jackrabbit-webdav-2.4.3.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcharset-1.3.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jdom-1.0.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl-0.2.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-log4j12-1.3.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/stax-api-1.0.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/stax2-api-3.1.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/woodstox-core-asl-4.1.2.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/xercesImpl-2.8.1.jar +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/libgrowl.jnilib +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj/Localizable.strings +%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns +%%JAVASHAREDIR%%/davmail/davmail.jar +%%JAVASHAREDIR%%/davmail/davmail.png +%%JAVASHAREDIR%%/davmail/davmail.sh +%%JAVASHAREDIR%%/davmail/lib/activation-1.1.1.jar %%JAVASHAREDIR%%/davmail/lib/commons-codec-1.3.jar -%%JAVASHAREDIR%%/davmail/lib/libgrowl-0.2.jar -%%JAVASHAREDIR%%/davmail/lib/mail-1.4.3.jar +%%JAVASHAREDIR%%/davmail/lib/commons-collections-3.1.jar +%%JAVASHAREDIR%%/davmail/lib/commons-httpclient-3.1.jar %%JAVASHAREDIR%%/davmail/lib/commons-logging-1.0.4.jar -%%JAVASHAREDIR%%/davmail/lib/activation-1.1.1.jar -%%JAVASHAREDIR%%/davmail/lib/libgrowl.jnilib +%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.2.jar +%%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-2.4.3.jar %%JAVASHAREDIR%%/davmail/lib/jcharset-1.3.jar %%JAVASHAREDIR%%/davmail/lib/jcifs-1.3.14.jar %%JAVASHAREDIR%%/davmail/lib/jdom-1.0.jar +%%JAVASHAREDIR%%/davmail/lib/junit-3.8.1.jar +%%JAVASHAREDIR%%/davmail/lib/libgrowl-0.2.jar +%%JAVASHAREDIR%%/davmail/lib/libgrowl.jnilib +%%JAVASHAREDIR%%/davmail/lib/log4j-1.2.16.jar +%%JAVASHAREDIR%%/davmail/lib/mail-1.4.3.jar %%JAVASHAREDIR%%/davmail/lib/slf4j-api-1.3.1.jar -%%JAVASHAREDIR%%/davmail/lib/xercesImpl-2.8.1.jar -%%JAVASHAREDIR%%/davmail/lib/commons-httpclient-3.1.jar -%%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.4.jar -%%JAVASHAREDIR%%/davmail/lib/woodstox-core-asl-4.1.2.jar +%%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/DavMail.app/Contents/Resources/Java/htmlcleaner-2.2.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jackrabbit-webdav-2.4.3.jar -%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.2.jar -%%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-2.4.3.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.2.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jackrabbit-webdav-2.4.3.jar +%%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.4.jar +%%JAVASHAREDIR%%/davmail/lib/woodstox-core-asl-4.1.2.jar +%%JAVASHAREDIR%%/davmail/lib/xercesImpl-2.8.1.jar +%%JAVASHAREDIR%%/davmail/version.txt %%JAVASHAREDIR%%/davmail/web/WEB-INF/classes/davmail.properties -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/davmail.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/libgrowl-0.2.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/mail-1.4.3.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/activation-1.1.1.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-codec-1.3.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-collections-3.1.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-httpclient-3.1.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-logging-1.0.4.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/davmail.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.2.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jackrabbit-webdav-2.4.3.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcharset-1.3.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/junit-3.8.1.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcifs-1.3.14.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jdom-1.0.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/junit-3.8.1.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/log4j-1.2.16.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/mail-1.4.3.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-api-1.3.1.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-log4j12-1.3.1.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/xercesImpl-2.8.1.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-collections-3.1.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-httpclient-3.1.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcifs-1.3.14.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-codec-1.3.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-logging-1.0.4.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax-api-1.0.1.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax2-api-3.1.1.jar -%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/winrun4j-0.4.4.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/woodstox-core-asl-4.1.2.jar +%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/xercesImpl-2.8.1.jar %%JAVASHAREDIR%%/davmail/web/WEB-INF/web.xml -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/activation-1.1.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-codec-1.3.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-collections-3.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-httpclient-3.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/commons-logging-1.0.4.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jcharset-1.3.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jcifs-1.3.14.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/jdom-1.0.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/libgrowl-0.2.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/libgrowl.jnilib -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/log4j-1.2.16.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/mail-1.4.3.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/slf4j-api-1.3.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/slf4j-log4j12-1.3.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/xercesImpl-2.8.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/davmail.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/stax-api-1.0.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/stax2-api-3.1.1.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java/woodstox-core-asl-4.1.2.jar -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info.plist -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo -%%JAVASHAREDIR%%/davmail/version.txt -%%JAVASHAREDIR%%/davmail/davmail.jar -%%JAVASHAREDIR%%/davmail/davmail.png -%%JAVASHAREDIR%%/davmail/davmail.sh -share/applications/davmail.desktop @dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS -@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/Java +@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java +@dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/en.lproj @dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources @dirrm %%JAVASHAREDIR%%/davmail/DavMail.app/Contents @dirrm %%JAVASHAREDIR%%/davmail/DavMail.app