head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2018.04.30.12.22.31;	author wiz;	state dead;
branches;
next	1.2;
commitid	2PuFN7CN59VZJsAA;

1.2
date	2018.04.30.10.21.02;	author wiz;	state Exp;
branches;
next	1.1;
commitid	erWI9u5Cdlal4sAA;

1.1
date	2018.04.30.10.14.29;	author wiz;	state Exp;
branches;
next	;
commitid	3UifjC1EU4U72sAA;


desc
@@


1.3
log
@unison2.51: remove unneeded patch.

ok jaapb@@
@
text
@$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/04/30 10:21:02 wiz Exp $

Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation

--- src/Makefile.OCaml.orig	2018-01-27 21:12:13.000000000 +0000
+++ src/Makefile.OCaml
@@@@ -73,8 +73,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)
@@@@ -272,7 +272,7 @@@@ 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
@@@@ -282,7 +282,7 @@@@ OCAMLFIND := $(shell command -v ocamlfin
 
 ifeq ($(UISTYLE), gtk2)
   ifndef OCAMLFIND
-    CAMLFLAGS+=-I +lablgtk2
+    CAMLFLAGS+=-I $(OCAMLLIBDIR)/site-lib/lablgtk2
   else
     CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 )
   endif
@@@@ -370,7 +370,7 @@@@ ifeq ($(PROFILING), true)
 else
   OCAMLC=$(EXEC_PREFIX)ocamlc
 endif
-OCAMLOPT=$(EXEC_PREFIX)ocamlopt
+OCAMLOPT=$(EXEC_PREFIX)ocamlopt.opt
 
 ifeq ($(NATIVE), true)
   ## Set up for native code compilation
@


1.2
log
@unison2.51: Remove unnecessary patches. Update a comment.
@
text
@d1 1
a1 1
$NetBSD: patch-src_Makefile.OCaml,v 1.1 2018/04/30 10:14:29 wiz Exp $
@


1.1
log
@net/unison2.51: import unison-2.51.2

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.
@
text
@d1 1
a1 1
$NetBSD: patch-src_Makefile.OCaml,v 1.2 2018/01/22 10:35:45 wiz Exp $
a3 1
Add -unsafe-string for OCaml >= 4.06.
@