5 files changed, 22 insertions, 63 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 974baa7fc7a..cadbe916538 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.36 2009/08/26 19:58:46 sno Exp $
+# $NetBSD: Makefile,v 1.37 2009/11/20 20:18:47 wiz Exp $
+
+DISTNAME=	unison-2.32.52
 
-DISTNAME=	unison-2.27.57
-PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
+MASTER_SITES=	http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
 
 MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
+LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
 BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
 
 # docs: unison-manual.pdf/html/ps/dvi
@@ -40,13 +40,13 @@ INSTALLATION_DIRS=	bin
 INSTALLATION_DIRS+=	share/doc/unison
 
 post-install:
-		${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
-		${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/CONTRIB ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/NEWS ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${DESTDIR}${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/TODO.txt ${DESTDIR}${PREFIX}/share/doc/unison
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/unison/distinfo b/net/unison/distinfo
index ef054ca5651..66e622f10f4 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.13 2008/07/25 20:03:03 tonio Exp $
+$NetBSD: distinfo,v 1.14 2009/11/20 20:18:47 wiz Exp $
 
-SHA1 (unison-2.27.57/unison-2.27.57.tar.gz) = 9892680d8bd3e3c50031451cc6e77eb5431768ea
-RMD160 (unison-2.27.57/unison-2.27.57.tar.gz) = 15388e3f2b9b593aba140416216837c49e4800c0
-Size (unison-2.27.57/unison-2.27.57.tar.gz) = 617253 bytes
-SHA1 (patch-aa) = bca069d0c27bec552c103b39e299fea36afb51c7
-SHA1 (patch-ab) = 9093c61236c379148ae99eb1ec94fb80ea6dbea4
-SHA1 (patch-ac) = d996e1ffff23da511976ba4455391952afab6234
+SHA1 (unison-2.32.52.tar.gz) = 68ea5709de4fcc2f9aef7b01b24637503b61b5ac
+RMD160 (unison-2.32.52.tar.gz) = 8216a2e482d5a445dd7acdb62e1bb6377e90d1a1
+Size (unison-2.32.52.tar.gz) = 697866 bytes
+SHA1 (patch-aa) = d59adf3446ea3f98f4ab72274b95b1140d3cf896
diff --git a/net/unison/patches/patch-aa b/net/unison/patches/patch-aa
index 9beff9aeb01..78f46a08512 100644
--- a/net/unison/patches/patch-aa
+++ b/net/unison/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2008/07/25 20:03:03 tonio Exp $
+$NetBSD: patch-aa,v 1.8 2009/11/20 20:18:47 wiz Exp $
 
---- Makefile.orig	2008-01-18 16:46:16.000000000 +0100
+--- Makefile.orig	2009-05-02 02:31:27.000000000 +0000
 +++ Makefile
 @@ -39,7 +39,7 @@ all:: INSTALL
  
@@ -16,12 +16,12 @@ $NetBSD: patch-aa,v 1.7 2008/07/25 20:03:03 tonio Exp $
  # Installation
  
 -INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = $(DESTDIR)$(PREFIX)/bin/
++INSTALLDIR = ${DESTDIR}$(PREFIX)/bin/
  
  # This has two names because on OSX the file INSTALL shadows the target 'install'!
  install: doinstall
 @@ -80,10 +80,7 @@ text: 
- 	make -C .. text
+ 	$(MAKE) -C .. text
  
  doinstall: $(NAME)$(EXEC_EXT)
 -	-mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.7 2008/07/25 20:03:03 tonio Exp $
  
  ######################################################################
  # Demo
-@@ -332,7 +329,7 @@ testmerge:
+@@ -336,7 +333,7 @@ testmerge:
  tags:
  	-$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt
  
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
deleted file mode 100644
index 090fe8f48e5..00000000000
--- a/net/unison/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2008/07/25 20:03:03 tonio Exp $
-
---- Makefile.OCaml.orig	2007-05-07 17:42:29.000000000 +0200
-+++ Makefile.OCaml
-@@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin)
- else
- ifeq ($(shell uname),OpenBSD)
-   OSARCH=OpenBSD
-+else
-+ifeq ($(shell uname),NetBSD)
-+  OSARCH=NetBSD
-+endif
- endif
- endif
- endif
-@@ -261,6 +265,10 @@ else
-   endif
- endif
- 
-+ifeq ($(OSARCH), NetBSD)
-+  OCAMLDOT=false
-+endif
-+
- # Rebuild dependencies (must be invoked manually)
- .PHONY: depend
- depend::
diff --git a/net/unison/patches/patch-ac b/net/unison/patches/patch-ac
deleted file mode 100644
index 39963c72f4c..00000000000
--- a/net/unison/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2008/07/25 20:03:03 tonio Exp $
-
---- pty.c.orig	2007-04-13 16:30:01.000000000 +0200
-+++ pty.c
-@@ -15,7 +15,7 @@ extern void uerror (char * cmdname, valu
- #define HAS_OPENPTY 1
- #endif
- 
--#ifdef __APPLE__
-+#if defined(__APPLE__) || defined(__NetBSD__)
- #include <util.h>
- #define HAS_OPENPTY 1
- #endif