CVS commit: pkgsrc/net/ocamlnet

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Mon Jun 20 15:36:04 UTC 2016

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

Log Message:
Updated package to work with new mk/ocaml.mk; no upstream changes. Revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/ocamlnet/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/ocamlnet/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ocamlnet/buildlink3.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.30 pkgsrc/net/ocamlnet/Makefile:1.31
--- pkgsrc/net/ocamlnet/Makefile:1.30   Thu May  5 16:04:21 2016
+++ pkgsrc/net/ocamlnet/Makefile        Mon Jun 20 15:36:04 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2016/05/05 16:04:21 jaapb Exp $
+# $NetBSD: Makefile,v 1.31 2016/06/20 15:36:04 jaapb Exp $
 #
 
 DISTNAME=              ocamlnet-4.1.1
+PKGREVISION=   1
 CATEGORIES=            net
 MASTER_SITES=          http://download.camlcity.org/download/
 
@@ -19,14 +20,9 @@ USE_TOOLS+=          gmake
 BUILD_TARGET=          all
 OCAML_USE_FINDLIB=     yes
 OCAML_FINDLIB_DIRS= \
-       ${OCAML_SITELIBDIR}/equeue ${OCAML_SITELIBDIR}/netcamlbox \
-       ${OCAML_SITELIBDIR}/netcgi2-plex ${OCAML_SITELIBDIR}/netcgi2 \
-       ${OCAML_SITELIBDIR}/netclient ${OCAML_SITELIBDIR}/netmulticore \
-       ${OCAML_SITELIBDIR}/netplex ${OCAML_SITELIBDIR}/netshm \
-       ${OCAML_SITELIBDIR}/netstring-pcre ${OCAML_SITELIBDIR}/netstring \
-       ${OCAML_SITELIBDIR}/netsys ${OCAML_SITELIBDIR}/netunidata \
-       ${OCAML_SITELIBDIR}/netzip ${OCAML_SITELIBDIR}/rpc-auth-local \
-       ${OCAML_SITELIBDIR}/rpc-generator ${OCAML_SITELIBDIR}/rpc
+       equeue netcamlbox netcgi2-plex netcgi2 netclient netmulticore \
+       netplex netshm netstring-pcre netstring netsys netunidata \
+       netzip rpc-auth-local rpc-generator rpc
 
 .include "../../mk/ocaml.mk"
 .include "../../mk/bsd.prefs.mk"
@@ -37,7 +33,7 @@ BUILD_TARGET+=                opt
 .endif
 .if ${OPSYS} == "SunOS"
 PLIST.xti=             yes
-OCAML_FINDLIB_DIRS+=   ${OCAML_SITELIBDIR}/rpc-xti
+OCAML_FINDLIB_DIRS+=   rpc-xti
 .endif
 
 .include "options.mk"

Index: pkgsrc/net/ocamlnet/PLIST
diff -u pkgsrc/net/ocamlnet/PLIST:1.12 pkgsrc/net/ocamlnet/PLIST:1.13
--- pkgsrc/net/ocamlnet/PLIST:1.12      Thu May  5 16:04:21 2016
+++ pkgsrc/net/ocamlnet/PLIST   Mon Jun 20 15:36:04 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2016/05/05 16:04:21 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/06/20 15:36:04 jaapb Exp $
 ${OCAML_SITELIB}/equeue/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
 ${OCAML_SITELIB}/equeue/equeue.cma
@@ -704,20 +704,3 @@ ${OCAML_SITELIB}/shell/shell_sys.cmi
 ${OCAML_SITELIB}/shell/shell_sys.mli
 ${OCAML_SITELIB}/shell/shell_uq.cmi
 ${OCAML_SITELIB}/shell/shell_uq.mli
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/equeue
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcgi2-plex
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netplex
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netclient
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netshm
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/shell
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcamlbox
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netstring
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-auth-local
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcgi2
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netmulticore
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netsys
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-generator
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netunidata
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netzip
-${PLIST.xti}@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-xti

Index: pkgsrc/net/ocamlnet/buildlink3.mk
diff -u pkgsrc/net/ocamlnet/buildlink3.mk:1.2 pkgsrc/net/ocamlnet/buildlink3.mk:1.3
--- pkgsrc/net/ocamlnet/buildlink3.mk:1.2       Fri Jul  6 09:29:14 2012
+++ pkgsrc/net/ocamlnet/buildlink3.mk   Mon Jun 20 15:36:04 2016
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/07/06 09:29:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2016/06/20 15:36:04 jaapb Exp $
 
 BUILDLINK_TREE+=       ocamlnet
 
 .if !defined(OCAMLNET_BUILDLINK3_MK)
 OCAMLNET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=3.5.1
+BUILDLINK_API_DEPENDS.ocamlnet+=       ocamlnet>=4.1.1nb1
 BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
 
 .endif # OCAMLNET_BUILDLINK3_MK