From 8638a4151906aab546870d305f1d6f3d62ec267e Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 5 Nov 2021 22:00:06 +0100
Subject: [PATCH] ArmyKnife: v5.1.1

and removed old recipes
---
 haiku-apps/armyknife/armyknife-4.3.0.recipe   | 58 -------------------
 ...fe-5.1.0.recipe => armyknife-5.1.1.recipe} | 18 +++---
 2 files changed, 9 insertions(+), 67 deletions(-)
 delete mode 100644 haiku-apps/armyknife/armyknife-4.3.0.recipe
 rename haiku-apps/armyknife/{armyknife-5.1.0.recipe => armyknife-5.1.1.recipe} (68%)

diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe
deleted file mode 100644
index b0ffb04da..000000000
--- a/haiku-apps/armyknife/armyknife-4.3.0.recipe
+++ /dev/null
@@ -1,58 +0,0 @@
-SUMMARY="The all-in-one metadata editor for audio and MPEG files"
-DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of \
-audio and MPEG files, both Haiku file attributes and in-file ID3 tags. You can \
-copy data to and from ID3 tags and attributes, and rename files according to \
-attributes or fill attributes according to file name.
-Now also with support for cover art!"
-HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife"
-COPYRIGHT="2000-2001 Jason Burgess"
-LICENSE="MIT"
-REVISION="4"
-srcGitRev="49f9a12cf288b061449edf5049e5de6a6501093c"
-SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="e223d01114256e1e57291fdb8cd22eb3c5c1e034a41971d7a283433c6344d786"
-SOURCE_FILENAME="$portName-$srcGitRev.tar.gz"
-SOURCE_DIR="ArmyKnife-$srcGitRev"
-
-ARCHITECTURES="?all x86_gcc2 !x86"
-SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
-
-PROVIDES="
-	armyknife$secondaryArchSuffix = $portVersion
-	app:ArmyKnife = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libsanta$secondaryArchSuffix
-	lib:libtag$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	libsanta${secondaryArchSuffix}_devel
-	taglib${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:find
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:unzip
-	cmd:xargs
-	cmd:zip
-	"
-
-BUILD()
-{
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make zipfile
-
-	mkdir -p $appsDir
-	unzip release/ArmyKnife-*.zip -d $appsDir
-
-	addAppDeskbarSymlink $appsDir/ArmyKnife/ArmyKnife
-}
diff --git a/haiku-apps/armyknife/armyknife-5.1.0.recipe b/haiku-apps/armyknife/armyknife-5.1.1.recipe
similarity index 68%
rename from haiku-apps/armyknife/armyknife-5.1.0.recipe
rename to haiku-apps/armyknife/armyknife-5.1.1.recipe
index c176689d4..8c7ce0482 100644
--- a/haiku-apps/armyknife/armyknife-5.1.0.recipe
+++ b/haiku-apps/armyknife/armyknife-5.1.1.recipe
@@ -1,18 +1,18 @@
 SUMMARY="The all-in-one metadata editor for audio and MPEG files"
 DESCRIPTION="ArmyKnife is an application that lets you edit the metadata of \
-audio and MPEG files, both Haiku file attributes and in-file ID3 tags. You can \
-copy data to and from ID3 tags and attributes, and rename files according to \
+audio and MPEG files, both Haiku file attributes and in-file tags. You can \
+copy data to and from tags and attributes, and rename files according to \
 attributes or fill attributes according to file name.
 Now also with support for cover art!"
 HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife"
 COPYRIGHT="2000-2001 Jason Burgess
-	2015-2016 Markus Himmel"
+	2008 Jonas Sundström, Ryan Leavengood
+	2009-2021 HaikuArchives team"
 LICENSE="MIT"
-REVISION="5"
-srcGitRev="4e92b18705930e32fd162273a58647fc7fc55537"
-SOURCE_URI="https://github.com/HaikuArchives/ArmyKnife/archive/$srcGitRev.zip"
-CHECKSUM_SHA256="60ca86043552566fb6170f3a79129698a848bb40372b74b4a9d5b9279fe42055"
-SOURCE_DIR="ArmyKnife-$srcGitRev"
+REVISION="1"
+SOURCE_URI="https://github.com/HaikuArchives/ArmyKnife/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="1ecf71011f7ea82642d531ea5c2d8be59dc6da9b36d00e5c1ea85555abf0e824"
+SOURCE_DIR="ArmyKnife-$portVersion"
 
 ARCHITECTURES="all"
 
@@ -33,7 +33,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
-	cmd:gcc
+	cmd:g++
 	cmd:make
 	"