[pkgsrc/pkgsrc-2012Q1]: pkgsrc/lang/ocamlduce Pullup ticket #3735 - requested...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2012Q1]: pkgsrc/lang/ocamlduce Pullup ticket #3735 - requested...
From: tron <tron%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 12:12:21 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7cde0ee598bc
branches:  pkgsrc-2012Q1
changeset: 602028:7cde0ee598bc
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Apr 15 14:35:20 2012 +0000

description:
Pullup ticket #3735 - requested by dholland
lang/ocamlduce: build fix

Revisions pulled up:
- lang/ocamlduce/Makefile                                       1.9
- lang/ocamlduce/PLIST.opt                                      1.3
- lang/ocamlduce/distinfo                                       1.5
- lang/ocamlduce/files/ocaml-configure.diff                     1.1
- lang/ocamlduce/patches/patch-aa                               1.3

---
   Module Name: pkgsrc
   Committed By:        dholland
   Date:                Fri Apr 13 07:34:54 UTC 2012

   Modified Files:
        pkgsrc/lang/ocamlduce: Makefile PLIST.opt distinfo
        pkgsrc/lang/ocamlduce/patches: patch-aa
   Added Files:
        pkgsrc/lang/ocamlduce/files: ocaml-configure.diff

   Log Message:
   Update to 3.12.1, syncing with current ocaml in pkgsrc and thereby
   fixing the build.

   Changes 3.12.0.0 -> 3.12.1.0:

   - merge with OCaml 3.12.1

   Changes 3.11.2.0 -> 3.12.0.0:

   - merge with OCaml 3.12.0
   - drop native ocamlducedoc
   - fix memory leak issue in NS handling [Stefan Lampe]

   Changes 3.11.1.0 -> 3.11.2.0:

   - merge with OCaml 3.11.2
   - build and install native-code plugin
   - build ocamldoc library
   - accept also ocaml_cmi_magic_number in objinfo

diffstat:

 lang/ocamlduce/Makefile                   |  18 +++++++++---------
 lang/ocamlduce/PLIST.opt                  |   4 ++--
 lang/ocamlduce/distinfo                   |  16 ++++++++--------
 lang/ocamlduce/files/ocaml-configure.diff |  13 +++++++++++++
 lang/ocamlduce/patches/patch-aa           |  16 ++++++++--------
 5 files changed, 40 insertions(+), 27 deletions(-)

diffs (153 lines):

diff -r 31b83c03e91c -r 7cde0ee598bc lang/ocamlduce/Makefile
--- a/lang/ocamlduce/Makefile   Sun Apr 15 13:21:39 2012 +0000
+++ b/lang/ocamlduce/Makefile   Sun Apr 15 14:35:20 2012 +0000
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2011/12/06 00:19:24 sbd Exp $
+# $NetBSD: Makefile,v 1.8.4.1 2012/04/15 14:35:20 tron Exp $
 #
 
-DISTNAME=       ocamlduce-3.11.1.0
-PKGREVISION=     1
+DISTNAME=       ocamlduce-3.12.1.0
 CATEGORIES=     lang
-MASTER_SITES=   http://forge.ocamlcore.org/frs/download.php/225/
+MASTER_SITES=   http://forge.ocamlcore.org/frs/download.php/644/
 DISTFILES=      ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 # we need the OCaml sources too
-DISTFILES+=    ocaml-3.11.1.tar.bz2
-SITES.ocaml-3.11.1.tar.bz2= http://caml.inria.fr/pub/distrib/ocaml-3.11/       
+DISTFILES+=    ocaml-3.12.1.tar.bz2
+SITES.ocaml-3.12.1.tar.bz2= http://caml.inria.fr/pub/distrib/ocaml-3.12/
 
 MAINTAINER=     jaapb%kerguelen.org@localhost
 HOMEPAGE=       http://ocamlduce.forge.ocamlcore.org/
@@ -20,7 +19,7 @@
 
 DEPENDS+=       ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
 
