CVS commit: pkgsrc/www/ocaml-http

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Jun 25 14:32:50 UTC 2016

Modified Files:
        pkgsrc/www/ocaml-http: Makefile PLIST

Log Message:
Updated package to use ocaml.mk framework. No upstream changes.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/ocaml-http/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ocaml-http/PLIST

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

Modified files:

Index: pkgsrc/www/ocaml-http/Makefile
diff -u pkgsrc/www/ocaml-http/Makefile:1.9 pkgsrc/www/ocaml-http/Makefile:1.10
--- pkgsrc/www/ocaml-http/Makefile:1.9  Thu May  5 11:45:42 2016
+++ pkgsrc/www/ocaml-http/Makefile      Sat Jun 25 14:32:49 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/05/05 11:45:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/25 14:32:49 jaapb Exp $
 #
 
 DISTNAME=      ocaml-http-0.1.5
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    www
 MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/545/
 
@@ -14,21 +14,19 @@ LICENSE=    gnu-gpl-v2
 WRKSRC=                ${WRKDIR}/ocaml-http_0.1.5
 USE_LANGUAGES= # none
 USE_TOOLS+=    gmake
-MAKE_ENV=      PKG_DESTDIR=${DESTDIR}/${PREFIX}/lib/ocaml/site-lib/
+MAKE_ENV=      PKG_DESTDIR=${DESTDIR}/${PREFIX}/${OCAML_SITELIBDIR}
 
 BUILD_TARGET=  all
 
-PLIST_VARS=     opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "arm")
-PLIST.opt=      yes
+OCAML_USE_FINDLIB=     yes
+
+.include "../../mk/ocaml.mk"
+
+.if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET+= opt
 .endif
 
 .include "../../lang/camlp4/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../net/ocamlnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ocaml-http/PLIST
diff -u pkgsrc/www/ocaml-http/PLIST:1.1 pkgsrc/www/ocaml-http/PLIST:1.2
--- pkgsrc/www/ocaml-http/PLIST:1.1     Wed Oct 10 11:23:32 2012
+++ pkgsrc/www/ocaml-http/PLIST Sat Jun 25 14:32:49 2016
@@ -1,24 +1,22 @@
-@comment $NetBSD: PLIST,v 1.1 2012/10/10 11:23:32 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/http
-lib/ocaml/site-lib/http/META
-${PLIST.opt}lib/ocaml/site-lib/http/http.a
-lib/ocaml/site-lib/http/http.cma
-${PLIST.opt}lib/ocaml/site-lib/http/http.cmxa
-lib/ocaml/site-lib/http/http_common.cmi
-lib/ocaml/site-lib/http/http_common.mli
-lib/ocaml/site-lib/http/http_daemon.cmi
-lib/ocaml/site-lib/http/http_daemon.mli
-lib/ocaml/site-lib/http/http_message.cmi
-lib/ocaml/site-lib/http/http_message.mli
-${PLIST.opt}lib/ocaml/site-lib/http/http_mt.a
-lib/ocaml/site-lib/http/http_mt.cma
-${PLIST.opt}lib/ocaml/site-lib/http/http_mt.cmxa
-lib/ocaml/site-lib/http/http_request.cmi
-lib/ocaml/site-lib/http/http_request.mli
-lib/ocaml/site-lib/http/http_response.cmi
-lib/ocaml/site-lib/http/http_response.mli
-lib/ocaml/site-lib/http/http_types.cmi
-lib/ocaml/site-lib/http/http_types.mli
-lib/ocaml/site-lib/http/http_user_agent.cmi
-lib/ocaml/site-lib/http/http_user_agent.mli
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/http
+@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:32:49 jaapb Exp $
+${OCAML_SITELIB}/http/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http.a
+${OCAML_SITELIB}/http/http.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http.cmxa
+${OCAML_SITELIB}/http/http_common.cmi
+${OCAML_SITELIB}/http/http_common.mli
+${OCAML_SITELIB}/http/http_daemon.cmi
+${OCAML_SITELIB}/http/http_daemon.mli
+${OCAML_SITELIB}/http/http_message.cmi
+${OCAML_SITELIB}/http/http_message.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http_mt.a
+${OCAML_SITELIB}/http/http_mt.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http_mt.cmxa
+${OCAML_SITELIB}/http/http_request.cmi
+${OCAML_SITELIB}/http/http_request.mli
+${OCAML_SITELIB}/http/http_response.cmi
+${OCAML_SITELIB}/http/http_response.mli
+${OCAML_SITELIB}/http/http_types.cmi
+${OCAML_SITELIB}/http/http_types.mli
+${OCAML_SITELIB}/http/http_user_agent.cmi
+${OCAML_SITELIB}/http/http_user_agent.mli