summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net/unison/Makefile20
-rw-r--r--net/unison/distinfo14
-rw-r--r--net/unison/patches/patch-aa14
-rw-r--r--net/unison/patches/patch-ab6
-rw-r--r--net/unison/patches/patch-ac16
5 files changed, 30 insertions, 40 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 2b8efafb014..530fba78a23 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2007/09/21 13:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2008/07/25 20:03:03 tonio Exp $
-DISTNAME= unison-2.13.16
-PKGREVISION= 3
+DISTNAME= unison-2.27.57
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/
@@ -10,6 +9,7 @@ HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/
COMMENT= File-synchronization tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
DIST_SUBDIR= ${PKGNAME_NOREV}
BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2
@@ -39,13 +39,13 @@ INSTALLATION_DIRS= bin
INSTALLATION_DIRS+= share/doc/unison
post-install:
- ${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}/NEWS ${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${PREFIX}/share/doc/unison
- ${INSTALL_MAN} ${WRKSRC}/TODO.txt ${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 fed1ca39be8..ef054ca5651 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: distinfo,v 1.13 2008/07/25 20:03:03 tonio Exp $
-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
+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
diff --git a/net/unison/patches/patch-aa b/net/unison/patches/patch-aa
index 9bc53001f2e..9beff9aeb01 100644
--- a/net/unison/patches/patch-aa
+++ b/net/unison/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: patch-aa,v 1.7 2008/07/25 20:03:03 tonio Exp $
---- Makefile.orig 2005-07-03 00:44:28.000000000 +0200
+--- Makefile.orig 2008-01-18 16:46:16.000000000 +0100
+++ Makefile
@@ -39,7 +39,7 @@ all:: INSTALL
@@ -11,15 +11,17 @@ $NetBSD: patch-aa,v 1.6 2005/09/27 14:46:08 tonio Exp $
########################################################################
## Miscellaneous developer-only switches
-@@ -68,16 +68,13 @@ include Makefile.OCaml
+@@ -68,7 +68,7 @@ include Makefile.OCaml
######################################################################
# Installation
-INSTALLDIR = $(HOME)/bin/
-+INSTALLDIR = $(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
doinstall: $(NAME)$(EXEC_EXT)
- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$)
@@ -29,9 +31,9 @@ $NetBSD: patch-aa,v 1.6 2005/09/27 14:46:08 tonio Exp $
######################################################################
# Demo
-@@ -355,7 +352,7 @@ testmerge:
+@@ -332,7 +329,7 @@ testmerge:
tags:
- -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt
+ -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt
-all:: TAGS
+#all:: TAGS
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
index 815d55c011b..090fe8f48e5 100644
--- a/net/unison/patches/patch-ab
+++ b/net/unison/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: patch-ab,v 1.5 2008/07/25 20:03:03 tonio Exp $
---- Makefile.OCaml.orig 2005-06-27 19:38:25.000000000 +0200
+--- Makefile.OCaml.orig 2007-05-07 17:42:29.000000000 +0200
+++ Makefile.OCaml
@@ -29,6 +29,10 @@ ifeq ($(shell uname),Darwin)
else
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.4 2005/09/27 14:46:08 tonio Exp $
endif
endif
endif
-@@ -242,6 +249,10 @@ else
+@@ -261,6 +265,10 @@ else
endif
endif
diff --git a/net/unison/patches/patch-ac b/net/unison/patches/patch-ac
index cd75034dd1f..39963c72f4c 100644
--- a/net/unison/patches/patch-ac
+++ b/net/unison/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2005/09/27 14:46:08 tonio Exp $
+$NetBSD: patch-ac,v 1.5 2008/07/25 20:03:03 tonio Exp $
---- pty.c.orig 2005-05-30 14:15:43.000000000 +0200
+--- 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
@@ -11,15 +11,3 @@ $NetBSD: patch-ac,v 1.4 2005/09/27 14:46:08 tonio Exp $
#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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 00:16:04 +0000