From 5b2ad2f0f4b1d9e4bd60cc2c27e3468cbdd4fe0d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sat, 25 Jul 2015 11:03:20 +0200
Subject: [PATCH] Libdsk: update to current version and recipe standards

* Release 1.3.3 is not even online anymore on the homepage
* Reorder things in the recipe to match current practises
* Remove libtoolize invokation since it is not needed anymore (upstream
fixed)
* Move tools to a separate package
---
 ...ibdsk-1.3.3.recipe => libdsk-1.3.8.recipe} | 68 +++++++++++--------
 1 file changed, 39 insertions(+), 29 deletions(-)
 rename app-emulation/libdsk/{libdsk-1.3.3.recipe => libdsk-1.3.8.recipe} (72%)

diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.8.recipe
similarity index 72%
rename from app-emulation/libdsk/libdsk-1.3.3.recipe
rename to app-emulation/libdsk/libdsk-1.3.8.recipe
index 0ed6f0dd0..23bb8755a 100644
--- a/app-emulation/libdsk/libdsk-1.3.3.recipe
+++ b/app-emulation/libdsk/libdsk-1.3.8.recipe
@@ -1,19 +1,34 @@
-SUMMARY="LibDSK is a library for manipulating disk image files"
+SUMMARY="A library for manipulating disk image files"
+DESCRIPTION="LIBDSK is a library for accessing discs and disc image files. \
+It is intended for use in:
+* Emulator tools - converting between real floppy discs and disc images, as \
+CPCTRANS / PCWTRANS do under DOS.
+* Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus allowing \
+the use of CPMTOOLS on emulator .DSK images. To do this, install LIBDSK and \
+then build CPMTOOLS, using \"./configure --with-libdsk\". For CPMTOOLS 1.9 or \
+2.0, you will also need to apply this patch.
+* Emulators - it is possible to use LIBDSK as part of an emulator's floppy \
+controller emulation, thus giving the emulator transparent access to .DSK \
+files or real discs.
+"
+COPYRIGHT="2010-2015 John Elliott"
+LICENSE="GNU GPL v2"
 HOMEPAGE="http://www.seasip.demon.co.uk/Unix/LibDsk/"
-SOURCE_URI="http://www.seasip.info/Unix/LibDsk/libdsk-1.3.3.tar.gz"
-CHECKSUM_SHA256="a9186b167934ce5b847f74d2389b6c37084761ea255501dab481051336353606"
-REVISION="2"
+REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
+SOURCE_URI="http://www.seasip.info/Unix/LibDsk/libdsk-$portVersion.tar.gz"
+CHECKSUM_SHA256="1472cb30534e3a1b3ac0c2e7e4a00a9c247955af5d407cb95c25391fb61e45d4"
+
 PROVIDES="
 	libdsk$secondaryArchSuffix = $portVersion
-	lib:libdsk$secondaryArchSuffix = $portVersion
+	lib:libdsk$secondaryArchSuffix = 3.3.1 compat >= 3
 	"
 
 
 if [ -z "$secondaryArchSuffix" ]; then
-PROVIDES="$PROVIDES
+PROVIDES_tools="$PROVIDES
 	cmd:apriboot
 	cmd:dskdump
 	cmd:dskform
@@ -23,6 +38,11 @@ PROVIDES="$PROVIDES
 	cmd:dskutil
 	cmd:md3serial
 	"
+
+REQUIRES_tools="
+	haiku
+	lib:libdsk
+"
 fi
 
 PROVIDES_devel="
@@ -36,22 +56,26 @@ REQUIRES_devel="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
-	"
+"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+"
 
 BUILD_PREREQUIRES="
-	haiku_devel
-	haiku${secondaryArchSuffix}_devel
-	cmd:libtoolize
+	cmd:aclocal
 	cmd:autoconf
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
-	"
+	cmd:libtoolize
+	cmd:make
+"
 
 BUILD()
 {
 	# Need to update the libtools in the package to build shared libraries
-	libtoolize --install --copy --force
-	autoconf
+#aclocal
+#	libtoolize --install --copy --force
+#	autoconf
 	runConfigure ./configure
 	make $jobArgs
 }
@@ -68,20 +92,6 @@ INSTALL()
 	prepareInstalledDevelLib libdsk
 
 	packageEntries devel $developDir
+	packageEntries tools $binDir
 }
 
-COPYRIGHT="2010 John Elliott"
-LICENSE="GNU GPL v2"
-DESCRIPTION="
-LIBDSK is a library for accessing discs and disc image files. It is intended \
-for use in:
-* Emulator tools - converting between real floppy discs and disc images, as \
-CPCTRANS / PCWTRANS do under DOS.
-* Filesystem utilities - CPMTOOLS is configurable to use LIBDSK, thus allowing \
-the use of CPMTOOLS on emulator .DSK images. To do this, install LIBDSK and \
-then build CPMTOOLS, using \"./configure --with-libdsk\". For CPMTOOLS 1.9 or \
-2.0, you will also need to apply this patch.
-* Emulators - it is possible to use LIBDSK as part of an emulator's floppy \
-controller emulation, thus giving the emulator transparent access to .DSK \
-files or real discs.
-"