jed, bump version, remove old bep/patch files (#1342)

This commit is contained in:
Schrijvers Luc
2017-05-15 22:42:30 +02:00
committed by waddlesplash
parent ee89d2d652
commit d672884a33
4 changed files with 111 additions and 78 deletions

View File

@@ -0,0 +1,64 @@
SUMMARY="Editor for programmers"
DESCRIPTION="Jed is a small, fast and powerful text editor.\
It is completely customizable with prepared emulation modes for Emacs, \
CUA (similar to Openoffice), Borland-IDE, Brief, and EDT using the S-Lang \
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="1"
SOURCE_URI="http://www.jedsoft.org/snapshots/jed-pre0.99.20-128.tar.gz"
CHECKSUM_SHA256="51a98c72064b4654ec8143643478a6d98d2642081d06d994aa90a0d7ddd2e7e1"
SOURCE_DIR="jed-pre0.99.20-128"
PATCHES="jed-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
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="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:libtoolize$secondaryArchSuffix
cmd:gcc$secondaryArchSuffix
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 $jobArgs
}
INSTALL()
{
mkdir -p $libDir/jed $docDir/jed
touch src/objs/xjed
make install
rm $binDir/xjed
}

View File

@@ -1,34 +0,0 @@
SUMMARY="Editor for programmers"
DESCRIPTION="
Jed is a small, fast and powerful text editor.\
It is completely customizable with prepared emulation modes for Emacs, \
CUA (similar to Openoffice), Borland-IDE, Brief, and EDT using the S-Lang \
scripting language (with a syntax resembling C).
"
HOMEPAGE="http://www.jedsoft.org/jed/"
SOURCE_URI="ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-19.tar.bz2"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="ncurses >= 5.7
slang >= 2.2.2"
CHECKSUM_MD5="c9b2f58a3defc6f61faa1ce7d6d629ea"
BUILD()
{
cd jed-0.99-19
cd autoconf
cp /boot/common/share/libtool/config/config.guess .
cd ..
./configure --prefix=`finddir B_COMMON_DIRECTORY` LIBS="-lnetwork" JED_ROOT=`finddir B_COMMON_LIB_DIRECTORY`/jed
make clean
make
}
INSTALL()
{
cd jed-0.99-19
touch src/objs/xjed
make install DESTDIR=${DESTDIR}
rm ${DESTDIR}/`finddir B_COMMON_DIRECTORY`/bin/xjed
}
LICENSE="GNU GPL v2"
COPYRIGHT="1992, 1998-2009 John E. Davis"

View File

@@ -1,44 +0,0 @@
diff -urN jed-0.99-19/configure jed-0.99-19-haiku/configure
--- jed-0.99-19/configure 2009-12-14 02:12:55.051118080 +0000
+++ jed-0.99-19-haiku/configure 2010-08-27 06:26:06.645922816 +0000
@@ -5320,6 +5320,7 @@
;;
*haiku* )
M_LIB=""
+ LIBS = "-lnetwork"
DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
ELF_CC="\$(CC)"
ELF_CFLAGS="\$(CFLAGS) -fPIC"
diff -urN jed-0.99-19/src/Makefile.in jed-0.99-19-haiku/src/Makefile.in
--- jed-0.99-19/src/Makefile.in 2009-12-14 02:12:55.029622272 +0000
+++ jed-0.99-19-haiku/src/Makefile.in 2010-08-27 14:56:57.164888576 +0000
@@ -91,7 +91,7 @@
DL_LIB = @DYNAMIC_LINK_LIB@
# Anything else???
-OTHERLIBS = @LIBS@ -lm
+OTHERLIBS = @LIBS@ @M_LIB@
#---------------------------------------------------------------------------
# There should be no need to modify anything below here.
@@ -240,7 +240,7 @@
#
install_bin: install_bin_directories
$(INSTALL) $(OBJDIR)/jed $(DEST_BIN_DIR)/
- -cd $(DEST_BIN_DIR); ln -s jed jed-script
+ -cd $(DEST_BIN_DIR); ln -s -f jed jed-script
-$(INSTALL) $(OBJDIR)/xjed $(DEST_BIN_DIR)/
if test -r $(OBJDIR)/getmail; \
then \
diff -urN jed-0.99-19/src/pty.c jed-0.99-19-haiku/src/pty.c
--- jed-0.99-19/src/pty.c 2009-12-14 02:12:55.064225280 +0000
+++ jed-0.99-19-haiku/src/pty.c 2010-08-27 06:01:46.000000000 +0000
@@ -19,7 +19,7 @@
#include <errno.h>
#ifdef HAVE_GRANTPT
-# if !defined (__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(_AIX)
+# if !defined (__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__HAIKU__)
# define USE_SYSV_PTYS
# include <sys/types.h>
# include <stropts.h>

View File

@@ -0,0 +1,47 @@
From c9bc6a91d752ffef80318b5986a4737cf1ef5ab6 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
diff --git a/src/pty.c b/src/pty.c
index 22800f6..652e747 100644
--- a/src/pty.c
+++ b/src/pty.c
@@ -19,7 +19,7 @@
#include <errno.h>
#ifdef HAVE_GRANTPT
-# if !defined (__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(_AIX)
+# if !defined (__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__HAIKU__)
# define USE_SYSV_PTYS
# include <sys/types.h>
# include <stropts.h>
--
2.7.0
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)
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 \
/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