update net/unison-devel to 2.17.1

5 files changed, 32 insertions, 39 deletions

diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index f02e62ab97e..c56934f363b 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/08/03 12:45:27 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2005/09/27 14:44:18 tonio Exp $
 
-DISTNAME=	unison-2.13.0
+DISTNAME=	unison-2.17.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/beta/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 
@@ -35,12 +35,6 @@ 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
diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo
index 39b0e27cfb3..a1c3b058c71 100644
--- a/net/unison-devel/distinfo
+++ b/net/unison-devel/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/08/06 12:44:26 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/09/27 14:44:18 tonio Exp $
 
-SHA1 (unison-2.13.0/unison-2.13.0.tar.gz) = c6eebdff8cd103fd560288b9fbff92703edf29f8
-RMD160 (unison-2.13.0/unison-2.13.0.tar.gz) = 423d354806d5c4d982113740c16be99ede4a170c
-Size (unison-2.13.0/unison-2.13.0.tar.gz) = 390341 bytes
-SHA1 (patch-aa) = 9e10cd0cd5369955c8494d03dedd73116d334aab
-SHA1 (patch-ab) = 1718f7648403ca617d562b632260d64632fc462b
-SHA1 (patch-ac) = 9c2c7ded25b184156ff75ea64f08ec32620beb60
+SHA1 (unison-2.17.1/unison-2.17.1.tar.gz) = 03e02df5499b2c9db79ac895ca7c2d5d59b1f294
+RMD160 (unison-2.17.1/unison-2.17.1.tar.gz) = 7b5143d160c09cefd6027807ca54c02e83265008
+Size (unison-2.17.1/unison-2.17.1.tar.gz) = 415057 bytes
+SHA1 (patch-aa) = 1f863c233ca99e9f030d85dfd64be29d59bc64bf
+SHA1 (patch-ab) = d1ca5128ff3177c2592e0035da10350d91c5f68f
+SHA1 (patch-ac) = c01b261d0c25f9625003e31b64b2bdfe6fb054ca
diff --git a/net/unison-devel/patches/patch-aa b/net/unison-devel/patches/patch-aa
index f1d688aabc2..943eec79dc7 100644
--- a/net/unison-devel/patches/patch-aa
+++ b/net/unison-devel/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/08/03 12:45:27 tonio Exp $
+$NetBSD: patch-aa,v 1.4 2005/09/27 14:44:18 tonio Exp $
 
---- Makefile.orig	2005-07-29 17:30:08.000000000 +0200
-+++ Makefile	2005-07-29 17:34:14.000000000 +0200
-@@ -39,7 +39,7 @@
+--- Makefile.orig	2005-08-12 02:26:59.000000000 +0200
++++ Makefile
+@@ -39,7 +39,7 @@ all:: INSTALL
  
  INSTALL: $(NAME)$(EXEC_EXT)
  # file isn't made for OS X, so check that it's there first
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2005/08/03 12:45:27 tonio Exp $
  
  ########################################################################
  ## Miscellaneous developer-only switches
-@@ -68,17 +68,15 @@
+@@ -68,7 +68,7 @@ include Makefile.OCaml
  ######################################################################
  # Installation
  
@@ -20,24 +20,23 @@ $NetBSD: patch-aa,v 1.3 2005/08/03 12:45:27 tonio Exp $
  
  # This has two names because on OSX the file INSTALL shadows the target 'install'!
  install: doinstall
+@@ -77,10 +77,7 @@ installtext: 
+ 	make -C .. installtext
  
  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)
+-
  
  ######################################################################
-@@ -357,7 +355,7 @@
+ # Demo
+@@ -358,7 +355,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-devel/patches/patch-ab b/net/unison-devel/patches/patch-ab
index fb2920356c5..8fe03892500 100644
--- a/net/unison-devel/patches/patch-ab
+++ b/net/unison-devel/patches/patch-ab
@@ -1,20 +1,20 @@
-$NetBSD: patch-ab,v 1.3 2005/08/03 12:45:27 tonio Exp $
+$NetBSD: patch-ab,v 1.4 2005/09/27 14:44:18 tonio Exp $
 
---- Makefile.OCaml.orig	2005-07-29 17:34:34.000000000 +0200
-+++ Makefile.OCaml	2005-07-29 17:42:53.000000000 +0200
-@@ -29,6 +29,11 @@
+--- Makefile.OCaml.orig	2005-08-12 02:26:59.000000000 +0200
++++ Makefile.OCaml
+@@ -29,6 +29,11 @@ ifeq ($(shell uname),Darwin)
  else
  ifeq ($(shell uname),OpenBSD)
    OSARCH=OpenBSD
-+else
++  else
 +ifeq ($(shell uname),NetBSD)
 +  OSARCH=NetBSD
-+	STATIC=true
++  STATIC=true
 +endif
  endif
  endif
  endif
-@@ -242,6 +247,10 @@
+@@ -242,6 +247,10 @@ else
    endif
  endif
  
diff --git a/net/unison-devel/patches/patch-ac b/net/unison-devel/patches/patch-ac
index aa11b9629e8..2503e89b55b 100644
--- a/net/unison-devel/patches/patch-ac
+++ b/net/unison-devel/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2005/08/06 12:44:26 rillig Exp $
+$NetBSD: patch-ac,v 1.6 2005/09/27 14:44:18 tonio Exp $
 
---- pty.c.orig	Mon May 30 14:15:43 2005
-+++ pty.c	Sat Aug  6 14:41:44 2005
+--- pty.c.orig	2005-08-12 02:26:59.000000000 +0200
++++ pty.c
 @@ -15,7 +15,7 @@ extern void uerror (char * cmdname, valu
  #define HAS_OPENPTY 1
  #endif