From e1aa05cb681064f75a0de6d055126b82ea434db5 Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Tue, 21 Mar 2023 10:36:29 -0400
Subject: [PATCH] ncurses needs less hacks now

---
 projects/fishshell.com/package.yml          |  1 -
 projects/github.com/mtoyoda/sl/package.yml  |  3 +--
 projects/midnight-commander.org/package.yml | 10 ++++------
 projects/rigaux.org/hexedit/package.yml     |  8 --------
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/projects/fishshell.com/package.yml b/projects/fishshell.com/package.yml
index 76902ee0..d8e40e01 100644
--- a/projects/fishshell.com/package.yml
+++ b/projects/fishshell.com/package.yml
@@ -38,7 +38,6 @@ build:
     ARGS:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX="{{prefix}}"
-      - -DCURSES_INCLUDE_PATH="{{deps.invisible-island.net/ncurses.prefix}}/include/ncursesw"
 
 test:
   dependencies:
diff --git a/projects/github.com/mtoyoda/sl/package.yml b/projects/github.com/mtoyoda/sl/package.yml
index 46733966..d28ddce4 100644
--- a/projects/github.com/mtoyoda/sl/package.yml
+++ b/projects/github.com/mtoyoda/sl/package.yml
@@ -20,10 +20,9 @@ build:
     # Add -v to allow testing resultant binary
     patch -p1 < props/version.patch
     make
-    mkdir "{{prefix}}"/bin
+    mkdir -p "{{prefix}}"/bin
     mv sl "{{prefix}}"/bin
   env:
-    CPATH: ${{ deps.invisible-island.net/ncurses.prefix }}/include/ncursesw:$CPATH
     TEA_VERSION: ${{ version }}
 
 test:
diff --git a/projects/midnight-commander.org/package.yml b/projects/midnight-commander.org/package.yml
index c7c98b73..6690f6ed 100644
--- a/projects/midnight-commander.org/package.yml
+++ b/projects/midnight-commander.org/package.yml
@@ -23,12 +23,12 @@ runtime:
 
 build:
   dependencies:
-    tea.xyz/gx/cc: '*'
+    tea.xyz/gx/cc: c99
     tea.xyz/gx/make: '*'
     gnu.org/autoconf: '>=2.64'
     gnu.org/automake: '>=1.12'
     gnu.org/libtool: '*'
-    freedesktop.org/pkg-config: '^0.29'
+    freedesktop.org/pkg-config: ~0.29
   script: |
     ./configure $ARGS
     make -j {{hw.concurrency}}
@@ -42,15 +42,13 @@ build:
       rm $x.bak
     done
 
-    sed -i.bak 's|{{tea.prefix}}|%p/../|g' etc/mc/mc.ext
-    rm etc/mc/mc.ext.bak
+    sed -i.bak 's|{{tea.prefix}}|%p/../|g' etc/mc/mc.ext*
+    rm etc/mc/mc.ext*.bak
 
   env:
     ARGS:
       - --prefix={{prefix}}
       - --with-screen=ncurses
-    # Needed for the compiler to `#include <term.h>`
-    CPATH: $CPATH:{{deps.invisible-island.net/ncurses.prefix}}/include/ncursesw
 
 # FIXME: hard to test interactive tools
 test:
diff --git a/projects/rigaux.org/hexedit/package.yml b/projects/rigaux.org/hexedit/package.yml
index fbd9967e..52bd89ab 100644
--- a/projects/rigaux.org/hexedit/package.yml
+++ b/projects/rigaux.org/hexedit/package.yml
@@ -15,17 +15,9 @@ build:
     gnu.org/autoconf: '*'
   script: |
     ./autogen.sh
-
-    # configure won't find libncursesw for libncurses.
-    sed -i.bak -e 's/-lncurses/-lncursesw/' configure
-    rm configure.bak
-
     ./configure --prefix={{prefix}}
     make
     make install
-  env:
-    # needed to `include <curses.h>;`
-    CPATH: $CPATH:{{deps.invisible-island.net/ncurses.prefix}}/include/ncursesw
 
 test:
   true