code style.

2026-04-09 05:10:05 +02:00 · 2018-08-07 08:26:26 +02:00
parent 1e17abb3a9
commit ac17bd1be4
36 changed files with 78 additions and 88 deletions
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
@@ -9,7 +9,6 @@ REVISION="4"
 SOURCE_URI="http://aluigi.altervista.org/mytoolz/daa2iso.zip"
 CHECKSUM_SHA256="f5990542bbfb632a18e664bb956d1dfa35b20945881c617af641a9ee8cfbc47b"
 SOURCE_FILENAME="daa2iso-$portVersion.zip"
-#intentionally empty
 SOURCE_DIR=""
 SOURCE_URI_2="http://httpredir.debian.org/debian/pool/main/d/daa2iso/daa2iso_0.1.7e-1.diff.gz#noarchive"
 CHECKSUM_SHA256_2="810b1400c18f5dbcb35c64c56b23bd0a22b7623f2bc694f1b789f0418eaba1d1"
--- a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
@@ -12,7 +12,6 @@ REVISION="4"
 SOURCE_URI="http://aluigi.altervista.org/mytoolz/uif2iso.zip"
 CHECKSUM_SHA256="b78dde3e8bc28559f73e2feb46d41c8f57b511ddbe25d63ada704ef8697528ec"
 SOURCE_FILENAME="uif2iso-$portVersion.zip"
-#intentionally empty
 SOURCE_DIR=""
 SOURCE_URI_2="http://httpredir.debian.org/debian/pool/main/u/uif2iso/uif2iso_0.1.7a-1.diff.gz#noarchive"
 CHECKSUM_SHA256_2="60e91e4a3c7b64d18a144b0e2bc0499c1ab10db3676c099725aca820ff429594"
--- a/app-emulation/basiliskii/basiliskii-1.0.0.recipe
+++ b/app-emulation/basiliskii/basiliskii-1.0.0.recipe
@@ -3,15 +3,15 @@ DESCRIPTION="Basilisk II is an Open Source 68k Macintosh emulator. That is, it \
 allows you to run 68k MacOS software on your computer, even if you are using a \
 different operating system. However, you still need a copy of MacOS and a \
 Macintosh ROM image to use Basilisk II."
-LICENSE="GNU GPL v2"
 HOMEPAGE="http://basilisk.cebix.net/"
-REVISION="2"
 COPYRIGHT="1997-2015 Christian Bauer, Gwenolé Beauchene"
+LICENSE="GNU GPL v2"
+REVISION="2"
 srcGitRev="c2b519ee1ea848ac827e68cd1d536b3464b79ed1"
 SOURCE_URI="https://github.com/cebix/macemu/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="37c3e841f719f4fd0ed5c17d5f8286420f4b4a35c6709de932274919cda27976"
-PATCHES="basiliskii-1.0.0.patchset"
 SOURCE_DIR="macemu-$srcGitRev"
+PATCHES="basiliskii-1.0.0.patchset"

 ARCHITECTURES="x86_gcc2"

@@ -19,7 +19,6 @@ PROVIDES="
 	basiliskii$secondaryArchSuffix = $portVersion
 	app:BasiliskII
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
@@ -28,7 +27,6 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	makefile_engine
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
--- a/app-misc/toilet/toilet-0.3~git.recipe
+++ b/app-misc/toilet/toilet-0.3~git.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://github.com/cacalabs/toilet"
 COPYRIGHT="2004 Sam Hocevar"
 LICENSE="WTFPL"
 REVISION="1"
-srcGitRev=3eb9d58037afb0a1baec6dca82caa045fb2217c0
+srcGitRev="3eb9d58037afb0a1baec6dca82caa045fb2217c0"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="a16b3a6217852d4ec5e9fa94c5600b900710d652910ac041bf1c5c61524a03d4"
 SOURCE_FILENAME="toilet-$portVersion-$srcGitRev.tar.gz"
--- a/app-text/coolreader3/coolreader3-3.1.2.52.recipe
+++ b/app-text/coolreader3/coolreader3-3.1.2.52.recipe
@@ -6,12 +6,10 @@ HOMEPAGE="https://sourceforge.net/projects/crengine/"
 COPYRIGHT="1998-2009 Vadim Lopatin"
 LICENSE="GNU GPL v2"
 REVISION="1"