-USE_TOOLS+=     gmake
+USE_TOOLS+=     gmake patch
 BUILD_TARGET=   all
 INSTALL_TARGET=        installbyte
 MAKE_JOBS_SAFE=        no
@@ -39,10 +38,11 @@
 BUILD_TARGET=   world
 .endif
 
-BUILDLINK_API_DEPENDS.ocaml+=   ocaml>=3.11.1
+BUILDLINK_API_DEPENDS.ocaml+=   ocaml>=3.12.1
 pre-configure:
        cd ${WRKSRC} && DISTDIR=${DISTDIR} make prepare
-       cd ${WRKSRC}/ocaml-3.11.1 && ./configure -prefix ${PREFIX} -libs ${LDFLAGS:Q} -with-pthread -host ${MACHINE_GNU_PLATFORM:Q} -mandir ${PREFIX}/${PKGMANDIR} -no-tk
+       cd ${WRKSRC}/ocaml-3.12.1 && ${PATCH} < ${FILESDIR}/ocaml-configure.diff
+       cd ${WRKSRC}/ocaml-3.12.1 && ./configure -prefix ${PREFIX} -libs ${LDFLAGS:Q} -with-pthread -host ${MACHINE_GNU_PLATFORM:Q} -mandir ${PREFIX}/${PKGMANDIR} -no-tk
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 31b83c03e91c -r 7cde0ee598bc lang/ocamlduce/PLIST.opt
--- a/lang/ocamlduce/PLIST.opt  Sun Apr 15 13:21:39 2012 +0000
+++ b/lang/ocamlduce/PLIST.opt  Sun Apr 15 14:35:20 2012 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST.opt,v 1.2 2009/09/07 21:53:30 tonio Exp $
+@comment $NetBSD: PLIST.opt,v 1.2.22.1 2012/04/15 14:35:20 tron Exp $
 bin/ocamlducec.opt
 bin/ocamlducedep.opt
-bin/ocamlducedoc.opt
 bin/ocamlduceopt
 bin/ocamlduceopt.opt
 lib/ocaml/site-lib/ocamlduce/ocamlduce.a
 lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxa
+lib/ocaml/site-lib/ocamlduce/ocamlduce.cmxs
diff -r 31b83c03e91c -r 7cde0ee598bc lang/ocamlduce/distinfo
--- a/lang/ocamlduce/distinfo   Sun Apr 15 13:21:39 2012 +0000
+++ b/lang/ocamlduce/distinfo   Sun Apr 15 14:35:20 2012 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2009/09/07 21:53:31 tonio Exp $
+$NetBSD: distinfo,v 1.4.22.1 2012/04/15 14:35:20 tron Exp $
 
