Corrected build to work with x11/lablgtk. Corrected build that compiled

parts the package during the install phase. Added comments to patches.

4 files changed, 41 insertions, 8 deletions

diff --git a/net/unison/Makefile b/net/unison/Makefile
index c9dccb782c8..66e54766fac 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2012/09/07 19:17:22 adam Exp $
+# $NetBSD: Makefile,v 1.58 2012/09/14 19:14:53 jaapb Exp $
 
 DISTNAME=	unison-2.40.63
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	net
 MASTER_SITES=	http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
 
@@ -18,6 +18,7 @@ BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=3.12.0nb2
 .else
 BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=3.11.2
 .endif
+BUILDLINK_API_DEPENDS.lablgtk+= lablgtk>=2.16.0
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
@@ -28,7 +29,7 @@ MAKE_ENV+=	HOME=${WRKDIR:Q}
 .include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH}=="arm")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH}=="arm") || (${MACHINE_ARCH} == "x86_64")
 MAKE_FLAGS+=	NATIVE=true
 .else
 MAKE_FLAGS+=	NATIVE=false
@@ -40,6 +41,8 @@ MAKE_FLAGS+=	NATIVE=false
 MAKE_FLAGS+=	THREADS=true
 .endif
 
+BUILD_TARGET=	buildexecutable
+
 INSTALLATION_DIRS=	bin
 INSTALLATION_DIRS+=	share/doc/unison
 
diff --git a/net/unison/distinfo b/net/unison/distinfo
index 7b008fddc62..eaa0463cfd3 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2011/08/03 12:50:43 is Exp $
+$NetBSD: distinfo,v 1.19 2012/09/14 19:14:53 jaapb Exp $
 
 SHA1 (unison-2.40.63.tar.gz) = 645e70bc37a5d4e8e9ccb7bad065fc579b18cf75
 RMD160 (unison-2.40.63.tar.gz) = 5dede9ea2f1213d4a22ed1914da7bfb1921f9993
 Size (unison-2.40.63.tar.gz) = 2601791 bytes
-SHA1 (patch-Makefile.OCaml) = dbcd910b008830f555835be4c3c3cb09f7911134
-SHA1 (patch-aa) = 09be0de200807825013537c75fca50f7d179be0a
+SHA1 (patch-Makefile.OCaml) = 51026fc6c6df90e6619673b824cba218adc751f4
+SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081
diff --git a/net/unison/patches/patch-Makefile.OCaml b/net/unison/patches/patch-Makefile.OCaml
index e8892da01b9..6035dfa24dd 100644
--- a/net/unison/patches/patch-Makefile.OCaml
+++ b/net/unison/patches/patch-Makefile.OCaml
@@ -1,7 +1,36 @@
-$NetBSD: patch-Makefile.OCaml,v 1.1 2011/08/03 12:50:43 is Exp $
+$NetBSD: patch-Makefile.OCaml,v 1.2 2012/09/14 19:14:53 jaapb Exp $
 
+Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
 --- Makefile.OCaml.orig	2011-04-16 20:35:38.000000000 +0000
 +++ Makefile.OCaml
+@@ -71,8 +71,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 
+ #
+ # This should be set to an appropriate value automatically, depending
+ # on whether the lablgtk library is available
+-LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
+-LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk2
++LABLGTKLIB=$(OCAMLLIBDIR)/site-lib/lablgtk
++LABLGTK2LIB=$(OCAMLLIBDIR)/site-lib/lablgtk2
+ ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well 
+ ## at the moment and we don't want to confuse people by building it by default
+ ifeq ($(OSARCH),osx)
+@@ -285,14 +285,14 @@ endif
+ 
+ # Gtk GUI
+ ifeq ($(UISTYLE), gtk)
+-  CAMLFLAGS+=-I +lablgtk
++  CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk
+   OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
+   OCAMLLIBS+=lablgtk.cma
+ endif
+ 
+ # Gtk2 GUI
+ ifeq ($(UISTYLE), gtk2)
+-  CAMLFLAGS+=-I +lablgtk2
++  CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk2
+   OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
+   OCAMLLIBS+=lablgtk.cma
+ endif
 @@ -364,7 +364,7 @@ ifeq ($(PROFILING), true)
  else
    OCAMLC=ocamlc
diff --git a/net/unison/patches/patch-aa b/net/unison/patches/patch-aa
index a3cd9b09b6c..8e6352fb7d9 100644
--- a/net/unison/patches/patch-aa
+++ b/net/unison/patches/patch-aa
@@ -1,5 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2011/05/02 13:25:26 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2012/09/14 19:14:53 jaapb Exp $
 
+Correct installation procedure
 --- Makefile.orig	2011-04-16 20:35:38.000000000 +0000
 +++ Makefile
 @@ -49,7 +49,7 @@ all:: INSTALL