[pkgsrc/trunk]: pkgsrc/lang/caml-light Fix broken 64-bit build. Add destdir s...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/caml-light Fix broken 64-bit build. Add destdir s...
From: dholland <dholland%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:32:25 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/14b1a4189de7
branches:  trunk
changeset: 546570:14b1a4189de7
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Fri Sep 05 02:07:51 2008 +0000

description:
Fix broken 64-bit build. Add destdir support.
PKGREVISION++, because I changed some things around.

diffstat:

 lang/caml-light/Makefile         |   9 +++++--
 lang/caml-light/distinfo         |  25 +++++++++++++++++++--
 lang/caml-light/patches/patch-aa |  46 +++++++++++++++++++++++++++++++++------
 lang/caml-light/patches/patch-ab |  16 ++++++++-----
 lang/caml-light/patches/patch-ac |  35 ++++++++++++++++++++++++++++++
 lang/caml-light/patches/patch-ad |  15 +++++++++++++
 lang/caml-light/patches/patch-ae |  15 +++++++++++++
 lang/caml-light/patches/patch-af |  14 ++++++++++++
 lang/caml-light/patches/patch-ag |  14 ++++++++++++
 lang/caml-light/patches/patch-ah |  15 +++++++++++++
 lang/caml-light/patches/patch-ai |  14 ++++++++++++
 lang/caml-light/patches/patch-aj |  13 +++++++++++
 lang/caml-light/patches/patch-ak |  21 ++++++++++++++++++
 lang/caml-light/patches/patch-al |  15 +++++++++++++
 lang/caml-light/patches/patch-am |  31 ++++++++++++++++++++++++++
 lang/caml-light/patches/patch-an |  38 +++++++++++++++++++++++++++++++++
 lang/caml-light/patches/patch-ao |  15 +++++++++++++
 lang/caml-light/patches/patch-ap |  15 +++++++++++++
 lang/caml-light/patches/patch-aq |  17 ++++++++++++++
 lang/caml-light/patches/patch-ar |  25 +++++++++++++++++++++
 lang/caml-light/patches/patch-as |  17 ++++++++++++++
 lang/caml-light/patches/patch-at |  17 ++++++++++++++
 lang/caml-light/patches/patch-au |  15 +++++++++++++
 23 files changed, 438 insertions(+), 19 deletions(-)

diffs (truncated from 607 to 300 lines):

diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/Makefile
--- a/lang/caml-light/Makefile  Fri Sep 05 01:04:23 2008 +0000
+++ b/lang/caml-light/Makefile  Fri Sep 05 02:07:51 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/05/25 21:42:21 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2008/09/05 02:07:51 dholland Exp $
 #
 
 DISTNAME=              cl74unix
 PKGNAME=               caml-light-0.74
+PKGREVISION=           1
 CATEGORIES=            lang
 MASTER_SITES=          ftp://ftp.inria.fr/lang/caml-light/
 
@@ -10,14 +11,16 @@
 HOMEPAGE=              http://caml.inria.fr/caml-light/index.en.html
 COMMENT=               Another implementation of Caml
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/cl74/src
 BUILD_TARGET=          world
