diff --git a/app-arch/sharutils/patches/sharutils-4.14.patchset b/app-arch/sharutils/patches/sharutils-4.14.patchset deleted file mode 100644 index 7a2ab8b03..000000000 --- a/app-arch/sharutils/patches/sharutils-4.14.patchset +++ /dev/null @@ -1,55 +0,0 @@ -From ddc3088b56acff9a92dd611bc35989cbea8ba580 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Sun, 24 Nov 2013 19:58:36 -0700 -Subject: Include config.h before other headers - - -diff --git a/src/scribble.c b/src/scribble.c -index 57fa9d0..26e820b 100644 ---- a/src/scribble.c -+++ b/src/scribble.c -@@ -1,4 +1,5 @@ - -+#include "config.h" - #include - #include - #include "scribble.h" --- -1.8.3.4 - - -From a9cb54731100e3d642a38721d655340d7ba47778 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 14 Apr 2014 18:36:36 +0000 -Subject: gcc2 fix - - -diff --git a/configure b/configure -index 98d81a5..b7af1ec 100755 ---- a/configure -+++ b/configure -@@ -17612,6 +17612,8 @@ if ac_fn_c_try_compile "$LINENO"; then : - else - ac_cv_header_stdbool_h=no - fi -+ac_cv_header_stdbool_h=yes -+ - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -diff --git a/src/uuencode.c b/src/uuencode.c -index 370726e..bbf259d 100644 ---- a/src/uuencode.c -+++ b/src/uuencode.c -@@ -249,7 +249,7 @@ process_opts (int argc, char ** argv, int * mode) - if (HAVE_OPT(ENCODE_FILE_NAME)) - { - size_t nmlen = strlen (output_name); -- size_t bfsz = nmlen + (nmlen / 3) + 4;; -+ size_t bfsz = nmlen + (nmlen / 3) + 4; - char * p = malloc (bfsz); - if (p == NULL) - fserr (UUENCODE_EXIT_FAILURE, "malloc", _("file name")); --- -1.8.3.4 - diff --git a/app-arch/sharutils/patches/sharutils-4.15.2.patchset b/app-arch/sharutils/patches/sharutils-4.15.2.patchset new file mode 100644 index 000000000..27d5ba073 --- /dev/null +++ b/app-arch/sharutils/patches/sharutils-4.15.2.patchset @@ -0,0 +1,59 @@ +From 1cc78ef9ae5f3dd70980064338945500cb5b2b22 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 2 Jun 2015 17:09:25 +0000 +Subject: Haiku patch + + +diff --git a/src/shar.c b/src/shar.c +index 11cbada..59f95da 100644 +--- a/src/shar.c ++++ b/src/shar.c +@@ -51,6 +51,8 @@ static const char cright_years_z[] = + #endif + #include + ++#include "gettext.h" ++ + #include "inttostr.h" + #include "liballoca.h" + #include "md5.c" +diff --git a/src/unshar.c b/src/unshar.c +index 80bc3a9..006dec8 100644 +--- a/src/unshar.c ++++ b/src/unshar.c +@@ -30,6 +30,7 @@ + #include + #include + ++#include "gettext.h" + #include "xgetcwd.h" + + /* +diff --git a/src/uudecode.c b/src/uudecode.c +index 0621c99..18d103a 100644 +--- a/src/uudecode.c ++++ b/src/uudecode.c +@@ -55,6 +55,7 @@ static char const cright_years_z[] = + #define UUDECODE_C 1 + #include "uudecode-opts.h" + #include "liballoca.h" ++#include "gettext.h" + + #if HAVE_LOCALE_H + #else +diff --git a/src/uuencode.c b/src/uuencode.c +index c651798..907da87 100644 +--- a/src/uuencode.c ++++ b/src/uuencode.c +@@ -64,6 +64,8 @@ static const char cright_years_z[] = + #define UUENCODE_C 1 + #include "uuencode-opts.h" + ++#include "gettext.h" ++ + #if HAVE_LOCALE_H + #else + # define setlocale(Category, Locale) +-- +1.8.3.4 + diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.15.2.recipe similarity index 88% rename from app-arch/sharutils/sharutils-4.14.recipe rename to app-arch/sharutils/sharutils-4.15.2.recipe index ccefcdd8b..2554f4791 100644 --- a/app-arch/sharutils/sharutils-4.14.recipe +++ b/app-arch/sharutils/sharutils-4.15.2.recipe @@ -15,13 +15,15 @@ shell. unshar may also process files containing concatenated shell archives. HOMEPAGE="http://www.gnu.org/software/sharutils/" LICENSE="GNU GPL v3" COPYRIGHT="1990-2013 Free Software Foundation, Inc." -SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz" -CHECKSUM_SHA256="90f5107c167cfd1b299bb211828d2586471087863dbed698f53109cd5f717208" +SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-$portVersion.tar.gz" +CHECKSUM_SHA256="ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +PATCHES="sharutils-$portVersion.patchset" + PROVIDES=" sharutils$secondaryArchSuffix = $portVersion cmd:shar$secondaryArchSuffix = $portVersion @@ -48,12 +50,10 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix " -PATCHES="sharutils-4.14.patchset" - BUILD() { runConfigure ./configure \ - --disable-nls + --disable-nls make }