Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Feb 2011 17:07:05 +0100 (CET)
From:      Guido Falsi <mad@madpilot.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/154802: [maintainer-update]: net/unison upgrade to version 2.40.61
Message-ID:  <20110215160705.D41501FB5@megatron.madpilot.net>
Resent-Message-ID: <201102151610.p1FGA8eW099178@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         154802
>Category:       ports
>Synopsis:       [maintainer-update]: net/unison upgrade to version 2.40.61
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 15 16:10:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Guido Falsi
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
none
>Environment:
System: FreeBSD megatron.madpilot.net 8.1-STABLE FreeBSD 8.1-STABLE #23: Sun Nov 14 14:54:14 CET 2010 root@megatron.madpilot.net:/usr/obj/usr/src/sys/MEGATRON amd64

>Description:

Version 2.40.61 has been silently promoted to stable from beta
sometime in January. There is a Makefile issue which is solved by
a patch in the -devel port.

I'm adding a patch to update the stable port to this version to
reflect this situation.

Another PR will follow to mark the -devel port as forbidden for
now, since there is no newer beta version at present.

Added file:

files/patch-Makefile

>How-To-Repeat:
>Fix:

diff -ruN unison.old/Makefile unison/Makefile
--- unison.old/Makefile	2011-02-15 16:51:06.067577888 +0100
+++ unison/Makefile	2011-02-15 16:51:28.140497478 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	unison
-PORTVERSION=	2.32.52
-PORTREVISION=	1
+PORTVERSION=	2.40.61
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -24,6 +23,7 @@
 CONFLICTS=	unison-devel-[0-9]* unison-nox11-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
+ALL_TARGET=	unison all
 
 LICENCE=	GPLv3
 
diff -ruN unison.old/distinfo unison/distinfo
--- unison.old/distinfo	2011-02-15 16:51:06.066579999 +0100
+++ unison/distinfo	2011-02-15 16:51:28.141497322 +0100
@@ -1,8 +1,8 @@
-SHA256 (unison-2.32.52/unison-2.32.52.tar.gz) = 1542e5d4ad03e928260e061a8ff9d5e0bca3282481ed8bec5552de17a0270485
-SIZE (unison-2.32.52/unison-2.32.52.tar.gz) = 697866
-SHA256 (unison-2.32.52/unison-2.32.52-manual.html) = c898239d8139d8405b96d87e12c06c7f41fd3629cac0c83bc338aad50fed7f81
-SIZE (unison-2.32.52/unison-2.32.52-manual.html) = 249124
-SHA256 (unison-2.32.52/unison-2.32.52-manual.pdf) = b3fee7ac99907f3b1ed02c6ac901678e82ea1eed936acb45e9735b95d55cc4eb
-SIZE (unison-2.32.52/unison-2.32.52-manual.pdf) = 478388
-SHA256 (unison-2.32.52/unison-2.32.52-manual.ps) = 779924e2a89ab2592c512e808cfcdf302c1a691fb1f2a6a02cc415fdc87770e5
-SIZE (unison-2.32.52/unison-2.32.52-manual.ps) = 572128
+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
diff -ruN unison.old/files/patch-Makefile unison/files/patch-Makefile
--- unison.old/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ unison/files/patch-Makefile	2011-02-15 16:51:28.139497355 +0100
@@ -0,0 +1,11 @@
+--- 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
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110215160705.D41501FB5>