Mon Jun 20 15:36:04 2016 UTC ()
Updated package to work with new mk/ocaml.mk; no upstream changes. Revbump.


(jaapb)
diff -r1.30 -r1.31 pkgsrc/net/ocamlnet/Makefile
diff -r1.12 -r1.13 pkgsrc/net/ocamlnet/PLIST
diff -r1.2 -r1.3 pkgsrc/net/ocamlnet/buildlink3.mk
cvs diff -r1.30 -r1.31 pkgsrc/net/ocamlnet/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ocamlnet/Makefile 2016/05/05 16:04:21 1.30
+++ pkgsrc/net/ocamlnet/Makefile 2016/06/20 15:36:04 1.31
@@ -1,46 +1,42 @@ @@ -1,46 +1,42 @@
1# $NetBSD: Makefile,v 1.30 2016/05/05 16:04:21 jaapb Exp $ 1# $NetBSD: Makefile,v 1.31 2016/06/20 15:36:04 jaapb Exp $
2# 2#
3 3
4DISTNAME= ocamlnet-4.1.1 4DISTNAME= ocamlnet-4.1.1
 5PKGREVISION= 1
5CATEGORIES= net 6CATEGORIES= net
6MASTER_SITES= http://download.camlcity.org/download/ 7MASTER_SITES= http://download.camlcity.org/download/
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://projects.camlcity.org/projects/ocamlnet.html 10HOMEPAGE= http://projects.camlcity.org/projects/ocamlnet.html
10COMMENT= Library focusing on application-level network protocols (OCaml) 11COMMENT= Library focusing on application-level network protocols (OCaml)
11LICENSE= zlib AND gnu-gpl-v2 12LICENSE= zlib AND gnu-gpl-v2
12 13
13MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
14 15
15HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
16CONFIGURE_ARGS+= -without-nethttpd -disable-tcl -disable-apache \ 17CONFIGURE_ARGS+= -without-nethttpd -disable-tcl -disable-apache \
17 -enable-pcre -enable-zip 18 -enable-pcre -enable-zip
18USE_TOOLS+= gmake 19USE_TOOLS+= gmake
19BUILD_TARGET= all 20BUILD_TARGET= all
20OCAML_USE_FINDLIB= yes 21OCAML_USE_FINDLIB= yes
21OCAML_FINDLIB_DIRS= \ 22OCAML_FINDLIB_DIRS= \
22 ${OCAML_SITELIBDIR}/equeue ${OCAML_SITELIBDIR}/netcamlbox \ 23 equeue netcamlbox netcgi2-plex netcgi2 netclient netmulticore \
23 ${OCAML_SITELIBDIR}/netcgi2-plex ${OCAML_SITELIBDIR}/netcgi2 \ 24 netplex netshm netstring-pcre netstring netsys netunidata \
24 ${OCAML_SITELIBDIR}/netclient ${OCAML_SITELIBDIR}/netmulticore \ 25 netzip rpc-auth-local rpc-generator rpc
25 ${OCAML_SITELIBDIR}/netplex ${OCAML_SITELIBDIR}/netshm \ 
26 ${OCAML_SITELIBDIR}/netstring-pcre ${OCAML_SITELIBDIR}/netstring \ 
27 ${OCAML_SITELIBDIR}/netsys ${OCAML_SITELIBDIR}/netunidata \ 
28 ${OCAML_SITELIBDIR}/netzip ${OCAML_SITELIBDIR}/rpc-auth-local \ 
29 ${OCAML_SITELIBDIR}/rpc-generator ${OCAML_SITELIBDIR}/rpc 
30 26
31.include "../../mk/ocaml.mk" 27.include "../../mk/ocaml.mk"
32.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
33 29
34PLIST_VARS+= xti 30PLIST_VARS+= xti
35.if ${OCAML_USE_OPT_COMPILER} == "yes" 31.if ${OCAML_USE_OPT_COMPILER} == "yes"
36BUILD_TARGET+= opt 32BUILD_TARGET+= opt
37.endif 33.endif
38.if ${OPSYS} == "SunOS" 34.if ${OPSYS} == "SunOS"
39PLIST.xti= yes 35PLIST.xti= yes
40OCAML_FINDLIB_DIRS+= ${OCAML_SITELIBDIR}/rpc-xti 36OCAML_FINDLIB_DIRS+= rpc-xti
41.endif 37.endif
42 38
43.include "options.mk" 39.include "options.mk"
44.include "../../devel/pcre-ocaml/buildlink3.mk" 40.include "../../devel/pcre-ocaml/buildlink3.mk"
45.include "../../archivers/ocaml-zip/buildlink3.mk" 41.include "../../archivers/ocaml-zip/buildlink3.mk"
46.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/net/ocamlnet/PLIST (expand / switch to unified diff)