-MAKE_FLAGS+=           MANDIR=${PREFIX}/${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    bin lib/caml-light ${PKGMANDIR}/man1
 
 USE_TOOLS+=            pax
 
 do-configure:
-       cd ${WRKSRC} && make configure
+       cd ${WRKSRC} && ${MAKE} configure
 
 post-configure:
        ${ECHO} '#define HAS_STRERROR' >> ${WRKDIR}/cl74/config/s.h
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/distinfo
--- a/lang/caml-light/distinfo  Fri Sep 05 01:04:23 2008 +0000
+++ b/lang/caml-light/distinfo  Fri Sep 05 02:07:51 2008 +0000
@@ -1,7 +1,26 @@
-$NetBSD: distinfo,v 1.5 2007/02/15 14:33:56 rillig Exp $
+$NetBSD: distinfo,v 1.6 2008/09/05 02:07:51 dholland Exp $
 
 SHA1 (cl74unix.tar.gz) = feae4a53af78b6c500a03c618dc11444e8b5dc47
 RMD160 (cl74unix.tar.gz) = a00a8de15e042080041076fcf3ad2592d9deb469
 Size (cl74unix.tar.gz) = 999170 bytes
-SHA1 (patch-aa) = e9a564183d445a61c00e0f6e134dee9029856bea
-SHA1 (patch-ab) = de97223ec671c8b04313c80fe4275c7ade087030
+SHA1 (patch-aa) = 6d3bc6249267789806ad4eef1b36aa809277a930
+SHA1 (patch-ab) = 3098db9faa0cd60931c781b4b24f796ac23ef52d
+SHA1 (patch-ac) = 6b268ddd007f73a8bb4085df4826627425eb9658
+SHA1 (patch-ad) = 22c97a5a2ee4a45cd85ae4c886b61cdcf833703a
+SHA1 (patch-ae) = 8de237bfb4b9a1c17e1cf4ad9c4abb7b1b456698
+SHA1 (patch-af) = 196fb2ace8ab078bccb2c8dba8b8cff211e6e95c
+SHA1 (patch-ag) = fce329f96d369f86c6fe7e3a30d78bed003d7043
+SHA1 (patch-ah) = 6a83f924ba49ae7121e070dc75432b2009643d9a
+SHA1 (patch-ai) = d9b663b4be634ccb64259c6fe0ddcda193dbbe50
+SHA1 (patch-aj) = 0e9ebfb02fb5efa06e393cf3e0ea3db6acd56acd
+SHA1 (patch-ak) = c24484f6dc1978c8bd04ff125f6fd86812fe68bc
+SHA1 (patch-al) = d4274b118eacf8f6f2a61ddaa8fde7468f45aefc
+SHA1 (patch-am) = a158d8553a85467955394b169ace0081eab65317
+SHA1 (patch-an) = 1bb3d4a32ae15f5639ab7575f50452764cf1d9a5
+SHA1 (patch-ao) = 59ec322fd19a9139fd329a9a36c0640a12306adf
+SHA1 (patch-ap) = e573c67efe96d159b3ab5bedc2ca1a319633a227
+SHA1 (patch-aq) = 00285a3f4cd6beea7a5b1b8f9c7c6810540dc5d8
+SHA1 (patch-ar) = aba9a829916af887d1115b51a57b449aced8535f
+SHA1 (patch-as) = 5d462ae1a1bf72ae1a0f19ff73d4b1b4226dbb32
+SHA1 (patch-at) = 83c69c1635a0c8f038bcd23d00acc4dc406c0684
+SHA1 (patch-au) = 4fe5ac20d7526e782143874b0ce9c7367716dbce
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-aa
--- a/lang/caml-light/patches/patch-aa  Fri Sep 05 01:04:23 2008 +0000
+++ b/lang/caml-light/patches/patch-aa  Fri Sep 05 02:07:51 2008 +0000
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2004/03/20 22:35:04 bouyer Exp $
+$NetBSD: patch-aa,v 1.3 2008/09/05 02:07:51 dholland Exp $
 
---- Makefile.orig      1997-04-24 16:51:03.000000000 +0200
-+++ Makefile   2004-03-08 01:07:53.010550000 +0100
-@@ -7,7 +7,7 @@
+Config fixes.
+Destdir support.
+
+--- Makefile.orig      1997-04-24 10:51:03.000000000 -0400
++++ Makefile   2008-09-04 21:28:01.000000000 -0400
+@@ -7,7 +7,7 @@ CC=gcc
  # Additional options to $(CC).
  # If you are using gcc, add -fno-defer-pop.
  # This option circumvents a gcc bug on some platforms (680x0, 80386).
@@ -11,7 +14,7 @@
  
  # Extra libraries that have to be linked with the runtime system.
  # The math library "-lm" is linked by default.
-@@ -24,19 +24,19 @@
+@@ -24,19 +24,19 @@ LIBS=
  # not all Unix C preprocessors define it.
  # If your cpp is too fussy, make tools/clprepro and use this:
  # CPP=../../src/tools/clprepro -Dunix
@@ -31,11 +34,11 @@
  
  # The directory where the manual pages will be installed
 -MANDIR=/usr/local/man/man$(MANEXT)
-+MANDIR=${PREFIX}/man/man$(MANEXT)
++MANDIR=${PREFIX}/${PKGMANDIR}/man$(MANEXT)
  
  # Some "make"s need this to ensure that they call the Bourne shell,
  # not the C shell. Seems harmless on most other "make"s.
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ SUBDIRS=runtime launch lib compiler link
  
  # Configure the system
  configure:
@@ -44,3 +47,32 @@
  
  # Build the system for the first time
  world:
+@@ -118,8 +118,8 @@ compile:
+ 
+ # Install the Caml Light system
+ install:
+-      if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
+-      if test -d $(LIBDIR); then : ; else mkdir $(LIBDIR); fi
++      if test -d $(DESTDIR)$(BINDIR); then : ; else mkdir $(DESTDIR)$(BINDIR); fi
++      if test -d $(DESTDIR)$(LIBDIR); then : ; else mkdir $(DESTDIR)$(LIBDIR); fi
+       cd runtime; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
+       cd launch; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
+       cd lib; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
+@@ -130,13 +130,13 @@ install:
+       cd lex; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
+       cd yacc; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
+       cd man; make MANDIR=$(MANDIR) MANEXT=$(MANEXT) install
+-      cp camlmsgs.txt $(LIBDIR)
++      cp camlmsgs.txt $(DESTDIR)$(LIBDIR)
+ 
+ # Remove the Caml Light system after installation
+ uninstall:
+-      rm -rf $(LIBDIR)
+-      rm -f $(BINDIR)/camlrun $(BINDIR)/camlc $(BINDIR)/camllight
+-      rm -f $(BINDIR)/camlyacc $(BINDIR)/camllex $(BINDIR)/camlmktop
++      rm -rf $(DESTDIR)$(LIBDIR)
++      rm -f $(DESTDIR)$(BINDIR)/camlrun $(DESTDIR)$(BINDIR)/camlc $(DESTDIR)$(BINDIR)/camllight
++      rm -f $(DESTDIR)$(BINDIR)/camlyacc $(DESTDIR)$(BINDIR)/camllex $(DESTDIR)$(BINDIR)/camlmktop
+ 
+ # Remove all generated files
+ clean:
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-ab
--- a/lang/caml-light/patches/patch-ab  Fri Sep 05 01:04:23 2008 +0000
+++ b/lang/caml-light/patches/patch-ab  Fri Sep 05 02:07:51 2008 +0000
@@ -1,15 +1,19 @@
-$NetBSD: patch-ab,v 1.1 2007/02/15 14:34:09 rillig Exp $
+$NetBSD: patch-ab,v 1.2 2008/09/05 02:07:51 dholland Exp $
 
 cp(1) cannot overwrite read-only files.
 
---- lib/Makefile.orig  1997-11-12 17:49:46.000000000 +0100
-+++ lib/Makefile       2007-01-18 21:05:00.000000000 +0100
-@@ -31,7 +31,7 @@ clean:
+Add destdir support.
+
+--- lib/Makefile.orig  1997-11-12 11:49:46.000000000 -0500
++++ lib/Makefile       2008-09-04 21:39:14.000000000 -0400
+@@ -31,8 +31,8 @@ clean:
        rm -f filename.ml genlex.ml
  
  install:
 -      cp stdlib.zo *.zi *.zix *.mli *.ml $(LIBDIR)
-+      pax -wr stdlib.zo *.zi *.zix *.mli *.ml $(LIBDIR)
-       rm $(LIBDIR)/iparsing.mli
+-      rm $(LIBDIR)/iparsing.mli
++      pax -wr stdlib.zo *.zi *.zix *.mli *.ml $(DESTDIR)$(LIBDIR)
++      rm $(DESTDIR)$(LIBDIR)/iparsing.mli
  
  .SUFFIXES :
+ .SUFFIXES : .ml .mli .zi .zo .mlp
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/caml-light/patches/patch-ac  Fri Sep 05 02:07:51 2008 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.1 2008/09/05 02:07:51 dholland Exp $
+
+Fix 64-bit build.
+Fix build with gcc4.
+
+--- runtime/main.c~    1997-04-24 10:51:06.000000000 -0400
++++ runtime/main.c     2008-09-04 21:09:25.000000000 -0400
+@@ -1,6 +1,7 @@
+ /* Start-up code */
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ #ifdef __MWERKS__
+ #include "myfcntl.h"
+ #else
+@@ -125,6 +126,7 @@ Algorithm:
+ 
+ */
+ 
++int
+ #ifdef HAS_UI
+ caml_main(argc, argv)
+ #else
+@@ -133,9 +135,9 @@ main(argc, argv)
+      int argc;
+      char * argv[];
+ {
+-  int fd;
++  volatile int fd;
+   struct exec_trailer trail;
+-  int i;
++  volatile int i;
+   struct longjmp_buffer raise_buf;
+   struct channel * chan;
+   int verbose_init = 0, percent_free_init = Percent_free_def;
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/caml-light/patches/patch-ad  Fri Sep 05 02:07:51 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2008/09/05 02:07:51 dholland Exp $
+
+Fix 64-bit build.
+
+--- runtime/signals.c~ 1995-11-10 10:10:32.000000000 -0500
++++ runtime/signals.c  2008-09-04 21:10:48.000000000 -0400
+@@ -5,6 +5,8 @@
+ #include "signals.h"
+ #include "stacks.h"
+ 
++value callback(value closure, value argument);
++
+ Volatile int async_signal_mode = 0;
+ Volatile code_t pending_signal_handler;
+ Volatile int pending_signal = 0;
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/caml-light/patches/patch-ae  Fri Sep 05 02:07:51 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2008/09/05 02:07:51 dholland Exp $
+
+Fix 64-bit build.
+
+--- runtime/debugcom.c~        1997-06-27 09:59:02.000000000 -0400
++++ runtime/debugcom.c 2008-09-04 21:11:39.000000000 -0400
+@@ -2,6 +2,8 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <unistd.h>
++#include <arpa/inet.h> /* for inet_addr() */
+ #include "misc.h"
+ #include "debugger.h"
+ #include "mlvalues.h"
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/caml-light/patches/patch-af  Fri Sep 05 02:07:51 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2008/09/05 02:07:51 dholland Exp $
+
+Fix 64-bit build.
+
+--- runtime/io.c~      1997-04-24 10:51:06.000000000 -0400
++++ runtime/io.c       2008-09-04 21:13:01.000000000 -0400
+@@ -1,6 +1,7 @@
+ /* Buffered input/output. */
+ 
+ #include <errno.h>
++#include <unistd.h>
+ #ifdef __MWERKS__
+ #include "myfcntl.h"
+ #else
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/caml-light/patches/patch-ag  Fri Sep 05 02:07:51 2008 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.1 2008/09/05 02:07:51 dholland Exp $
+
+Fix 64-bit build.
+
+--- runtime/sys.c~     1997-10-16 09:36:19.000000000 -0400
++++ runtime/sys.c      2008-09-04 21:13:32.000000000 -0400
+@@ -1,6 +1,7 @@
+ /* Basic system calls */
+ 
+ #include <errno.h>
++#include <unistd.h>
+ #ifdef __MWERKS__
+ #include "myfcntl.h"
+ #else
diff -r 0ddf7a89ad33 -r 14b1a4189de7 lang/caml-light/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/caml-light/patches/patch-ah  Fri Sep 05 02:07:51 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2008/09/05 02:07:51 dholland Exp $
+
+Fix 64-bit build.
+
+--- runtime/lexing.c~  1994-11-01 12:36:10.000000000 -0500
++++ runtime/lexing.c   2008-09-04 21:13:59.000000000 -0400
+@@ -4,6 +4,8 @@
+ #include "stacks.h"
+ #include "str.h"
+ 
++value callback(value closure, value argument);
++
+ struct lexer_buffer {
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11 Add dri2proto
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils/open-vm-tools Change == -> = to appease the p...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11 Add dri2proto
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/open-vm-tools Change == -> = to appease the p...
Indexes:
Home | Main Index | Thread Index | Old Index