joe: bump version.

tree: bump version.
tar: bump version.
haikuports · waddlesplash · Apr 5, 2019 · waddlesplash · Apr 5, 2019 · waddlesplash
diff --git a/app-arch/tar/patches/tar-1.30-gcc2.patchset → app-arch/tar/patches/tar-1.32-gcc2.patchset b/app-arch/tar/patches/tar-1.30-gcc2.patchset → app-arch/tar/patches/tar-1.32-gcc2.patchset
diff --git a/app-arch/tar/tar-1.30.recipe → app-arch/tar/tar-1.32.recipe b/app-arch/tar/tar-1.30.recipe → app-arch/tar/tar-1.32.recipe
@@ -15,7 +15,7 @@ LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2
 	https://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
-CHECKSUM_SHA256="87592b86cb037c554375f5868bdd3cc57748aef38d6cb741c81065f0beac63b7"
+CHECKSUM_SHA256="e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
 if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
 PATCHES="tar-$portVersion-gcc2.patchset"
 fi
@@ -71,8 +71,6 @@ BUILD()
 INSTALL()
 {
 	make install
-
-	rm $libDir/charset.alias
 }
 
 TEST()

diff --git a/app-editors/joe/joe-4.4.recipe b/app-editors/joe/joe-4.4.recipe
diff --git a/app-editors/joe/joe-4.5.recipe → app-editors/joe/joe-4.6.recipe b/app-editors/joe/joe-4.5.recipe → 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

diff --git a/app-editors/joe/patches/0001-Fix-gcc2-build.patch b/app-editors/joe/patches/0001-Fix-gcc2-build.patch
diff --git a/app-editors/joe/patches/joe-4.6.patchset b/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
+
diff --git a/app-text/tree/patches/tree-1.7.0.patchset b/app-text/tree/patches/tree-1.7.0.patchset
diff --git a/app-text/tree/patches/tree-1.8.0.patchset b/app-text/tree/patches/tree-1.8.0.patchset
@@ -0,0 +1,40 @@
+From c44e177a02ccfe9dfbdfc830aed8837afa2ad6b1 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 24 Apr 2014 16:37:07 +0000
+Subject: Haiku patch
+
+
+diff --git a/Makefile b/Makefile
+index 842281e..f13abd6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,12 +30,12 @@ OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o file.o
+ # Uncomment options below for your particular OS:
+
+ # Linux defaults:
+-CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++#CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #LDFLAGS=-s
+
+ # Uncomment for FreeBSD:
+-#CFLAGS=-O2 -Wall -fomit-frame-pointer
++CFLAGS=-O2 -Wall -fomit-frame-pointer
+ #LDFLAGS=-s
+ #OBJS+=strverscmp.o
+
+@@ -68,6 +68,11 @@ CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=6
+ #MANDIR=/usr/share/man/man1
+ #OBJS+=strverscmp.o
+
++# Uncomment for Haiku:
++CFLAGS=-O2 -Wall -fomit-frame-pointer
++LDFLAGS=
++OBJS+=strverscmp.o
++
+ # Uncomment for HP/UX:
+ #CC=cc
+ #CFLAGS=-O2 -DAportable -Wall
+-- 
+2.19.1
+
diff --git a/app-text/tree/tree-1.7.0.recipe → app-text/tree/tree-1.8.0.recipe b/app-text/tree/tree-1.7.0.recipe → app-text/tree/tree-1.8.0.recipe
@@ -4,10 +4,10 @@ of files."
 HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
 COPYRIGHT="1996-2011 Steve Baker"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="http://mama.indstate.edu/users/ice/tree/src/tree-$portVersion.tgz"
-CHECKSUM_SHA256="6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12"
-PATCHES="tree-1.7.0.patchset"
+CHECKSUM_SHA256="715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2"
+PATCHES="tree-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"

diff --git a/dev-db/sqlite/sqlite-3.25.3.0.recipe b/dev-db/sqlite/sqlite-3.25.3.0.recipe