Date: Tue, 19 Feb 2008 15:34:05 GMT From: Derkjan de Haan <derkjan@haanjdj.homeip.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/120836: update to the net/unison port Message-ID: <200802191534.m1JFY5aL096624@freefall.freebsd.org> Resent-Message-ID: <200802191540.m1JFe7Wv097347@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120836 >Category: ports >Synopsis: update to the net/unison port >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Feb 19 15:40:07 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Derkjan de Haan >Release: FreeBSD 7.0-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD olivetti.badmuts.org 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #13: Mon Feb 18 21:02:23 CET 2008 root@olivetti.badmuts.org:/usr/obj/usr/src/sys/CUSTOM amd64 >Description: The unison file synchroniser apparently refuses to synchronise with machines running older versions. I have prepared an update to the port after consultation with the maintainer. >How-To-Repeat: >Fix: I have prepared a minimal diff. The patch file patch-pty.c is gone; it doesn't compile and the app seems to function fine without it. --- unison.diff begins here --- diff -ruN unison.org/Makefile unison/Makefile --- unison.org/Makefile 2007-12-12 00:02:44.000000000 +0100 +++ unison/Makefile 2008-02-19 10:30:25.000000000 +0100 @@ -6,8 +6,7 @@ # PORTNAME= unison -PORTVERSION= 2.13.16 -PORTREVISION= 1 +PORTVERSION= 2.27.57 CATEGORIES= net MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} diff -ruN unison.org/distinfo unison/distinfo --- unison.org/distinfo 2006-01-22 22:23:59.000000000 +0100 +++ unison/distinfo 2008-02-19 10:05:46.000000000 +0100 @@ -1,12 +1,12 @@ -MD5 (unison-2.13.16/unison-2.13.16.tar.gz) = a79bf5f4ebf2a1eaf15b1ac97f827374 -SHA256 (unison-2.13.16/unison-2.13.16.tar.gz) = 808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656 -SIZE (unison-2.13.16/unison-2.13.16.tar.gz) = 393266 -MD5 (unison-2.13.16/unison-2.13.16-manual.html) = 2b39e52ec3893a112b28b7b0a294d941 -SHA256 (unison-2.13.16/unison-2.13.16-manual.html) = 52fbb03925c44c46837d919a3baebceefc723c09458ec7e95d3993f2a98f0e20 -SIZE (unison-2.13.16/unison-2.13.16-manual.html) = 196162 -MD5 (unison-2.13.16/unison-2.13.16-manual.pdf) = e7684d401d6f5ee194b9e631cc022dd6 -SHA256 (unison-2.13.16/unison-2.13.16-manual.pdf) = 8f0851b5b34e2d85a6a02f5a374a7d743e5067a419fca689d14d278c951597df -SIZE (unison-2.13.16/unison-2.13.16-manual.pdf) = 436229 -MD5 (unison-2.13.16/unison-2.13.16-manual.ps) = 49cd0eef6cc98a1af7fed38313ccab42 -SHA256 (unison-2.13.16/unison-2.13.16-manual.ps) = 8355ca8b150ee950c43543e6f99439fb883da2032646c39c581dc5312aa6dc54 -SIZE (unison-2.13.16/unison-2.13.16-manual.ps) = 414346 +MD5 (unison-2.27.57/unison-2.27.57.tar.gz) = 4ba0a3e4bf4b4ad0c063f86391371f78 +SHA256 (unison-2.27.57/unison-2.27.57.tar.gz) = 49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae +SIZE (unison-2.27.57/unison-2.27.57.tar.gz) = 617253 +MD5 (unison-2.27.57/unison-2.27.57-manual.html) = 0d15059f968d847ce75bafea34fe1c30 +SHA256 (unison-2.27.57/unison-2.27.57-manual.html) = 6916be92391aba8c9176d26d9e22805dc5c6978c12299b37d41a035f15adcf92 +SIZE (unison-2.27.57/unison-2.27.57-manual.html) = 232117 +MD5 (unison-2.27.57/unison-2.27.57-manual.pdf) = 453659e6088617b850daefcbb37a98e7 +SHA256 (unison-2.27.57/unison-2.27.57-manual.pdf) = fabda0833b4c7c39080b00ad7e945872986246df243c728c586ed97e4110e308 +SIZE (unison-2.27.57/unison-2.27.57-manual.pdf) = 453871 +MD5 (unison-2.27.57/unison-2.27.57-manual.ps) = 20f961228a2c52c908ef16918720fdbd +SHA256 (unison-2.27.57/unison-2.27.57-manual.ps) = 7096e4b6010b21387bda66d8d3d331f91796097e8cc0e4f9385ccb60756c976a +SIZE (unison-2.27.57/unison-2.27.57-manual.ps) = 535584 diff -ruN unison.org/files/patch-pty.c unison/files/patch-pty.c --- unison.org/files/patch-pty.c 2005-08-31 13:37:57.000000000 +0200 +++ unison/files/patch-pty.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ ---- pty.c.orig Mon May 30 15:15:43 2005 -+++ pty.c Sat Aug 27 15:47:55 2005 -@@ -21,6 +21,7 @@ - #endif - - #ifdef __FreeBSD__ -+#include <sys/types.h> - #include <libutil.h> - #define HAS_OPENPTY 1 - #endif -@@ -40,9 +41,10 @@ - /* c_openpty: unit -> (int * Unix.file_descr) */ - CAMLprim value c_openpty() { - int master,slave; -+ value pair; - if (openpty(&master,&slave,NULL,NULL,NULL) < 0) - uerror("openpty", (value) 0); -- value pair = alloc_tuple(2); -+ pair = alloc_tuple(2); - Store_field(pair,0,Val_int(master)); - Store_field(pair,1,Val_int(slave)); - return pair; --- unison.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802191534.m1JFY5aL096624>