-
 srcGitRev="d8a3a1bb60b6d03968469c0b866065af787a7373"
 SOURCE_URI="https://sourceforge.net/code-snapshots/git/c/cr/crengine/crengine.git/crengine-crengine-$srcGitRev.zip"
 CHECKSUM_SHA256="72f472fe0231b214df3cb31861ccabdf588bdb18efc37ba65eacdb6d0542c44c"
 SOURCE_DIR="crengine-crengine-$srcGitRev"
-
 PATCHES="coolreader3-$portVersion.patchset"
 ADDITIONAL_FILES="
 	coolreader.rdef.in
@@ -25,7 +23,6 @@ PROVIDES="
 	coolreader3$secondaryArchSuffix = $portVersion
 	app:coolreader3$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -62,7 +59,6 @@ BUILD_REQUIRES="
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
--- a/app-text/hunspell/hunspell-1.4.2.recipe
+++ b/app-text/hunspell/hunspell-1.4.2.recipe
@@ -11,13 +11,13 @@ LICENSE="GNU GPL v2
 	MPL v1.1"
 REVISION="1"
 SOURCE_URI="https://github.com/hunspell/hunspell/archive/v$portVersion.tar.gz"
-SOURCE_FILENAME="hunspell-$portVersion.tar.gz"
 CHECKSUM_SHA256="b6a0b23d083e0130f8c561cca8c980814ba65740ccfa52f47159f9141089946d"
-PATCHES="hunspell-$portVersion.patchset"
-SOURCE_FILENAME_2="hunspell-1.4.0-renameexes.patch"
+SOURCE_FILENAME="hunspell-$portVersion.tar.gz"
 srcGitRev_2="59fa121f0ded94266f99bd840e2b4e640272f689"
 SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/hunspell/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
 CHECKSUM_SHA256_2="18359f057a814db6d37b2394b397461a03f6af616d21c4f98fc8019e52a88b88"
+SOURCE_FILENAME_2="hunspell-1.4.0-renameexes.patch"
+PATCHES="hunspell-$portVersion.patchset"

 ARCHITECTURES="?x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
--- a/app-text/hunspell/hunspell-1.5.4.recipe
+++ b/app-text/hunspell/hunspell-1.5.4.recipe
@@ -11,14 +11,13 @@ LICENSE="GNU GPL v2
 	MPL v1.1"
 REVISION="1"
 SOURCE_URI="https://github.com/hunspell/hunspell/archive/v$portVersion.tar.gz"
-SOURCE_FILENAME="hunspell-$portVersion.tar.gz"
 CHECKSUM_SHA256="852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59"
-PATCHES="hunspell-$portVersion.patchset"
-
-SOURCE_FILENAME_2="hunspell-1.5.0-renameexes.patch"
+SOURCE_FILENAME="hunspell-$portVersion.tar.gz"
 srcGitRev_2="f3a2e939f24bc4369f26c10019588db46a576c80"
 SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/hunspell/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
 CHECKSUM_SHA256_2="274a5632519986abd7824266dafa2e2073f3634df0a81efb72101b8cd9e8a94f"
+SOURCE_FILENAME_2="hunspell-1.5.0-renameexes.patch"
+PATCHES="hunspell-$portVersion.patchset"

 ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
--- a/dev-libs/gtest/gtest-1.9.0~git.recipe
+++ b/dev-libs/gtest/gtest-1.9.0~git.recipe
@@ -14,8 +14,8 @@ Features:
 HOMEPAGE="https://github.com/google/googletest"
 COPYRIGHT="2008-2018 Google Test developers"
 LICENSE="BSD (3-clause)"
-srcGitRev="ea31cb15f0c2ab9f5f5b18e82311eb522989d747"
 REVISION="1"
+srcGitRev="ea31cb15f0c2ab9f5f5b18e82311eb522989d747"
 SOURCE_URI="https://github.com/google/googletest/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="41a782bacfed269409e533599f2272910e6c7ccd0c3d03f9694c693916070180"
 SOURCE_FILENAME="googletest-$portVersion-$srcGitRev.tar.gz"
