>Number:         31345
>Category:       pkg
>Synopsis:       update: net/unison
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 19 05:21:00 +0000 2005
>Originator:     Charlie Allom <charlie@rubberduck.com>
>Release:        NetBSD 2.0_STABLE
>Organization:
 hail eris
 http://rubberduck.com/
>Environment:
	
	
System: NetBSD lazy 2.0_STABLE NetBSD 2.0_STABLE (LAZY) #0: Fri Jul 15 06:41:35 CDT 2005 root@lazy:/usr/src/netbsd-2/sys/arch/i386/compile/LAZY i386
Architecture: i386
Machine: i386
>Description:
	please update unison
>How-To-Repeat:
	
>Fix:
I haven't tested this with X11...

diff -auNr unison.orig/Makefile unison/Makefile
--- unison.orig/Makefile	2005-08-03 07:42:13.000000000 -0500
+++ unison/Makefile	2005-09-19 00:15:56.000000000 -0500
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.27 2005/08/03 12:42:13 tonio Exp $
 
-DISTNAME=	unison-2.12.0
+DISTNAME=	unison-2.13.16
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
 
@@ -47,7 +47,6 @@
 		${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/CONTRIB ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/COPYING ${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/DEPENDENCIES.ps ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/NEWS ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/unison
diff -auNr unison.orig/PLIST unison/PLIST
--- unison.orig/PLIST	2001-10-31 16:59:40.000000000 -0600
+++ unison/PLIST	2005-09-19 00:14:53.000000000 -0500
@@ -3,7 +3,6 @@
 share/doc/unison/BUGS.txt
 share/doc/unison/CONTRIB
 share/doc/unison/COPYING
-share/doc/unison/DEPENDENCIES.ps
 share/doc/unison/INSTALL
 share/doc/unison/NEWS
 share/doc/unison/README
diff -auNr unison.orig/distinfo unison/distinfo
--- unison.orig/distinfo	2005-08-03 07:42:13.000000000 -0500
+++ unison/distinfo	2005-09-19 00:13:27.000000000 -0500
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/08/03 12:42:13 tonio Exp $
+$NetBSD$
 
-SHA1 (unison-2.12.0/unison-2.12.0.tar.gz) = 71cc8abedf8e9434285a610c3f4090ddc05cdfa9
-RMD160 (unison-2.12.0/unison-2.12.0.tar.gz) = 89f215787df9b8f1d0edb367559be5dce810c215
-Size (unison-2.12.0/unison-2.12.0.tar.gz) = 841717 bytes
-SHA1 (patch-aa) = ca1409cfd3ffe6ceb5a85c588e2d17e544133031
-SHA1 (patch-ab) = 2f796147ff5fa91ed6bf6b3fa3a760b6a153c8bd
-SHA1 (patch-ac) = f5e703b5b509b8976efbd7f435c3db1de714427e
+SHA1 (unison-2.13.16/unison-2.13.16.tar.gz) = 3f119f6a6e8bc5ade8933d4693075a768f0abf9a
+RMD160 (unison-2.13.16/unison-2.13.16.tar.gz) = 171d8bbc788be31227f6b09d1793a984d33bfdfc
+Size (unison-2.13.16/unison-2.13.16.tar.gz) = 393266 bytes
+SHA1 (patch-aa) = 24d65291ec4881030feb0377c2205167d09b50cb
+SHA1 (patch-ab) = cc61ad955ee97231639d5c2d95e2a2faad20311c
+SHA1 (patch-ac) = c260ef39a78651d4943e405c815798cdd2ed1ae9
diff -auNr unison.orig/patches/patch-aa unison/patches/patch-aa
--- unison.orig/patches/patch-aa	2005-08-03 07:42:13.000000000 -0500
+++ unison/patches/patch-aa	2005-09-19 00:13:07.000000000 -0500
@@ -1,40 +1,28 @@
-$NetBSD: patch-aa,v 1.5 2005/08/03 12:42:13 tonio Exp $
-
---- Makefile.orig	Sat Mar 12 16:17:58 2005
-+++ Makefile
-@@ -38,7 +38,7 @@ all:: strings.ml buildexecutable
- all:: INSTALL
- 
- INSTALL: $(NAME)$(EXEC_EXT)
--	./$(NAME) -doc install > INSTALL
-+##	./$(NAME) -doc install > INSTALL
- 
- ########################################################################
- ## Miscellaneous developer-only switches
-@@ -67,14 +67,12 @@ include Makefile.OCaml
+--- Makefile.orig	2005-09-19 00:10:33.000000000 -0500
++++ Makefile	2005-09-19 00:11:56.000000000 -0500
+@@ -68,15 +68,13 @@
  ######################################################################
  # 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)-$(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
-+#HF#	@# If we're running at Penn, install a public version too
-+#HF#	if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi
+-	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
  
  
  ######################################################################
-@@ -352,7 +350,7 @@ testmerge:
+@@ -355,7 +353,7 @@
  tags:
  	-$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
  
 -all:: TAGS
-+# all:: TAGS
++#all:: TAGS
  
  TAGS:
  	$(MAKE) tags
diff -auNr unison.orig/patches/patch-ab unison/patches/patch-ab
--- unison.orig/patches/patch-ab	2005-08-03 07:42:13.000000000 -0500
+++ unison/patches/patch-ab	2005-09-19 00:13:13.000000000 -0500
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2005/08/03 12:42:13 tonio Exp $
-
---- Makefile.OCaml.orig	2005-04-24 09:08:08.000000000 +0100
-+++ Makefile.OCaml
-@@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin)
+--- Makefile.OCaml.orig	2005-09-19 00:05:00.000000000 -0500
++++ Makefile.OCaml	2005-09-19 00:09:37.000000000 -0500
+@@ -29,6 +29,10 @@
  else
  ifeq ($(shell uname),OpenBSD)
    OSARCH=OpenBSD
@@ -13,34 +11,23 @@
  endif
  endif
  endif
-@@ -240,6 +244,9 @@ endif
- ifeq ($(OSARCH), osx)
-   X11LIBDIR=/usr/X11R6/lib
- endif
-+ifeq ($(OSARCH), NetBSD)
-+  X11LIBDIR=/usr/X11R6/lib
-+endif
- 
- # Developer-only directories
- ifeq ($(shell hostname), raptor.research.att.com)
-@@ -383,6 +390,9 @@ ifeq ($(STATIC), true)
-   ifeq ($(OSARCH), osx)
-     STATICLIBS+=-cclib -static
+@@ -110,6 +114,9 @@
+       ifneq ($(OSARCH),osx)
+         CLIBS+=-cclib -lutil
+       endif
++    ifeq ($(OSARCH), NetBSD)
++      STATICLIBS+=-cclib -static
++    endif
+     endif
+     buildexecutable::
+ 	@echo Building for Unix
+@@ -241,6 +248,9 @@
+     OCAMLDOT=true
    endif
-+  ifeq ($(OSARCH), NetBSD)
-+    STATICLIBS+=-cclib -static
-+  endif
-   CLIBS=$(STATICLIBS)
  endif
- 
-@@ -424,6 +434,10 @@ else
-   endif
- endif
- 
 +ifeq ($(OSARCH), NetBSD)
 +  OCAMLDOT=false
 +endif
-+
+ 
  # Rebuild dependencies (must be invoked manually)
  .PHONY: depend
- depend::
diff -auNr unison.orig/patches/patch-ac unison/patches/patch-ac
--- unison.orig/patches/patch-ac	2005-07-30 16:57:42.000000000 -0500
+++ unison/patches/patch-ac	2005-09-19 00:13:20.000000000 -0500
@@ -1,21 +1,11 @@
-$NetBSD: patch-ac,v 1.3 2005/07/30 21:57:42 rillig Exp $
-
---- pty.c.orig	Mon Sep  6 21:15:47 2004
-+++ pty.c	Sat Jul 30 23:55:49 2005
-@@ -18,6 +18,7 @@ CAMLprim value dumpFd(value fdVal) {
- }
- 
- #include <caml/fail.h>     // failwith
-+#include <errno.h>         // errno
- #include <sys/errno.h>     // errno
- #include <string.h>        // strerror
- #include <caml/alloc.h>    // alloc_tuple
-@@ -29,7 +30,7 @@ CAMLprim value dumpFd(value fdVal) {
- #ifdef __linux__
- #include <pty.h>           // openpty
+--- pty.c.orig	2005-09-19 00:03:04.000000000 -0500
++++ pty.c	2005-09-19 00:03:47.000000000 -0500
+@@ -15,7 +15,7 @@
+ #define HAS_OPENPTY 1
  #endif
+ 
 -#ifdef __APPLE__
 +#if defined(__APPLE__) || defined(__NetBSD__)
- #include <util.h>          // openpty
+ #include <util.h>
+ #define HAS_OPENPTY 1
  #endif
- 

>Unformatted: