Date: Sat, 27 Aug 2005 16:48:43 +0300 (IDT) From: Dan Pelleg <daniel+unison@pelleg.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85350: Maintainer update: net/unison to 2.13.16 Message-ID: <20050827134843.937F1240@muky.here> Resent-Message-ID: <200508271350.j7RDo49Q067477@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85350 >Category: ports >Synopsis: Maintainer update: net/unison to 2.13.16 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 27 13:50:04 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Dan Pelleg >Release: FreeBSD 5-4-STABLE i386 >Organization: >Environment: System: FreeBSD l 5.4-STABLE >Description: Port updated to latest version. Thanks to NAKAMURA Takeshi, who did all the work. >How-To-Repeat: >Fix: diff -ruN unison-2.10.2/Makefile unison-2.13.16/Makefile --- unison-2.10.2/Makefile Tue Aug 16 06:24:58 2005 +++ unison-2.13.16/Makefile Tue Aug 16 06:31:41 2005 @@ -6,9 +6,9 @@ # PORTNAME= unison -PORTVERSION= 2.10.2 +PORTVERSION= 2.13.16 CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/ +MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/ DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz diff -ruN unison-2.10.2/distinfo unison-2.13.16/distinfo --- unison-2.10.2/distinfo Tue Aug 16 06:24:58 2005 +++ unison-2.13.16/distinfo Tue Aug 16 06:34:55 2005 @@ -1,8 +1,8 @@ -MD5 (unison-2.10.2/unison-2.10.2.tar.gz) = a93cf03d4221ab6bab8b758b0325a9d5 -SIZE (unison-2.10.2/unison-2.10.2.tar.gz) = 458032 -MD5 (unison-2.10.2/unison-2.10.2-manual.html) = 46cac2b5b84e821d39cc5a100dd97e7a -SIZE (unison-2.10.2/unison-2.10.2-manual.html) = 190911 -MD5 (unison-2.10.2/unison-2.10.2-manual.pdf) = 7e6b018d758b786d7cf5752413c08168 -SIZE (unison-2.10.2/unison-2.10.2-manual.pdf) = 354402 -MD5 (unison-2.10.2/unison-2.10.2-manual.ps) = 89cc36cf06d688f163a924fc8c1a47f9 -SIZE (unison-2.10.2/unison-2.10.2-manual.ps) = 490966 +MD5 (unison-2.13.16/unison-2.13.16.tar.gz) = a79bf5f4ebf2a1eaf15b1ac97f827374 +SIZE (unison-2.13.16/unison-2.13.16.tar.gz) = 393266 +MD5 (unison-2.13.16/unison-2.13.16-manual.html) = 2b39e52ec3893a112b28b7b0a294d941 +SIZE (unison-2.13.16/unison-2.13.16-manual.html) = 196162 +MD5 (unison-2.13.16/unison-2.13.16-manual.pdf) = e7684d401d6f5ee194b9e631cc022dd6 +SIZE (unison-2.13.16/unison-2.13.16-manual.pdf) = 436229 +MD5 (unison-2.13.16/unison-2.13.16-manual.ps) = 49cd0eef6cc98a1af7fed38313ccab42 +SIZE (unison-2.13.16/unison-2.13.16-manual.ps) = 414346 diff -ruN unison-2.10.2/files/patch-aa unison-2.13.16/files/patch-aa --- unison-2.10.2/files/patch-aa Tue Aug 16 06:24:58 2005 +++ unison-2.13.16/files/patch-aa Sat Aug 27 15:53:36 2005 @@ -1,27 +1,31 @@ ---- Makefile.orig Tue Aug 28 16:27:01 2001 -+++ Makefile Wed Aug 29 09:15:09 2001 -@@ -62,12 +62,12 @@ +--- Makefile.orig Sat Aug 27 15:49:56 2005 ++++ Makefile Sat Aug 27 15:51:55 2005 +@@ -68,15 +68,15 @@ ###################################################################### # Installation -INSTALLDIR = $(HOME)/bin/ +INSTALLDIR = ${PREFIX}/bin/ - install: $(NAME)$(EXEC_EXT) + # This has two names because on OSX the file INSTALL shadows the target 'install'! + install: doinstall + + doinstall: $(NAME)$(EXEC_EXT) - -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) +- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) +- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) +# -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) - cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) -- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) -+# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) - @# If we're running at Penn, install a public version too - if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi ++ ${BSD_INSTALL_PROGRAM} $(NAME)$(EXEC_EXT) $(INSTALLDIR) ++# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) + + + ###################################################################### +@@ -353,7 +353,7 @@ + .PHONY: tags -@@ -231,7 +231,7 @@ tags: - -$(ETAGS) *.ml *.mli *.txt +- -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt ++ -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt --all:: TAGS -+#all:: TAGS + all:: TAGS - TAGS: - $(MAKE) tags diff -ruN unison-2.10.2/files/patch-ab unison-2.13.16/files/patch-ab --- unison-2.10.2/files/patch-ab Thu Jan 1 02:00:00 1970 +++ unison-2.13.16/files/patch-ab Sat Aug 27 15:48:54 2005 @@ -0,0 +1,22 @@ +--- 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; diff -ruN unison-2.10.2/files/patch-pty.c unison-2.13.16/files/patch-pty.c --- unison-2.10.2/files/patch-pty.c Tue Aug 16 06:24:58 2005 +++ unison-2.13.16/files/patch-pty.c Thu Jan 1 02:00:00 1970 @@ -1,13 +0,0 @@ ---- pty.c.orig Sun Jan 23 19:55:28 2005 -+++ pty.c Sun Jan 23 19:56:28 2005 -@@ -32,6 +32,10 @@ - #ifdef __APPLE__ - #include <util.h> // openpty - #endif -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <libutil.h> -+#endif - - /* c_openpty: unit -> (int * Unix.file_descr) */ - CAMLprim value c_openpty() { diff -ruN unison-2.10.2/pkg-message unison-2.13.16/pkg-message --- unison-2.10.2/pkg-message Tue Aug 16 06:24:58 2005 +++ unison-2.13.16/pkg-message Sat Aug 27 16:03:57 2005 @@ -1,7 +1,7 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ATTENTION: -1) Unison archive format has changed since 2.9.20. The old archive +1) Unison archive format has changed since 2.10.2. The old archive won't be deleted automatically in case you want to downgrade it. 2) Merge functionality has seriously changed. Check the manual. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050827134843.937F1240>