Reimport of net/unison-2.32 before update to incompatible 2.40 version.

7 files changed, 145 insertions, 0 deletions

diff --git a/net/unison2.32/DESCR b/net/unison2.32/DESCR
new file mode 100644
index 00000000000..85be9866caa
--- /dev/null
+++ b/net/unison2.32/DESCR
@@ -0,0 +1,7 @@
+Unison is a file-synchronization tool for Unix and Windows. It allows
+two replicas of a collection of files and directories to be stored
+on different hosts (or different disks on the same host), modified
+separately, and then brought up to date by propagating the changes
+in each replica to the other.
+
+This package contains the old 2.32 version for compatibility reasons.
diff --git a/net/unison2.32/Makefile b/net/unison2.32/Makefile
new file mode 100644
index 00000000000..26953269010
--- /dev/null
+++ b/net/unison2.32/Makefile
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
+
+DISTNAME=	unison-2.32.52
+PKGREVISION=	4
+
+CATEGORIES=	net
+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 (old 2.32 branch)
+LICENSE=	gnu-gpl-v3
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.08.2
+
+# docs: unison-manual.pdf/html/ps/dvi
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+USE_TOOLS+=	gmake
+MAKE_FLAGS+=	CFLAGS=""
+MAKE_ENV+=	HOME=${WRKDIR:Q}
+
+.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
+
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+MAKE_FLAGS+=	NATIVE=true
+.else
+MAKE_FLAGS+=	NATIVE=false
+.endif
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
+MAKE_FLAGS+=	THREADS=true
+.endif
+
+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
+
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/unison2.32/PLIST b/net/unison2.32/PLIST
new file mode 100644
index 00000000000..913b4592ac4
--- /dev/null
+++ b/net/unison2.32/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
+bin/unison
+share/doc/unison/BUGS.txt
+share/doc/unison/CONTRIB
+share/doc/unison/COPYING
+share/doc/unison/NEWS
+share/doc/unison/README
+share/doc/unison/ROADMAP.txt
+share/doc/unison/TODO.txt
diff --git a/net/unison2.32/distinfo b/net/unison2.32/distinfo
new file mode 100644
index 00000000000..3fea378c1e8
--- /dev/null
+++ b/net/unison2.32/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
+
+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
+SHA1 (patch-ab) = 29a2bc3842be7bb1bde7372dfeca2a5c5b4acdef
diff --git a/net/unison2.32/options.mk b/net/unison2.32/options.mk
new file mode 100644
index 00000000000..859d2f405d0
--- /dev/null
+++ b/net/unison2.32/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.unison
+PKG_SUPPORTED_OPTIONS=	lablgtk
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlablgtk)
+MAKE_FLAGS+=	UISTYLE=gtk2
+.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+MAKE_FLAGS+=	UISTYLE=text
+.endif
diff --git a/net/unison2.32/patches/patch-aa b/net/unison2.32/patches/patch-aa
new file mode 100644
index 00000000000..8cbc6411dda
--- /dev/null
+++ b/net/unison2.32/patches/patch-aa
@@ -0,0 +1,42 @@
+$NetBSD: patch-aa,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
+
+--- Makefile.orig	2009-05-02 02:31:27.000000000 +0000
++++ 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
+-	(if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
++##	(if [ -f $(NAME) ]; then ./$(NAME) -doc install > INSTALLATION; fi)
+ 
+ ########################################################################
+ ## Miscellaneous developer-only switches
+@@ -68,7 +68,7 @@ include Makefile.OCaml
+ ######################################################################
+ # Installation
+ 
+-INSTALLDIR = $(HOME)/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 $$$$)
+ 	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)
+-	cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT)
+-
+ 
+ ######################################################################
+ # Demo
+@@ -336,7 +333,7 @@ testmerge:
+ tags:
+ 	-$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt
+ 
+-all:: TAGS
++#all:: TAGS
+ 
+ TAGS:
+ 	$(MAKE) tags
diff --git a/net/unison2.32/patches/patch-ab b/net/unison2.32/patches/patch-ab
new file mode 100644
index 00000000000..2d7861c69a0
--- /dev/null
+++ b/net/unison2.32/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2011/02/25 20:01:37 wiz Exp $
+
+--- update.mli.orig	2009-05-02 02:31:27.000000000 +0000
++++ update.mli	2010-08-23 22:18:21.000000000 +0000
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t