joe: bump version.

app-editors/joe/joe-4.4.recipe

@@ -1,53 +0,0 @@
-SUMMARY="Terminal-based text editor"
-DESCRIPTION="Joe's Own Editor is a full-featured text editor with minimal requirements. \
-It is fully customizable (Emacs, pico or WordStar are preset). Is also has multiple \
-windows, hexadecimal edit mode for binary files or syntax highlighting for more than 40 languages. \
-It also supports mouse for both text and window manipulation."
-HOMEPAGE="http://joe-editor.sourceforge.net/"
-COPYRIGHT="1992, 2004, 2006, 2015 Joseph H. Allen"
-LICENSE="GNU GPL v1"
-REVISION="1"
-SOURCE_URI="https://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-4.4/joe-4.4.tar.gz"
-CHECKSUM_SHA256="a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979"
-PATCHES="0001-Fix-gcc2-build.patch"
-
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/joe directory keep-old
-	"
-
-PROVIDES="
-	joe = $portVersion
-	cmd:jmacs
-	cmd:joe = $portVersion
-	cmd:jpico
-	cmd:jstar
-	cmd:rjoe
-	"
-REQUIRES="
-	haiku
-	lib:libncurses
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libncurses
-	"
-BUILD_PREREQUIRES="
-	cmd:gawk
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	"
-
-BUILD()
-{
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}

app-editors/joe/joe-4.6.recipe

@@ -8,9 +8,10 @@ COPYRIGHT="1992, 2004, 2006, 2015 Joseph H. Allen"
 LICENSE="GNU GPL v1"
 REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$portVersion/joe-$portVersion.tar.gz"
-CHECKSUM_SHA256="51104aa34d8650be3fa49f2204672a517688c9e6ec47e68f1ea85de88e36cadf"
+CHECKSUM_SHA256="495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de"
+PATCHES="joe-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
 GLOBAL_WRITABLE_FILES="
 	settings/joe directory keep-old

app-editors/joe/patches/0001-Fix-gcc2-build.patch

@@ -1,25 +0,0 @@
-From 6ed4f1f0b316a6819e4f38e36ee7f8863133c907 Mon Sep 17 00:00:00 2001
-From: Scott McCreary <scottmc2@gmail.com>
-Date: Mon, 30 Jan 2017 18:41:03 -0800
-Subject: [PATCH] Fix gcc2 build
-
----
- joe/bw.c | 2 +-
- 1 file changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/joe/bw.c b/joe/bw.c
-index ecbfb32..f620585 100644
---- a/joe/bw.c
-+++ b/joe/bw.c
-@@ -1208,8 +1208,8 @@ int ucrawll(W *w, int k)
- {
- 	BW *bw;
- 	off_t amnt;
--	WIND_BW(bw, w);
- 	int rtn = -1;
-+	WIND_BW(bw, w);
-
- 	if (opt_left < 0)
- 		amnt = bw->w / (-opt_left);
---
-2.7.0

app-editors/joe/patches/joe-4.6.patchset

@@ -0,0 +1,46 @@
+From 7cd34a216c356e454c47691c8b9649b1e04275fe Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sun, 31 Mar 2019 12:18:46 +0200
+Subject: sys/fcntl.h doesn't exit on Haiku. fcntl.h does.
+
+
+diff --git a/joe/util/checkwidths.c b/joe/util/checkwidths.c
+index 509447d..984785b 100644
+--- a/joe/util/checkwidths.c
++++ b/joe/util/checkwidths.c
+@@ -12,7 +12,7 @@
+ #include <arpa/inet.h>
+ #include <stddef.h>
+ #include <poll.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <termios.h>
+ 
+ #define TO_CHAR_OK(c) ((char)(c))
+-- 
+2.19.1
+
+
+From b3a1b477920232a9a354f1bc6bbe7e154b0cfbc9 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sun, 31 Mar 2019 12:59:48 +0200
+Subject: gcc2 patch
+
+
+diff --git a/joe/bw.c b/joe/bw.c
+index 66594b8..fcbc3db 100644
+--- a/joe/bw.c
++++ b/joe/bw.c
+@@ -1227,8 +1227,8 @@ int ucrawll(W *w, int k)
+ {
+ 	BW *bw;
+ 	off_t amnt;
+-	WIND_BW(bw, w);
+ 	int rtn = -1;
++	WIND_BW(bw, w);
+ 
+ 	if (opt_left < 0)
+ 		amnt = bw->w / (-opt_left);
+-- 
+2.19.1
+