CVS commit: pkgsrc/net/ocamlnet

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Oct  4 13:08:20 UTC 2017

Modified Files:
        pkgsrc/net/ocamlnet: Makefile buildlink3.mk options.mk

Log Message:
Added missing optional findlib directory to net/ocamlnet


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/ocamlnet/buildlink3.mk \
    pkgsrc/net/ocamlnet/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ocamlnet/Makefile
diff -u pkgsrc/net/ocamlnet/Makefile:1.42 pkgsrc/net/ocamlnet/Makefile:1.43
--- pkgsrc/net/ocamlnet/Makefile:1.42   Mon Sep 18 09:53:31 2017
+++ pkgsrc/net/ocamlnet/Makefile        Wed Oct  4 13:08:20 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2017/09/18 09:53:31 maya Exp $
+# $NetBSD: Makefile,v 1.43 2017/10/04 13:08:20 jaapb Exp $
 #
 
 DISTNAME=              ocamlnet-4.1.4
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            net
 MASTER_SITES=          http://download.camlcity.org/download/
 

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.7 pkgsrc/net/ocamlnet/buildlink3.mk:1.8
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.7       Mon Sep  4 18:17:47 2017
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Wed Oct  4 13:08:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/09/04 18:17:47 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/10/04 13:08:20 jaapb Exp $
 
 BUILDLINK_TREE+=       ocamlnet
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocamlnet
 OCAMLNET_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=4.1.2
-BUILDLINK_ABI_DEPENDS.ocamlnet+=       ocamlnet>=4.1.4
+BUILDLINK_ABI_DEPENDS.ocamlnet+=       ocamlnet>=4.1.4nb3
 BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK
Index: pkgsrc/net/ocamlnet/options.mk
diff -u pkgsrc/net/ocamlnet/options.mk:1.7 pkgsrc/net/ocamlnet/options.mk:1.8
--- pkgsrc/net/ocamlnet/options.mk:1.7  Mon Jul 17 12:30:55 2017
+++ pkgsrc/net/ocamlnet/options.mk      Wed Oct  4 13:08:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2017/07/17 12:30:55 jaapb Exp $
+# $NetBSD: options.mk,v 1.8 2017/10/04 13:08:20 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocamlnet
 PKG_SUPPORTED_OPTIONS= gtk gtk2 gnutls cmxs
@@ -36,6 +36,7 @@ CONFIGURE_ARGS+=      -disable-gtk2
 .if !empty(PKG_OPTIONS:Mgnutls)
 .  include "../../security/gnutls/buildlink3.mk"
 PLIST.gnutls=          yes
+OCAML_FINDLIB_DIRS+=   nettls-gnutls
 CONFIGURE_ARGS+=       -enable-gnutls
 .else
 CONFIGURE_ARGS+=       -disable-gnutls