haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

jed: remove ncurses dependency (#6954)

Browse Source 
switch source to github as the jedsoft site doesn't have this snapshot
This commit is contained in:
augiedoggie
2022-05-27 23:00:46 -06:00
committed by GitHub
parent 83b12d3093
commit 19a8402012
2 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app-editors/jed/jed-0.99.20_128.recipe
View File

@@ -6,10 +6,11 @@ scripting language (with a syntax resembling C)."
HOMEPAGE="http://www.jedsoft.org/jed/"
COPYRIGHT="1992, 1998-2009 John E. Davis"
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="http://www.jedsoft.org/snapshots/jed-pre0.99.20-128.tar.gz"
CHECKSUM_SHA256="51a98c72064b4654ec8143643478a6d98d2642081d06d994aa90a0d7ddd2e7e1"
SOURCE_DIR="jed-pre0.99.20-128"
REVISION="3"
srcGitRev="bf503722a1e646cddef8a9efe4cc2b76812d6f7a"
SOURCE_URI="https://github.com/jedsoft/jed/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="e6ae9243ed480d39175dd0d58e320287711b65f673966502a37ab9a0380f5c08"
SOURCE_DIR="jed-$srcGitRev"
PATCHES="jed-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -19,17 +20,14 @@ PROVIDES="
jed$secondaryArchSuffix = $portVersion
cmd:jed$secondaryArchSuffix
cmd:jed_script$secondaryArchSuffix
#cmd:xjed$secondaryArchSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
lib:libslang$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
devel:libslang$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -38,27 +36,26 @@ BUILD_PREREQUIRES="
cmd:awk
cmd:gcc$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:m4
cmd:make
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
export LDFLAGS="-lncurses -lnetwork"
cd autoconf
autoconf
cd ..
chmod +x ./configure
runConfigure ./configure --with-slanglib=$libDir \
--with-slanginc=$developDir JED_ROOT=$docDir
make clean
make -C autoconf
LDFLAGS="-lbsd -lnetwork" \
JED_ROOT=$docDir \
runConfigure ./configure \
--with-slanglib=$libDir \
--with-slanginc=$developDir
make $jobArgs
}
INSTALL()
{
mkdir -p $libDir/jed $docDir/jed
touch src/objs/xjed
make install
rm $binDir/xjed
}

42
app-editors/jed/patches/jed-0.99.20_128.patchset
View File

@@ -1,4 +1,4 @@
From c9bc6a91d752ffef80318b5986a4737cf1ef5ab6 Mon Sep 17 00:00:00 2001
From a275388bae678811300aea937137608c37bb75b7 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 15 May 2017 19:47:03 +0200
Subject: import patch from previous version
@@ -18,30 +18,30 @@ index 22800f6..652e747 100644
# include <sys/types.h>
# include <stropts.h>
--
2.7.0
2.36.1
From ae8e6e65c9e8f6744b5c7c1a29d9a4eabeeda023 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 15 May 2017 21:32:54 +0200
Subject: fix -ltermcap/-lncures issue for x86_64 (works also for x86)
From 5e854d2defdd13e354df630f89ab2b221b8c701d Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Fri, 27 May 2022 22:51:24 -0600
Subject: add Haiku terminfo dir
diff --git a/configure b/configure
old mode 100755
new mode 100644
index 073a048..ec1dc79
--- a/configure
+++ b/configure
@@ -6297,7 +6297,7 @@ JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \
diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4
index 383256d..0d09da3 100644
--- a/autoconf/aclocal.m4
+++ b/autoconf/aclocal.m4
@@ -505,6 +505,10 @@ then
else
MISC_TERMINFO_DIRS=""
fi
+if test "$host_os" = "haiku"
+then
+ MISC_TERMINFO_DIRS="/boot/system/data/terminfo"
+fi
JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \
/usr/lib/terminfo \
/usr/share/terminfo \
/usr/share/lib/terminfo \
/usr/local/lib/terminfo"
-TERMCAP=-ltermcap
+TERMCAP=-lncurses
for terminfo_dir in $JD_Terminfo_Dirs
do
--
2.7.0
2.36.1