From owner-svn-ports-head@FreeBSD.ORG Thu Jul 19 07:25:16 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E609A106566B; Thu, 19 Jul 2012 07:25:16 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C6EF08FC16; Thu, 19 Jul 2012 07:25:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6J7PGP9055213; Thu, 19 Jul 2012 07:25:16 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6J7PGEr055208; Thu, 19 Jul 2012 07:25:16 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201207190725.q6J7PGEr055208@svn.freebsd.org> From: Doug Barton Date: Thu, 19 Jul 2012 07:25:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301142 - head/mail/davmail X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jul 2012 07:25:17 -0000 Author: dougb Date: Thu Jul 19 07:25:16 2012 New Revision: 301142 URL: http://svn.freebsd.org/changeset/ports/301142 Log: ** DavMail 3.9.9 released ** Bugfix release with major IMAP changes to improve sync performance, many Caldav enhancements and bugfixes and some documentation updates. For the port: Fix the davmail.desktop file contents and install location PR: ports/169852 Submitted by: me Approved by: maintainer (private mail) Modified: head/mail/davmail/Makefile head/mail/davmail/distinfo head/mail/davmail/pkg-plist Modified: head/mail/davmail/Makefile ============================================================================== --- head/mail/davmail/Makefile Thu Jul 19 06:27:16 2012 (r301141) +++ head/mail/davmail/Makefile Thu Jul 19 07:25:16 2012 (r301142) @@ -6,8 +6,7 @@ # PORTNAME= davmail -PORTVERSION= 3.9.8 -PORTREVISION= 1 +PORTVERSION= 3.9.9 CATEGORIES= mail java MASTER_SITES= SF/davmail/davmail/${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION}-${REVISION} @@ -24,7 +23,7 @@ USE_ANT= yes USE_JAVA= yes JAVA_VERSION= 1.6+ ALL_TARGET= release -REVISION= 1921 +REVISION= 1976 # port build number, same as on DISTNAME MAKE_ARGS= -Drevision=${REVISION} @@ -33,6 +32,11 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} USE_RC_SUBR= davmail SUB_FILES= davmail.sh +post-patch: + @${REINPLACE_CMD} -e 's#exec=\"davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \ + -e 's#icon=\"/usr/share/davmail/davmail.png\"#icon=\"${DATADIR}/davmail.png\"#' \ + ${WRKSRC}/build.xml + do-install: @cd ${WRKSRC}/dist && ${FIND} . -type d \ -exec ${MKDIR} ${DATADIR}/\{} \; @@ -44,10 +48,13 @@ do-install: -not -name "*.zip" \ -not -name "*.war" \ -not -name "*.rpm" \ + -not -name "*.desktop" \ -exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \; @${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh ${PREFIX}/bin/davmail @${INSTALL_DATA} ${FILESDIR}/davmail.properties.sample \ ${PREFIX}/etc + @${MKDIR} ${PREFIX}/share/applications + @${INSTALL_DATA} ${WRKSRC}/dist/davmail.desktop ${PREFIX}/share/applications/ post-install: @if [ ! -f ${PREFIX}/etc/davmail.properties ]; then \ Modified: head/mail/davmail/distinfo ============================================================================== --- head/mail/davmail/distinfo Thu Jul 19 06:27:16 2012 (r301141) +++ head/mail/davmail/distinfo Thu Jul 19 07:25:16 2012 (r301142) @@ -1,2 +1,2 @@ -SHA256 (davmail-src-3.9.8-1921.tgz) = c8009a6fa6b0fb6c99cff1b9069559b965bd58740ba8d3b5d1e4daea4baa50fb -SIZE (davmail-src-3.9.8-1921.tgz) = 19728852 +SHA256 (davmail-src-3.9.9-1976.tgz) = 1f94cdd1b3725d871bc0c5bc08946f8c0bf84c5185f23e5e1e65884d4069f5d2 +SIZE (davmail-src-3.9.9-1976.tgz) = 22143077 Modified: head/mail/davmail/pkg-plist ============================================================================== --- head/mail/davmail/pkg-plist Thu Jul 19 06:27:16 2012 (r301141) +++ head/mail/davmail/pkg-plist Thu Jul 19 07:25:16 2012 (r301142) @@ -20,6 +20,7 @@ etc/davmail.properties.sample %%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.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/stax-api-1.0.1.jar %%JAVASHAREDIR%%/davmail/lib/stax2-api-3.1.1.jar @@ -44,6 +45,7 @@ etc/davmail.properties.sample %%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/web.xml %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/MacOS/davmail @@ -57,7 +59,6 @@ etc/davmail.properties.sample %%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/junit-3.8.1.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 @@ -72,13 +73,11 @@ etc/davmail.properties.sample %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Resources/tray.icns %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info.plist %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/PkgInfo -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info-dock.plist -%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info-nodock.plist %%JAVASHAREDIR%%/davmail/version.txt %%JAVASHAREDIR%%/davmail/davmail.jar %%JAVASHAREDIR%%/davmail/davmail.png %%JAVASHAREDIR%%/davmail/davmail.sh -%%JAVASHAREDIR%%/davmail/davmail.desktop +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/Resources @@ -90,3 +89,4 @@ etc/davmail.properties.sample @dirrm %%JAVASHAREDIR%%/davmail/web/WEB-INF @dirrm %%JAVASHAREDIR%%/davmail/web @dirrm %%JAVASHAREDIR%%/davmail +@dirrmtry share/applications