Attachment 126124 Details for Bug 169852 – file.diff

[patch] file.diff

file.diff (text/plain), 4.32 KB, created by Doug Barton on 2012-07-14 12:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Doug Barton

Created: 2012-07-14 12:20:01 UTC

Size: 4.32 KB

patch

obsolete

>diff -ur /usr/ports/mail/davmail/Makefile ./Makefile
>--- /usr/ports/mail/davmail/Makefile	2012-06-02 17:46:34.000000000 -0700
>+++ ./Makefile	2012-07-14 02:04:40.000000000 -0700
>@@ -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_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 @@
> 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 @@
> 		-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 \
>diff -ur /usr/ports/mail/davmail/distinfo ./distinfo
>--- /usr/ports/mail/davmail/distinfo	2012-02-23 14:05:53.000000000 -0800
>+++ ./distinfo	2012-07-14 00:41:38.000000000 -0700
>@@ -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
>diff -ur /usr/ports/mail/davmail/pkg-plist ./pkg-plist
>--- /usr/ports/mail/davmail/pkg-plist	2012-02-23 14:05:53.000000000 -0800
>+++ ./pkg-plist	2012-07-14 02:06:32.000000000 -0700
>@@ -20,6 +20,7 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> @dirrm %%JAVASHAREDIR%%/davmail/web/WEB-INF
> @dirrm %%JAVASHAREDIR%%/davmail/web
> @dirrm %%JAVASHAREDIR%%/davmail
>+@dirrmtry share/applications

Actions: View | Diff

Attachments on bug 169852: 126124