code format.

* fix libdsk_tools PROVIDES.
2026-04-22 19:50:05 +02:00 · 2018-09-11 14:43:35 +02:00
parent c79192faea
commit 20746f828e
7 changed files with 80 additions and 88 deletions
--- a/app-admin/testdisk/testdisk-7.1~git.recipe
+++ b/app-admin/testdisk/testdisk-7.1~git.recipe
@@ -38,11 +38,11 @@ SOURCE_DIR="testdisk-$srcGitRev"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
-	commandBinDir=$prefix/bin
+	commandBinDir="$prefix/bin"
 fi

 #TODO: add SVG icon to qphotorec
@@ -50,15 +50,10 @@ fi

 PROVIDES="
 	testdisk$secondaryArchSuffix = $portVersion
-	cmd:testdisk$commandSuffix = $portVersion
-	cmd:photorec$commandSuffix = $portVersion
 	cmd:fidentify$commandSuffix = $portVersion
+	cmd:photorec$commandSuffix = $portVersion
+	cmd:testdisk$commandSuffix = $portVersion
 	"
-PROVIDES_qt="
-	testdisk${secondaryArchSuffix}_qt = $portVersion
-	cmd:qphotorec$commandSuffix = $portVersion
-	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -68,9 +63,14 @@ REQUIRES="
 	lib:libuuid$secondaryArchSuffix >= 1.3
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_qt="
+	testdisk${secondaryArchSuffix}_qt = $portVersion
+	cmd:qphotorec$commandSuffix = $portVersion
+	"
 REQUIRES_qt="
-	testdisk$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
+	testdisk$secondaryArchSuffix == $portVersion base
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -98,8 +98,8 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"

--- a/app-arch/gcab/gcab-0.8.recipe
+++ b/app-arch/gcab/gcab-0.8.recipe
@@ -21,17 +21,17 @@ PATCHES="gcab-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

-libVersion="0.0.0"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
 fi

+libVersion="0.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	gcab$secondaryArchSuffix = $portVersion
 	cmd:gcab$commandSuffix = $portVersion
@@ -57,17 +57,17 @@ REQUIRES_devel="

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libgettextlib$secondaryArchSuffix >= 0.14.1
+	devel:libglib_2.0$secondaryArchSuffix >= 0.4600.2
 	devel:libintl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
-	devel:libglib_2.0$secondaryArchSuffix >= 0.4600.2
-	devel:libgettextlib$secondaryArchSuffix >= 0.14.1
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
-	cmd:autoreconf
 	cmd:autom4te
 	cmd:automake
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:intltool_update
 	cmd:ld$secondaryArchSuffix
--- a/app-arch/libarchive/libarchive-3.3.2.recipe
+++ b/app-arch/libarchive/libarchive-3.3.2.recipe
@@ -20,8 +20,8 @@ cab, mtree, rar, and ISO images.
 or compress.
 * Unique format conversion feature."
 HOMEPAGE="http://www.libarchive.org/"
-LICENSE="BSD (2-clause)"
 COPYRIGHT="2003-2013 Tim Kientzle"
+LICENSE="BSD (2-clause)"
 REVISION="2"
 SOURCE_URI="http://www.libarchive.org/downloads/libarchive-$portVersion.tar.gz"
 CHECKSUM_SHA256="ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce"
@@ -31,11 +31,11 @@ ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
    commandSuffix=
-    commandBinDir=$prefix/bin
+    commandBinDir="$prefix/bin"
 fi

 PROVIDES="
@@ -54,6 +54,7 @@ REQUIRES="
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
 	devel:libarchive$secondaryArchSuffix = 13.3.2 compat >= 13
@@ -61,6 +62,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libarchive$secondaryArchSuffix == $portVersion
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
@@ -74,9 +76,9 @@ BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
+	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:xml2_config$secondaryArchSuffix
 	"
--- a/app-arch/zopfli/zopfli-1.0.2.recipe
+++ b/app-arch/zopfli/zopfli-1.0.2.recipe
@@ -12,8 +12,8 @@ SOURCE_DIR="zopfli-zopfli-$portVersion"
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"

-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
@@ -31,9 +31,10 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:make
 	"
