Update net/unison to 2.13.16 (Fix PR 31345)

Update maintainer, i'm taking this one

6 files changed, 51 insertions, 75 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 818f6037310..3e091076002 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2005/08/03 12:42:13 tonio Exp $
+# $NetBSD: Makefile,v 1.28 2005/09/27 14:46:08 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/
+MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 
@@ -35,19 +35,12 @@ MAKE_FLAGS+=	THREADS=true
 
 INSTALLATION_DIRS=	bin
 
-SUBST_CLASSES=		x11
-SUBST_STAGE.x11=	post-patch
-SUBST_FILES.x11=	Makefile.OCaml
-SUBST_SED.x11=		-e "s|/usr/X11R6|${X11BASE}|g"
-SUBST_MESSAGE.x11=	"Fixing X11 paths."
-
 post-install:
 		@cd ${WRKSRC} && ./unison -doc install > INSTALL
 		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison
 		${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 --git a/net/unison/PLIST b/net/unison/PLIST
index 9fb2089bdcd..3f525ca8069 100644
--- a/net/unison/PLIST
+++ b/net/unison/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:40 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/09/27 14:46:08 tonio Exp $
 bin/unison
 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 --git a/net/unison/distinfo b/net/unison/distinfo
index 3e422f0d244..fed1ca39be8 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2005/08/03 12:42:13 tonio Exp $
+$NetBSD: distinfo,v 1.12 2005/09/27 14:46:08 tonio Exp $
 
-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) = 25820d9e61b258d430f5b927fdab8aeaf756ae55
+SHA1 (patch-ab) = e879c62e9dcd83778e5ebebf14a739c23cba666e
+SHA1 (patch-ac) = fa8c3c46ca822a34460404aeb122f0c82d801dc3
diff --git a/net/unison/patches/patch-aa b/net/unison/patches/patch-aa
index 564fcfb66ec..9bc53001f2e 100644
--- a/net/unison/patches/patch-aa
+++ b/net/unison/patches/patch-aa
@@ -1,40 +1,40 @@
-$NetBSD: patch-aa,v 1.5 2005/08/03 12:42:13 tonio Exp $
+$NetBSD: patch-aa,v 1.6 2005/09/27 14:46:08 tonio Exp $
 
---- Makefile.orig	Sat Mar 12 16:17:58 2005
+--- Makefile.orig	2005-07-03 00:44:28.000000000 +0200
 +++ Makefile
-@@ -38,7 +38,7 @@ all:: strings.ml buildexecutable
- all:: INSTALL
+@@ -39,7 +39,7 @@ all:: INSTALL
  
  INSTALL: $(NAME)$(EXEC_EXT)
--	./$(NAME) -doc install > INSTALL
-+##	./$(NAME) -doc install > INSTALL
+ # file isn't made for OS X, so check that it's there first
+-	(if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
++##	(if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
  
  ########################################################################
  ## Miscellaneous developer-only switches
-@@ -67,14 +67,12 @@ include Makefile.OCaml
+@@ -68,16 +68,13 @@ include Makefile.OCaml
  ######################################################################
  # 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:
+ # Demo
+@@ -355,7 +352,7 @@ testmerge:
  tags:
  	-$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
  
 -all:: TAGS
-+# all:: TAGS
++#all:: TAGS
  
  TAGS:
  	$(MAKE) tags
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
index 5f22e6a3dfa..815d55c011b 100644
--- a/net/unison/patches/patch-ab
+++ b/net/unison/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2005/08/03 12:42:13 tonio Exp $
+$NetBSD: patch-ab,v 1.4 2005/09/27 14:46:08 tonio Exp $
 
---- Makefile.OCaml.orig	2005-04-24 09:08:08.000000000 +0100
+--- Makefile.OCaml.orig	2005-06-27 19:38:25.000000000 +0200
 +++ Makefile.OCaml
 @@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin)
  else
@@ -13,27 +13,7 @@ $NetBSD: patch-ab,v 1.3 2005/08/03 12:42:13 tonio Exp $
  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
-   endif
-+  ifeq ($(OSARCH), NetBSD)
-+    STATICLIBS+=-cclib -static
-+  endif
-   CLIBS=$(STATICLIBS)
- endif
- 
-@@ -424,6 +434,10 @@ else
+@@ -242,6 +249,10 @@ else
    endif
  endif
  
diff --git a/net/unison/patches/patch-ac b/net/unison/patches/patch-ac
index 6e767caadaf..cd75034dd1f 100644
--- a/net/unison/patches/patch-ac
+++ b/net/unison/patches/patch-ac
@@ -1,21 +1,25 @@
-$NetBSD: patch-ac,v 1.3 2005/07/30 21:57:42 rillig Exp $
+$NetBSD: patch-ac,v 1.4 2005/09/27 14:46:08 tonio 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-05-30 14:15:43.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>          // openpty
+ #include <util.h>
+ #define HAS_OPENPTY 1
  #endif
- 
+@@ -40,9 +40,10 @@ CAMLprim value setControllingTerminal(va
+ /* 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;