Attachment 118187 Details for Bug 160374 – file.diff

[patch] file.diff

file.diff (text/plain), 2.35 KB, created by Gleb Popov on 2011-09-01 20:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Popov

Created: 2011-09-01 20:20:05 UTC

Size: 2.35 KB

patch

obsolete

>diff -ruN /usr/ports/devel/tortoisehg2/Makefile ./Makefile
>--- /usr/ports/devel/tortoisehg2/Makefile	2011-08-18 14:16:54.280103726 +0400
>+++ ./Makefile	2011-09-01 10:39:32.411438419 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tortoisehg
>-PORTVERSION=	2.1.2
>+PORTVERSION=	2.1.3
> CATEGORIES=	devel
> MASTER_SITES=	http://cdn.bitbucket.org/tortoisehg/targz/downloads/
> 
>@@ -37,6 +37,8 @@
> USE_PYDISTUTILS=yes
> INSTALLS_EGGINFO=yes
> 
>+SUB_FILES=	pkg-message
>+
> .include <bsd.port.options.mk>
> 
> .if defined(WITHOUT_NLS)
>@@ -73,7 +75,7 @@
> 	${INSTALL_DATA} ${WRKSRC}/contrib/tortoisehg.desktop ${PREFIX}/share/applications/
> 
> 	@${ECHO_MSG}
>-	@${CAT} pkg-message
>+	@${CAT} ${PKGMESSAGE}
> 	@${ECHO_MSG}
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/devel/tortoisehg2/distinfo ./distinfo
>--- /usr/ports/devel/tortoisehg2/distinfo	2011-08-18 14:16:54.321601179 +0400
>+++ ./distinfo	1970-01-01 03:00:00.000000000 +0300
>@@ -1,2 +0,0 @@
>-SHA256 (tortoisehg-2.1.2.tar.gz) = 33ab105e734cea16f5e58fffa9b867fee66176d1f2426774c63b85a4c733ee0a
>-SIZE (tortoisehg-2.1.2.tar.gz) = 9033204
>diff -ruN /usr/ports/devel/tortoisehg2/files/pkg-message.in ./files/pkg-message.in
>--- /usr/ports/devel/tortoisehg2/files/pkg-message.in	1970-01-01 03:00:00.000000000 +0300
>+++ ./files/pkg-message.in	2011-09-01 10:28:10.098483840 +0400
>@@ -0,0 +1,4 @@
>+It is recommended to %include TortoiseHG's mergetools.rc into your ~/.hgrc file,
>+especially if you use textproc/kdiff3 as your merge tool.
>+
>+%include %%PREFIX%%/share/tortoisehg/mergetools.rc
>diff -ruN /usr/ports/devel/tortoisehg2/pkg-message ./pkg-message
>--- /usr/ports/devel/tortoisehg2/pkg-message	2011-08-18 14:16:54.366602988 +0400
>+++ ./pkg-message	1970-01-01 03:00:00.000000000 +0300
>@@ -1,4 +0,0 @@
>-It is recommended to %include TortoiseHG's mergetools.rc into your ~/.hgrc file,
>-especially if you use textproc/kdiff3 as your merge tool.
>-
>-%include %%PREFIX%%/share/tortoisehg/mergetools.rc
>diff -ruN /usr/ports/devel/tortoisehg2/pkg-plist ./pkg-plist
>--- /usr/ports/devel/tortoisehg2/pkg-plist	2011-08-18 14:16:54.391601975 +0400
>+++ ./pkg-plist	2011-09-01 10:29:25.086529527 +0400
>@@ -571,7 +571,7 @@
> @dirrm share/pixmaps/tortoisehg/icons/svg
> @dirrm share/pixmaps/tortoisehg/icons
> @dirrm share/pixmaps/tortoisehg
>-@dirrm share/applications
>+@dirrmtry share/applications
> @dirrm %%DATADIR%%
> %%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
> %%NLS%%@dirrmtry share/locale/oc

Actions: View | Diff

Attachments on bug 160374: 118187