summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/unison/Makefile5
-rw-r--r--net/unison/distinfo11
-rw-r--r--net/unison/patches/patch-Makefile.OCaml16
3 files changed, 15 insertions, 17 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 4f29757b4d3..e33811fa3a1 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2014/10/22 09:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2015/01/06 12:58:36 wiz Exp $
-DISTNAME= unison-2.40.102
-PKGREVISION= 22
+DISTNAME= unison-2.48.3
CATEGORIES= net
MASTER_SITES= http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
diff --git a/net/unison/distinfo b/net/unison/distinfo
index c434bbed9f2..20074f9efbe 100644
--- a/net/unison/distinfo
+++ b/net/unison/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.22 2014/10/22 09:43:01 wiz Exp $
+$NetBSD: distinfo,v 1.23 2015/01/06 12:58:36 wiz Exp $
-SHA1 (unison-2.40.102.tar.gz) = bf18f64fa30bd04234e864d42190294e0d9a2910
-RMD160 (unison-2.40.102.tar.gz) = 0231fd41895bde97ad4ae15bdc4994f9c9e27ad6
-Size (unison-2.40.102.tar.gz) = 2694761 bytes
-SHA1 (patch-Makefile.OCaml) = 2872f07e323f23375b0b7ea5ec17fe387fe22a0f
+SHA1 (unison-2.48.3.tar.gz) = 74f1c087ee49dc1db4680ad779280f7333d5c968
+RMD160 (unison-2.48.3.tar.gz) = 884b4ec225d0411e8112e809c621b6779cf816b6
+Size (unison-2.48.3.tar.gz) = 1172532 bytes
+SHA1 (patch-Makefile.OCaml) = 2c39a20eb731d3f787d5c938b539ceb3276d5d47
SHA1 (patch-aa) = dd1a001fb7071cd9141615b42a692e6d1d812081
-SHA1 (patch-ubase_util.ml) = d8ee8ea1cc1a5d0e8794623c24621f1a2d57d189
diff --git a/net/unison/patches/patch-Makefile.OCaml b/net/unison/patches/patch-Makefile.OCaml
index fbc63923d18..a2a00dfd9d3 100644
--- a/net/unison/patches/patch-Makefile.OCaml
+++ b/net/unison/patches/patch-Makefile.OCaml
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.OCaml,v 1.4 2012/12/09 15:02:51 wiz Exp $
+$NetBSD: patch-Makefile.OCaml,v 1.5 2015/01/06 12:58:37 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.orig 2014-09-28 16:48:05.000000000 +0000
+++ Makefile.OCaml
-@@ -71,8 +71,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1
+@@ -75,8 +75,8 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1
#
# This should be set to an appropriate value automatically, depending
# on whether the lablgtk library is available
@@ -15,7 +15,7 @@ Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
##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
+@@ -292,14 +292,14 @@ endif
# Gtk GUI
ifeq ($(UISTYLE), gtk)
@@ -32,12 +32,12 @@ Correct lablgtk paths for 2.16, and use ocamlopt.opt for compilation
OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
OCAMLLIBS+=lablgtk.cma
endif
-@@ -364,7 +364,7 @@ ifeq ($(PROFILING), true)
+@@ -384,7 +384,7 @@ ifeq ($(PROFILING), true)
else
- OCAMLC=ocamlc
+ OCAMLC=$(EXEC_PREFIX)ocamlc
endif
--OCAMLOPT=ocamlopt
-+OCAMLOPT=ocamlopt.opt
+-OCAMLOPT=$(EXEC_PREFIX)ocamlopt
++OCAMLOPT=$(EXEC_PREFIX)ocamlopt.opt
ifeq ($(NATIVE), true)
## Set up for native code compilation