CVS commit: pkgsrc/lang/racket

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/racket
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Wed, 20 Sep 2023 22:37:40 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Sep 20 22:37:40 UTC 2023

Modified Files:
        pkgsrc/lang/racket: Makefile distinfo
        pkgsrc/lang/racket/patches: patch-src_ChezScheme_configure
            patch-src_bc_configure patch-src_bc_configure.ac
            patch-src_cs_c_configure patch-src_cs_c_configure.ac
Added Files:
        pkgsrc/lang/racket/patches: patch-src_ChezScheme_c_expeditor.c

Log Message:
lang/racket: fix build on NetBSD.

* Package uses terminfo, so include "mk/terminfo.buildlink3.mk".
* Patch to not require ncurses on NetBSD. Builds fine with netbsd-curses
  and apparently doesn't require extra features.
* Replace all instances of `-lncurses` with `-lcurses -lterminfo` in
  patch files.
* Replace "devel/ncurses/buildlink3.mk" with "mk/curses.buildlink3.mk"
  in Makefile to reflect above change.
* Bump revision.

Tested on NetBSD-10.0_BETA/amd64.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/lang/racket/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/racket/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/racket/patches/patch-src_ChezScheme_c_expeditor.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/racket/patches/patch-src_ChezScheme_configure \
    pkgsrc/lang/racket/patches/patch-src_bc_configure \
    pkgsrc/lang/racket/patches/patch-src_bc_configure.ac \
    pkgsrc/lang/racket/patches/patch-src_cs_c_configure \
    pkgsrc/lang/racket/patches/patch-src_cs_c_configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/racket/Makefile
diff -u pkgsrc/lang/racket/Makefile:1.95 pkgsrc/lang/racket/Makefile:1.96
--- pkgsrc/lang/racket/Makefile:1.95    Wed Sep 20 16:27:37 2023
+++ pkgsrc/lang/racket/Makefile Wed Sep 20 22:37:39 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.95 2023/09/20 16:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2023/09/20 22:37:39 vins Exp $
 
 DISTNAME=              racket-8.10-src
 PKGNAME=               ${DISTNAME:S/-src$//}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            lang
 MASTER_SITES_PLT=      https://download.racket-lang.org/installers/${PKGVERSION_NOREV}/
 MASTER_SITES_PLT+=     https://mirror.racket-lang.org/installers/${PKGVERSION_NOREV}/
@@ -64,7 +64,6 @@ post-install:
                ${DESTDIR:Q}${PREFIX:Q}/${EGDIR:Q}
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -76,4 +75,6 @@ post-install:
 
 PTHREAD_AUTO_VARS=     yes
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/terminfo.buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/racket/distinfo
diff -u pkgsrc/lang/racket/distinfo:1.27 pkgsrc/lang/racket/distinfo:1.28
--- pkgsrc/lang/racket/distinfo:1.27    Fri Sep  1 19:48:28 2023
+++ pkgsrc/lang/racket/distinfo Wed Sep 20 22:37:40 2023
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.27 2023/09/01 19:48:28 riastradh Exp $
+$NetBSD: distinfo,v 1.28 2023/09/20 22:37:40 vins Exp $
 
 BLAKE2s (racket-8.10-src.tgz) = 75ead0b8bd75edebf7743eaeba1465ac99d4559fdb97df7f485713331a6022f4
 SHA512 (racket-8.10-src.tgz) = 75df87b1322ebe10e9d3de3661a64ae4aea41f68af2a4941570fbe53c7047e67b74f126e532fba244e2593eaeef740ded3736e3b6eab77b9a4f1b8a0ee850894
 Size (racket-8.10-src.tgz) = 33960563 bytes
-SHA1 (patch-src_ChezScheme_configure) = 2ca8a7f3de569ccfdc4296916774fd9a2276275d
-SHA1 (patch-src_bc_configure) = 4d4c75686c3170617ba216438f5815d238f44ff8
-SHA1 (patch-src_bc_configure.ac) = 8f86d669f203ecde18c5cce1c544718f1c5938e4
-SHA1 (patch-src_cs_c_configure) = 0c0a087da9e21aacbad64cf00a6a877ab161b7b7
-SHA1 (patch-src_cs_c_configure.ac) = f9d24bb3c829aecc1a33864d9d7a5e0268fbc6af
+SHA1 (patch-src_ChezScheme_c_expeditor.c) = b31d795ec9202762d56a0add7c2cd010bdcf6817
+SHA1 (patch-src_ChezScheme_configure) = c0e0e3a9f68bbae18693d26c45a401f2add8a408
+SHA1 (patch-src_bc_configure) = de3b834b7528a41f07f52602b7c3ab0f8700a538
+SHA1 (patch-src_bc_configure.ac) = cf8f61e2268c7a206c8c17fe32dc96d548672009
+SHA1 (patch-src_cs_c_configure) = 103c94e23fa81c8da786b9e6a345c06a0d3f6919
+SHA1 (patch-src_cs_c_configure.ac) = 999bd30c818efe83e9f53eff8498646fe477ca67

Index: pkgsrc/lang/racket/patches/patch-src_ChezScheme_configure
diff -u pkgsrc/lang/racket/patches/patch-src_ChezScheme_configure:1.1 pkgsrc/lang/racket/patches/patch-src_ChezScheme_configure:1.2
--- pkgsrc/lang/racket/patches/patch-src_ChezScheme_configure:1.1       Fri Sep  1 19:48:28 2023
+++ pkgsrc/lang/racket/patches/patch-src_ChezScheme_configure   Wed Sep 20 22:37:40 2023
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_ChezScheme_configure,v 1.1 2023/09/01 19:48:28 riastradh Exp $
+$NetBSD: patch-src_ChezScheme_configure,v 1.2 2023/09/20 22:37:40 vins Exp $
 
 Don't link against libiconv_std.a.
 https://github.com/racket/racket/issues/4736
 
-Link against ncurses with -lncurses, not by hard-coding the static
-library path out of /usr/pkg.  Omit spurious -I paths.
+Directly link against netbsd curses and terminfo libraries, not by
+hard-coding the static library path out of /usr/pkg.
+Omit spurious -I paths. 
 https://github.com/racket/racket/issues/4734
 
 --- src/ChezScheme/configure.orig      2023-07-18 00:36:32.000000000 +0000
@@ -17,7 +18,7 @@ https://github.com/racket/racket/issues/
 -            iconvLib="/usr/lib/i18n/libiconv_std.a"
 -        fi
 -        LIBS="${LIBS} ${iconvLib} -lm /usr/pkg/lib/libncurses.a"
-+        LIBS="${LIBS} ${iconvLib} -lm -lncurses"
++        LIBS="${LIBS} ${iconvLib} -lm ${cursesLib} -lterminfo"
          ;;
      *s2)
          LIBS="${LIBS} -lnsl -ldl -lm ${cursesLib} -lrt"
