slang: fix recipe so it builds again (#1247)

* patch configure to use ncurses 6.0
haikuports · Mar 24, 2017 · 6b8d52c · 6b8d52c
1 parent 3e8e73a
commit 6b8d52c
Show file tree

Hide file tree

Showing 2 changed files with 171 additions and 10 deletions.
diff --git a/sys-libs/slang/patches/slang-2.2.4.patchset b/sys-libs/slang/patches/slang-2.2.4.patchset
@@ -1,4 +1,4 @@
-From fc18ce32a741119f78108823fbcc0ec6012121c5 Mon Sep 17 00:00:00 2001
+From a0709b517a5c3ac5b586017a1116319580bef0da Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Wed, 9 Oct 2013 16:04:04 -0600
 Subject: Enhance Haiku support by tweaking paths and defining a HAIKU
@@ -73,10 +73,10 @@ index d86765e..f80295e 100644
  	"SLANG_DOUBLE_TYPE",
  #endif
 -- 
-1.8.3.4
+2.7.0
 
 
-From 95a0248382ceb2d0248fa95379136a74bf998075 Mon Sep 17 00:00:00 2001
+From 7dae865b7917ae55df3c62b1792b3096878d4c1c Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Fri, 11 Oct 2013 00:32:22 -0600
 Subject: Change location of some install paths
@@ -122,5 +122,167 @@ index 03fa056..fab1477 100644
  MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
  #---------------------------------------------------------------------------
 -- 
-1.8.3.4
+2.7.0
+
+
+From ba3be9eed7ff3d68889bd874890fbf5390fdd23d Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 24 Mar 2017 11:59:23 +0000
+Subject: update the check for ncurses to version6
+
+
+diff --git a/configure b/configure
+index f1586c3..945e06f 100755
+--- a/configure
++++ b/configure
+@@ -6702,16 +6702,16 @@ _ACEOF
+
+
+
+-# Extract the first word of "ncurses5-config", so it can be a program name with args.
+-set dummy ncurses5-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++# Extract the first word of "ncurses6-config", so it can be a program name with args.
++set dummy ncurses6-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&6
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_nc5config+set}" = set; then :
++if test "${ac_cv_path_nc6config+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  case $nc5config in
++  case $nc6config in
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_nc5config="$nc5config" # Let the user override the test with a path.
++  ac_cv_path_nc5config="$nc6config" # Let the user override the test with a path.
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -6721,40 +6721,40 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_nc5config="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    ac_cv_path_nc6config="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&6
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+
+-  test -z "$ac_cv_path_nc5config" && ac_cv_path_nc5config="no"
++  test -z "$ac_cv_path_nc6config" && ac_cv_path_nc6config="no"
+   ;;
+ esac
+ fi
+-nc5config=$ac_cv_path_nc5config
+-if test -n "$nc5config"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nc5config" >&5
+-$as_echo "$nc5config" >&6; }
++nc6config=$ac_cv_path_nc6config
++if test -n "$nc6config"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nc6config" >&6
++$as_echo "$nc6config" >&6; }
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&6
+ $as_echo "no" >&6; }
+ fi
+
+
+-if test "$nc5config" = "no"
++if test "$nc6config" = "no"
+ then
+-  # Extract the first word of "ncurses5w-config", so it can be a program name with args.
+-set dummy ncurses5w-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++  # Extract the first word of "ncursesw6-config", so it can be a program name with args.
++set dummy ncursesw6-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&6
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_nc5config+set}" = set; then :
++if test "${ac_cv_path_nc6config+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  case $nc5config in
++  case $nc6config in
+   [\\/]* | ?:[\\/]*)
+-  ac_cv_path_nc5config="$nc5config" # Let the user override the test with a path.
++  ac_cv_path_nc5config="$nc6config" # Let the user override the test with a path.
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -6764,24 +6764,24 @@ do
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_nc5config="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    ac_cv_path_nc6config="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&6
+     break 2
+   fi
+ done
+   done
+ IFS=$as_save_IFS
+
+-  test -z "$ac_cv_path_nc5config" && ac_cv_path_nc5config="no"
++  test -z "$ac_cv_path_nc6config" && ac_cv_path_nc6config="no"
+   ;;
+ esac
+ fi
+-nc5config=$ac_cv_path_nc5config
+-if test -n "$nc5config"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nc5config" >&5
+-$as_echo "$nc5config" >&6; }
++nc6config=$ac_cv_path_nc6config
++if test -n "$nc6config"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nc6config" >&6
++$as_echo "$nc6config" >&6; }
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&6
+ $as_echo "no" >&6; }
+ fi
+
+@@ -6789,9 +6789,9 @@ fi
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for terminfo" >&5
+ $as_echo_n "checking for terminfo... " >&6; }
+-if test "$nc5config" != "no"
++if test "$nc6config" != "no"
+ then
+-   MISC_TERMINFO_DIRS=`$nc5config --terminfo`
++   MISC_TERMINFO_DIRS=`$nc6config --terminfo`
+ else
+    MISC_TERMINFO_DIRS=""
+ fi
+@@ -6800,20 +6800,20 @@ JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \
+                   /usr/share/terminfo \
+                   /usr/share/lib/terminfo \
+ 		  /usr/local/lib/terminfo"
+-TERMCAP=-ltermcap
++TERMCAP=-lncurses
+
+ for terminfo_dir in $JD_Terminfo_Dirs
+ do
+    if test -d $terminfo_dir
+    then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&6
+ $as_echo "yes" >&6; }
+       TERMCAP=""
+       break
+    fi
+ done
+ if test "$TERMCAP"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&6
+ $as_echo "no" >&6; }
+
+ $as_echo "#define USE_TERMCAP 1" >>confdefs.h
+-- 
+2.7.0
 
diff --git a/sys-libs/slang/slang-2.2.4.recipe b/sys-libs/slang/slang-2.2.4.recipe
@@ -12,7 +12,7 @@ part of the S-Lang distribution."
 HOMEPAGE="http://www.jedsoft.org/slang/"
 COPYRIGHT="2004-2013 John E. Davis"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.4.tar.bz2"
 CHECKSUM_SHA256="9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db"
 PATCHES="slang-${portVersion}.patchset"
@@ -26,9 +26,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
+	lib:libncurses
 	lib:libpcre
 	lib:libiconv
-	lib:libpng
+	lib:libpng16
 	lib:libz
 	"
 
@@ -45,16 +46,14 @@ BUILD_REQUIRES="
 	devel:libncurses
 	devel:libpcre
 	devel:libiconv
-	devel:libpng
+	devel:libpng16
 	devel:libz
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
-	cmd:find
 	cmd:gcc
 	cmd:ld
 	cmd:make
-	cmd:ncurses5_config
 	"
 
 GLOBAL_WRITABLE_FILES="
@@ -87,4 +86,4 @@ INSTALL()
 	prepareInstalledDevelLibs libslang
 
 	packageEntries devel $developDir
-}
+}