From 507e1c2954d905875efc5c9cdecb31924e2b7a1e Mon Sep 17 00:00:00 2001 From: jaapb Date: Sat, 25 Jun 2016 14:31:13 +0000 Subject: Updated package to use ocaml.mk framework. No upstream changes. --- www/ocaml-curl/Makefile | 18 +++++------------- www/ocaml-curl/PLIST | 18 ++++++++---------- www/ocaml-http/Makefile | 18 ++++++++---------- www/ocaml-http/PLIST | 46 ++++++++++++++++++++++------------------------ www/ocsigen/Makefile | 3 ++- www/ocsigen/PLIST | 4 +--- 6 files changed, 46 insertions(+), 61 deletions(-) (limited to 'www') diff --git a/www/ocaml-curl/Makefile b/www/ocaml-curl/Makefile index 4f6f72995e8..5a467ed6ece 100644 --- a/www/ocaml-curl/Makefile +++ b/www/ocaml-curl/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.13 2016/05/05 11:45:42 jaapb Exp $ +# $NetBSD: Makefile,v 1.14 2016/06/25 14:32:27 jaapb Exp $ # DISTNAME= ocurl-0.5.3 PKGNAME= ocaml-curl-0.5.3 EXTRACT_SUFX= .tgz -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= www net devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ocurl/} @@ -15,25 +15,17 @@ LICENSE= mit MAKE_JOBS_SAFE= no -DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib - USE_TOOLS= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-findlib -.include "../../mk/bsd.prefs.mk" +OCAML_USE_FINDLIB= yes -PLIST_VARS+= opt -.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ - (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") -PLIST.opt= yes -.endif +.include "../../mk/bsd.prefs.mk" WRKSRC= ${WRKDIR}/ocurl USE_LANGUAGES= c -INSTALLATION_DIRS+= lib/ocaml/site-lib - -.include "../../lang/ocaml/buildlink3.mk" .include "../../www/curl/buildlink3.mk" +.include "../../mk/ocaml.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ocaml-curl/PLIST b/www/ocaml-curl/PLIST index f4fad7ecc02..527c34e556f 100644 --- a/www/ocaml-curl/PLIST +++ b/www/ocaml-curl/PLIST @@ -1,10 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2014/10/28 14:53:19 hiramatsu Exp $ -@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/curl -lib/ocaml/site-lib/curl/META -${PLIST.opt}lib/ocaml/site-lib/curl/curl.a -lib/ocaml/site-lib/curl/curl.cma -lib/ocaml/site-lib/curl/curl.cmi -${PLIST.opt}lib/ocaml/site-lib/curl/curl.cmxa -lib/ocaml/site-lib/curl/curl.mli -${PLIST.opt}lib/ocaml/site-lib/curl/libcurl-helper.a -@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/curl +@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:32:27 jaapb Exp $ +${OCAML_SITELIB}/curl/META +${PLIST.ocaml-opt}${OCAML_SITELIB}/curl/curl.a +${OCAML_SITELIB}/curl/curl.cma +${OCAML_SITELIB}/curl/curl.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/curl/curl.cmxa +${OCAML_SITELIB}/curl/curl.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/curl/libcurl-helper.a diff --git a/www/ocaml-http/Makefile b/www/ocaml-http/Makefile index da96d77e0f7..07fca5861a6 100644 --- a/www/ocaml-http/Makefile +++ b/www/ocaml-http/Makefile @@ -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" diff --git a/www/ocaml-http/PLIST b/www/ocaml-http/PLIST index fc6622917cd..f8cafc80d1d 100644 --- a/www/ocaml-http/PLIST +++ b/www/ocaml-http/PLIST @@ -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 diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile index 27448b1d896..f4b8bdeadb7 100644 --- a/www/ocsigen/Makefile +++ b/www/ocsigen/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.22 2016/06/20 19:35:56 jaapb Exp $ +# $NetBSD: Makefile,v 1.23 2016/06/25 14:33:41 jaapb Exp $ # VERSION= 2.7 GITHUB_PROJECT= ocsigenserver PKGNAME= ocsigen-${VERSION} DISTNAME= ${GITHUB_PROJECT}-${VERSION} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} diff --git a/www/ocsigen/PLIST b/www/ocsigen/PLIST index 742385a6738..f806f953f2e 100644 --- a/www/ocsigen/PLIST +++ b/www/ocsigen/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2016/02/06 13:20:33 jaapb Exp $ -@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/ocsigenserver +@comment $NetBSD: PLIST,v 1.7 2016/06/25 14:33:41 jaapb Exp $ bin/ocsigenserver ${PLIST.ocaml-opt}bin/ocsigenserver.opt share/examples/ocsigen/ocsigenserver.conf @@ -184,4 +183,3 @@ share/ocsigen/www/ocsigenstuff/tgz.png share/ocsigen/www/ocsigenstuff/txt.png share/ocsigen/www/ocsigenstuff/unknown.png share/ocsigen/www/ocsigenstuff/video.png -@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/ocsigenserver -- cgit v1.2.3