Index: pkgsrc/lang/racket/patches/patch-src_bc_configure
diff -u pkgsrc/lang/racket/patches/patch-src_bc_configure:1.1 pkgsrc/lang/racket/patches/patch-src_bc_configure:1.2
--- pkgsrc/lang/racket/patches/patch-src_bc_configure:1.1       Fri Sep  1 19:48:28 2023
+++ pkgsrc/lang/racket/patches/patch-src_bc_configure   Wed Sep 20 22:37:40 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_bc_configure,v 1.1 2023/09/01 19:48:28 riastradh Exp $
+$NetBSD: patch-src_bc_configure,v 1.2 2023/09/20 22:37:40 vins Exp $
 
-Link against ncurses with -lncurses, not by hard-coding the static
-library path out of /usr/pkg.
+Directly link against ncurses and terminfo libraries, not by
+hard-coding the static library path out of /usr/pkg.
 https://github.com/racket/racket/issues/4734
 
 Allow CONFIGURE_ENV to set PAXCTL so user need not have /usr/sbin in
@@ -15,7 +15,7 @@ PATH.
      skip_curses_check=yes
 -    add_curses_lib="/usr/pkg/lib/libncurses.a"
 -    default_post_linker="paxctl +m"
-+    add_curses_lib="-lncurses"
++    add_curses_lib="-lcurses -lterminfo"
 +    default_post_linker="${PAXCTL:-paxctl} +m"
      ;;
    irix*)
Index: pkgsrc/lang/racket/patches/patch-src_bc_configure.ac
diff -u pkgsrc/lang/racket/patches/patch-src_bc_configure.ac:1.1 pkgsrc/lang/racket/patches/patch-src_bc_configure.ac:1.2
--- pkgsrc/lang/racket/patches/patch-src_bc_configure.ac:1.1    Fri Sep  1 19:48:28 2023
+++ pkgsrc/lang/racket/patches/patch-src_bc_configure.ac        Wed Sep 20 22:37:40 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-src_bc_configure.ac,v 1.1 2023/09/01 19:48:28 riastradh Exp $
+$NetBSD: patch-src_bc_configure.ac,v 1.2 2023/09/20 22:37:40 vins Exp $
 
-Link against ncurses with -lncurses, not by hard-coding the static
-library path out of /usr/pkg.
+Directly link against ncurses and terminfo libraries, not by
+hard-coding the static library path out of /usr/pkg.
 https://github.com/racket/racket/issues/4734
 
 Allow CONFIGURE_ENV to set PAXCTL so user need not have /usr/sbin in
