CVS commit: pkgsrc/lang/ghc92

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 14 07:44:11 UTC 2023

Modified Files:
        pkgsrc/lang/ghc92: distinfo
Added Files:
        pkgsrc/lang/ghc92/patches: patch-libraries_terminfo_configure

Log Message:
ghc92: fix build on NetBSD 10.99.2


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ghc92/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc92/patches/patch-libraries_terminfo_configure

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

Modified files:

Index: pkgsrc/lang/ghc92/distinfo
diff -u pkgsrc/lang/ghc92/distinfo:1.6 pkgsrc/lang/ghc92/distinfo:1.7
--- pkgsrc/lang/ghc92/distinfo:1.6      Fri Feb 25 12:19:15 2022
+++ pkgsrc/lang/ghc92/distinfo  Sat Jan 14 07:44:11 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2022/02/25 12:19:15 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2023/01/14 07:44:11 wiz Exp $
 
 BLAKE2s (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 03efbb455a52d0dbc246b1c8b30f82121f5354a1ca0eb1b08b6225b90286a18f
 SHA512 (ghc-8.10.4-boot-x86_64-unknown-netbsd.tar.xz) = 730347bb5eaac4efac8ec487fafd2da6fe2932db45f59e324c83698eb0b0e8a6a4b4fd513de17fb9c152ccee328660cfe1638cad631ce5e35b2dbfddda0d8850
@@ -36,6 +36,7 @@ SHA1 (patch-libraries_base_System_CPUTim
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
 SHA1 (patch-libraries_base_configure) = 4e02082cdfde8d927d12f3d2f3d98ace6d4ee116
 SHA1 (patch-libraries_process_cbits_posix_fork__exec.c) = 9c942faf829a64a20237c788e8c8265179db55c7
+SHA1 (patch-libraries_terminfo_configure) = c1955d2ea059cf07fa0fd66d5a1f2f6772e224bb
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = 68914d012a98cc4a4a245efeabcb9143dba0246a
 SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab

Added files:

Index: pkgsrc/lang/ghc92/patches/patch-libraries_terminfo_configure
diff -u /dev/null pkgsrc/lang/ghc92/patches/patch-libraries_terminfo_configure:1.1
--- /dev/null   Sat Jan 14 07:44:11 2023
+++ pkgsrc/lang/ghc92/patches/patch-libraries_terminfo_configure        Sat Jan 14 07:44:11 2023
@@ -0,0 +1,49 @@
+$NetBSD: patch-libraries_terminfo_configure,v 1.1 2023/01/14 07:44:11 wiz Exp $
+
+Look for setupterm in libterminfo.
+
+--- libraries/terminfo/configure.orig  2021-10-28 20:43:04.000000000 +0000
++++ libraries/terminfo/configure
+@@ -2639,13 +2639,13 @@ $as_echo "$ac_cv_lib_tinfow_setupterm" >
+ if test "x$ac_cv_lib_tinfow_setupterm" = xyes; then :
+   HaveLibCurses=YES; LibCurses=tinfow
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -ltinfo" >&5
+-$as_echo_n "checking for setupterm in -ltinfo... " >&6; }
+-if ${ac_cv_lib_tinfo_setupterm+:} false; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lterminfo" >&5
++$as_echo_n "checking for setupterm in -lterminfo... " >&6; }
++if ${ac_cv_lib_terminfo_setupterm+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltinfo  $LIBS"
++LIBS="-lterminfo  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -2665,18 +2665,18 @@ return setupterm ();
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_tinfo_setupterm=yes
++  ac_cv_lib_terminfo_setupterm=yes
+ else
+-  ac_cv_lib_tinfo_setupterm=no
++  ac_cv_lib_terminfo_setupterm=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_setupterm" >&5
+-$as_echo "$ac_cv_lib_tinfo_setupterm" >&6; }
+-if test "x$ac_cv_lib_tinfo_setupterm" = xyes; then :
+-  HaveLibCurses=YES; LibCurses=tinfo
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_terminfo_setupterm" >&5
++$as_echo "$ac_cv_lib_terminfo_setupterm" >&6; }
++if test "x$ac_cv_lib_terminfo_setupterm" = xyes; then :
++  HaveLibCurses=YES; LibCurses=terminfo
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setupterm in -lncursesw" >&5
+ $as_echo_n "checking for setupterm in -lncursesw... " >&6; }