Import of pkgsrc-2015Q1

net/unison/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2014/02/12 23:18:26 tron Exp $
+# $NetBSD: Makefile,v 1.90 2015/01/20 14:24:36 jaapb Exp $
 
-DISTNAME=	unison-2.40.102
-PKGREVISION=	16
+DISTNAME=	unison-2.48.3
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/
 
@@ -10,14 +10,12 @@ HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	File-synchronization tool
 LICENSE=	gnu-gpl-v3
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 .if (${MACHINE_ARCH} == "arm")
 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
+BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0
 
 # docs: unison-manual.pdf/html/ps/dvi
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}

net/unison/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2012/12/09 15:02:50 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

net/unison/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/06/26 14:27:14 shattered Exp $
+# $NetBSD: options.mk,v 1.4 2014/10/10 08:39:08 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unison
 PKG_SUPPORTED_OPTIONS=	lablgtk
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS=	lablgtk
 .if !empty(PKG_OPTIONS:Mlablgtk)
 MAKE_FLAGS+=	UISTYLE=gtk2
 DEPENDS+=	font-schumacher-misc>=1.0:../../fonts/font-schumacher-misc
-.include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/ocaml-lablgtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .else
 MAKE_FLAGS+=	UISTYLE=text

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