@@ -15,7 +15,7 @@ PATH.
      skip_curses_check=yes
 -    add_curses_lib="/usr/pkg/lib/libncurses.a"
 -    default_post_linker="paxctl +m"
-+    add_curses_lib="-lncurses"
++    add_curses_lib="-lcurses -lterminfo"
 +    default_post_linker="${PAXCTL:-paxctl} +m"
      ;;
    irix*)
Index: pkgsrc/lang/racket/patches/patch-src_cs_c_configure
diff -u pkgsrc/lang/racket/patches/patch-src_cs_c_configure:1.1 pkgsrc/lang/racket/patches/patch-src_cs_c_configure:1.2
--- pkgsrc/lang/racket/patches/patch-src_cs_c_configure:1.1     Fri Sep  1 19:48:28 2023
+++ pkgsrc/lang/racket/patches/patch-src_cs_c_configure Wed Sep 20 22:37:40 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_cs_c_configure,v 1.1 2023/09/01 19:48:28 riastradh Exp $
+$NetBSD: patch-src_cs_c_configure,v 1.2 2023/09/20 22:37:40 vins Exp $
 
 Don't link against libiconv_std.a.
 https://github.com/racket/racket/issues/4736
 
-Link against ncurses with -lncurses, not by hard-coding the static
-library path out of /usr/pkg.
+Directly link against ncurses and terminfo libraries, not by
+hard-coding the static library path out of /usr/pkg.
 https://github.com/racket/racket/issues/4734
 
 Allow CONFIGURE_ENV to set PAXCTL so user need not have /usr/sbin in
@@ -20,7 +20,7 @@ PATH.
      skip_curses_check=yes
 -    add_curses_lib="/usr/pkg/lib/libncurses.a"
 -    default_post_linker="paxctl +m"
-+    add_curses_lib="-lncurses"
++    add_curses_lib="-lcurses -lterminfo"
 +    default_post_linker="${PAXCTL:-paxctl} +m"
      ;;
    irix*)
Index: pkgsrc/lang/racket/patches/patch-src_cs_c_configure.ac
diff -u pkgsrc/lang/racket/patches/patch-src_cs_c_configure.ac:1.1 pkgsrc/lang/racket/patches/patch-src_cs_c_configure.ac:1.2
--- pkgsrc/lang/racket/patches/patch-src_cs_c_configure.ac:1.1  Fri Sep  1 19:48:28 2023
+++ pkgsrc/lang/racket/patches/patch-src_cs_c_configure.ac      Wed Sep 20 22:37:40 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_cs_c_configure.ac,v 1.1 2023/09/01 19:48:28 riastradh Exp $
+$NetBSD: patch-src_cs_c_configure.ac,v 1.2 2023/09/20 22:37:40 vins Exp $
 
 Don't link against libiconv_std.a.
 https://github.com/racket/racket/issues/4736
 
-Link against ncurses with -lncurses, not by hard-coding the static
-library path out of /usr/pkg.
+Directly link against ncurses and terminfo libraries, not by
+hard-coding the static library path out of /usr/pkg.
 https://github.com/racket/racket/issues/4734
 
 Allow CONFIGURE_ENV to set PAXCTL so user need not have /usr/sbin in
@@ -20,7 +20,7 @@ PATH.
      skip_curses_check=yes
 -    add_curses_lib="/usr/pkg/lib/libncurses.a"
 -    default_post_linker="paxctl +m"
-+    add_curses_lib="-lncurses"
++    add_curses_lib="-lcurses -lterminfo"
 +    default_post_linker="${PAXCTL:-paxctl} +m"
      ;;
    irix*)

Added files:

Index: pkgsrc/lang/racket/patches/patch-src_ChezScheme_c_expeditor.c
diff -u /dev/null pkgsrc/lang/racket/patches/patch-src_ChezScheme_c_expeditor.c:1.1
--- /dev/null   Wed Sep 20 22:37:40 2023
+++ pkgsrc/lang/racket/patches/patch-src_ChezScheme_c_expeditor.c       Wed Sep 20 22:37:40 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_ChezScheme_c_expeditor.c,v 1.1 2023/09/20 22:37:40 vins Exp $
+
+Do not require ncurses on NetBSD.
+
+--- src/ChezScheme/c/expeditor.c.orig  2023-07-18 00:36:31.000000000 +0000
++++ src/ChezScheme/c/expeditor.c
+@@ -660,9 +660,6 @@ static void s_ee_set_color(int color_id,
+ # define CHTYPE int
+ # include </usr/include/curses.h>
+ # include </usr/include/term.h>
+-#elif defined(NETBSD)
+-# include <ncurses.h>
+-# include <ncurses/term.h>
+ #else
+ # include <curses.h>
+ # include <term.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index