Remove build time dependency on bash.

Build with posix threads if supported ocaml.

3 files changed, 56 insertions, 5 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index 2fba6f5ba04..8d596e458e8 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/06/23 20:36:14 jtb Exp $
-#
+# $NetBSD: Makefile,v 1.15 2003/06/29 23:52:03 jtb Exp $
 
 DISTNAME=	src
 PKGNAME=	unison-2.9.1
@@ -13,7 +12,6 @@ HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	file-synchronization tool
 
 BUILD_DEPENDS=	ocaml>=3.00:../../lang/ocaml
-BUILD_DEPENDS+=	bash>=2.05:../../shells/bash2
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
@@ -24,10 +22,18 @@ MAKE_ENV+=	HOME=${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} != "i386") || (${MACHINE_ARCH} != "powerpc") || (${MACHINE_ARCH} != "sparc")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+MAKE_FLAGS+=	NATIVE=true
+.else
 MAKE_FLAGS+=	NATIVE=false
 .endif
 
+.include "../../mk/pthread.buildlink2.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
+MAKE_FLAGS+=	THREADS=true
+.endif
+
 post-install:
 		${INSTALL_MAN_DIR} ${PREFIX}/share/doc/unison
 		${INSTALL_MAN} ${WRKSRC}/BUGS.txt ${PREFIX}/share/doc/unison
diff --git a/net/unison/distinfo b/net/unison/distinfo
index 41bde6f790b..7a5294456b7 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/06/01 04:41:30 deberg Exp $
+$NetBSD: distinfo,v 1.6 2003/06/29 23:52:04 jtb Exp $
 
 SHA1 (unison-2.9.1/src.tar.gz) = d355639b8191f5c74e652fe257fd98dcf76d4cc0
 Size (unison-2.9.1/src.tar.gz) = 319081 bytes
 SHA1 (patch-aa) = bb844e8070faab7d4c8aac30345881c1c66ca8d2
+SHA1 (patch-ab) = 0d391ffc0c47a16d24cda5e9f219665eeafb1553
diff --git a/net/unison/patches/patch-ab b/net/unison/patches/patch-ab
new file mode 100644
index 00000000000..6131a0eabe9
--- /dev/null
+++ b/net/unison/patches/patch-ab
@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.1 2003/06/29 23:52:05 jtb Exp $
+
+--- Makefile.OCaml.orig
++++ Makefile.OCaml
+@@ -42,7 +42,7 @@
+ ifeq ($(shell hostname),saul.cis.upenn.edu)
+   OSARCH=solaris
+ else
+-  OSARCH=linux
++  OSARCH=bsd
+ endif
+   ETAGS=etags
+ endif
+@@ -157,7 +157,7 @@
+ ifeq ($(OSARCH), win32gnuc)
+   GUILIBDIR=$(OCAMLLIBDIR)/lablgtk/cclibs
+ endif
+-ifeq ($(OSARCH), linux)
++ifeq ($(OSARCH), bsd)
+   X11LIBDIR=/usr/X11R6/lib
+ endif
+ 
+@@ -243,7 +243,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
+   CLIBS=$(STATICLIBS)
+@@ -255,9 +255,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