diff --git a/app-crypt/minisign/minisign-0.7.recipe b/app-crypt/minisign/minisign-0.9.recipe similarity index 84% rename from app-crypt/minisign/minisign-0.7.recipe rename to app-crypt/minisign/minisign-0.9.recipe index 6f4152d66..4a6a1082c 100644 --- a/app-crypt/minisign/minisign-0.7.recipe +++ b/app-crypt/minisign/minisign-0.9.recipe @@ -7,9 +7,7 @@ COPYRIGHT="2015-2016 Frank Denis" LICENSE="ISC" REVISION="1" SOURCE_URI="https://github.com/jedisct1/minisign/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="0c9f25ae647b6ba38cf7e6aea1da4e8fb20e1bc64ef0c679da737a38c8ad43ef" -# NOTE: This patch is upstreamed. It could be drop once a new version come out -PATCHES="minisign-$portVersion.patchset" +CHECKSUM_SHA256="caa4b3dd314e065c6f387b2713f7603673e39a8a0b1a76f96ef6c9a5b845da0f" ARCHITECTURES="x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -31,6 +29,7 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make + cmd:pkg_config " BUILD() diff --git a/app-crypt/minisign/patches/minisign-0.7.patchset b/app-crypt/minisign/patches/minisign-0.7.patchset deleted file mode 100644 index 47c59a42d..000000000 --- a/app-crypt/minisign/patches/minisign-0.7.patchset +++ /dev/null @@ -1,79 +0,0 @@ -From 1a98e0ece40e6e4b2a26f899804cccbffef1aea6 Mon Sep 17 00:00:00 2001 -From: Leorize -Date: Sun, 17 Dec 2017 17:51:40 +0700 -Subject: Add Haiku support - - -diff --git a/src/get_line.c b/src/get_line.c -index 8db6765..3030f78 100644 ---- a/src/get_line.c -+++ b/src/get_line.c -@@ -1,5 +1,5 @@ - --#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - # include - #endif - -@@ -9,7 +9,7 @@ - #include - #include - --#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - # include - # include - # include -@@ -33,7 +33,7 @@ disable_echo(void) - fflush(stdout); - fflush(stderr); - --# if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+# if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - { - struct termios p; - -@@ -60,7 +60,7 @@ enable_echo(void) - fflush(stdout); - fflush(stderr); - --# if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+# if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - { - struct termios p; - -diff --git a/src/helpers.c b/src/helpers.c -index dbe46df..1f59d2e 100644 ---- a/src/helpers.c -+++ b/src/helpers.c -@@ -1,7 +1,7 @@ - --#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - # include --# include -+# include - # include - #elif defined(_WIN32) - # include -@@ -184,7 +184,7 @@ file_basename(const char *file) - FILE * - fopen_create_useronly(const char *file) - { --#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - int fd; - - if ((fd = open(file, O_CREAT | O_TRUNC | O_WRONLY, -@@ -209,7 +209,7 @@ basedir_create_useronly(const char *file) - if (basename != dir) { - dir[basename - dir - 1] = 0; - } --#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - if (*dir == 0 || mkdir(dir, 0700) == 0 || errno == EEXIST) { - ret = 0; - } --- -2.15.0 -