From mad@madpilot.net  Wed Apr  4 08:37:39 2012
Return-Path: <mad@madpilot.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1FB7E106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  4 Apr 2012 08:37:39 +0000 (UTC)
	(envelope-from mad@madpilot.net)
Received: from megatron.madpilot.net (megatron.madpilot.net [88.149.173.206])
	by mx1.freebsd.org (Postfix) with ESMTP id 4DBB38FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  4 Apr 2012 08:37:38 +0000 (UTC)
Received: from megatron.madpilot.net (localhost [127.0.0.1])
	by megatron.madpilot.net (Postfix) with ESMTP id 3VN0ss2ZRqz1n8
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  4 Apr 2012 10:37:37 +0200 (CEST)
Received: from megatron.madpilot.net ([127.0.0.1])
	by megatron.madpilot.net (megatron.madpilot.net [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id gkTixBoKIkGI for <FreeBSD-gnats-submit@freebsd.org>;
	Wed,  4 Apr 2012 10:37:31 +0200 (CEST)
Received: by megatron.madpilot.net (Postfix, from userid 1000)
	id 3VN0sl2X2yz1n7; Wed,  4 Apr 2012 10:37:31 +0200 (CEST)
Message-Id: <3VN0sl2X2yz1n7@megatron.madpilot.net>
Date: Wed,  4 Apr 2012 10:37:31 +0200 (CEST)
From: Guido Falsi <mad@madpilot.net>
Reply-To: Guido Falsi <mad@madpilot.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] net/unison-devel: update to 2.45.4 and enable again.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166634
>Category:       ports
>Synopsis:       [maintainer-update] net/unison-devel: update to 2.45.4 and enable again.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 04 08:40:01 UTC 2012
>Closed-Date:    Thu Apr 12 21:11:39 UTC 2012
>Last-Modified:  Thu Apr 12 21:20:07 UTC 2012
>Originator:     Guido Falsi
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 9.0-STABLE FreeBSD 9.0-STABLE #4 r233791: Mon Apr 2 21:14:27 CEST 2012 root@megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64

>Description:

Unignore and update to latest beta, 2.45.4

removed file:
files/patch-Makefile

added file:
files/unison.desktop.in

>How-To-Repeat:
>Fix:

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
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Apr 4 08:40:36 UTC 2012 
Responsible-Changed-Why:  
crees@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166634 
Responsible-Changed-From-To: crees->madpilot 
Responsible-Changed-By: crees 
Responsible-Changed-When: Thu Apr 12 13:12:45 UTC 2012 
Responsible-Changed-Why:  
You are approved to commit these two. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166634 
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Thu Apr 12 21:11:38 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166634 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166634: commit references a PR
Date: Thu, 12 Apr 2012 21:11:20 +0000 (UTC)

 madpilot    2012-04-12 21:11:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/unison-devel     Makefile distinfo pkg-plist 
   Added files:
     net/unison-devel/files unison.desktop.in 
   Removed files:
     net/unison-devel/files patch-Makefile 
   Log:
   Unignore and update to latest beta, 2.45.4.
   
   PR:             166634
   Approved by:    crees (mentor)
   
   Revision  Changes    Path
   1.30      +13 -3     ports/net/unison-devel/Makefile
   1.15      +8 -8      ports/net/unison-devel/distinfo
   1.2       +0 -11     ports/net/unison-devel/files/patch-Makefile (dead)
   1.1       +11 -0     ports/net/unison-devel/files/unison.desktop.in (new)
   1.6       +1 -0      ports/net/unison-devel/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