-SHA1 (ocaml-3.11.1.tar.bz2) = 570feab47b34b29f866ecadcc16153d5a4a4f6a1
-RMD160 (ocaml-3.11.1.tar.bz2) = 991147354a85b975a86ce2dffafce669c9338db5
-Size (ocaml-3.11.1.tar.bz2) = 2352236 bytes
-SHA1 (ocamlduce-3.11.1.0.tar.gz) = f387911301318c772cb06a29474c2cdc9eee5084
-RMD160 (ocamlduce-3.11.1.0.tar.gz) = 836a954d5ce6d9ed356021c4d775cc3f7041cb75
-Size (ocamlduce-3.11.1.0.tar.gz) = 138926 bytes
-SHA1 (patch-aa) = 3a80190b17728dffe55843712de8b59174952fe8
+SHA1 (ocaml-3.12.1.tar.bz2) = 29b44117b116b1a5bc54a8b4514af483793a769f
+RMD160 (ocaml-3.12.1.tar.bz2) = 61d38c0785491c8790ac02ab78fb2f26ea490fc1
+Size (ocaml-3.12.1.tar.bz2) = 2949124 bytes
+SHA1 (ocamlduce-3.12.1.0.tar.gz) = c5006c36071a1e22736ccd5bb96024f13e575302
+RMD160 (ocamlduce-3.12.1.0.tar.gz) = 33078e31c4cffade2f6d762fa9e9e4023f96fec4
+Size (ocamlduce-3.12.1.0.tar.gz) = 140291 bytes
+SHA1 (patch-aa) = 7ba89169cf1d10f9c2767019cccae1e4682d1c70
diff -r 31b83c03e91c -r 7cde0ee598bc lang/ocamlduce/files/ocaml-configure.diff
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ocamlduce/files/ocaml-configure.diff Sun Apr 15 14:35:20 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: ocaml-configure.diff,v 1.1.2.2 2012/04/15 14:35:20 tron Exp $
+
+--- configure~ 2011-07-04 21:15:01.000000000 +0000
++++ configure
+@@ -621,7 +621,7 @@ if test $withsharedlibs = "yes"; then
+     i[3456]86-*-linux*)           natdynlink=true;;
+     x86_64-*-linux*)              natdynlink=true;;
+     i[3456]86-*-darwin10.*)
+-      if test $arch64 == true; then
++      if test $arch64 = true; then
+         natdynlink=true
+       fi;;
+     i[3456]86-*-darwin[89]*)      natdynlink=true;;
diff -r 31b83c03e91c -r 7cde0ee598bc lang/ocamlduce/patches/patch-aa
--- a/lang/ocamlduce/patches/patch-aa   Sun Apr 15 13:21:39 2012 +0000
+++ b/lang/ocamlduce/patches/patch-aa   Sun Apr 15 14:35:20 2012 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2009/09/07 21:53:31 tonio Exp $
+$NetBSD: patch-aa,v 1.2.22.1 2012/04/15 14:35:20 tron Exp $
 
---- Makefile.orig      2009-06-13 01:49:38.000000000 +0200
-+++ Makefile   2009-07-10 10:55:08.000000000 +0200
+--- Makefile.orig      2011-07-06 16:21:30.000000000 +0000
++++ Makefile
 @@ -1,7 +1,7 @@
  #-include config/Makefile
  
@@ -11,7 +11,7 @@
  OCAML_SRCDIR := ocaml-$(OCAML_VERSION)
  
  DUCE_VERSION := $(shell head -n1 VERSION)
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@ all:
        @echo "===> Please explicit what you want <==="
  
  prepare:
@@ -20,7 +20,7 @@
        cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR)
        cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs
        cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done
-@@ -44,15 +44,11 @@
+@@ -45,15 +45,11 @@ prepare:
        sed '\@^#-include config/Makefile@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new
        mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce
  
@@ -40,7 +40,7 @@
  
  META: META.in
        sed 's/%VER%/$(DUCE_VERSION)/' $< > $@
-@@ -63,20 +59,20 @@
+@@ -64,20 +60,20 @@ installcommon-stamp: META
        install -m 755 -d $(DUCE_LIBDIR)
        install -m 755 ocamlducefind $(BINDIR)
        install -m 644 META $(DUCE_LIBDIR)
@@ -63,9 +63,9 @@
  installopt: installcommon-stamp
        @echo "===> Installing native files... <==="
 -      for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
--      install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR)
+-      install -m 644 $(addprefix _build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR)
 +      for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done
-+      install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA)) $(DUCE_LIBDIR)
++      install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR)
  
  clean:
        build/distclean.sh
Prev by Date: [pkgsrc/pkgsrc-2012Q1]: pkgsrc/multimedia/kmplayer-kde3 Pullup ticket #3740 -...
Next by Date: [pkgsrc/pkgsrc-2012Q1]: pkgsrc/doc Pullup ticket #3740.
Previous by Thread: [pkgsrc/pkgsrc-2012Q1]: pkgsrc/multimedia/kmplayer-kde3 Pullup ticket #3740 -...
Next by Thread: [pkgsrc/pkgsrc-2012Q1]: pkgsrc/doc Pullup ticket #3740.
Indexes:
Home | Main Index | Thread Index | Old Index