4 files changed, 21 insertions, 18 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 383c70fc889..818f6037310 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:26 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/03 12:42:13 tonio Exp $
 
-DISTNAME=	unison-2.10.2
+DISTNAME=	unison-2.12.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/
 
diff --git a/net/unison/distinfo b/net/unison/distinfo
index 4cb2c01fa3f..3e422f0d244 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2005/07/30 21:57:42 rillig Exp $
+$NetBSD: distinfo,v 1.11 2005/08/03 12:42:13 tonio Exp $
 
-SHA1 (unison-2.10.2/unison-2.10.2.tar.gz) = 1d378292d944981fb41504c8cea92cd3e1913c49
-RMD160 (unison-2.10.2/unison-2.10.2.tar.gz) = 593d71c39b49f30e82df58f62891d6d5540c2af7
-Size (unison-2.10.2/unison-2.10.2.tar.gz) = 458032 bytes
-SHA1 (patch-aa) = b6974657b864a75262562053185a7fd9b8df6b73
-SHA1 (patch-ab) = 0fe6bbb5f39f535c4b6a956978e75822528d7bdf
+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
diff --git a/net/unison/patches/patch-aa b/net/unison/patches/patch-aa
index b360df2da36..564fcfb66ec 100644
--- a/net/unison/patches/patch-aa
+++ b/net/unison/patches/patch-aa
@@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2005/04/24 12:48:43 adrianp Exp $
+$NetBSD: patch-aa,v 1.5 2005/08/03 12:42:13 tonio Exp $
 
---- Makefile.orig	Mon Sep  6 20:15:46 2004
+--- Makefile.orig	Sat Mar 12 16:17:58 2005
 +++ Makefile
-@@ -55,19 +55,17 @@ all:: strings.ml buildexecutable
+@@ -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
  ######################################################################
  # Installation
  
@@ -26,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2005/04/24 12:48:43 adrianp Exp $
  
  
  ######################################################################
-@@ -345,7 +343,7 @@ testmerge:
+@@ -352,7 +350,7 @@ testmerge:
  tags:
  	-$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
  
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
index fc7b4f9238b..5f22e6a3dfa 100644
--- a/net/unison/patches/patch-ab
+++ b/net/unison/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/04/24 12:48:43 adrianp Exp $
+$NetBSD: patch-ab,v 1.3 2005/08/03 12:42:13 tonio Exp $
 
---- Makefile.OCaml.orig	2004-09-06 20:15:46.000000000 +0100
+--- Makefile.OCaml.orig	2005-04-24 09:08:08.000000000 +0100
 +++ Makefile.OCaml
-@@ -47,6 +47,10 @@ ifeq ($(shell uname),Darwin)
+@@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin)
  else
  ifeq ($(shell uname),OpenBSD)
    OSARCH=OpenBSD
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.2 2005/04/24 12:48:43 adrianp Exp $
  endif
  endif
  endif
-@@ -253,6 +257,9 @@ endif
+@@ -240,6 +244,9 @@ endif
  ifeq ($(OSARCH), osx)
    X11LIBDIR=/usr/X11R6/lib
  endif
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.2 2005/04/24 12:48:43 adrianp Exp $
  
  # Developer-only directories
  ifeq ($(shell hostname), raptor.research.att.com)
-@@ -396,6 +403,9 @@ ifeq ($(STATIC), true)
+@@ -383,6 +390,9 @@ ifeq ($(STATIC), true)
    ifeq ($(OSARCH), osx)
      STATICLIBS+=-cclib -static
    endif
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.2 2005/04/24 12:48:43 adrianp Exp $
    CLIBS=$(STATICLIBS)
  endif
  
-@@ -437,6 +447,10 @@ else
+@@ -424,6 +434,10 @@ else
    endif
  endif