fdupes: update to 2.1.2 (#6553)

app-misc/fdupes/fdupes-1.6.1.recipe

@@ -1,39 +0,0 @@
-SUMMARY="A program for identifying or deleting duplicate files"
-DESCRIPTION="fdupes is a program written by Adrian Lopez to scan directories \
-for duplicate files, with options to list, delete or replace the files with \
-hardlinks pointing to the duplicate. It first compares file sizes and MD5 \
-signatures, and then performs a byte-by-byte check for verification."
-HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-COPYRIGHT="1999-2016 Adrian Lopez"
-LICENSE="fdupes"
-REVISION="2"
-SOURCE_URI="https://github.com/adrianlopezroche/fdupes/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="9d6b6fdb0b8419815b4df3bdfd0aebc135b8276c90bbbe78ebe6af0b88ba49ea"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	fdupes = $portVersion
-	cmd:fdupes = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:make
-	"
-
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	make install PREFIX=$prefix MAN_BASE_DIR=$manDir
-}

app-misc/fdupes/fdupes-2.1.2.recipe

@@ -0,0 +1,52 @@
+SUMMARY="A program for identifying or deleting duplicate files"
+DESCRIPTION="fdupes is a program written by Adrian Lopez to scan directories for duplicate files, \
+with options to list, delete or replace the files with hardlinks pointing to the duplicate. It \
+first compares file sizes and MD5 signatures, and then performs a byte-by-byte check for \
+verification."
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+COPYRIGHT="1999-2020 Adrian Lopez"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://github.com/adrianlopezroche/fdupes/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="47536dad3f628b49420d60be55417238e537902a7461e19f199092ab8b24e8f1"
+PATCHES="fdupes-$portVersion.patchset"
+
+ARCHITECTURES="all"
+
+PROVIDES="
+	fdupes = $portVersion
+	cmd:fdupes = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libncursesw
+	lib:libpcre2_32
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libncursesw
+	devel:libpcre2_32
+	"
+BUILD_PREREQUIRES="
+	cmd:autoreconf
+	cmd:autoconf
+	cmd:aclocal
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	cmd:sed
+	cmd:pkg_config
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}

app-misc/fdupes/licenses/fdupes

@@ -1,22 +0,0 @@
-Legal Information
---------------------------------------------------------------------
-FDUPES Copyright (c) 1999 Adrian Lopez
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation files
-(the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

app-misc/fdupes/patches/fdupes-2.1.2.patchset

@@ -0,0 +1,39 @@
+From 3cbbed2f63c91ea3eb4eb2f28fc1aab9c42ffb45 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Fri, 21 Jan 2022 22:00:38 +0000
+Subject: define va_copy for Haiku x86_gcc2
+
+
+diff --git a/ncurses-prompt.c b/ncurses-prompt.c
+index 0db22ac..4fa255b 100644
+--- a/ncurses-prompt.c
++++ b/ncurses-prompt.c
+@@ -24,6 +24,10 @@
+ #include "ncurses-print.h"
+ #include "ncurses-prompt.h"
+ 
++#if defined(__HAIKU__) && __GNUC__ < 3
++#define va_copy __va_copy
++#endif
++
+ struct prompt_info *prompt_info_alloc(size_t initial_size)
+ {
+   struct prompt_info *out;
+diff --git a/ncurses-status.c b/ncurses-status.c
+index a209949..6db46ef 100644
+--- a/ncurses-status.c
++++ b/ncurses-status.c
+@@ -24,6 +24,10 @@
+ #include "ncurses-print.h"
+ #include "ncurses-status.h"
+ 
++#if defined(__HAIKU__) && __GNUC__ < 3
++#define va_copy __va_copy
++#endif
++
+ struct status_text *status_text_alloc(struct status_text *status, size_t width)
+ {
+   struct status_text *result;
+-- 
+2.30.2
+