Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  6 Dec 2010 01:40:03 +0100 (CET)
From:      Guido Falsi <mad@madpilot.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/152855: [PATCH] net/unison, net/unison-devel: update to respective latest version
Message-ID:  <20101206004003.2D49E1220@megatron.madpilot.net>
Resent-Message-ID: <201012060050.oB60oAsL090817@freefall.freebsd.org>

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

>Number:         152855
>Category:       ports
>Synopsis:       [PATCH] net/unison, net/unison-devel: update to respective latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 06 00:50:09 UTC 2010
>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:

Update net/unison to 2.32.52 and net/unison-devel to 2.40.61.

Mark both as MAKE_JOBS_UNSAFE, tested on dual core and quad core
systems and it did not build on both with make jobs.

added dir:

ports/net/unison-devel/files

added file:

ports/net/unison-devel/files/patch-Makefile

Note: patch relative to /usr/ports.

>How-To-Repeat:
>Fix:

diff -ruN ports.old/net/unison/Makefile ports/net/unison/Makefile
--- ports.old/net/unison/Makefile	2010-12-06 01:21:25.659117071 +0100
+++ ports/net/unison/Makefile	2010-12-05 17:50:23.029043000 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	unison
-PORTVERSION=	2.27.157
-PORTREVISION?=	2
+PORTVERSION=	2.32.52
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 DISTFILES=	${EXTRACT_ONLY} ${EXTRA_DOCS}
@@ -22,6 +21,8 @@
 MAKE_ARGS=	CFLAGS=""
 CONFLICTS=	unison-devel-[0-9]* unison-nox11-[0-9]*
 
+MAKE_JOBS_UNSAFE= yes
+
 .include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
diff -ruN ports.old/net/unison/distinfo ports/net/unison/distinfo
--- ports.old/net/unison/distinfo	2010-12-06 01:21:25.682008749 +0100
+++ ports/net/unison/distinfo	2010-12-03 17:22:52.190032000 +0100
@@ -1,12 +1,8 @@
-MD5 (unison-2.27.157/unison-2.27.157.tar.gz) = 4cc2a0332cb8c947adc04b9d4f2a83b0
-SHA256 (unison-2.27.157/unison-2.27.157.tar.gz) = ec04069e95249a5b4e212ab48ec03820b1e1f707fb4c607e7f98851e98735adc
-SIZE (unison-2.27.157/unison-2.27.157.tar.gz) = 674332
-MD5 (unison-2.27.157/unison-2.27.157-manual.html) = 5c1185a47a3217351e37dba55ea937c5
-SHA256 (unison-2.27.157/unison-2.27.157-manual.html) = 58f514c4c0818ebed6b2afa8e3dbf84871e240ddb6819d91e1b7c93be36c3f50
-SIZE (unison-2.27.157/unison-2.27.157-manual.html) = 235599
-MD5 (unison-2.27.157/unison-2.27.157-manual.pdf) = d4a780abb68af73177f5d59f759e4c89
-SHA256 (unison-2.27.157/unison-2.27.157-manual.pdf) = 6af0f5242a08056d7dbcfce171083a577ed9748d13d1f9bc5d7050f224ec0162
-SIZE (unison-2.27.157/unison-2.27.157-manual.pdf) = 453255
-MD5 (unison-2.27.157/unison-2.27.157-manual.ps) = 6672037b889e62b392eb269fb7f45fd6
-SHA256 (unison-2.27.157/unison-2.27.157-manual.ps) = 31d2328ccc7006212e90e7eece45942cd32efffde9b3eebc0075f98f0147e5c0
-SIZE (unison-2.27.157/unison-2.27.157-manual.ps) = 551643
+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
diff -ruN ports.old/net/unison-devel/Makefile ports/net/unison-devel/Makefile
--- ports.old/net/unison-devel/Makefile	2010-12-06 01:21:25.685029163 +0100
+++ ports/net/unison-devel/Makefile	2010-12-05 17:50:10.684477000 +0100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	unison
-PORTVERSION=	2.32.52
-PORTREVISION=	2
+PORTVERSION=	2.40.61
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
 PKGNAMESUFFIX=	-devel
@@ -23,7 +22,7 @@
 MAKE_ARGS=	CFLAGS=""
 CONFLICTS=	unison-[0-9]* unison-nox11-[0-9]*
 
-MAKE_JOBS_SAFE=	yes
+MAKE_JOBS_UNSAFE= yes
 ALL_TARGET=	unison all
 
 .include <bsd.port.pre.mk>
diff -ruN ports.old/net/unison-devel/distinfo ports/net/unison-devel/distinfo
--- ports.old/net/unison-devel/distinfo	2010-12-06 01:21:25.685029163 +0100
+++ ports/net/unison-devel/distinfo	2010-12-05 17:47:55.517830000 +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 ports.old/net/unison-devel/files/patch-Makefile ports/net/unison-devel/files/patch-Makefile
--- ports.old/net/unison-devel/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ ports/net/unison-devel/files/patch-Makefile	2010-12-06 01:13:04.749901000 +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?20101206004003.2D49E1220>