6 files changed, 153 insertions, 0 deletions
diff --git a/net/unison-devel/DESCR b/net/unison-devel/DESCR
new file mode 100644
index 00000000000..adb6e8f2641
--- /dev/null
+++ b/net/unison-devel/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 is a beta version of Unison.
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
new file mode 100644
index 00000000000..54c7e5701cf
--- /dev/null
+++ b/net/unison-devel/Makefile
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $
+
+DISTNAME=	src
+PKGNAME=	unison-2.9.20
+PKGREVISION=	1
+CATEGORIES=	net
+MASTER_SITES=	http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/latest/
+
+MAINTAINER=	jlam@NetBSD.org
+HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
+COMMENT=	File-synchronization tool
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+DIST_SUBDIR=	${PKGNAME_NOREV}
+
+# docs: unison-manual.pdf/html/ps/dvi
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+USE_BUILDLINK3=	yes
+USE_GNU_TOOLS+=	make
+MAKE_FLAGS+=	CFLAGS="" UISTYLE=text
+MAKE_ENV+=	HOME=${WRKDIR}
+
+.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
+
+post-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
+	${INSTALL_MAN} ${WRKSRC}/ROADMAP.txt ${PREFIX}/share/doc/unison
+	${INSTALL_MAN} ${WRKSRC}/TODO.txt ${PREFIX}/share/doc/unison
+
+.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/unison-devel/PLIST b/net/unison-devel/PLIST
new file mode 100644
index 00000000000..d16f554b69c
--- /dev/null
+++ b/net/unison-devel/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/27 10:56:57 jlam 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
+share/doc/unison/ROADMAP.txt
+share/doc/unison/TODO.txt
+@dirrm share/doc/unison
diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo
new file mode 100644
index 00000000000..ea6693084c2
--- /dev/null
+++ b/net/unison-devel/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $
+
+SHA1 (unison-2.9.20/src.tar.gz) = 23d48f8dbcb2064241518375185bd2e7f50ab30f
+Size (unison-2.9.20/src.tar.gz) = 363079 bytes
+SHA1 (patch-aa) = 0b11802fb208e10fa07792738935761a170c0242
+SHA1 (patch-ab) = 181f0e0823c3a27f91bf97726afd2ad91f18cbaf
diff --git a/net/unison-devel/patches/patch-aa b/net/unison-devel/patches/patch-aa
new file mode 100644
index 00000000000..88be2a4d1bf
--- /dev/null
+++ b/net/unison-devel/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $
+
+--- Makefile.orig	Mon Aug 19 17:15:04 2002
++++ Makefile	Tue Jan 27 05:50:28 2004
+@@ -65,14 +65,12 @@
+ ######################################################################
+ # Installation
+ 
+-INSTALLDIR = $(HOME)/bin/
++INSTALLDIR = $(PREFIX)/bin/
+ 
+ install: $(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
+ 
+ 
+ ######################################################################
+@@ -234,7 +232,7 @@
+ tags:
+ 	-$(ETAGS) *.mli */*.mli *.ml */*.ml *.txt 
+ 
+-all:: TAGS
++# all:: TAGS
+ 
+ TAGS: 
+ 	$(MAKE) tags
diff --git a/net/unison-devel/patches/patch-ab b/net/unison-devel/patches/patch-ab
new file mode 100644
index 00000000000..2375293f6f2
--- /dev/null
+++ b/net/unison-devel/patches/patch-ab
@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/01/27 10:56:57 jlam Exp $
+
+--- Makefile.OCaml.orig	Mon Aug 19 17:15:04 2002
++++ Makefile.OCaml	Tue Jan 27 05:51:03 2004
+@@ -45,7 +45,7 @@
+ ifeq ($(shell uname),Darwin)
+   OSARCH=osx
+ else
+-  OSARCH=linux
++  OSARCH=bsd
+ endif
+ endif
+ ETAGS=etags
+@@ -178,7 +178,7 @@
+ ifeq ($(OSARCH), win32gnuc)
+   GUILIBDIR=$(OCAMLLIBDIR)/lablgtk/cclibs
+ endif
+-ifeq ($(OSARCH), linux)
++ifeq ($(OSARCH), bsd)
+   X11LIBDIR=/usr/X11R6/lib
+ endif
+ ifeq ($(OSARCH), osx)
+@@ -267,7 +267,7 @@
+     # libcurses is not in a standard place in older Solaris releases.
+     STATICLIBS+=-cclib -R/usr/xpg4/lib
+   endif
+-  ifeq ($(OSARCH), linux)
++  ifeq ($(OSARCH), bsd)
+     STATICLIBS+=-cclib -static
+   endif
+   ifeq ($(OSARCH), osx)
+@@ -304,9 +304,9 @@
+ # Include an automatically generated list of dependencies
+ include .depend
+ 
+-ifeq ($(shell echo type -t ocamldot | bash), file)
+-  OCAMLDOT=true
+-endif
++#ifeq ($(shell echo type -t ocamldot | bash), file)
++  OCAMLDOT=false
++#endif
+ 
+ # Rebuild dependencies (must be invoked manually)
+ .PHONY: depend