--- a/dev-libs/nfd/nfd-1.0.recipe
+++ b/dev-libs/nfd/nfd-1.0.recipe
@@ -33,7 +33,8 @@ BUILD()
 	scons debug=0
 }

-INSTALL(){
+INSTALL()
+{
 	cd src/
 	mkdir -p $libDir
 	cp libnfd.a $libDir/libnfd.a
--- a/games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.38.6_20180319.recipe
+++ b/games-emulation/mednafen_psx_hw_libretro/mednafen_psx_hw_libretro-0.9.38.6_20180319.recipe
@@ -13,8 +13,8 @@ SOURCE_URI="https://github.com/libretro/beetle-psx-libretro/archive/$srcGitRev.t
 CHECKSUM_SHA256="a74891082dc3817b4d79e2df37f461a6e5197b75ccd9941c609ba21918b125ce"
 SOURCE_FILENAME="libretro-mednafen-psx-hw-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-psx-libretro-$srcGitRev"
-ADDITIONAL_FILES="mednafen_psx_hw_libretro.info.in"
 PATCHES="mednafen_psx_hw_libretro-$portVersion.patchset"
+ADDITIONAL_FILES="mednafen_psx_hw_libretro.info.in"

 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
--- a/games-mud/mudlet/mudlet-3.10.2.recipe
+++ b/games-mud/mudlet/mudlet-3.10.2.recipe
@@ -25,8 +25,8 @@ SOURCE_DIR="Mudlet-Mudlet-$portVersion"
 srcGitRev_2="d6a71925bda26dcab2b32571b14338ffb7a18e2e"
 SOURCE_URI_2="https://github.com/edbee/edbee-lib/archive/$srcGitRev_2.tar.gz"
 CHECKSUM_SHA256_2="871e0aa4507d8b6ca86f71b977ec1161cb3309760cba2e520f3eaffb70891d35"
-SOURCE_DIR_2="edbee-lib-$srcGitRev_2"
 SOURCE_FILENAME_2="edbee-lib-$srcGitRev_2.tar.gz"
+SOURCE_DIR_2="edbee-lib-$srcGitRev_2"
 ADDITIONAL_FILES="mudlet.rdef.in"

 ARCHITECTURES="!x86_gcc2 x86 x86_64"
--- a/haiku-apps/beacon/beacon-27.recipe
+++ b/haiku-apps/beacon/beacon-27.recipe
@@ -7,9 +7,8 @@ REVISION="1"
 srcGitRev="b34f3773deff426d091d1395965e3859c761e8fa"
 SOURCE_URI="https://github.com/HaikuArchives/Beacon/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="33a48323a40e761c9f121dc2f201a71df078a5d55bbc1d4036b8f574bd2dc0bf"
-PATCHES="beacon-$portVersion.patchset"
-
 SOURCE_DIR="Beacon-$srcGitRev"
+PATCHES="beacon-$portVersion.patchset"

 ARCHITECTURES="!x86_gcc2 ?x86_64"

@@ -28,7 +27,6 @@ BUILD_REQUIRES="
 	haiku_devel
 	devel:libclucene_core
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:jam
--- a/haiku-apps/becasso/becasso-2.0.recipe
+++ b/haiku-apps/becasso/becasso-2.0.recipe
@@ -16,6 +16,9 @@ SOURCE_DIR="Becasso-$srcGitRev"

 ARCHITECTURES="x86_gcc2 x86_64"

+USER_SETTINGS_FILES="
+	settings/Becasso directory"
+
 PROVIDES="
 	becasso = $portVersion
 	app:Becasso = $portVersion
@@ -35,9 +38,6 @@ BUILD_PREREQUIRES="
 	cmd:jam
 	"

-USER_SETTINGS_FILES="
-	settings/Becasso directory"
-
 BUILD()
 {
 	jam -q
--- a/haiku-apps/beshare/beshare-2.32.recipe
+++ b/haiku-apps/beshare/beshare-2.32.recipe
@@ -21,9 +21,9 @@ REVISION="2"
 srcGitRev="2345e48664fddfff1d9a968d1da2a185dbbdb50c"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="da4a7149793f2b4af72cbcb8ad009df45c8944b9194529e53b81d535ded8ccce"
+SOURCE_DIR="BeShare-$srcGitRev"
 SOURCE_URI_2="https://public.msli.com/lcs/muscle/muscle6.11.zip"
 CHECKSUM_SHA256_2="7cf3c92095f46e5a0858852e7d387d11fdf8e1e95a4de26b5e68e8319a373340"
-SOURCE_DIR="BeShare-$srcGitRev"

 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
--- a/haiku-apps/binaryclock/binaryclock-20141223.recipe
+++ b/haiku-apps/binaryclock/binaryclock-20141223.recipe
@@ -42,6 +42,10 @@ SOURCE_DIR="BinaryClock-$srcGitRev"

 ARCHITECTURES="x86_gcc2 !x86 !x86_64"

+USER_SETTINGS_FILES="
+	settings/BinaryClock
+	"
+
 PROVIDES="
 	binaryclock = $portVersion
 	app:BinaryClock = $portVersion
@@ -61,10 +65,6 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"

-USER_SETTINGS_FILES="
-	settings/BinaryClock
-	"
-
 BUILD()
 {
 	cd Application
--- a/haiku-apps/clockwerk/clockwerk-1.0~git.recipe
+++ b/haiku-apps/clockwerk/clockwerk-1.0~git.recipe
@@ -12,13 +12,17 @@ LICENSE="GNU GPL v2"
 REVISION="5"
 srcGitRev="d2f5ee511e52a7b6b213c608445cdec12c1ab318"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="b59825218cc32199da5611491655612ed580bec1d8005abfff841471cfc76a4a"
 SOURCE_FILENAME="$portName-$srcGitRev.tar.gz"
 SOURCE_DIR="Clockwerk-$srcGitRev"
-CHECKSUM_SHA256="b59825218cc32199da5611491655612ed580bec1d8005abfff841471cfc76a4a"
 PATCHES="clockwerk-$portVersion.patchset"

 ARCHITECTURES="x86_gcc2 x86_64"

+USER_SETTINGS_FILES="
+	settings/mindwork-m3 directory
+	"
+
 PROVIDES="
 	clockwerk = $portVersion
 	app:Clockwerk = $portVersion
@@ -38,10 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"

-USER_SETTINGS_FILES="
-	settings/mindwork-m3 directory
-	"
-
 BUILD()
 {
 	jam -q $jobArgs
--- a/haiku-apps/finance/finance-1.0.0.recipe
+++ b/haiku-apps/finance/finance-1.0.0.recipe
@@ -20,6 +20,10 @@ SOURCE_DIR="Finance-$srcGitRev"

 ARCHITECTURES="x86_gcc2 x86 x86_64"

+USER_SETTINGS_FILES="
+	settings/BeFinancial_data
+	"
+
 PROVIDES="
 	finance = $portVersion
 	app:Finance = $portVersion
@@ -27,19 +31,16 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
 BUILD_PREREQUIRES="
 	cmd:xres
 	cmd:gcc
 	cmd:jam
 	cmd:awk
 	"
-BUILD_REQUIRES="
-	haiku_devel
-	"
-
-USER_SETTINGS_FILES="
-	settings/BeFinancial_data
-	"

 BUILD()
 {
--- a/haiku-apps/haikuwebsearch/haikuwebsearch-0~git.recipe
+++ b/haiku-apps/haikuwebsearch/haikuwebsearch-0~git.recipe
@@ -16,7 +16,6 @@ PROVIDES="
 	haikuwebsearch = $portVersion
 	app:Haiku_WebSearch = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
--- a/haiku-apps/helios/helios-1.7.2.recipe
+++ b/haiku-apps/helios/helios-1.7.2.recipe
@@ -6,9 +6,9 @@ LICENSE="MIT"
 REVISION="3"
 srcGitRev="a4743ce52eb5f0a1dfcee004932f21ad76afceca"
 SOURCE_URI="https://github.com/HaikuArchives/Helios/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="9c7dced758541d499df1c0af2f197b098b8279eb0efa4d6093319d5bb636677b"
 SOURCE_FILENAME="Helios-$portVersion.tar.gz"
 SOURCE_DIR="Helios-$srcGitRev"
-CHECKSUM_SHA256="9c7dced758541d499df1c0af2f197b098b8279eb0efa4d6093319d5bb636677b"

 ARCHITECTURES="x86_gcc2 x86 x86_64"

--- a/haiku-apps/joystickutilizer/joystickutilizer-2.0.1.recipe
+++ b/haiku-apps/joystickutilizer/joystickutilizer-2.0.1.recipe
@@ -13,6 +13,10 @@ SOURCE_DIR="JoystickUtilizer-$srcGitRev/trunk"

 ARCHITECTURES="x86_gcc2 x86 x86_64"

+USER_SETTINGS_FILES="
+	settings/JoystickUtilizer_settings
+	"
+
 PROVIDES="
 	joystickutilizer = $portVersion
 	app:JoystickUtilizer = $portVersion
@@ -31,10 +35,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"

-USER_SETTINGS_FILES="
-	settings/JoystickUtilizer_settings
-	"
-
 BUILD()
 {
 	cd InputDevice
--- a/haiku-apps/nightandday/nightandday-0.1.2.recipe
+++ b/haiku-apps/nightandday/nightandday-0.1.2.recipe
@@ -22,20 +22,18 @@ PROVIDES="
 	nightandday = $portVersion
 	app:NightAndDay = $portVersion
 	"
+REQUIRES="
+	haiku
+	"

 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:g++
 	cmd:ld
 	"

-REQUIRES="
-	haiku
-	"
-
 BUILD()
 {
 	cd src
--- a/haiku-apps/phantomlimb/phantomlimb-1.recipe
+++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe
@@ -24,17 +24,17 @@ PROVIDES="
 	phantomlimb = $portVersion
 	app:PhantomLimb = $portVersion
 	"
+REQUIRES="
+	haiku
+	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:g++
 	cmd:xres
 	"
-REQUIRES="
-	haiku
-	"

 BUILD()
 {
--- a/haiku-apps/streamradio/streamradio-0.0.3_14.recipe
+++ b/haiku-apps/streamradio/streamradio-0.0.3_14.recipe
@@ -2,16 +2,21 @@ SUMMARY="Find and listen to internet radio stations"
 DESCRIPTION="'StreamRadio' helps you find and listen to internet radio \
 streams."
 HOMEPAGE="https://github.com/fishpond-haiku/Haiku-Radio"
-LICENSE="MIT"
 COPYRIGHT="2017 Kai Niessen"
+LICENSE="MIT"
 REVISION="1"
 srcGitRev="26f3bbda29da165c849d246038af98e17270249c"
 SOURCE_URI="https://github.com/fishpond-haiku/Haiku-Radio/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="05a015706082618e7282db537852aa697b949cb1a34f698733d0b69131938d3b"
 SOURCE_DIR="Haiku-Radio-$srcGitRev"
 PATCHES="streamradio-$portVersion.patchset"
+
 ARCHITECTURES="x86_gcc2 x86_64"

+USER_SETTINGS_FILES="
+	settings/StreamRadio.settings
+	"
+
 PROVIDES="
 	streamradio = $portVersion
 	app:StreamRadio = $portVersion
@@ -31,10 +36,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"

-USER_SETTINGS_FILES="
-	settings/StreamRadio.settings
-	"
-
 BUILD()
 {
 	mkdir -p dist
--- a/haiku-apps/wordclock/wordclock-0.1.1.recipe
+++ b/haiku-apps/wordclock/wordclock-0.1.1.recipe
@@ -44,4 +44,3 @@ INSTALL()

 	addAppDeskbarSymlink $appsDir/WordClock
 }
-
--- a/haiku-games/bemines/bemines-1.0b3.recipe
+++ b/haiku-games/bemines/bemines-1.0b3.recipe
@@ -31,6 +31,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_PREREQUIRES="
 	haiku_devel
 	makefile_engine
--- a/haiku-games/bevexed/bevexed-20141224.recipe
+++ b/haiku-games/bevexed/bevexed-20141224.recipe
@@ -13,6 +13,10 @@ SOURCE_DIR="BeVexed-$srcGitRev"

 ARCHITECTURES="x86_gcc2 ?x86 x86_64"

+USER_SETTINGS_FILES="
+	settings/BeVexed
+	"
+
 PROVIDES="
 	BeVexed = $portVersion
 	app:BeVexed = $portVersion
@@ -30,10 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"

-USER_SETTINGS_FILES="
-	settings/BeVexed
-	"
-
 BUILD()
 {
 	cd source
--- a/haiku-games/minesweeper/minesweeper-20150109.recipe
+++ b/haiku-games/minesweeper/minesweeper-20150109.recipe
@@ -2,19 +2,21 @@ SUMMARY="A Windows Minesweeper clone"
 DESCRIPTION="Minesweeper is a clone of the original Windows minesweeper game. \
 It supports different board sizes and best time saving."
 HOMEPAGE="https://github.com/HaikuArchives/Minesweeper"
+COPYRIGHT="
+	2013 Tri-Edge AI
+	2015 Josef Gajdusek
+	"
+LICENSE="MIT"
 REVISION="5"
 srcGitRev="702046e61588c953e759f7792930c5acc258359a"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="f532980a4f507375a982c2efcc09118e5a8cfedb9fd0775563ed236c2a70304f"
 SOURCE_DIR="Minesweeper-$srcGitRev"
-LICENSE="MIT"
-COPYRIGHT="
-	2013 Tri-Edge AI
-	2015 Josef Gajdusek
-	"

 ARCHITECTURES="x86_gcc2 x86 x86_64"

+USER_SETTINGS_FILES="settings/Minesweeper_settings"
+
 PROVIDES="
 	minesweeper = $portVersion
 	app:minesweeper = $portVersion
@@ -22,6 +24,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
@@ -31,8 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	"

-USER_SETTINGS_FILES="settings/Minesweeper_settings"
-
 BUILD()
 {
 	make -C src $jobArgs OBJ_DIR=objects
--- a/haiku-games/w6/w6-1.7.recipe
+++ b/haiku-games/w6/w6-1.7.recipe
@@ -24,6 +24,7 @@ REQUIRES="
 	haiku
 	lib:libpng
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libpng
--- a/mail-client/trojita/trojita-0.7.0~git.recipe
+++ b/mail-client/trojita/trojita-0.7.0~git.recipe
@@ -20,10 +20,10 @@ REVISION="5"
 srcGitRev="64b489aa33101ed28168c894e3d92f4d1a0b5416"
 SOURCE_URI="https://github.com/KDE/trojita/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="e0ab025c42efc925386aabc7facec59e3f0699bee79c725e9365157b2c1f77e8"
-SOURCE_DIR="trojita-$srcGitRev"
 SOURCE_FILENAME="trojita-$srcGitRev.tar.gz"
-ADDITIONAL_FILES="trojita.rdef.in"
+SOURCE_DIR="trojita-$srcGitRev"
 PATCHES="trojita-$portVersion.patchset"
+ADDITIONAL_FILES="trojita.rdef.in"

 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
--- a/media-gfx/png2ico/png2ico-2002.12.08.recipe
+++ b/media-gfx/png2ico/png2ico-2002.12.08.recipe
@@ -7,10 +7,10 @@ REVISION="2"
 SOURCE_URI="http://winterdrache.de/freeware/png2ico/data/png2ico-src-${portVersion//./-}.tar.gz"
 CHECKSUM_SHA256="d6bc2b8f9dacfb8010e5f5654aaba56476df18d88e344ea1a32523bb5843b68e"
 SOURCE_DIR="png2ico"
-SOURCE_FILENAME_2="png2ico-$portVersion-memset_and_strcmp.patch"
 srcGitRev_2="8fb6e61574b0727120e3c7dcf4f8ed5b6f56d06c"
 SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/png2ico/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
 CHECKSUM_SHA256_2="643170b93549022d357ab5892f7f702f4ad0c0ad001ffbb784a1ad17d26a2390"
+SOURCE_FILENAME_2="png2ico-$portVersion-memset_and_strcmp.patch"

 ARCHITECTURES="x86_gcc2 x86 x86_64"

--- a/media-libs/audiofile/audiofile-0.3.6.recipe
+++ b/media-libs/audiofile/audiofile-0.3.6.recipe
@@ -33,11 +33,10 @@ LICENSE="GNU LGPL v2.1"
 REVISION="5"
 SOURCE_URI="https://audiofile.68k.org/audiofile-0.3.6.tar.gz"
 CHECKSUM_SHA256="cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965"
-
-SOURCE_FILENAME_2="audiofile-0.3.6-gcc6-build-fixes.patch"
 srcGitRev_2="1709d2d431a493deea7765902011730e04fab466"
 SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/audiofile/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive"
 CHECKSUM_SHA256_2="c088e405ae54bc560e7d203cc5a18edb829b555e675c363d789b0f3f2b4d5d0c"
+SOURCE_FILENAME_2="audiofile-0.3.6-gcc6-build-fixes.patch"

 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
--- a/media-sound/amc/amc-1.14.0.recipe
+++ b/media-sound/amc/amc-1.14.0.recipe
@@ -16,7 +16,6 @@ PROVIDES="
 	amc = $portVersion
 	app:AMC = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	"
@@ -24,7 +23,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
 BUILD_PREREQUIRES="
 	makefile_engine
 	cmd:make
--- a/media-sound/musescore/musescore-3.0.0_git.recipe
+++ b/media-sound/musescore/musescore-3.0.0_git.recipe
@@ -59,6 +59,7 @@ BUILD_PREREQUIRES="
 	cmd:getconf
 	cmd:make
 	"
+
 BUILD()
 {
 	make release PREFIX=$prefix UPDATE_CACHE=FALSE
--- a/media-sound/skympc/skympc-1.6.4.recipe
+++ b/media-sound/skympc/skympc-1.6.4.recipe
@@ -11,8 +11,8 @@ REVISION="3"
 srcGitRev="f6a96781319fb16b4d3a07c447d54ec476442a90"
 SOURCE_URI="https://github.com/soramimi/SkyMPC/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="eb52ed5e834ff9f17c7d432143279c851bbf221ce97120df877678918dde743f"
-SOURCE_DIR="SkyMPC-$srcGitRev"
 SOURCE_FILENAME="$portVersionedName.tar.gz"
+SOURCE_DIR="SkyMPC-$srcGitRev"
 ADDITIONAL_FILES="skympc.rdef.in
 	Haiku_Style_Icons.zip"

--- a/net-im/vacuum/vacuum-1.3.0~git.recipe
+++ b/net-im/vacuum/vacuum-1.3.0~git.recipe
@@ -8,8 +8,8 @@ srcGitRev="dac287f7260782103c1cd8b177de7b4dcadced9d"
 SOURCE_URI="https://github.com/Vacuum-IM/vacuum-im/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="f87a640d950e1cbe16c94718051301557ddf6f141db9dcfd99adf1a5c1c5a95f"
 SOURCE_DIR="vacuum-im-$srcGitRev"
-ADDITIONAL_FILES="vacuum.rdef"
 PATCHES="vacuum-$portVersion.patchset"
+ADDITIONAL_FILES="vacuum.rdef"

 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -34,6 +34,7 @@ REQUIRES="
 	lib:libQt5Xml$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libidn$secondaryArchSuffix
--- a/sys-devel/jam/jam-2.5_2012_10_12.recipe
+++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe
@@ -17,8 +17,8 @@ LICENSE="Jam"
 REVISION="5"
 srcGitRev="259af3cf06a9e75cc93903d6ff4d8cad89f94874"
 SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
-SOURCE_FILENAME="$portVersionedName.tar.gz"
 CHECKSUM_SHA256="211cbfb355b6950b2c94952526a02e3aa16e01e042fb97826c0a28b354f35efe"
+SOURCE_FILENAME="$portVersionedName.tar.gz"
 SOURCE_DIR="buildtools-$srcGitRev/jam"

 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"