ne recipe: update to 3.1.1

It does build and seems to work in general, but I don't think the macros work.
It also uses ~/.ne as config folder, which I tried to change but failed...
Removed old v2.1 recipe and patch.
This commit is contained in:
Humdinger
2017-06-17 17:18:12 +02:00
committed by humdinger
parent 125d8a1929
commit 8624a375af
4 changed files with 108 additions and 65 deletions

View File

@@ -1,26 +0,0 @@
SUMMARY="The 'nice editor'"
DESCRIPTION="ne is one of the few text editors which are \
both easy to use for beginners and powerful enough for powerusers. \
It supports UTF-8 and multi-column characters as well as syntax highlighting. \
Is also has fully configurable key bindings and supports macros.
"
HOMEPAGE="http://ne.dsi.unimi.it"
SOURCE_URI="http://ne.dsi.unimi.it/ne-2.1.tar.gz"
REVISION="1"
STATUS_HAIKU="stable"
CHECKSUM_MD5="9f76652f6349721cfe0e8dc2aec9c767"
BUILD()
{
cd ne-2.1
make PREFIX=`finddir B_COMMON_DIRECTORY` NE_ANSI=1 haiku
}
INSTALL()
{
cd ne-2.1
make PREFIX=`finddir B_COMMON_DIRECTORY` haiku
}
LICENSE="GNU GPL v2"
COPYRIGHT="1993-1998 Sebastiano Vigna
1999-2010 Todd M. Lewis and Sebastiano Vigna"

View File

@@ -0,0 +1,57 @@
SUMMARY="The 'nice editor'"
DESCRIPTION="ne is one of the few text editors which are \
both easy to use for beginners and powerful enough for powerusers. \
It supports UTF-8 and multi-column characters as well as syntax highlighting. \
Is also has fully configurable key bindings and supports macros."
HOMEPAGE="http://ne.dsi.unimi.it"
COPYRIGHT="1993-1998 Sebastiano Vigna
1999-2010 Todd M. Lewis and Sebastiano Vigna"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/vigna/ne/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="a88a24153a17844bb2dfbc3c76a6fbd1d456ee0e8215d5139551cf082627596a"
PATCHES="ne-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
ne$secondaryArchSuffix = $portVersion
cmd:ne$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
cmd:aspell
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libncurses$secondaryArchSuffix
"
BUILD_PREREQUIRES="
makefile_engine
cmd:gcc$secondaryArchSuffix
cmd:make
cmd:makeinfo
cmd:perl
"
BUILD()
{
make $jobArgs CC=gcc NE_ANSI=1 NE_TERMCAP=1 NE_GLOBAL_DIR=$dataDir/ne
}
INSTALL()
{
mkdir -p $binDir $manDir/man1 $dataDir/ne/syntax $docDir
cp -pf src/ne $binDir
cp -p syntax/*.jsf $dataDir/ne/syntax
cp -pr macros $dataDir/ne
cp -pr doc/html doc/ne.txt doc/default.* \
README.md COPYING NEWS CHANGES $docDir
cp -p doc/ne.1 $manDir/man1
}

View File

@@ -1,39 +0,0 @@
diff -Naur ne-2.1/makefile ne-2.1-haiku/makefile
--- ne-2.1/makefile 2010-05-10 09:42:12.052953088 -0700
+++ ne-2.1-haiku/makefile 2011-07-29 16:03:27.170131456 -0700
@@ -42,6 +42,19 @@
make install PREFIX=/usr CMDSUFFIX=.exe
tar zcvf ne-cygwin-$(VERSION).tar.gz /usr/share/ne /usr/bin/ne.exe /usr/share/doc/ne /usr/share/info/ne.info.gz /usr/share/man/man1/ne.1
+haiku:
+ (cd src; make NE_GLOBAL_DIR=$(shell finddir B_COMMON_DATA_DIRECTORY)/ne)
+ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_BIN_DIRECTORY)
+ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/ne/syntax
+ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1
+ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/doc/ne
+ mkdir -p $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/info
+ cp -pf src/ne$(CMDSUFFIX) $(DESTDIR)$(shell finddir B_COMMON_BIN_DIRECTORY)
+ cp -p syntax/*.jsf $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/ne/syntax
+ cp -p doc/ne.1 $(DESTDIR)$(shell finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man/man1
+ cp -pr doc/ne.pdf doc/html doc/ne.txt doc/default.* README COPYING NEWS CHANGES $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/doc/ne
+ cp -p doc/ne.info.gz $(DESTDIR)$(shell finddir B_COMMON_DATA_DIRECTORY)/info
+
install:
(cd src; make NE_GLOBAL_DIR=$(PREFIX)/share/ne)
mkdir -p $(DESTDIR)$(PREFIX)/bin
diff -Naur ne-2.1/src/makefile ne-2.1-haiku/src/makefile
--- ne-2.1/src/makefile 2010-04-28 06:47:06.005767168 +0000
+++ ne-2.1-haiku/src/makefile 2011-04-26 12:54:53.738721792 +0000
@@ -101,10 +101,10 @@
$(if $(NE_TERMCAP), -DTERMCAP,) \
$(if $(NE_ANSI), -DTERMCAP -DANSI,)
-LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses)
+LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lncurses)
ne: $(OBJS) $(if $(NE_TERMCAP)$(NE_ANSI),$(TERMCAPOBJS),)
- $(CC) -lm $(OPTS) $(LDFLAGS) $^ $(LIBS) -o $(PROGRAM)
+ $(CC) $(OPTS) $(LDFLAGS) $^ $(LIBS) -o $(PROGRAM)
clean:
rm -f *.o core

View File

@@ -0,0 +1,51 @@
From 975db08b98b3bbeb2045112a5e983a1feead3e99 Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Sun, 11 Jun 2017 09:12:18 +0200
Subject: Adjust path to perl
diff --git a/src/copyright++.pl b/src/copyright++.pl
index 7d6bdd0..b756106 100755
--- a/src/copyright++.pl
+++ b/src/copyright++.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/perl -w
use strict;
$| = 1;
diff --git a/src/info2src.pl b/src/info2src.pl
index 43778b5..75e463d 100755
--- a/src/info2src.pl
+++ b/src/info2src.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/perl -w
use strict;
$| = 1;
diff --git a/src/request.c b/src/request.c
index 2023586..8b06433 100644
--- a/src/request.c
+++ b/src/request.c
@@ -81,7 +81,7 @@ static bool prune;
$M names_per_page
$x NAMES_PER_LINE(p)
-#!/usr/bin/perl -w
+#!/bin/perl -w
use strict;
my ($X,$Y,$M,$N,$x,$y,$n);
use integer; # use integer math, like C macros do
diff --git a/version.pl b/version.pl
index 81d14df..1dea8b1 100755
--- a/version.pl
+++ b/version.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/bin/perl -w
#
# Usage: $0 [VERSION=XXXXX]
#
--
2.7.0