summaryrefslogtreecommitdiff
path: root/www/ocaml-curl
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2016-06-25 14:31:13 +0000
committerjaapb <jaapb@pkgsrc.org>2016-06-25 14:31:13 +0000
commit328cc753f1e13f695b557348c0e7677ae5bc46e0 (patch)
tree14456244ac335625bc740a8d7ef30da76e5d121b /www/ocaml-curl
parent70ae7e7365ba687c1f88de655aa14b9a1ba8720d (diff)
downloadpkgsrc-328cc753f1e13f695b557348c0e7677ae5bc46e0.tar.gz
Updated package to use ocaml.mk framework. No upstream changes.
Diffstat (limited to 'www/ocaml-curl')
-rw-r--r--www/ocaml-curl/Makefile18
-rw-r--r--www/ocaml-curl/PLIST18
2 files changed, 13 insertions, 23 deletions
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