--- pkgsrc/net/ocamlnet/PLIST 2016/05/05 16:04:21 1.12
+++ pkgsrc/net/ocamlnet/PLIST 2016/06/20 15:36:04 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2016/05/05 16:04:21 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.13 2016/06/20 15:36:04 jaapb Exp $
2${OCAML_SITELIB}/equeue/META 2${OCAML_SITELIB}/equeue/META
3${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a 3${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.a
4${OCAML_SITELIB}/equeue/equeue.cma 4${OCAML_SITELIB}/equeue/equeue.cma
5${OCAML_SITELIB}/equeue/equeue.cmi 5${OCAML_SITELIB}/equeue/equeue.cmi
6${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxa 6${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.cmxa
7${OCAML_SITELIB}/equeue/equeue.mli 7${OCAML_SITELIB}/equeue/equeue.mli
8${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.a 8${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.a
9${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.cmxa 9${PLIST.ocaml-opt}${OCAML_SITELIB}/equeue/equeue.p.cmxa
10${OCAML_SITELIB}/equeue/unixqueue.cmi 10${OCAML_SITELIB}/equeue/unixqueue.cmi
11${OCAML_SITELIB}/equeue/unixqueue.mli 11${OCAML_SITELIB}/equeue/unixqueue.mli
12${OCAML_SITELIB}/equeue/unixqueue_pollset.cmi 12${OCAML_SITELIB}/equeue/unixqueue_pollset.cmi
13${OCAML_SITELIB}/equeue/unixqueue_pollset.mli 13${OCAML_SITELIB}/equeue/unixqueue_pollset.mli
14${OCAML_SITELIB}/equeue/unixqueue_select.cmi 14${OCAML_SITELIB}/equeue/unixqueue_select.cmi
@@ -694,30 +694,13 @@ ${OCAML_SITELIB}/shell/META @@ -694,30 +694,13 @@ ${OCAML_SITELIB}/shell/META
694${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.a 694${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.a
695${OCAML_SITELIB}/shell/shell.cma 695${OCAML_SITELIB}/shell/shell.cma
696${OCAML_SITELIB}/shell/shell.cmi 696${OCAML_SITELIB}/shell/shell.cmi
697${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.cmxa 697${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.cmxa
698${OCAML_SITELIB}/shell/shell.mli 698${OCAML_SITELIB}/shell/shell.mli
699${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.a 699${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.a
700${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.cmxa 700${PLIST.ocaml-opt}${OCAML_SITELIB}/shell/shell.p.cmxa
701${OCAML_SITELIB}/shell/shell_fs.cmi 701${OCAML_SITELIB}/shell/shell_fs.cmi
702${OCAML_SITELIB}/shell/shell_fs.mli 702${OCAML_SITELIB}/shell/shell_fs.mli
703${OCAML_SITELIB}/shell/shell_sys.cmi 703${OCAML_SITELIB}/shell/shell_sys.cmi
704${OCAML_SITELIB}/shell/shell_sys.mli 704${OCAML_SITELIB}/shell/shell_sys.mli
705${OCAML_SITELIB}/shell/shell_uq.cmi 705${OCAML_SITELIB}/shell/shell_uq.cmi
706${OCAML_SITELIB}/shell/shell_uq.mli 706${OCAML_SITELIB}/shell/shell_uq.mli
707@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/equeue 
708@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcgi2-plex 
709@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netplex 
710@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netclient 
711@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netshm 
712@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc 
713@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/shell 
714@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcamlbox 
715@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netstring 
716@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-auth-local 
717@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netcgi2 
718@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netmulticore 
719@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netsys 
720@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-generator 
721@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netunidata 
722@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/netzip 
723${PLIST.xti}@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/rpc-xti 
cvs diff -r1.2 -r1.3 pkgsrc/net/ocamlnet/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/ocamlnet/buildlink3.mk 2012/07/06 09:29:14 1.2
+++ pkgsrc/net/ocamlnet/buildlink3.mk 2016/06/20 15:36:04 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.2 2012/07/06 09:29:14 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2016/06/20 15:36:04 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocamlnet 3BUILDLINK_TREE+= ocamlnet
4 4
5.if !defined(OCAMLNET_BUILDLINK3_MK) 5.if !defined(OCAMLNET_BUILDLINK3_MK)
6OCAMLNET_BUILDLINK3_MK:= 6OCAMLNET_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocamlnet+= ocamlnet>=3.5.1 8BUILDLINK_API_DEPENDS.ocamlnet+= ocamlnet>=4.1.1nb1
9BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet 9BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet
10 10
11.endif # OCAMLNET_BUILDLINK3_MK 11.endif # OCAMLNET_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -ocamlnet 13BUILDLINK_TREE+= -ocamlnet