+
 BUILD()
 {
 	make $jobArgs
--- a/app-backup/burp/burp-1.4.28.recipe
+++ b/app-backup/burp/burp-1.4.28.recipe
@@ -3,58 +3,19 @@ DESCRIPTION="Burp aims to be a better Bacula and is a network backup and \
 restore software. It relies on librsync for compression of network \
 communication and of the backups itself. Burp provides both a client and a \
 server and supports Windows's Volume Shadow Copy Services."
-
 HOMEPAGE="https://burp.grke.org"
-
-SOURCE_URI="http://sourceforge.net/projects/burp/files/burp-1.4.28/burp-1.4.28.tar.bz2"
-CHECKSUM_SHA256="01c41c07805ebe8c882d7cb9f294e779b6decbe2eb2c81fd65d8fb2b174e18f0"
-REVISION="2"
-SOURCE_DIR="burp"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?ppc"
-
-LICENSE="GNU AGPL v3"
 COPYRIGHT="
 	2011-2014 Graham Keeling
 	2005-2010 Troy D. Hanson
 	"
+LICENSE="GNU AGPL v3"
+REVISION="2"
+SOURCE_URI="http://sourceforge.net/projects/burp/files/burp-1.4.28/burp-1.4.28.tar.bz2"
+CHECKSUM_SHA256="01c41c07805ebe8c882d7cb9f294e779b6decbe2eb2c81fd65d8fb2b174e18f0"
+SOURCE_DIR="burp"
+PATCHES="burp-1.4.28.patchset"

-REQUIRES="
-	haiku
-	lib:libssl
-	lib:libz
-	lib:librsync
-	lib:libncurses
-	lib:libpopt
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libssl
-	devel:libz
-	devel:librsync
-	devel:libncurses
-	devel:libpopt
-	"
-
-BUILD_PREREQUIRES="
-	cmd:make
-	cmd:gcc
-	cmd:gawk
-	cmd:sed
-	"
-
-PROVIDES="
-	burp = $portVersion
-	cmd:burp_ca
-	cmd:burp
-	cmd:bedup
-	cmd:vss_strip
-	"
-
-PATCHES="
-	burp-1.4.28.patchset
-	"
+ARCHITECTURES="x86_gcc2 ?x86 ?ppc"

 GLOBAL_WRITABLE_FILES="
 	settings/burp/CA.cnf auto-merge
@@ -70,6 +31,37 @@ GLOBAL_WRITABLE_FILES="
 	settings/burp/timer_script auto-merge
 	"

+PROVIDES="
+	burp = $portVersion
+	cmd:bedup
+	cmd:burp
+	cmd:burp_ca
+	cmd:vss_strip
+	"
+REQUIRES="
+	haiku
+	lib:libncurses
+	lib:libpopt
+	lib:librsync
+	lib:libssl
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libncurses
+	devel:libpopt
+	devel:librsync
+	devel:libssl
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:gawk
+	cmd:gcc
+	cmd:make
+	cmd:sed
+	"
+
 BUILD()
 {
 	runConfigure  --omit-dirs sysconfdir\
--- a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
@@ -19,8 +19,8 @@ CHECKSUM_SHA256_2="60e91e4a3c7b64d18a144b0e2bc0499c1ab10db3676c099725aca820ff429
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
+commandSuffix="$secondaryArchSuffix"
+commandBinDir="$binDir"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
@@ -40,9 +40,9 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:install
+	cmd:make
 	cmd:patch
 	cmd:zcat
 	"
--- a/app-emulation/libdsk/libdsk-1.5.4.recipe
+++ b/app-emulation/libdsk/libdsk-1.5.4.recipe
@@ -11,10 +11,10 @@ then build CPMTOOLS, using \"./configure --with-libdsk\". For CPMTOOLS 1.9 or \
 controller emulation, thus giving the emulator transparent access to .DSK \
 files or real discs.
 "
+HOMEPAGE="http://www.seasip.info/Unix/LibDsk/"
 COPYRIGHT="2010-2015 John Elliott"
 LICENSE="GNU GPL v2"
-HOMEPAGE="http://www.seasip.info/Unix/LibDsk/"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://www.seasip.info/Unix/LibDsk/libdsk-$portVersion.tar.gz"
 CHECKSUM_SHA256="e1c56f6395a011d508a5e548dcbcadce8ee8cb95740f986d6e8e3695ed59de82"

@@ -25,9 +25,14 @@ PROVIDES="
 	libdsk$secondaryArchSuffix = $portVersion
 	lib:libdsk$secondaryArchSuffix = 4.3.0 compat >= 4
 	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"

 if [ -z "$secondaryArchSuffix" ]; then
-PROVIDES_tools="$PROVIDES
+PROVIDES_tools="
+	libdsk_tools = $portVersion
 	cmd:apriboot
 	cmd:dskconv
 	cmd:dskdump
@@ -38,7 +43,6 @@ PROVIDES_tools="$PROVIDES
 	cmd:dskutil
 	cmd:md3serial
 	"
-
 REQUIRES_tools="
 	haiku
 	lib:libdsk
@@ -48,20 +52,13 @@ fi
 PROVIDES_devel="
 	devel:libdsk$secondaryArchSuffix = $portVersion
 "
-
 REQUIRES_devel="
 	libdsk$secondaryArchSuffix == $portVersion base
 "

-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 "
-
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf