pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ocaml Changes 3.10.1:
details: https://anonhg.NetBSD.org/pkgsrc/rev/a91867ef4404
branches: trunk
changeset: 537998:a91867ef4404
user: adam <adam%pkgsrc.org@localhost>
date: Wed Jan 23 20:42:25 2008 +0000
description:
Changes 3.10.1:
* Bug fixes
* New features:
- made configure script work on PlayStation 3
- ARM port: brought up-to-date for Debian 4.0 (Etch)
- many other small changes and bugfixes in camlp4, ocamlbuild, labltk,
emacs files
diffstat:
lang/ocaml/Makefile | 4 ++--
lang/ocaml/Makefile.common | 12 ++++++------
lang/ocaml/PLIST | 9 ++++++++-
lang/ocaml/PLIST.opt | 4 +++-
lang/ocaml/buildlink3.mk | 15 ++++++++-------
lang/ocaml/distinfo | 12 ++++++------
lang/ocaml/patches/patch-at | 16 ++++++++--------
lang/ocaml/patches/patch-aw | 6 +++---
8 files changed, 44 insertions(+), 34 deletions(-)
diffs (266 lines):
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/Makefile Wed Jan 23 20:42:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/12/21 17:02:53 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2008/01/23 20:42:25 adam Exp $
.include "Makefile.common"
@@ -43,7 +43,7 @@
# to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}. /bin/ksh, which
# is what ${SH} is on SunOS, doesn't exhibit this behaviour.
.if ${OPSYS} == "SunOS"
-INSTALL_MAKE_FLAGS+= SHELL=${SH}
+INSTALL_MAKE_FLAGS+= SHELL=${SH:Q}
.endif
.include "../../mk/bsd.pkg.mk"
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/Makefile.common Wed Jan 23 20:42:25 2008 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.19 2007/09/14 15:34:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2008/01/23 20:42:25 adam Exp $
-DISTNAME= ocaml-3.10.0
+DISTNAME= ocaml-3.10.1
CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.10/
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +16,7 @@
HAS_CONFIGURE= yes
CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q}
CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
-CONFIGURE_ARGS+= -prefix ${PREFIX:Q}
+CONFIGURE_ARGS+= -prefix ${PREFIX}
CONFIGURE_ARGS+= -libs ${LDFLAGS:Q}
CONFIGURE_ARGS+= -with-pthread
CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q}
@@ -35,11 +35,11 @@
.PHONY: cp-power-bsd
cp-power-bsd:
- ${CP} ${WRKSRC:Q}/asmrun/power-elf.S ${WRKSRC:Q}/asmrun/power-bsd.S
+ ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
.PHONY: cp-gnu-config
cp-gnu-config:
- ${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.guess ${WRKSRC:Q}/config/gnu/
- ${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.sub ${WRKSRC:Q}/config/gnu/
+ ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
+ ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
.include "../../mk/pthread.buildlink3.mk"
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/PLIST Wed Jan 23 20:42:25 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/09/14 15:34:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/01/23 20:42:25 adam Exp $
bin/camlp4
bin/camlp4boot
bin/camlp4o
@@ -170,6 +170,7 @@
lib/ocaml/camlp4/Camlp4Top/Top.cmo
lib/ocaml/camlp4/Camlp4Top/Top.o
lib/ocaml/camlp4/Camlp4_config.cmi
+lib/ocaml/camlp4/Camlp4_import.cmi
lib/ocaml/camlp4/camlp4fulllib.a
lib/ocaml/camlp4/camlp4fulllib.cma
lib/ocaml/camlp4/camlp4lib.a
@@ -266,8 +267,14 @@
lib/ocaml/obj.mli
lib/ocaml/ocamlbuild/ocamlbuild.cmo
lib/ocaml/ocamlbuild/ocamlbuild.o
+lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo
+lib/ocaml/ocamlbuild/ocamlbuild_executor.o
lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi
lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
lib/ocaml/ocamlbuild/ocamlbuildlib.a
lib/ocaml/ocamlbuild/ocamlbuildlib.cma
lib/ocaml/ocamldoc/ocamldoc.hva
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/PLIST.opt
--- a/lang/ocaml/PLIST.opt Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/PLIST.opt Wed Jan 23 20:42:25 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.13 2007/09/14 15:34:09 adam Exp $
+@comment $NetBSD: PLIST.opt,v 1.14 2008/01/23 20:42:25 adam Exp $
bin/camlp4o.opt
bin/camlp4of.opt
bin/camlp4oof.opt
@@ -90,6 +90,8 @@
lib/ocaml/nums.cmxa
lib/ocaml/obj.cmx
lib/ocaml/ocamlbuild/ocamlbuild.cmx
+lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
+lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx
lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
lib/ocaml/ocamldoc/odoc_info.a
lib/ocaml/ocamldoc/odoc_info.cmxa
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/buildlink3.mk
--- a/lang/ocaml/buildlink3.mk Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/buildlink3.mk Wed Jan 23 20:42:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2008/01/23 20:42:25 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@
BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml}
BUILDLINK_PACKAGES+= ocaml
+
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml
.if !empty(OCAML_BUILDLINK3_MK:M+)
@@ -34,18 +35,18 @@
ocaml-wrappers:
${_PKG_SILENT}${_PKG_DEBUG} set -e; \
for w in ${OCAML_WRAPPERS}; do \
- ${SED} -e 's|@SH@|'${SH:Q}'|g' \
+ ${SED} -e 's|@SH@|'${SH:Q}'|g' \
-e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \
-e 's|@CFLAGS@|'${CFLAGS:Q}'|g' \
-e 's|@LDFLAGS@|'${LDFLAGS:Q}'|g' \
- < ${.CURDIR:Q}/../../lang/ocaml/files/wrapper.sh \
- > ${BUILDLINK_DIR:Q}/bin/"$$w"; \
- ${CHMOD} +x ${BUILDLINK_DIR:Q}/bin/"$$w"; \
+ < ${.CURDIR}/../../lang/ocaml/files/wrapper.sh \
+ > ${BUILDLINK_DIR}/bin/"$$w"; \
+ ${CHMOD} +x ${BUILDLINK_DIR}/bin/"$$w"; \
done
${_PKG_SILENT}${_PKG_DEBUG} set -e; \
for w in ${OCAMLBIN_WRAPPERS}; do \
- ${LN} -s ${BUILDLINK_PREFIX.ocaml:Q}/bin/"$$w" \
- ${BUILDLINK_DIR:Q}/bin/"$$w"; \
+ ${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/"$$w" \
+ ${BUILDLINK_DIR}/bin/"$$w"; \
done
.endif # OCAML_BUILDLINK3_MK
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/distinfo Wed Jan 23 20:42:25 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.40 2007/10/04 05:19:16 adam Exp $
+$NetBSD: distinfo,v 1.41 2008/01/23 20:42:25 adam Exp $
-SHA1 (ocaml-3.10.0.tar.bz2) = 5c7ee7dd5ac55bee2877ca0ace5ffb044df8efb5
-RMD160 (ocaml-3.10.0.tar.bz2) = 19615743230f0215135eb966f1f08a6a828f9aa4
-Size (ocaml-3.10.0.tar.bz2) = 2786012 bytes
+SHA1 (ocaml-3.10.1.tar.bz2) = 908176ff481fd6ce3ab89a96a76d9b3d7ca8c105
+RMD160 (ocaml-3.10.1.tar.bz2) = bf5bc105aece26df6460204d5a04e90c0d90d1cb
+Size (ocaml-3.10.1.tar.bz2) = 2282041 bytes
SHA1 (patch-aa) = 858f326fe4db7971a05b3b001c6aecc02ecb2903
SHA1 (patch-ab) = c6140f43fdb76c4f2d499f9d3beb714de3926460
SHA1 (patch-ac) = efe8290b394f40d6675fc9d57557c49ddafdb239
@@ -11,10 +11,10 @@
SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
SHA1 (patch-aj) = 61b977596cbaf8e16a66bfdbe8a7ca1701073fa7
SHA1 (patch-an) = 7a56338a19015b407cbfa8a328655e2bd035f8bf
-SHA1 (patch-at) = 0e7657ff41899864fba9db8bd330b790b31a24e8
+SHA1 (patch-at) = 4ce7a79f0c418ffe662401e7bd0bb0b150ee5e8f
SHA1 (patch-au) = 2696bc59b08a0ef06157b77665588bcf26feb306
SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
-SHA1 (patch-aw) = 9d8b75ebba957ff69e4a344400ba3d1c0adb3951
+SHA1 (patch-aw) = 5838ca13ba0f5d9328b9bb2135604f72e7d8b87b
SHA1 (patch-ax) = 2419dffbf548837dc61e137032e06d33b1059976
SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
SHA1 (patch-az) = 4870ed5960559a90aaaa5e2e881b546e6a5898ad
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/patches/patch-at
--- a/lang/ocaml/patches/patch-at Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/patches/patch-at Wed Jan 23 20:42:25 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.14 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-at,v 1.15 2008/01/23 20:42:25 adam Exp $
---- configure.orig 2007-05-03 14:49:56.000000000 +0200
+--- configure.orig 2008-01-04 14:26:38.000000000 +0100
+++ configure
@@ -488,7 +488,7 @@ mksharedlibrpath=''
@@ -31,7 +31,7 @@
i[3456]86-*-darwin*) arch=i386; system=macosx;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
mips-*-irix6*) arch=mips; system=irix;;
-@@ -680,6 +682,7 @@ case "$arch,$model,$system" in
+@@ -691,6 +693,7 @@ case "$arch,$model,$system" in
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,*,linux) profiling='prof';;
amd64,*,gnu) profiling='prof';;
@@ -39,7 +39,7 @@
*) profiling='noprof';;
esac
-@@ -1070,6 +1073,8 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1081,6 +1084,8 @@ if test "$pthread_wanted" = "yes"; then
pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
*-*-freebsd*) pthread_link="-pthread"
pthread_caml_link="-cclib -pthread";;
@@ -48,7 +48,7 @@
*-*-openbsd*) pthread_link="-pthread"
pthread_caml_link="-cclib -pthread";;
*) pthread_link="-lpthread"
-@@ -1121,6 +1126,7 @@ fi
+@@ -1132,6 +1137,7 @@ fi
x11_include="not found"
x11_link="not found"
@@ -56,7 +56,7 @@
for dir in \
$x11_include_dir \
\
-@@ -1167,6 +1173,7 @@ do
+@@ -1178,6 +1184,7 @@ do
break
fi
done
@@ -64,7 +64,7 @@
if test "$x11_include" = "not found"; then
x11_try_lib_dir=''
-@@ -1256,31 +1263,8 @@ dbm_include="not found"
+@@ -1269,31 +1276,8 @@ dbm_include="not found"
dbm_link="not found"
use_gdbm_ndbm=no
@@ -98,7 +98,7 @@
if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
echo "NDBM not found, the \"dbm\" library will not be supported."
else
-@@ -1290,8 +1274,8 @@ else
+@@ -1303,8 +1287,8 @@ else
else
dbm_include="-I$dbm_include"
fi
diff -r 0354210bf109 -r a91867ef4404 lang/ocaml/patches/patch-aw
--- a/lang/ocaml/patches/patch-aw Wed Jan 23 17:35:20 2008 +0000
+++ b/lang/ocaml/patches/patch-aw Wed Jan 23 20:42:25 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aw,v 1.6 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-aw,v 1.7 2008/01/23 20:42:26 adam Exp $
--- ocamldoc/Makefile.orig 2007-09-02 08:28:20.000000000 +0200
+++ ocamldoc/Makefile
@@ -9,13 +9,13 @@
- if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi
- if test -d $(INSTALL_LIBDIR); then : ; else $(MKDIR) $(INSTALL_LIBDIR); fi
- if test -d $(INSTALL_CUSTOMDIR); then : ; else $(MKDIR) $(INSTALL_CUSTOMDIR); fi
-- $(CP) $(OCAMLDOC)$(EXE) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
+- $(CP) $(OCAMLDOC) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
- $(CP) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
- $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
+ if test -d $(INSTALL_BINDIR); then : ; else ${BSD_INSTALL_PROGRAM_DIR} $(INSTALL_BINDIR); fi
+ if test -d $(INSTALL_LIBDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_LIBDIR); fi
+ if test -d $(INSTALL_CUSTOMDIR); then : ; else ${BSD_INSTALL_DATA_DIR} $(INSTALL_CUSTOMDIR); fi
-+ ${BSD_INSTALL_SCRIPT} $(OCAMLDOC)$(EXE) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
++ ${BSD_INSTALL_SCRIPT} $(OCAMLDOC) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE)
+ ${BSD_INSTALL_DATA} ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
+ ${BSD_INSTALL_DATA} $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
Home |
Main Index |
Thread Index |
Old Index