pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Updated package to use ocaml.mk framework. No upstream...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8c8a729b6bd0
branches: trunk
changeset: 349054:8c8a729b6bd0
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Sat Jun 25 14:31:13 2016 +0000
description:
Updated package to use ocaml.mk framework. No upstream changes.
diffstat:
math/ocaml-zarith/Makefile | 10 +-
math/ocaml-zarith/PLIST | 32 +-
security/ocaml-cryptokit/Makefile | 4 +-
security/ocaml-cryptokit/PLIST | 4 +-
textproc/ocaml-expat/Makefile | 16 +-
textproc/ocaml-expat/PLIST | 22 +-
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 +-
x11/ocaml-lablgtk/Makefile | 10 +-
x11/ocaml-lablgtk/PLIST | 698 ++++++++++++++++----------------
x11/ocaml-lablgtk/PLIST.glade | 20 +-
x11/ocaml-lablgtk/PLIST.gnome | 28 +-
x11/ocaml-lablgtk/PLIST.gnomecanvas | 46 +-
x11/ocaml-lablgtk/PLIST.gtksourceview | 34 +-
x11/ocaml-lablgtk/PLIST.gtksourceview2 | 34 +-
x11/ocaml-lablgtk/PLIST.gtkspell | 20 +-
x11/ocaml-lablgtk/PLIST.svg | 20 +-
21 files changed, 537 insertions(+), 568 deletions(-)
diffs (truncated from 1331 to 300 lines):
diff -r 34ced107c8b2 -r 8c8a729b6bd0 math/ocaml-zarith/Makefile
--- a/math/ocaml-zarith/Makefile Sat Jun 25 14:30:31 2016 +0000
+++ b/math/ocaml-zarith/Makefile Sat Jun 25 14:31:13 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/05/05 11:45:40 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/25 14:31:13 jaapb Exp $
#
DISTNAME= ocaml-zarith-1.4.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= math
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1574/
@@ -11,8 +11,6 @@
COMMENT= OCaml arithmetic library for arbitrary precision integers
LICENSE= gnu-lgpl-v2
-DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
# zarith library creation is racy
MAKE_JOBS_SAFE= no
@@ -20,12 +18,12 @@
CONFIGURE_ENV+= DESTDIR=${DESTDIR}
USE_TOOLS+= gmake perl
-INSTALLATION_DIRS= lib/ocaml/site-lib
+OCAML_USE_FINDLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/ocaml-//}
REPLACE_PERL+= z_pp.pl
.include "../../devel/gmp/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 34ced107c8b2 -r 8c8a729b6bd0 math/ocaml-zarith/PLIST
--- a/math/ocaml-zarith/PLIST Sat Jun 25 14:30:31 2016 +0000
+++ b/math/ocaml-zarith/PLIST Sat Jun 25 14:31:13 2016 +0000
@@ -1,17 +1,15 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/31 10:27:26 markd Exp $
-lib/ocaml/site-lib/zarith/big_int_Z.cmi
-lib/ocaml/site-lib/zarith/big_int_Z.mli
-lib/ocaml/site-lib/zarith/dllzarith.so
-lib/ocaml/site-lib/zarith/libzarith.a
-lib/ocaml/site-lib/zarith/META
-lib/ocaml/site-lib/zarith/q.cmi
-lib/ocaml/site-lib/zarith/q.mli
-lib/ocaml/site-lib/zarith/zarith.a
-lib/ocaml/site-lib/zarith/zarith.cma
-lib/ocaml/site-lib/zarith/zarith.cmxa
-lib/ocaml/site-lib/zarith/zarith.cmxs
-lib/ocaml/site-lib/zarith/zarith.h
-lib/ocaml/site-lib/zarith/z.cmi
-lib/ocaml/site-lib/zarith/z.mli
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/zarith
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/zarith
+@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:31:13 jaapb Exp $
+${OCAML_SITELIB}/zarith/big_int_Z.cmi
+${OCAML_SITELIB}/zarith/big_int_Z.mli
+${OCAML_SITELIB}/zarith/dllzarith.so
+${OCAML_SITELIB}/zarith/libzarith.a
+${OCAML_SITELIB}/zarith/META
+${OCAML_SITELIB}/zarith/q.cmi
+${OCAML_SITELIB}/zarith/q.mli
+${OCAML_SITELIB}/zarith/zarith.a
+${OCAML_SITELIB}/zarith/zarith.cma
+${OCAML_SITELIB}/zarith/zarith.cmxa
+${OCAML_SITELIB}/zarith/zarith.cmxs
+${OCAML_SITELIB}/zarith/zarith.h
+${OCAML_SITELIB}/zarith/z.cmi
+${OCAML_SITELIB}/zarith/z.mli
diff -r 34ced107c8b2 -r 8c8a729b6bd0 security/ocaml-cryptokit/Makefile
--- a/security/ocaml-cryptokit/Makefile Sat Jun 25 14:30:31 2016 +0000
+++ b/security/ocaml-cryptokit/Makefile Sat Jun 25 14:31:13 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2016/06/20 10:21:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/25 14:31:35 jaapb Exp $
#
DISTNAME= cryptokit-1.10
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1493/
diff -r 34ced107c8b2 -r 8c8a729b6bd0 security/ocaml-cryptokit/PLIST
--- a/security/ocaml-cryptokit/PLIST Sat Jun 25 14:30:31 2016 +0000
+++ b/security/ocaml-cryptokit/PLIST Sat Jun 25 14:31:13 2016 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/09 22:28:12 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/cryptokit
+@comment $NetBSD: PLIST,v 1.4 2016/06/25 14:31:35 jaapb Exp $
lib/ocaml/site-lib/cryptokit/META
lib/ocaml/site-lib/cryptokit/dllcryptokit_stubs.so
lib/ocaml/site-lib/cryptokit/libcryptokit_stubs.a
@@ -10,4 +9,3 @@
${PLIST.ocaml-opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmxa
${PLIST.ocaml-opt}lib/ocaml/site-lib/cryptokit/cryptokit.cmxs
lib/ocaml/site-lib/cryptokit/cryptokit.mli
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/cryptokit
diff -r 34ced107c8b2 -r 8c8a729b6bd0 textproc/ocaml-expat/Makefile
--- a/textproc/ocaml-expat/Makefile Sat Jun 25 14:30:31 2016 +0000
+++ b/textproc/ocaml-expat/Makefile Sat Jun 25 14:31:13 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/05/05 11:45:41 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/25 14:32:00 jaapb Exp $
#
DISTNAME= ocaml-expat-0.9.1
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= textproc
MASTER_SITES= http://mmzeeman.home.xs4all.nl/ocaml/
@@ -15,15 +15,13 @@
USE_LANGUAGES= c
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+= allopt expat.cmxs
.endif
-.include "../../devel/ocaml-findlib/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 34ced107c8b2 -r 8c8a729b6bd0 textproc/ocaml-expat/PLIST
--- a/textproc/ocaml-expat/PLIST Sat Jun 25 14:30:31 2016 +0000
+++ b/textproc/ocaml-expat/PLIST Sat Jun 25 14:31:13 2016 +0000
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/16 09:45:19 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/expat
-lib/ocaml/site-lib/expat/META
-lib/ocaml/site-lib/expat/dllmlexpat.so
-${PLIST.opt}lib/ocaml/site-lib/expat/expat.a
-lib/ocaml/site-lib/expat/expat.cma
-${PLIST.opt}lib/ocaml/site-lib/expat/expat.cmxa
-${PLIST.opt}lib/ocaml/site-lib/expat/expat.cmxs
-lib/ocaml/site-lib/expat/expat.cmi
-lib/ocaml/site-lib/expat/expat.mli
-lib/ocaml/site-lib/expat/libmlexpat.a
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/expat
+@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:32:00 jaapb Exp $
+${OCAML_SITELIB}/expat/META
+${OCAML_SITELIB}/expat/dllmlexpat.so
+${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.a
+${OCAML_SITELIB}/expat/expat.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.cmxs
+${OCAML_SITELIB}/expat/expat.cmi
+${OCAML_SITELIB}/expat/expat.mli
+${OCAML_SITELIB}/expat/libmlexpat.a
diff -r 34ced107c8b2 -r 8c8a729b6bd0 www/ocaml-curl/Makefile
--- a/www/ocaml-curl/Makefile Sat Jun 25 14:30:31 2016 +0000
+++ b/www/ocaml-curl/Makefile Sat Jun 25 14:31:13 2016 +0000
@@ -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 @@
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 -r 34ced107c8b2 -r 8c8a729b6bd0 www/ocaml-curl/PLIST
--- a/www/ocaml-curl/PLIST Sat Jun 25 14:30:31 2016 +0000
+++ b/www/ocaml-curl/PLIST Sat Jun 25 14:31:13 2016 +0000
@@ -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 -r 34ced107c8b2 -r 8c8a729b6bd0 www/ocaml-http/Makefile
--- a/www/ocaml-http/Makefile Sat Jun 25 14:30:31 2016 +0000
+++ b/www/ocaml-http/Makefile Sat Jun 25 14:31:13 2016 +0000
@@ -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 @@
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 -r 34ced107c8b2 -r 8c8a729b6bd0 www/ocaml-http/PLIST
--- a/www/ocaml-http/PLIST Sat Jun 25 14:30:31 2016 +0000
+++ b/www/ocaml-http/PLIST Sat Jun 25 14:31:13 2016 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index