From 368cb0d40c74e307c1c3ea1e7d4a6eccc23f737f Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Sat, 19 Mar 2022 18:43:23 +0100
Subject: [PATCH] cleanup (#6726)

---
 .../twolame/patches/twolame-0.3.13.patchset   | 23 -----------
 ...ame-0.3.13.recipe => twolame-0.4.0.recipe} | 38 ++++++++++---------
 2 files changed, 21 insertions(+), 40 deletions(-)
 delete mode 100644 media-sound/twolame/patches/twolame-0.3.13.patchset
 rename media-sound/twolame/{twolame-0.3.13.recipe => twolame-0.4.0.recipe} (70%)

diff --git a/media-sound/twolame/patches/twolame-0.3.13.patchset b/media-sound/twolame/patches/twolame-0.3.13.patchset
deleted file mode 100644
index 31d5e55e4..000000000
--- a/media-sound/twolame/patches/twolame-0.3.13.patchset
+++ /dev/null
@@ -1,23 +0,0 @@
-From 294c0b700326ab24d1a793e81338a93aebb2e69e Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sat, 13 Sep 2014 18:02:16 +0200
-Subject: gcc2 fix.
-
-
-diff --git a/frontend/frontend.c b/frontend/frontend.c
-index f722955..3cdbf6c 100644
---- a/frontend/frontend.c
-+++ b/frontend/frontend.c
-@@ -736,8 +736,8 @@ int main(int argc, char **argv)
-     // 
-     mp2fill_size = twolame_encode_flush(encopts, mp2buffer, MP2_BUF_SIZE);
-     if (mp2fill_size > 0) {
--        frame_count++;
-         int bytes_out = fwrite(mp2buffer, sizeof(unsigned char), mp2fill_size, outputfile);
-+        frame_count++;
-         if (bytes_out <= 0) {
-             perror("error while writing to output file");
-             exit(ERR_WRITING_OUTPUT);
--- 
-1.8.3.4
-
diff --git a/media-sound/twolame/twolame-0.3.13.recipe b/media-sound/twolame/twolame-0.4.0.recipe
similarity index 70%
rename from media-sound/twolame/twolame-0.3.13.recipe
rename to media-sound/twolame/twolame-0.4.0.recipe
index e85834ed7..d1fae5959 100644
--- a/media-sound/twolame/twolame-0.3.13.recipe
+++ b/media-sound/twolame/twolame-0.4.0.recipe
@@ -3,27 +3,22 @@ DESCRIPTION="TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based \
 on tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and \
 portions of LAME."
 HOMEPAGE="https://www.twolame.org"
-COPYRIGHT="2004-2006 The TwoLAME Project"
+COPYRIGHT="2004-2018 The TwoLAME Project"
 LICENSE="GNU LGPL v2.1"
-REVISION="4"
-SOURCE_URI="http://downloads.sourceforge.net/twolame/twolame-0.3.13.tar.gz"
-CHECKSUM_SHA256="98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a"
-PATCHES="twolame-$portVersion.patchset"
+REVISION="1"
+SOURCE_URI="https://downloads.sourceforge.net/twolame/twolame-$portVersion.tar.gz"
+CHECKSUM_SHA256="cc35424f6019a88c6f52570b63e1baf50f62963a3eac52a03a800bb070d7c87d"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	twolame$secondaryArchSuffix = $portVersion compat >= 0
-	cmd:twolame$secondaryArchSuffix
 	lib:libtwolame$secondaryArchSuffix = 0.0.0 compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libFLAC$secondaryArchSuffix
-	lib:libogg$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -34,12 +29,19 @@ REQUIRES_devel="
 	twolame$secondaryArchSuffix == $portVersion base
 	"
 
+PROVIDES_bin="
+	twolame${secondaryArchSuffix}_bin = $portVersion compat >= 0
+	cmd:twolame$secondaryArchSuffix
+	"
+REQUIRES_bin="
+	twolame$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libsndfile$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libflac$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix
 	devel:libsndfile$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -55,11 +57,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	autoheader
-	automake --add-missing
+	autoreconf -vfi
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -73,5 +71,11 @@ INSTALL()
 	prepareInstalledDevelLib libtwolame
 	fixPkgconfig
 
+	packageEntries bin $binDir $docDir $manDir
 	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make check
+}