a15d06a5a4
in pkgsrc). Added BelowPath patterns, that match a path as well as all paths below (convenient to use with nodeletion,update,creationpartial preferences) Added a fat preference that makes Unison use the right options when one of the replica is on a FAT filesystem. Allow prefer/force=newer even when not synchronizing modification times. (The reconciler will not be aware of the modification time of unchanged files, so the synchronization choices of Unison can be different from when times=true, but the behavior remains sane: changed files with the most recent modification time will be propagated.) Minor fixes and improvements: Compare filenames up to decomposition in case sensitive mode when one host is running MacOSX and the unicode preference is set to true. Rsync: somewhat faster compressor Make Unicode the default on all architectures (it was only the default when a Mac OS X or Windows machine was involved).
43 lines
1.3 KiB
Text
43 lines
1.3 KiB
Text
$NetBSD: patch-Makefile.OCaml,v 1.4 2012/12/09 15:02:51 wiz 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
|
|
endif
|
|
-OCAMLOPT=ocamlopt
|
|
+OCAMLOPT=ocamlopt.opt
|
|
|
|
ifeq ($(NATIVE), true)
|
|
## Set up for native code compilation
|