5 files changed, 33 insertions, 22 deletions

diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index 5c6ce2f5d60c..3c1afd7c050b 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -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 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
 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 @@ BUILD_DEPENDS+=	ocamlc:${PORTSDIR}/lang/ocaml \
 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 @@ post-install:
 	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 --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo
index 567a7a8fbf3b..e5d94a9fc1e6 100644
--- a/net/unison-devel/distinfo
+++ b/net/unison-devel/distinfo
@@ -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 --git a/net/unison-devel/files/patch-Makefile b/net/unison-devel/files/patch-Makefile
deleted file mode 100644
index 121357a47a5b..000000000000
--- a/net/unison-devel/files/patch-Makefile
+++ /dev/null
@@ -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 --git a/net/unison-devel/files/unison.desktop.in b/net/unison-devel/files/unison.desktop.in
new file mode 100644
index 000000000000..a5c0a9c8dc31
--- /dev/null
+++ b/net/unison-devel/files/unison.desktop.in
@@ -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 --git a/net/unison-devel/pkg-plist b/net/unison-devel/pkg-plist
index 7fc5e3d995b4..b38bac713ffa 100644
--- a/net/unison-devel/pkg-plist
+++ b/net/unison-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/unison
+%%TEXT%%share/applications/unison.desktop
 %%TEXT%%bin/unison-text
 %%PORTDOCS%%%%DOCSDIR%%/BUGS.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS