Attachment 123307 Details for Bug 166634 – file.diff

[patch] file.diff

file.diff (text/plain), 4.66 KB, created by Guido Falsi on 2012-04-04 09:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2012-04-04 09:40:01 UTC

Size: 4.66 KB

patch

obsolete

>diff -ruN unison-devel.old/Makefile unison-devel/Makefile
>--- unison-devel.old/Makefile	2012-04-04 10:28:48.239407020 +0200
>+++ unison-devel/Makefile	2012-04-04 10:30:47.748342262 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	unison
>-PORTVERSION=	2.40.61
>+PORTVERSION=	2.45.4
> CATEGORIES=	net
> MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
> PKGNAMESUFFIX=	-devel
>@@ -17,11 +17,11 @@
> MAINTAINER=	mad@madpilot.net
> COMMENT=	A user-level file synchronization tool
> 
>-IGNORE=		No devel release available at present. \
>-		Install net/unison which is the latest stable version.
>+LICENSE=	GPLv3
> 
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
> USE_GMAKE=	yes
>+WANT_GNOME=	yes
> MAKE_ARGS=	CFLAGS=""
> CONFLICTS=	unison-[0-9]* unison-nox11-[0-9]*
> 
>@@ -48,6 +48,8 @@
> RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
> PATCH_DEPENDS+=	${BUILD_DEPENDS}
> CONFLICTS+=	ocaml-nox11*
>+USE_GNOME=	desktopfileutils
>+SUB_FILES+=	${PORTNAME}.desktop
> .else
> MAKE_ARGS+=	UISTYLE=text
> PLIST_SUB+=	TEXT="@comment "
>@@ -74,6 +76,14 @@
> 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
> 	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR}
> .endif
>+.if defined(WITH_GTK2)
>+	@${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin
>+	@${MKDIR} ${DESKTOPDIR}
>+	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${DESKTOPDIR}
>+	@-update-desktop-database > /dev/null
> 	@${CAT} ${PKGMESSAGE}
>+.else
>+	@${CAT} ${PKGMESSAGE}.nox11
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN unison-devel.old/distinfo unison-devel/distinfo
>--- unison-devel.old/distinfo	2012-04-04 10:28:48.239407020 +0200
>+++ unison-devel/distinfo	2012-04-04 10:30:47.748342262 +0200
>@@ -1,8 +1,8 @@
>-SHA256 (unison-2.40.61/unison-2.40.61.tar.gz) = e6114bf6a99d8bbe151250b7e28a74aa546d213f4f7f7914ca086a48b375277b
>-SIZE (unison-2.40.61/unison-2.40.61.tar.gz) = 2702722
>-SHA256 (unison-2.40.61/unison-2.40.61-manual.html) = b88c6c3a24c359e306e702672cc8da904e72c367861ef2a3dc3df07566948223
>-SIZE (unison-2.40.61/unison-2.40.61-manual.html) = 267159
>-SHA256 (unison-2.40.61/unison-2.40.61-manual.pdf) = 75ff6909abcf6f9ea0a981a8e3827218491fcdfb03c088c8dd1e43fcc9c687ef
>-SIZE (unison-2.40.61/unison-2.40.61-manual.pdf) = 507350
>-SHA256 (unison-2.40.61/unison-2.40.61-manual.ps) = 106dba47ebfe205f0454c0fdfdba484208449dace0223b37e1d1fe1eec7807fb
>-SIZE (unison-2.40.61/unison-2.40.61-manual.ps) = 598969
>+SHA256 (unison-2.45.4/unison-2.45.4.tar.gz) = f60a3327137129381b2028be43f84d79709ca5794d6394a6ca67a0f5f4d481c1
>+SIZE (unison-2.45.4/unison-2.45.4.tar.gz) = 2716641
>+SHA256 (unison-2.45.4/unison-2.45.4-manual.html) = 472598d57ef74972a6488f412ba29200f66c809c165b224aef0458708d00a93b
>+SIZE (unison-2.45.4/unison-2.45.4-manual.html) = 270543
>+SHA256 (unison-2.45.4/unison-2.45.4-manual.pdf) = f6488eae9fd1e5be405054d96df3aacd5b51c7ce64f615cfed7a43b516f0e839
>+SIZE (unison-2.45.4/unison-2.45.4-manual.pdf) = 513121
>+SHA256 (unison-2.45.4/unison-2.45.4-manual.ps) = a9a24bfed921f26bdff6a5569e87c9637981757a47f0c376001db048d01f8f62
>+SIZE (unison-2.45.4/unison-2.45.4-manual.ps) = 603771
>diff -ruN unison-devel.old/files/patch-Makefile unison-devel/files/patch-Makefile
>--- unison-devel.old/files/patch-Makefile	2012-04-04 10:28:48.238342671 +0200
>+++ unison-devel/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- Makefile.orig	2010-12-06 00:44:55.164242569 +0100
>-+++ Makefile	2010-12-06 00:45:26.227615139 +0100
>-@@ -60,7 +60,7 @@
>- # NAME, VERSION, and MAJORVERSION, automatically generated
>- -include Makefile.ProjectInfo
>- 
>--Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
>-+Makefile.ProjectInfo: mkProjectInfo $(wildcard ../.bzr/branch/last-revision)
>- 	./mkProjectInfo > $@
>- 
>- mkProjectInfo: mkProjectInfo.ml
>diff -ruN unison-devel.old/files/unison.desktop.in unison-devel/files/unison.desktop.in
>--- unison-devel.old/files/unison.desktop.in	1970-01-01 01:00:00.000000000 +0100
>+++ unison-devel/files/unison.desktop.in	2012-04-04 10:30:47.747371537 +0200
>@@ -0,0 +1,11 @@
>+[Desktop Entry]
>+Encoding=UTF-8
>+Name=Unison
>+GenericName=File-synchronization tool
>+Type=Application
>+Terminal=false
>+StartupNotify=true
>+Categories=GTK;Utility;
>+Exec=unison
>+Comment=Synchronize files (directories) over different disks (hosts)
>+Comment[ru]=Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð² (ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð¾Ð²) Ð½Ð° Ð½ÐµÑÐºÐ¾Ð»ÑÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ°Ñ (ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°Ñ)
>diff -ruN unison-devel.old/pkg-plist unison-devel/pkg-plist
>--- unison-devel.old/pkg-plist	2012-04-04 10:28:48.239407020 +0200
>+++ unison-devel/pkg-plist	2012-04-04 10:30:47.748342262 +0200
>@@ -1,4 +1,5 @@
> bin/unison
>+%%TEXT%%share/applications/unison.desktop
> %%TEXT%%bin/unison-text
> %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
> %%PORTDOCS%%%%DOCSDIR%%/NEWS

Actions: View | Diff

Attachments on bug 166634: 123307