CVS commit: pkgsrc/www/ocaml-curl

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

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

Modified Files:
        pkgsrc/www/ocaml-curl: 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.13 -r1.14 pkgsrc/www/ocaml-curl/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ocaml-curl/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-curl/Makefile
diff -u pkgsrc/www/ocaml-curl/Makefile:1.13 pkgsrc/www/ocaml-curl/Makefile:1.14
--- pkgsrc/www/ocaml-curl/Makefile:1.13 Thu May  5 11:45:42 2016
+++ pkgsrc/www/ocaml-curl/Makefile      Sat Jun 25 14:32:27 2016
@@ -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"

Index: pkgsrc/www/ocaml-curl/PLIST
diff -u pkgsrc/www/ocaml-curl/PLIST:1.2 pkgsrc/www/ocaml-curl/PLIST:1.3
--- pkgsrc/www/ocaml-curl/PLIST:1.2     Tue Oct 28 14:53:19 2014
+++ pkgsrc/www/ocaml-curl/PLIST Sat Jun 25 14:32:27 2016
@@ -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