From f67b534c07f5df0e5d0174d72139b0e9882046a9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 7 Aug 2018 08:47:35 +0200 Subject: [PATCH] COMMIT/commit => srcGitRev. * code style. --- app-editors/qvim/qvim-8.0.197.recipe | 7 ++-- app-emulation/qemu/qemu-2.1.2.recipe | 6 +-- app-i18n/becjk/becjk-1.0.1.recipe | 6 +-- app-i18n/canna/canna-1.0.2.recipe | 23 ++++++------ app-misc/far/far-2~git.recipe | 18 ++++----- .../googlemaps_mini-0.1.recipe | 6 +-- app-office/abiword/abiword-2.4.recipe | 7 ++-- .../libreoffice-6.2.0.0~git.recipe | 14 +++---- app-office/multitalk/multitalk-1.4.recipe | 6 +-- dev-games/godot/godot-3.0.6~git.recipe | 6 +-- dev-lang/brexx/brexx-1.3.2.recipe | 6 +-- .../monkeystudio/monkeystudio-1.9.0.4.recipe | 6 +-- .../qtwebkit-5.212.0~pre20180120.recipe | 8 ++-- dev-util/kbuild/kbuild-0.1.9998svn2997.recipe | 6 +-- haiku-apps/3dmov/3dmov-0.2.recipe | 6 +-- .../aalibtranslator-0.0.1.recipe | 7 ++-- haiku-apps/armyknife/armyknife-4.3.0.recipe | 8 ++-- haiku-apps/babybe/babybe-2.2~git.recipe | 8 ++-- .../beaccessible/beaccessible-1.0.0.recipe | 6 +-- haiku-apps/beae/beae-1.2.recipe | 6 +-- haiku-apps/beam/beam-1.2.recipe | 8 ++-- .../bebuilder/bebuilder-0.5.2~git.recipe | 9 ++--- haiku-apps/beohms/beohms-0.1~git.recipe | 8 ++-- haiku-apps/capitalbe/capitalbe-1.1.recipe | 6 +-- haiku-apps/chat/chat-20100903.recipe | 8 ++-- .../commandtimer/commandtimer-2.0~git.recipe | 8 ++-- haiku-apps/dockbert/dockbert-1.0.2b1.recipe | 6 +-- haiku-apps/ducksaver/ducksaver-1.1.0.recipe | 8 ++-- .../fairtrade/fairtrade-1.0.0~git.recipe | 8 ++-- haiku-apps/filecropper/filecropper-1.recipe | 8 ++-- haiku-apps/filwip/filwip-1.0.1.recipe | 14 +++---- .../hyperstudio/hyperstudio-1.1_git.recipe | 13 ++++--- .../jabber4haiku/jabber4haiku-1.2.1.recipe | 8 ++-- .../keymapswitcher-1.2.7.11.recipe | 6 +-- haiku-apps/niue/niue-20140701.recipe | 6 +-- .../photograbber/photograbber-2.3.3.recipe | 6 +-- .../runprogram/runprogram-1.0rc1.recipe | 6 +-- haiku-apps/slayer/slayer-1.0.recipe | 6 +-- haiku-apps/superprefs/superprefs-1.0.recipe | 6 +-- haiku-apps/tolmach/tolmach-1.1.0.recipe | 18 ++++----- haiku-apps/toner/toner-1.0.0.recipe | 6 +-- haiku-games/bebattle/bebattle-1.0.0.recipe | 6 +-- .../becheckers/becheckers-1.0.1.recipe | 6 +-- haiku-games/besol/besol-2.0.5.recipe | 6 +-- haiku-games/bespider/bespider-0.1.0.recipe | 6 +-- haiku-games/bespider/bespider-0.1.1.recipe | 6 +-- .../interface_elements-1.0.recipe | 7 ++-- haiku-libs/liblayout/liblayout-1.4.1.recipe | 19 +++++----- .../oxygen_icons-5.47.0~git.recipe | 6 +-- kde-misc/kdiff3/kdiff3-1.7.0~git.recipe | 6 +-- media-plugins/mda_vst/mda_vst-20150618.recipe | 8 ++-- .../opensound/opensound-4.2~git.recipe | 7 ++-- .../telegram_desktop-1.3.10.recipe | 37 +++++++------------ net-misc/berdp/berdp-1.recipe | 29 +++++++-------- .../eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe | 6 +-- net-p2p/ktorrent/ktorrent-5.1.1~git.recipe | 6 +-- .../partitionmanager-3.3.1~git.recipe | 6 +-- sys-libs/kpmcore/kpmcore-3.3.0~git.recipe | 16 ++++---- www-client/bezilla/bezilla-2.0.0.22.recipe | 6 +-- 59 files changed, 254 insertions(+), 273 deletions(-) diff --git a/app-editors/qvim/qvim-8.0.197.recipe b/app-editors/qvim/qvim-8.0.197.recipe index 532fe44e4..4f78fbe90 100644 --- a/app-editors/qvim/qvim-8.0.197.recipe +++ b/app-editors/qvim/qvim-8.0.197.recipe @@ -13,10 +13,10 @@ HOMEPAGE="https://github.com/equalsraf/vim-qt/" COPYRIGHT="1991-2017 Bram Moleenar et al." LICENSE="Vim" REVISION="1" -COMMIT="162b3f3ae0fbe8d4a8e33a24f347e5daa4dd9826" -SOURCE_URI="https://github.com/equalsraf/vim-qt/archive/$COMMIT.tar.gz" +srcGitRev="162b3f3ae0fbe8d4a8e33a24f347e5daa4dd9826" +SOURCE_URI="https://github.com/equalsraf/vim-qt/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="347ba160b86d5263cb0952358fb29ccf5636cdc9d90aa110bedd6a4277c11280" -SOURCE_DIR="vim-qt-$COMMIT" +SOURCE_DIR="vim-qt-$srcGitRev" PATCHES="qvim-$portVersion.patchset" ADDITIONAL_FILES="qvim.rdef.in" @@ -52,7 +52,6 @@ BUILD_REQUIRES=" devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:autoconf cmd:find diff --git a/app-emulation/qemu/qemu-2.1.2.recipe b/app-emulation/qemu/qemu-2.1.2.recipe index 69e9ac6c2..35c7356f7 100644 --- a/app-emulation/qemu/qemu-2.1.2.recipe +++ b/app-emulation/qemu/qemu-2.1.2.recipe @@ -8,10 +8,10 @@ HOMEPAGE="http://wiki.qemu.org/" COPYRIGHT="2003-2014 Fabrice Bellard" LICENSE="GNU GPL v2" REVISION="3" -COMMIT="d1b55862305d1eac5c7ca7cc56ec379bbc452d74" -SOURCE_URI="https://github.com/mmlr/qemu-haiku/archive/$COMMIT.tar.gz" -SOURCE_DIR="qemu-haiku-$COMMIT" +srcGitRev="d1b55862305d1eac5c7ca7cc56ec379bbc452d74" +SOURCE_URI="https://github.com/mmlr/qemu-haiku/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="014175cedf18d09f9b004672394f2c1ac760eb086fbfde83485c4493d7024c89" +SOURCE_DIR="qemu-haiku-$srcGitRev" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" diff --git a/app-i18n/becjk/becjk-1.0.1.recipe b/app-i18n/becjk/becjk-1.0.1.recipe index 7ce7b36ca..0ef021bc4 100644 --- a/app-i18n/becjk/becjk-1.0.1.recipe +++ b/app-i18n/becjk/becjk-1.0.1.recipe @@ -4,10 +4,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeCJK" COPYRIGHT="2001-2002 Anthony Lee" LICENSE="GNU LGPL v2" REVISION="3" -COMMIT="35ede035067ebfa14f9a906b57ec17e77f310bff" -SOURCE_URI="https://github.com/HaikuArchives/BeCJK/archive/$COMMIT.tar.gz" -SOURCE_DIR="BeCJK-$COMMIT" +srcGitRev="35ede035067ebfa14f9a906b57ec17e77f310bff" +SOURCE_URI="https://github.com/HaikuArchives/BeCJK/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="4d64bd104fb925fe9dc9ca7d066d2dd755d80f8c250f391c0085f7ae4633e1a5" +SOURCE_DIR="BeCJK-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/app-i18n/canna/canna-1.0.2.recipe b/app-i18n/canna/canna-1.0.2.recipe index 64468e80f..2474b0f31 100644 --- a/app-i18n/canna/canna-1.0.2.recipe +++ b/app-i18n/canna/canna-1.0.2.recipe @@ -2,41 +2,40 @@ SUMMARY="A Japanese input method add-on" DESCRIPTION="Canna (CannaIM) is a Japanese input method add-on. \ It is based a client-server based Kana-Kanji conversion system \"Canna\"." HOMEPAGE="http://canna.sourceforge.jp/" -LICENSE="MIT" COPYRIGHT=" 1999 M.Kawamura 1992 NEC Corporation, Tokyo, Japan. " -srcrev="82b97486e551f7ce15ad908b478f33a0a8611c8b" -SOURCE_URI="https://github.com/mt819/CannaIM/archive/$srcrev.tar.gz" -SOURCE_FILENAME="$portName-$srcrev.tar.gz" -SOURCE_DIR="CannaIM-$srcrev" -CHECKSUM_SHA256="c21c6573fa712f25a33875d35ee0eee6f335744010a8b7296e894c25e05ef34a" +LICENSE="MIT" REVISION="3" +srcGitRev="82b97486e551f7ce15ad908b478f33a0a8611c8b" +SOURCE_URI="https://github.com/mt819/CannaIM/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="c21c6573fa712f25a33875d35ee0eee6f335744010a8b7296e894c25e05ef34a" +SOURCE_FILENAME="$portName-$srcGitRev.tar.gz" +SOURCE_DIR="CannaIM-$srcGitRev" + ARCHITECTURES="x86_gcc2 x86 x86_64" +USER_SETTINGS_FILES=" + settings/Canna directory + " + PROVIDES=" canna = $portVersion addon:canna = $portVersion " - REQUIRES=" haiku " BUILD_REQUIRES=" " - BUILD_PREREQUIRES=" haiku_devel cmd:gcc cmd:jam " -USER_SETTINGS_FILES=" - settings/Canna directory - " - BUILD() { jam -q $jobArgs diff --git a/app-misc/far/far-2~git.recipe b/app-misc/far/far-2~git.recipe index c6a36c0a0..302f73f71 100644 --- a/app-misc/far/far-2~git.recipe +++ b/app-misc/far/far-2~git.recipe @@ -5,31 +5,31 @@ Currently interesting only for entusiasts. Currently working plugins: colorer, multiarc, farftp, tmppanel, align, \ autowrap, drawline, editcase, SimpleIndent" HOMEPAGE="https://github.com/elfmz/far2l/" -COMMIT="fc5b0a3a2a8e7ef9e25e42f82f1202cdaa206529" -SOURCE_URI="https://github.com/elfmz/far2l/archive/$COMMIT.zip" -CHECKSUM_SHA256="103e0540deaec5a80f05605c34faa14a431f3ab9ba522021d2af8a3ce2f497fd" -SOURCE_DIR="far2l-$COMMIT" -REVISION="1" -ARCHITECTURES="?x86 ?x86_64" -LICENSE="GNU GPL v2" COPYRIGHT="2016-2018 elfmz" +LICENSE="GNU GPL v2" +REVISION="1" +srcGitRev="fc5b0a3a2a8e7ef9e25e42f82f1202cdaa206529" +SOURCE_URI="https://github.com/elfmz/far2l/archive/$srcGitRev.zip" +CHECKSUM_SHA256="103e0540deaec5a80f05605c34faa14a431f3ab9ba522021d2af8a3ce2f497fd" +SOURCE_DIR="far2l-$srcGitRev" PATCHES="far-$portVersion.patchset" +ARCHITECTURES="?x86 ?x86_64" + PROVIDES=" far = $portVersion cmd:far = $portVersion app:Far = $portVersion " - REQUIRES=" haiku " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel wxqt${secondaryArchSuffix}_devel devel:libglib_2.0$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cmake cmd:gawk diff --git a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe index 3fe1409b1..2a0f9b28c 100644 --- a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe +++ b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/mgermain-genymobile/GoogleMapQtWidget/" COPYRIGHT="2013 Morgan Germain" LICENSE="MIT" REVISION="2" -COMMIT="3fefbef368430deda7bd26e2a875cca3db2126ce" -SOURCE_URI="https://github.com/mgermain-genymobile/GoogleMapQtWidget/archive/$COMMIT.tar.gz" -SOURCE_DIR="GoogleMapQtWidget-$COMMIT" +srcGitRev="3fefbef368430deda7bd26e2a875cca3db2126ce" +SOURCE_URI="https://github.com/mgermain-genymobile/GoogleMapQtWidget/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="db4cf6b5c725ade4e8177af9288e7173c43a9e37b4429e0d06dd15f72c06fedf" +SOURCE_DIR="GoogleMapQtWidget-$srcGitRev" PATCHES="googlemaps_mini-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86_64" diff --git a/app-office/abiword/abiword-2.4.recipe b/app-office/abiword/abiword-2.4.recipe index 2dea402c7..5a303cb00 100644 --- a/app-office/abiword/abiword-2.4.recipe +++ b/app-office/abiword/abiword-2.4.recipe @@ -10,10 +10,11 @@ HOMEPAGE="https://www.abisource.com/" COPYRIGHT="1998-2014 the AbiSource community" LICENSE="GNU GPL v2" REVISION="3" -COMMIT="217fbb622ee64efc181cd67d2742d6a60a086e2d" -SOURCE_URI="https://github.com/HaikuArchives/AbiWord/archive/$COMMIT.tar.gz" -SOURCE_DIR="AbiWord-$COMMIT" +srcGitRev="217fbb622ee64efc181cd67d2742d6a60a086e2d" +SOURCE_URI="https://github.com/HaikuArchives/AbiWord/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="7ec2ddca905c8ccb923315d952d04e90a4c124d50dc42dddbd1957a8ee6e915e" +SOURCE_DIR="AbiWord-$srcGitRev" + ARCHITECTURES="x86_gcc2 !x86_64" PROVIDES=" diff --git a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe index 1d2b4a33a..26b5c4199 100644 --- a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe +++ b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe @@ -18,14 +18,14 @@ HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2018 LibreOffice contributors" LICENSE="MPL v2.0" REVISION="14" -COMMIT="1c56d5fec2ddd9f68aaaf21e9dbe287db893c092" -SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz" +srcGitRev="1c56d5fec2ddd9f68aaaf21e9dbe287db893c092" +SOURCE_URI="https://github.com/LibreOffice/core/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="8ead56edb57384bf6f18331566a6d52a04d97bfd9e52e139925b8f6224d84b20" -SOURCE_DIR="core-$COMMIT" -#COMMIT_2="54cc0de67b3c948411cef3a0405c8992d80f34f3" -#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/$COMMIT_2.tar.gz" +SOURCE_DIR="core-$srcGitRev" +#srcGitRev_2="54cc0de67b3c948411cef3a0405c8992d80f34f3" +#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/$srcGitRev_2.tar.gz" #CHECKSUM_SHA256_2="5677ff6b362240e1741559b86057aeecda88030940f0d2dcb201d518c7f945c9" -#SOURCE_DIR_2="translations-$COMMIT_2" +#SOURCE_DIR_2="translations-$srcGitRev_2" PATCHES="libreoffice-$portVersion.patchset" ADDITIONAL_FILES="libreoffice.rdef.in" @@ -245,7 +245,7 @@ BUILD() # rename $sourceDir to something shorter, otherwise build fails with # execv: Argument too big /sources/core/sw/Library_sw.mk:20 cd .. ; mv $sourceDir core - ln -s core core-$COMMIT; cd core + ln -s core core-$srcGitRev; cd core #rm -rf translations #ln -s $sourceDir2 translations diff --git a/app-office/multitalk/multitalk-1.4.recipe b/app-office/multitalk/multitalk-1.4.recipe index a24a4494e..4cd800414 100644 --- a/app-office/multitalk/multitalk-1.4.recipe +++ b/app-office/multitalk/multitalk-1.4.recipe @@ -8,10 +8,10 @@ COPYRIGHT="2006-2008 David Ingram 2010 Johannes Buchner" LICENSE="GNU GPL v2" REVISION="1" -COMMIT="5abae62da5dfe5bbdf8c77a22f2622c8fb88103c" -SOURCE_URI="https://github.com/JohannesBuchner/multitalk/archive/$COMMIT.tar.gz" +srcGitRev="5abae62da5dfe5bbdf8c77a22f2622c8fb88103c" +SOURCE_URI="https://github.com/JohannesBuchner/multitalk/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="47d250cbdea4836e8320340da47d2259a18a2fe8bc22d3054d97cd67b68b8546" -SOURCE_DIR="multitalk-$COMMIT" +SOURCE_DIR="multitalk-$srcGitRev" PATCHES="multitalk-$portVersion.patchset" ARCHITECTURES="x86_gcc2" diff --git a/dev-games/godot/godot-3.0.6~git.recipe b/dev-games/godot/godot-3.0.6~git.recipe index 918fcea50..e9bacb13e 100644 --- a/dev-games/godot/godot-3.0.6~git.recipe +++ b/dev-games/godot/godot-3.0.6~git.recipe @@ -10,10 +10,10 @@ HOMEPAGE="https://godotengine.org/" COPYRIGHT="2007-2018 Juan Linietsky, Ariel Manzur" LICENSE="MIT" REVISION="1" -COMMIT="229d217a51ae9bba3c356331574e8d0b0be7aa95" -SOURCE_URI="https://github.com/godotengine/godot/archive/$COMMIT.tar.gz" +srcGitRev="229d217a51ae9bba3c356331574e8d0b0be7aa95" +SOURCE_URI="https://github.com/godotengine/godot/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="613b21598d5efce2e145fee309630bb8f60d75a4f8f6a73cebacda3aba703f7d" -SOURCE_DIR="godot-$COMMIT" +SOURCE_DIR="godot-$srcGitRev" PATCHES="godot-3.0.6.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" diff --git a/dev-lang/brexx/brexx-1.3.2.recipe b/dev-lang/brexx/brexx-1.3.2.recipe index 2c21f460e..416954b24 100644 --- a/dev-lang/brexx/brexx-1.3.2.recipe +++ b/dev-lang/brexx/brexx-1.3.2.recipe @@ -16,9 +16,9 @@ COPYRIGHT="1991-1999 Be Incorporated LICENSE="Public Domain BSD (3-clause)" REVISION="4" -commit="63d956a8a44beecbb3597d904ce97e159575aebc" -SOURCE_URI="https://github.com/pulkomandy/BeBrexx/archive/$commit.tar.gz" -SOURCE_DIR="BeBrexx-$commit" +srcGitRev="63d956a8a44beecbb3597d904ce97e159575aebc" +SOURCE_URI="https://github.com/pulkomandy/BeBrexx/archive/$srcGitRev.tar.gz" +SOURCE_DIR="BeBrexx-$srcGitRev" CHECKSUM_SHA256="26db8f9ce0bf318cf63495a3050ee94e4d2ccb0a734898efdf0aa72016ed9a27" ARCHITECTURES="x86_gcc2" diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe index bce3642a8..b870df845 100644 --- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe +++ b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe @@ -30,10 +30,10 @@ HOMEPAGE="http://www.monkeystudio.org" COPYRIGHT="2005-2016 Azevedo Filipe & The Monkey Studio Team" LICENSE="GNU GPL v2" REVISION="8" -COMMIT="01256a61395ae92e25d65c97b23a76212d8754a5" -SOURCE_URI="https://github.com/pasnox/monkeystudio2/archive/$COMMIT.zip" +srcGitRev="01256a61395ae92e25d65c97b23a76212d8754a5" +SOURCE_URI="https://github.com/pasnox/monkeystudio2/archive/$srcGitRev.zip" CHECKSUM_SHA256="ebb9cecef699c097dd12e567e8fca1d037a1fd020263fa5d5bf44b92343b5323" -SOURCE_DIR="monkeystudio2-$COMMIT" +SOURCE_DIR="monkeystudio2-$srcGitRev" PATCHES="monkeystudio-$portVersion.patchset" ADDITIONAL_FILES="monkeystudio.rdef.in" diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe index 7d19c959b..de379a8d2 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20180120.recipe @@ -5,16 +5,15 @@ content can be enhanced with native controls. QtWebKit provides facilities for rendering of HyperText Markup Language (HTML), \ Extensible HyperText Markup Language (XHTML) and Scalable Vector Graphics (SVG) \ documents, styled using Cascading Style Sheets (CSS) and scripted with JavaScript." - HOMEPAGE="https://www.qt.io" COPYRIGHT="2015-2018 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" REVISION="2" -COMMIT="72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da" -SOURCE_URI="https://github.com/qt/qtwebkit/archive/$COMMIT.tar.gz" +srcGitRev="72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da" +SOURCE_URI="https://github.com/qt/qtwebkit/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="2e393e7429387437cbfef56ec839329663e9b136ea68997d1e1cdd2f4d9d3ae0" -SOURCE_DIR="qtwebkit-$COMMIT" +SOURCE_DIR="qtwebkit-$srcGitRev" PATCHES="qtwebkit-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 x86_64" @@ -94,7 +93,6 @@ PROVIDES_devel=" devel:libQt5WebKit$secondaryArchSuffix = $portVersion compat >= 5 devel:libQt5WebKitWidgets$secondaryArchSuffix = $portVersion compat >= 5 " - REQUIRES_devel=" haiku$secondaryArchSuffix qtwebkit$secondaryArchSuffix == $portVersion base diff --git a/dev-util/kbuild/kbuild-0.1.9998svn2997.recipe b/dev-util/kbuild/kbuild-0.1.9998svn2997.recipe index 17e71d899..92ddefd59 100644 --- a/dev-util/kbuild/kbuild-0.1.9998svn2997.recipe +++ b/dev-util/kbuild/kbuild-0.1.9998svn2997.recipe @@ -15,10 +15,10 @@ HOMEPAGE="https://trac.netlabs.org/kbuild/" COPYRIGHT="kBuild developers" LICENSE="GNU LGPL v3" REVISION="2" -COMMIT="96a1801b3d446bfc80aab1ed1cb9b704d5d3dfbb" -SOURCE_URI="https://anonscm.debian.org/cgit/pkg-virtualbox/kbuild.git/snapshot/kbuild-$COMMIT.tar.gz" +srcGitRev="96a1801b3d446bfc80aab1ed1cb9b704d5d3dfbb" +SOURCE_URI="https://anonscm.debian.org/cgit/pkg-virtualbox/kbuild.git/snapshot/kbuild-$srcGitRev.tar.gz" CHECKSUM_SHA256="575734d3f6540feda3cb2b4e447009af8e6b76ef081157d139df13f62bfe6e3c" -SOURCE_DIR="kbuild-$COMMIT" +SOURCE_DIR="kbuild-$srcGitRev" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" diff --git a/haiku-apps/3dmov/3dmov-0.2.recipe b/haiku-apps/3dmov/3dmov-0.2.recipe index 69d02ce59..35759be08 100644 --- a/haiku-apps/3dmov/3dmov-0.2.recipe +++ b/haiku-apps/3dmov/3dmov-0.2.recipe @@ -9,10 +9,10 @@ COPYRIGHT=" " LICENSE="MIT" REVISION="2" -COMMIT="16e56117ce1d9d1bd1586f0481f7788e31fbcde2" -SOURCE_URI="https://github.com/HaikuArchives/3DMov/archive/$COMMIT.tar.gz" +srcGitRev="16e56117ce1d9d1bd1586f0481f7788e31fbcde2" +SOURCE_URI="https://github.com/HaikuArchives/3DMov/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="6b6ddb26eb2170533bf11214373fdd22658a3db476cae92639ec7af05ecf12c6" -SOURCE_DIR="3DMov-$COMMIT" +SOURCE_DIR="3DMov-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe index 16c8af6a1..5e3f8f9ba 100644 --- a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe +++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe @@ -5,10 +5,11 @@ HOMEPAGE="https://github.com/noryb009/AalibTranslator/" COPYRIGHT="2013 Luke (noryb009)" LICENSE="MIT" REVISION="4" -COMMIT="e302f911d3864e83aa4b65ba77531bea721c38d3" -SOURCE_URI="https://github.com/noryb009/AalibTranslator/archive/$COMMIT.zip" +srcGitRev="e302f911d3864e83aa4b65ba77531bea721c38d3" +SOURCE_URI="https://github.com/noryb009/AalibTranslator/archive/$srcGitRev.zip" CHECKSUM_SHA256="77f9cb1ac1564151c99df3143cfb324b5d8bc34627be869fbf90accb3966f745" -SOURCE_DIR="AalibTranslator-$COMMIT" +SOURCE_DIR="AalibTranslator-$srcGitRev" + ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe index 70dd60dcd..a1d2950bf 100644 --- a/haiku-apps/armyknife/armyknife-4.3.0.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -8,11 +8,11 @@ HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" COPYRIGHT="2000-2001 Jason Burgess" LICENSE="MIT" REVISION="3" -commit="49f9a12cf288b061449edf5049e5de6a6501093c" -SOURCE_URI="$HOMEPAGE/archive/$commit.tar.gz" -SOURCE_DIR="ArmyKnife-$commit" -SOURCE_FILENAME="$portName-$portVersion.tar.gz" +srcGitRev="49f9a12cf288b061449edf5049e5de6a6501093c" +SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="e223d01114256e1e57291fdb8cd22eb3c5c1e034a41971d7a283433c6344d786" +SOURCE_FILENAME="$portName-$srcGitRev.tar.gz" +SOURCE_DIR="ArmyKnife-$srcGitRev" ARCHITECTURES="x86_gcc2 !x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 !x86" diff --git a/haiku-apps/babybe/babybe-2.2~git.recipe b/haiku-apps/babybe/babybe-2.2~git.recipe index 2699729a5..4687836a8 100644 --- a/haiku-apps/babybe/babybe-2.2~git.recipe +++ b/haiku-apps/babybe/babybe-2.2~git.recipe @@ -4,11 +4,11 @@ HOMEPAGE="https://github.com/HaikuArchives/BabyBe" COPYRIGHT="2001 Ben Loftis" LICENSE="Public Domain" REVISION="2" -commit="ea3bfd36112800808e40083275e200f9c3e2d10c" -SOURCE_URI="https://github.com/HaikuArchives/BabyBe/archive/$commit.tar.gz" +srcGitRev="ea3bfd36112800808e40083275e200f9c3e2d10c" +SOURCE_URI="https://github.com/HaikuArchives/BabyBe/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="5bb6b099bde12d0ef5f324f238f650c6f7cf9514beb05bff6436715a15e34e5a" -SOURCE_FILENAME="BabyBe-$commit.tar.gz" -SOURCE_DIR="BabyBe-$commit" +SOURCE_FILENAME="BabyBe-$srcGitRev.tar.gz" +SOURCE_DIR="BabyBe-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/beaccessible/beaccessible-1.0.0.recipe b/haiku-apps/beaccessible/beaccessible-1.0.0.recipe index 02540c1e0..65c2e8e42 100644 --- a/haiku-apps/beaccessible/beaccessible-1.0.0.recipe +++ b/haiku-apps/beaccessible/beaccessible-1.0.0.recipe @@ -4,10 +4,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeAccessible" COPYRIGHT="2004 randar" LICENSE="MIT" REVISION="1" -COMMIT="724b55478f1fcd303f085518679b7d82d7ec1a3d" -SOURCE_URI="https://github.com/HaikuArchives/BeAccessible/archive/$COMMIT.tar.gz" +srcGitRev="724b55478f1fcd303f085518679b7d82d7ec1a3d" +SOURCE_URI="https://github.com/HaikuArchives/BeAccessible/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="5fc029666763f29eb1cb494fea1d333cf31b2df74be29849115d5d07f8cd4ad7" -SOURCE_DIR="BeAccessible-$COMMIT" +SOURCE_DIR="BeAccessible-$srcGitRev" ARCHITECTURES="x86_gcc2 !x86 !x86_64" diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index 71e5c9622..01a4d2103 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeAE/" COPYRIGHT="2003 Xentronix" LICENSE="BSD (3-clause)" REVISION="5" -COMMIT="ce7f02e451ff926c80e4b21bbee5a425dca159f3" -SOURCE_URI="https://github.com/HaikuArchives/BeAE/archive/$COMMIT.tar.gz" +srcGitRev="ce7f02e451ff926c80e4b21bbee5a425dca159f3" +SOURCE_URI="https://github.com/HaikuArchives/BeAE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="8466fe021fb5e11fd0a756e86d6d662f6e6f2e15b00c0ea4d96eb50d18633a10" -SOURCE_DIR="BeAE-$COMMIT" +SOURCE_DIR="BeAE-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/haiku-apps/beam/beam-1.2.recipe b/haiku-apps/beam/beam-1.2.recipe index 05d77694b..d53d4cc38 100644 --- a/haiku-apps/beam/beam-1.2.recipe +++ b/haiku-apps/beam/beam-1.2.recipe @@ -5,11 +5,11 @@ HOMEPAGE="https://github.com/HaikuArchives/Beam/" COPYRIGHT="2000-2014 Oliver Tappe" LICENSE="GNU GPL v2" REVISION="8" -commit="280e3862f83bedc05d683455aed79be112a680f8" -SOURCE_URI="https://github.com/HaikuArchives/beam/archive/$commit.tar.gz" +srcGitRev="280e3862f83bedc05d683455aed79be112a680f8" +SOURCE_URI="https://github.com/HaikuArchives/beam/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="01f7d6594ebeb5be1d4bf0dc3715b1859565f89709701dfe78c296077b275222" -SOURCE_DIR="Beam-$commit" -SOURCE_FILENAME=$SOURCE_DIR +SOURCE_FILENAME="Beam-$srcGitRev.tar.gz" +SOURCE_DIR="Beam-$srcGitRev" ARCHITECTURES="x86_gcc2 !x86_64" diff --git a/haiku-apps/bebuilder/bebuilder-0.5.2~git.recipe b/haiku-apps/bebuilder/bebuilder-0.5.2~git.recipe index 47ef900da..466dcd577 100644 --- a/haiku-apps/bebuilder/bebuilder-0.5.2~git.recipe +++ b/haiku-apps/bebuilder/bebuilder-0.5.2~git.recipe @@ -4,11 +4,11 @@ HOMEPAGE="https://github.com/HaikuArchives/BeBuilder" COPYRIGHT="1999 Jerome Fillmon" LICENSE="Public Domain" REVISION="2" -commit="a488ce807404481b74f989eac179398b5a48c1d5" -SOURCE_URI="https://github.com/HaikuArchives/BeBuilder/archive/$commit.tar.gz" +srcGitRev="a488ce807404481b74f989eac179398b5a48c1d5" +SOURCE_URI="https://github.com/HaikuArchives/BeBuilder/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="a42815e7672c7c393850ee282f1e66acd195d4faaea33f1884a4418f4853a82f" -SOURCE_FILENAME="BeBuilder-$commit.tar.gz" -SOURCE_DIR="BeBuilder-$commit" +SOURCE_FILENAME="BeBuilder-$srcGitRev.tar.gz" +SOURCE_DIR="BeBuilder-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -16,7 +16,6 @@ PROVIDES=" bebuilder = $portVersion app:BeBuilder = $portVersion " - REQUIRES=" haiku " diff --git a/haiku-apps/beohms/beohms-0.1~git.recipe b/haiku-apps/beohms/beohms-0.1~git.recipe index 67d842528..d8d77e0b5 100644 --- a/haiku-apps/beohms/beohms-0.1~git.recipe +++ b/haiku-apps/beohms/beohms-0.1~git.recipe @@ -6,11 +6,11 @@ HOMEPAGE="https://github.com/HaikuArchives/BeOhms" COPYRIGHT="1999 Kyle Crane" LICENSE="Public Domain" REVISION="2" -commit="dfdb28d7282aba7d7d616460e85692e68e27a762" -SOURCE_URI="https://github.com/HaikuArchives/BeOhms/archive/$commit.tar.gz" +srcGitRev="dfdb28d7282aba7d7d616460e85692e68e27a762" +SOURCE_URI="https://github.com/HaikuArchives/BeOhms/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="a2f414d54a94c8f84b2350097d6e48e93777266122272f80614a09b9c8c9f2fc" -SOURCE_FILENAME="BeOhms-$commit.tar.gz" -SOURCE_DIR="BeOhms-$commit" +SOURCE_FILENAME="BeOhms-$srcGitRev.tar.gz" +SOURCE_DIR="BeOhms-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/capitalbe/capitalbe-1.1.recipe b/haiku-apps/capitalbe/capitalbe-1.1.recipe index b87f5615c..7b40a27bb 100644 --- a/haiku-apps/capitalbe/capitalbe-1.1.recipe +++ b/haiku-apps/capitalbe/capitalbe-1.1.recipe @@ -7,10 +7,10 @@ HOMEPAGE="https://github.com/HaikuArchives/CapitalBe" COPYRIGHT="2009 DarkWyrm (Jon Yoder)" LICENSE="MIT" REVISION="6" -commit="8a3cc368ac2a79b0faf0fde1b4316ceec9e56bd7" -SOURCE_URI="https://github.com/HaikuArchives/CapitalBe/archive/$commit.tar.gz" +srcGitRev="8a3cc368ac2a79b0faf0fde1b4316ceec9e56bd7" +SOURCE_URI="https://github.com/HaikuArchives/CapitalBe/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="9ad2efa619dbbcde4d235c9b65cd7c9d269f271b05ae93f206bb49358f85e95c" -SOURCE_DIR="CapitalBe-$commit" +SOURCE_DIR="CapitalBe-$srcGitRev" ARCHITECTURES="x86_gcc2 ?x86 x86_64" diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe index 7ed07c5e8..d9e30e314 100644 --- a/haiku-apps/chat/chat-20100903.recipe +++ b/haiku-apps/chat/chat-20100903.recipe @@ -7,11 +7,11 @@ HOMEPAGE="http://synrc.com/client/chat/haiku/" COPYRIGHT="2010-2014 Maxim Sokhatsky" LICENSE="MIT" REVISION="3" -commit="37b34459b19b7f789073b348bab93c8f0df05f30" -SOURCE_URI="https://github.com/devaspot/chat/archive/$commit.tar.gz" -SOURCE_FILENAME="chat-$commit.tar.gz" -SOURCE_DIR="chat-$commit" +srcGitRev="37b34459b19b7f789073b348bab93c8f0df05f30" +SOURCE_URI="https://github.com/devaspot/chat/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="26721cbd6fac473ac20afd7774f7fd7ca8a7f2a849ca334d2cfdad48ce539c46" +SOURCE_FILENAME="chat-$srcGitRev.tar.gz" +SOURCE_DIR="chat-$srcGitRev" ARCHITECTURES="x86_gcc2 x86" diff --git a/haiku-apps/commandtimer/commandtimer-2.0~git.recipe b/haiku-apps/commandtimer/commandtimer-2.0~git.recipe index b0950ebd3..5a0228e40 100644 --- a/haiku-apps/commandtimer/commandtimer-2.0~git.recipe +++ b/haiku-apps/commandtimer/commandtimer-2.0~git.recipe @@ -5,11 +5,11 @@ HOMEPAGE="https://github.com/HaikuArchives/CommandTimer" COPYRIGHT="1999 Jason Scaroni" LICENSE="Public Domain" REVISION="2" -commit="c85fda361d2190688680319fd19d0ee00fb0d4ad" -SOURCE_URI="https://github.com/HaikuArchives/CommandTimer/archive/$commit.tar.gz" +srcGitRev="c85fda361d2190688680319fd19d0ee00fb0d4ad" +SOURCE_URI="https://github.com/HaikuArchives/CommandTimer/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="33652430ce0d44e6e9a403ce38b1a5f6bfb40119bab99348692e02923eaf6cad" -SOURCE_FILENAME="CommandTimer-$commit.tar.gz" -SOURCE_DIR="CommandTimer-$commit" +SOURCE_FILENAME="CommandTimer-$srcGitRev.tar.gz" +SOURCE_DIR="CommandTimer-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index 11fba8760..cb4319479 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -6,10 +6,10 @@ HOMEPAGE="https://github.com/HaikuArchives/DockBert" COPYRIGHT="2005 yellowTAB GmbH" LICENSE="BSD (3-clause)" REVISION="5" -COMMIT="29d289da4a293aa795b2aac50e5876fb7ee00c5b" -SOURCE_URI="https://github.com/HaikuArchives/DockBert/archive/$COMMIT.zip" +srcGitRev="29d289da4a293aa795b2aac50e5876fb7ee00c5b" +SOURCE_URI="https://github.com/HaikuArchives/DockBert/archive/$srcGitRev.zip" CHECKSUM_SHA256="044fdaa1eb4d4994680ec0bc82292a302f68d2c42112cacc367227bd607ffac5" -SOURCE_DIR="DockBert-$COMMIT" +SOURCE_DIR="DockBert-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe index d3878fe6a..e4fab01a6 100644 --- a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe +++ b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe @@ -5,11 +5,11 @@ HOMEPAGE="http://maybe.de/software/ducksaver" COPYRIGHT="2002-2008, Werner Freytag, 2009-2014 Haiku, Inc." LICENSE="MIT" REVISION="3" -commit="4859bfaf74d3d42883e03c85ef02a2ef03569a19" -SOURCE_URI="https://github.com/jscipione/DuckSaver/archive/$commit.tar.gz" -SOURCE_DIR="DuckSaver-$commit" -SOURCE_FILENAME="DuckSaver-$commit.tar.gz" +srcGitRev="4859bfaf74d3d42883e03c85ef02a2ef03569a19" +SOURCE_URI="https://github.com/jscipione/DuckSaver/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="b8a3b710a7ae731c72728a32b9cfa964ad2001c93379feb8c5086043345e1ed5" +SOURCE_FILENAME="DuckSaver-$srcGitRev.tar.gz" +SOURCE_DIR="DuckSaver-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe b/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe index 90f7e3ebe..9af25d8cb 100644 --- a/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe +++ b/haiku-apps/fairtrade/fairtrade-1.0.0~git.recipe @@ -6,10 +6,10 @@ HOMEPAGE="https://github.com/czeidler/fairtrade" COPYRIGHT="2006-2013 Clemens Zeidler" LICENSE="MIT" REVISION="2" -commit="2b4ff648e2118021b092c4f0d9d0b61bc51c1374" -SOURCE_URI="${HOMEPAGE}/archive/$commit.tar.gz" +srcGitRev="2b4ff648e2118021b092c4f0d9d0b61bc51c1374" +SOURCE_URI="${HOMEPAGE}/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="3508410755c1bdf9c90403fd5bbf622f5f6036fe7a787cfe570c6542fd9f4186" -SOURCE_DIR="fairtrade-$commit" +SOURCE_DIR="fairtrade-$srcGitRev" PATCHES="fairtrade-$portVersion.patchset" ARCHITECTURES="x86_gcc2 !x86 x86_64" @@ -18,7 +18,6 @@ PROVIDES=" fairtrade = $portVersion app:fairtrade = $portVersion " - REQUIRES=" haiku lib:libsqlite3 @@ -28,7 +27,6 @@ BUILD_REQUIRES=" haiku_devel devel:libsqlite3 " - BUILD_PREREQUIRES=" makefile_engine cmd:make diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe index 697a28f07..9836e2af1 100644 --- a/haiku-apps/filecropper/filecropper-1.recipe +++ b/haiku-apps/filecropper/filecropper-1.recipe @@ -5,11 +5,11 @@ HOMEPAGE="https://github.com/HaikuArchives/FileCropper" COPYRIGHT="2002 Maurice Michalski" LICENSE="MIT" REVISION="2" -commit="0dde0f752ad658772d0288a572193ec25b0c3ac8" -SOURCE_URI="https://github.com/HaikuArchives/FileCropper/archive/$commit.tar.gz" +srcGitRev="0dde0f752ad658772d0288a572193ec25b0c3ac8" +SOURCE_URI="https://github.com/HaikuArchives/FileCropper/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="810b04782f22e7a8184971fe7ace28f51a9b4e5e1d20aea3dc725d250ba54227" -SOURCE_FILENAME="filecropper-$commit.tar.gz" -SOURCE_DIR="FileCropper-$commit" +SOURCE_FILENAME="filecropper-$srcGitRev.tar.gz" +SOURCE_DIR="FileCropper-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 ?x86_64" diff --git a/haiku-apps/filwip/filwip-1.0.1.recipe b/haiku-apps/filwip/filwip-1.0.1.recipe index 53f053344..81fcb6a7b 100644 --- a/haiku-apps/filwip/filwip-1.0.1.recipe +++ b/haiku-apps/filwip/filwip-1.0.1.recipe @@ -7,15 +7,18 @@ HOMEPAGE="https://sites.google.com/site/appfilwip/home" COPYRIGHT="2002 Ramshankar" LICENSE="SPL" REVISION="3" -commit="227dac4d85ba9fdccf6fac672b399784a8ebfe0f" -SOURCE_URI="https://github.com/HaikuArchives/filwip/archive/$commit.tar.gz" +srcGitRev="227dac4d85ba9fdccf6fac672b399784a8ebfe0f" +SOURCE_URI="https://github.com/HaikuArchives/filwip/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="1666f52533b24ae9f72ffabe0484ca9b088dee997b90f271f42c98a4fc135a64" -SOURCE_FILENAME="filwip-$commit.tar.gz" -SOURCE_DIR="FilWip-$commit" +SOURCE_FILENAME="filwip-$srcGitRev.tar.gz" +SOURCE_DIR="FilWip-$srcGitRev" ADDITIONAL_FILES="install_plugins.sh" ARCHITECTURES="x86_gcc2 x86 x86_64" +USER_SETTINGS_FILES="settings/FilWip directory keep-old" +POST_INSTALL_SCRIPTS="$relativePostInstallDir/install_plugins.sh" + PROVIDES=" filwip = $portVersion app:FilWip = $portVersion @@ -34,9 +37,6 @@ BUILD_PREREQUIRES=" cmd:xres " -USER_SETTINGS_FILES="settings/FilWip directory keep-old" -POST_INSTALL_SCRIPTS="$relativePostInstallDir/install_plugins.sh" - BUILD() { make $jobArgs -C Source diff --git a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe index ac64fe9c2..e77a87f48 100644 --- a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe +++ b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe @@ -3,15 +3,15 @@ DESCRIPTION="HyperStudio is a multitrack audio recording and editing \ suite with an easy to master graphical user interface. It's based off of \ BeAE, and improves on BeAE in numerous ways." HOMEPAGE="https://github.com/HaikuArchives/HyperStudio" -LICENSE="MIT" COPYRIGHT="2003 Xentronix 2007 Pier Luigi Fiorini" -srcrev="59b31f0bdc3f0e49feb7d9892faa67222ffb3f95" -SOURCE_URI="https://github.com/HaikuArchives/HyperStudio/archive/$srcrev.tar.gz" -CHECKSUM_SHA256="03c2a7fc68d2a95bce9c873bf6d8a32494370861a23dc8e2689285e7e201a4c9" -SOURCE_DIR="HyperStudio-$srcrev" - +LICENSE="MIT" REVISION="2" +srcGitRev="59b31f0bdc3f0e49feb7d9892faa67222ffb3f95" +SOURCE_URI="https://github.com/HaikuArchives/HyperStudio/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="03c2a7fc68d2a95bce9c873bf6d8a32494370861a23dc8e2689285e7e201a4c9" +SOURCE_DIR="HyperStudio-$srcGitRev" + ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" @@ -21,6 +21,7 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" haiku_devel " diff --git a/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe b/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe index 9e7762b71..298b4b921 100644 --- a/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe +++ b/haiku-apps/jabber4haiku/jabber4haiku-1.2.1.recipe @@ -6,11 +6,11 @@ HOMEPAGE="https://github.com/HaikuArchives/Jabber4Haiku" COPYRIGHT="19??-2009 John Blanco, Frank Paul Silye, Andrea Anzani, Daniel Fischer, zuMi" LICENSE="MIT" REVISION="6" -commit="160b682b6c00640547c278e050104f11732b2c5f" -SOURCE_URI="$HOMEPAGE/archive/$commit.tar.gz" -SOURCE_FILENAME="$portName-$commit.tar.gz" -SOURCE_DIR="Jabber4Haiku-$commit" +srcGitRev="160b682b6c00640547c278e050104f11732b2c5f" +SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="8199235c33eb8ab14be31cf8777682a23808040883bc57421d0aad9fe0ccb5d9" +SOURCE_FILENAME="$portName-$srcGitRev.tar.gz" +SOURCE_DIR="Jabber4Haiku-$srcGitRev" ARCHITECTURES="x86_gcc2 ?x86 x86_64" diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe index 95847ce8d..60b899172 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe @@ -9,10 +9,10 @@ COPYRIGHT=" " LICENSE="BSD (4-clause)" REVISION="4" -commit="799e7bc6d091c4e5141d9d260bbb500c337e5eaf" -SOURCE_URI="https://github.com/HaikuArchives/KeymapSwitcher/archive/$commit.zip" -SOURCE_DIR="KeymapSwitcher-$commit" +srcGitRev="799e7bc6d091c4e5141d9d260bbb500c337e5eaf" +SOURCE_URI="https://github.com/HaikuArchives/KeymapSwitcher/archive/$srcGitRev.zip" CHECKSUM_SHA256="608f0a2286522a6d0bc7bfd37c0c15dedad5fff87f8ed031a17d2af18f9a3b2e" +SOURCE_DIR="KeymapSwitcher-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/haiku-apps/niue/niue-20140701.recipe b/haiku-apps/niue/niue-20140701.recipe index 1984f1d8e..da3db76f6 100644 --- a/haiku-apps/niue/niue-20140701.recipe +++ b/haiku-apps/niue/niue-20140701.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Niue" COPYRIGHT="2008 T. Lansbergen" LICENSE="Niue" REVISION="1" -COMMIT="6745dcca121799572d0b4c98f9a006b6a657aac2" -SOURCE_URI="https://github.com/HaikuArchives/Niue/archive/$COMMIT.tar.gz" -SOURCE_DIR="Niue-$COMMIT" +srcGitRev="6745dcca121799572d0b4c98f9a006b6a657aac2" +SOURCE_URI="https://github.com/HaikuArchives/Niue/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="7d82a163ae62fb45980df058c7010a3baba54d7648b8cf6229a32601ebd92610" +SOURCE_DIR="Niue-$srcGitRev" ARCHITECTURES="x86_gcc2 ?x86_64" diff --git a/haiku-apps/photograbber/photograbber-2.3.3.recipe b/haiku-apps/photograbber/photograbber-2.3.3.recipe index 31151430e..530ff886f 100644 --- a/haiku-apps/photograbber/photograbber-2.3.3.recipe +++ b/haiku-apps/photograbber/photograbber-2.3.3.recipe @@ -12,10 +12,10 @@ HOMEPAGE="https://github.com/HaikuArchives/PhotoGrabber" COPYRIGHT="2010 Jan-Rixt Van Hoye (Jixt)" LICENSE="MIT" REVISION="1" -COMMIT=f4a061cb61e188f59a80b1080ccc7da3ea55b352 -SOURCE_URI="https://github.com/HaikuArchives/PhotoGrabber/archive/$COMMIT.tar.gz" +srcGitRev="f4a061cb61e188f59a80b1080ccc7da3ea55b352" +SOURCE_URI="https://github.com/HaikuArchives/PhotoGrabber/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="296fb46be1a0d580fe47156ee5328d1b1103e5e7a73d216ca006a438c47b8fec" -SOURCE_DIR="PhotoGrabber-$COMMIT" +SOURCE_DIR="PhotoGrabber-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/haiku-apps/runprogram/runprogram-1.0rc1.recipe b/haiku-apps/runprogram/runprogram-1.0rc1.recipe index ee86ed1d5..164348724 100644 --- a/haiku-apps/runprogram/runprogram-1.0rc1.recipe +++ b/haiku-apps/runprogram/runprogram-1.0rc1.recipe @@ -7,10 +7,10 @@ HOMEPAGE="https://github.com/HaikuArchives/RunProgram/" COPYRIGHT="2008 DarkWyrm" LICENSE="MIT" REVISION="3" -COMMIT="ddd2f6bc886964011961a1880af11eb31fb3186e" -SOURCE_URI="https://github.com/HaikuArchives/RunProgram/archive/$COMMIT.zip" -SOURCE_DIR="RunProgram-$COMMIT" +srcGitRev="ddd2f6bc886964011961a1880af11eb31fb3186e" +SOURCE_URI="https://github.com/HaikuArchives/RunProgram/archive/$srcGitRev.zip" CHECKSUM_SHA256="357aa427d1b344a76bdf9e8b25191e7514b0c8b993a7dc72331fb2bcd8ae95df" +SOURCE_DIR="RunProgram-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-apps/slayer/slayer-1.0.recipe b/haiku-apps/slayer/slayer-1.0.recipe index 82ef11b8c..1f4dbb55a 100644 --- a/haiku-apps/slayer/slayer-1.0.recipe +++ b/haiku-apps/slayer/slayer-1.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Slayer" COPYRIGHT="1998 Arto Jalkanen" LICENSE="GNU GPL v3" REVISION="1" -COMMIT="bf24f8fdaa4841ad215b0aa4d99a377e86a5a4ab" -SOURCE_URI="https://github.com/HaikuArchives/Slayer/archive/$COMMIT.tar.gz" +srcGitRev="bf24f8fdaa4841ad215b0aa4d99a377e86a5a4ab" +SOURCE_URI="https://github.com/HaikuArchives/Slayer/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="efd3d2db245d585095b92ee5e07028939cd077227812418cf9e2677f80b28ea3" -SOURCE_DIR="Slayer-$COMMIT" +SOURCE_DIR="Slayer-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/haiku-apps/superprefs/superprefs-1.0.recipe b/haiku-apps/superprefs/superprefs-1.0.recipe index 495e06581..b64637967 100644 --- a/haiku-apps/superprefs/superprefs-1.0.recipe +++ b/haiku-apps/superprefs/superprefs-1.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/SuperPrefs" COPYRIGHT="2017 Anirudh Murali" LICENSE="MIT" REVISION="1" -COMMIT="cb155e51a042a04650f98e7ccd1c9d027af76115" -SOURCE_URI="https://github.com/HaikuArchives/SuperPrefs/archive/$COMMIT.tar.gz" +srcGitRev="cb155e51a042a04650f98e7ccd1c9d027af76115" +SOURCE_URI="https://github.com/HaikuArchives/SuperPrefs/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="1e4283ba36ce9e4c4a77988fae1990df5da495d745f8d770681ca0c92d2bdc35" -SOURCE_DIR="SuperPrefs-$COMMIT" +SOURCE_DIR="SuperPrefs-$srcGitRev" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index 70a705e27..79756c824 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -2,22 +2,24 @@ SUMMARY="A dictionary for Haiku" DESCRIPTION="This program is a BeOS port of KDictionary translation program \ for Linux by Ivan V. Murasko. It follows the main concept of original linux \ program but mainly is a real BeOS program." +HOMEPAGE="https://github.com/HaikuArchives/tolmach" COPYRIGHT="1999 Ivan V. Murasko" LICENSE="GNU GPL v2" -HOMEPAGE="https://github.com/HaikuArchives/tolmach" -COMMIT="bef06da57cf34e43a428f3e95855bd77a959cb1d" -SOURCE_URI="https://github.com/HaikuArchives/tolmach/archive/$COMMIT.tar.gz" -SOURCE_DIR="Tolmach-$COMMIT" -CHECKSUM_SHA256="d37169523cdfaa4acc0e8c67c97943e74d70767d08671574948a28553a1f17f2" REVISION="2" +srcGitRev="bef06da57cf34e43a428f3e95855bd77a959cb1d" +SOURCE_URI="https://github.com/HaikuArchives/tolmach/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="d37169523cdfaa4acc0e8c67c97943e74d70767d08671574948a28553a1f17f2" +SOURCE_DIR="Tolmach-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 ?x86_64" +USER_SETTINGS_FILES=" + settings/Tolmach_Preferences directory" + PROVIDES=" tolmach = $portVersion app:Tolmach = $portVersion " - REQUIRES=" haiku " @@ -25,16 +27,12 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc cmd:make " -USER_SETTINGS_FILES=" - settings/Tolmach_Preferences directory" - BUILD() { make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` OBJ_DIR=objects diff --git a/haiku-apps/toner/toner-1.0.0.recipe b/haiku-apps/toner/toner-1.0.0.recipe index 5fa0b559a..20f5d5e86 100644 --- a/haiku-apps/toner/toner-1.0.0.recipe +++ b/haiku-apps/toner/toner-1.0.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/Toner" COPYRIGHT="2001 Ben Loftis" LICENSE="MIT" REVISION="2" -COMMIT="eb78098c88b0d1eacb97a4e0085eff6bfd0a7f0b" -SOURCE_URI="https://github.com/HaikuArchives/Toner/archive/$COMMIT.tar.gz" +srcGitRev="eb78098c88b0d1eacb97a4e0085eff6bfd0a7f0b" +SOURCE_URI="https://github.com/HaikuArchives/Toner/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="9a3edf2de7436a33ce7706ad1347cbd3393e906c735ca097b42ded584e3e8a5f" -SOURCE_DIR="Toner-$COMMIT" +SOURCE_DIR="Toner-$srcGitRev" PATCHES="toner-$portVersion.patchset" ARCHITECTURES="x86_gcc2 ?x86 x86_64" diff --git a/haiku-games/bebattle/bebattle-1.0.0.recipe b/haiku-games/bebattle/bebattle-1.0.0.recipe index 9412600ab..c818d9127 100644 --- a/haiku-games/bebattle/bebattle-1.0.0.recipe +++ b/haiku-games/bebattle/bebattle-1.0.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeBattle/" COPYRIGHT="1999-2000 Jonathan Villemure" LICENSE="MIT" REVISION="2" -COMMIT="e44b8fd01f895e1ef068ab330abd3e492d95d369" -SOURCE_URI="https://github.com/HaikuArchives/BeBattle/archive/$COMMIT.tar.gz" +srcGitRev="e44b8fd01f895e1ef068ab330abd3e492d95d369" +SOURCE_URI="https://github.com/HaikuArchives/BeBattle/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="30be929f3fb9725fc8ca6f817fb75abd45c526436154d5dc397f39940b48f583" -SOURCE_DIR="BeBattle-$COMMIT" +SOURCE_DIR="BeBattle-$srcGitRev" PATCHES="bebattle-$portVersion.patchset" ARCHITECTURES="x86_gcc2 ?x86 x86_64" diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe index 708a74599..023080029 100644 --- a/haiku-games/becheckers/becheckers-1.0.1.recipe +++ b/haiku-games/becheckers/becheckers-1.0.1.recipe @@ -6,10 +6,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeCheckers" COPYRIGHT="2000 Jeremy J. Gibbons" LICENSE="MIT" REVISION="2" -gitCommit="d4fbfc69656ba5861184d37f7932b9a53ff28373" -SOURCE_URI="$HOMEPAGE/archive/$gitCommit.tar.gz" +srcGitRev="d4fbfc69656ba5861184d37f7932b9a53ff28373" +SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="e47de842a44ce1dcd548a4eb1a32f27120f84bb7de64c86de71f1e3ae6a3dec1" -SOURCE_DIR="BeCheckers-$gitCommit" +SOURCE_DIR="BeCheckers-$srcGitRev" PATCHES="becheckers-$portVersion.patchset" ARCHITECTURES="x86_gcc2 ?x86 x86_64" diff --git a/haiku-games/besol/besol-2.0.5.recipe b/haiku-games/besol/besol-2.0.5.recipe index ed1f6f332..073014422 100644 --- a/haiku-games/besol/besol-2.0.5.recipe +++ b/haiku-games/besol/besol-2.0.5.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeSol/" COPYRIGHT="1999 Jason Wrinkle" LICENSE="GNU GPL v2" REVISION="4" -COMMIT="2ac61dc65cb66ae9274d22f08c108ef845f9d76c" -SOURCE_URI="https://github.com/HaikuArchives/BeSol/archive/$COMMIT.zip" +srcGitRev="2ac61dc65cb66ae9274d22f08c108ef845f9d76c" +SOURCE_URI="https://github.com/HaikuArchives/BeSol/archive/$srcGitRev.zip" CHECKSUM_SHA256="245c6c685e48a553401a5461bd3809819c5745d0a2fd86e5833ffccab5ae313b" -SOURCE_DIR="BeSol-$COMMIT" +SOURCE_DIR="BeSol-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/haiku-games/bespider/bespider-0.1.0.recipe b/haiku-games/bespider/bespider-0.1.0.recipe index 4f75772f0..e88c8c99f 100644 --- a/haiku-games/bespider/bespider-0.1.0.recipe +++ b/haiku-games/bespider/bespider-0.1.0.recipe @@ -8,10 +8,10 @@ COPYRIGHT="2013 Przemysław Buczkowski, 2013 Luke (noryb009)" LICENSE="MIT" REVISION="2" -COMMIT="4fd4f1c4241865f6e6ebd30eaf8c1dd1eaa1ca77" -SOURCE_URI="https://github.com/HaikuArchives/BeSpider/archive/$COMMIT.tar.gz" +srcGitRev="4fd4f1c4241865f6e6ebd30eaf8c1dd1eaa1ca77" +SOURCE_URI="https://github.com/HaikuArchives/BeSpider/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="8898712b2e75cb90970a26db899fb27fcf3d89d88edb9fc22bc7c54471a0583a" -SOURCE_DIR="BeSpider-$COMMIT" +SOURCE_DIR="BeSpider-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 !x86_64" diff --git a/haiku-games/bespider/bespider-0.1.1.recipe b/haiku-games/bespider/bespider-0.1.1.recipe index 187543a50..00fceb66f 100644 --- a/haiku-games/bespider/bespider-0.1.1.recipe +++ b/haiku-games/bespider/bespider-0.1.1.recipe @@ -7,10 +7,10 @@ HOMEPAGE="https://github.com/HaikuArchives/BeSpider/" COPYRIGHT="2013-17 Przemysław Buczkowski" LICENSE="MIT" REVISION="1" -COMMIT="1b26eac8cf8b3f4fe1c41148d9f443d3188a8193" -SOURCE_URI="https://github.com/HaikuArchives/BeSpider/archive/$COMMIT.tar.gz" +srcGitRev="1b26eac8cf8b3f4fe1c41148d9f443d3188a8193" +SOURCE_URI="https://github.com/HaikuArchives/BeSpider/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="556c3ce7c4ccd93efb2218ee74e2ae033736b6125839a7e95491d88f1876dbc0" -SOURCE_DIR="BeSpider-$COMMIT" +SOURCE_DIR="BeSpider-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/haiku-libs/interface_elements/interface_elements-1.0.recipe b/haiku-libs/interface_elements/interface_elements-1.0.recipe index cb35163e4..db0850c52 100644 --- a/haiku-libs/interface_elements/interface_elements-1.0.recipe +++ b/haiku-libs/interface_elements/interface_elements-1.0.recipe @@ -5,10 +5,10 @@ HOMEPAGE="https://github.com/HaikuArchives/InterfaceElements/" COPYRIGHT="1997-1998 Attila Mezei" LICENSE="GNU GPL v3" REVISION="2" -COMMIT="43f91ffb883a94d4c239eda28a8ec2e0b985419e" -SOURCE_URI="https://github.com/HaikuArchives/InterfaceElements/archive/$COMMIT.tar.gz" +srcGitRev="43f91ffb883a94d4c239eda28a8ec2e0b985419e" +SOURCE_URI="https://github.com/HaikuArchives/InterfaceElements/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="443c685366a9517cad428c4e140c448c529a835585df321bb18732bdfbec198d" -SOURCE_DIR="InterfaceElements-$COMMIT" +SOURCE_DIR="InterfaceElements-$srcGitRev" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -41,6 +41,7 @@ BUILD() cd "Develop/IE library" make BUILDHOME=/system/develop $jobArgs } + INSTALL() { mkdir -p $includeDir $libDir diff --git a/haiku-libs/liblayout/liblayout-1.4.1.recipe b/haiku-libs/liblayout/liblayout-1.4.1.recipe index a7f321b60..526754153 100644 --- a/haiku-libs/liblayout/liblayout-1.4.1.recipe +++ b/haiku-libs/liblayout/liblayout-1.4.1.recipe @@ -14,13 +14,14 @@ Features: WARNING: This library is old and not intended for new development. It is only \ around to support legacy apps that have not migrated to the Haiku layout kit." HOMEPAGE="https://web.archive.org/web/20071227072934/http://www.xs4all.nl:80/~marcone/be.html" -COMMIT="6388c704c1f816d24bf266fe15d74f642bbf5fae" -CHECKSUM_SHA256="b225631900696dd8dcdfde25f211b2db3d09978f12039c3a68bf17c7c3f415bd" -SOURCE_URI="https://github.com/pulkomandy/liblayout/archive/$COMMIT.tar.gz" -SOURCE_DIR="liblayout-$COMMIT" COPYRIGHT="1996-2003 Marco Nelissen" LICENSE="LIBLAYOUT" REVISION="3" +srcGitRev="6388c704c1f816d24bf266fe15d74f642bbf5fae" +SOURCE_URI="https://github.com/pulkomandy/liblayout/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="b225631900696dd8dcdfde25f211b2db3d09978f12039c3a68bf17c7c3f415bd" +SOURCE_DIR="liblayout-$srcGitRev" + ARCHITECTURES="x86_gcc2 x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" @@ -28,24 +29,22 @@ PROVIDES=" liblayout$secondaryArchSuffix = $portVersion compat >= 1.4 lib:liblayout$secondaryArchSuffix = $portVersion compat >= 1.4 " - REQUIRES=" haiku$secondaryArchSuffix " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - " - PROVIDES_devel=" liblayout${secondaryArchSuffix}_devel = $portVersion compat >= 1.4 devel:liblayout$secondaryArchSuffix = $portVersion compat >= 1.4 " - REQUIRES_devel=" liblayout$secondaryArchSuffix == $portVersion base " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " + BUILD() { true diff --git a/kde-frameworks/oxygen-icons/oxygen_icons-5.47.0~git.recipe b/kde-frameworks/oxygen-icons/oxygen_icons-5.47.0~git.recipe index 41aa14b98..c139c57a3 100644 --- a/kde-frameworks/oxygen-icons/oxygen_icons-5.47.0~git.recipe +++ b/kde-frameworks/oxygen-icons/oxygen_icons-5.47.0~git.recipe @@ -4,10 +4,10 @@ HOMEPAGE="https://github.com/KDE/oxygen-icons/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" -COMMIT="bff159d338fe08be09146a5ee17b9b6efa8a2c8d" -SOURCE_URI="https://github.com/KDE/oxygen-icons/archive/$COMMIT.zip" +srcGitRev="bff159d338fe08be09146a5ee17b9b6efa8a2c8d" +SOURCE_URI="https://github.com/KDE/oxygen-icons/archive/$srcGitRev.zip" CHECKSUM_SHA256="cf182fd91c55f8b39385094889988252130b3f2ae0da3ec68899d2043572f9f0" -SOURCE_DIR="oxygen-icons-$COMMIT" +SOURCE_DIR="oxygen-icons-$srcGitRev" ARCHITECTURES="!x86_gcc2 ?x86_64" SECONDARY_ARCHITECTURES="?x86" diff --git a/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe b/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe index 36421d1bf..3a63f5dad 100644 --- a/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe +++ b/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe @@ -19,10 +19,10 @@ COPYRIGHT=" " LICENSE="GNU GPL v2" REVISION="2" -COMMIT="5ad19b344403c365d1e588ea50ca8c03e5609f8c" -SOURCE_URI="https://github.com/kde/kdiff3/archive/$COMMIT.tar.gz" -SOURCE_DIR="kdiff3-$COMMIT" +srcGitRev="5ad19b344403c365d1e588ea50ca8c03e5609f8c" +SOURCE_URI="https://github.com/kde/kdiff3/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="44a5835bc26ccdb77a6c5f36695f7442dddad2c089c0bb1b32c5bf467c6f86dc" +SOURCE_DIR="kdiff3-$srcGitRev" ADDITIONAL_FILES="kdiff3.rdef.in" ARCHITECTURES="x86_64" diff --git a/media-plugins/mda_vst/mda_vst-20150618.recipe b/media-plugins/mda_vst/mda_vst-20150618.recipe index eb6553d7e..46cef4899 100644 --- a/media-plugins/mda_vst/mda_vst-20150618.recipe +++ b/media-plugins/mda_vst/mda_vst-20150618.recipe @@ -42,13 +42,13 @@ HOMEPAGE="http://sourceforge.net/projects/mda-vst" COPYRIGHT="Paul Kellet" LICENSE="MIT" REVISION="1" +srcGitRev="1f1ad1ae5d29471419ab31bcfcbe84397d944f8a" SOURCE_URI="http://downloads.sf.net/mda-vst/mda-vst/mda-vst-src-2015-06-18.zip" -SOURCE_DIR="mda-vst" CHECKSUM_SHA256="88c8c9924cac8fd6bca6e1e82e71c38acec46491a5e53d47b193637c11288885" -COMMIT="1f1ad1ae5d29471419ab31bcfcbe84397d944f8a" -SOURCE_URI_2="https://github.com/kxproject/kx-audio-driver/archive/$COMMIT.zip" -SOURCE_DIR_2="kx-audio-driver-$COMMIT" +SOURCE_DIR="mda-vst" +SOURCE_URI_2="https://github.com/kxproject/kx-audio-driver/archive/$srcGitRev.zip" CHECKSUM_SHA256_2="d8f1b019b3099e57e8756a80ae588dd608ca2b9b1f0e121d7f1329fc75bad881" +SOURCE_DIR_2="kx-audio-driver-$srcGitRev" PATCHES="mda_vst-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86_64" diff --git a/media-sound/opensound/opensound-4.2~git.recipe b/media-sound/opensound/opensound-4.2~git.recipe index 85ffceeba..e59218174 100644 --- a/media-sound/opensound/opensound-4.2~git.recipe +++ b/media-sound/opensound/opensound-4.2~git.recipe @@ -6,11 +6,10 @@ HOMEPAGE="http://developer.opensound.com/" COPYRIGHT="1996-2008 Hannu Savolainen and Dev Mazumdar" LICENSE="BSD (2-clause)" REVISION="2" - -COMMIT="cd2ae052d390c4811acd10553b327bb94fa2abb0" -SOURCE_URI="https://sourceforge.net/code-snapshots/git/o/op/opensound/git.git/opensound-git-$COMMIT.zip" -SOURCE_DIR="opensound-git-$COMMIT" +srcGitRev="cd2ae052d390c4811acd10553b327bb94fa2abb0" +SOURCE_URI="https://sourceforge.net/code-snapshots/git/o/op/opensound/git.git/opensound-git-$srcGitRev.zip" CHECKSUM_SHA256="6c4852c4c835f54bc807c91a657ecdc398560e6c0b6fc165464265bc30ea407f" +SOURCE_DIR="opensound-git-$srcGitRev" PATCHES="opensound-4.2_git.patchset" ARCHITECTURES="?x86_gcc2 ?x86_64" diff --git a/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe b/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe index f0308cefe..cdcaf906c 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe @@ -4,44 +4,34 @@ HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2018 Telegram" LICENSE="GNU GPL v3" REVISION="1" - SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" -SOURCE_DIR="tdesktop-$portVersion" CHECKSUM_SHA256="2cdf89859be93196def45145fabbbbeff6c54743f84fe2a1809d66644aac243c" - -COMMIT_2="697eea96aa90205db4fc368df4127eef56b2a5c6" -SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$COMMIT_2.zip" +SOURCE_DIR="tdesktop-$portVersion" +srcGitRev_2="697eea96aa90205db4fc368df4127eef56b2a5c6" +SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$srcGitRev_2.zip" CHECKSUM_SHA256_2="3028061037a181c1ae9088a1f8e6ae8524858b647f218370323dff33fcfeebb9" - -COMMIT_3="550ac2f159ca883d360c196149b466955c77a573" -SOURCE_URI_3="https://github.com/mapbox/variant/archive/$COMMIT_3.zip" +srcGitRev_3="550ac2f159ca883d360c196149b466955c77a573" +SOURCE_URI_3="https://github.com/mapbox/variant/archive/$srcGitRev_3.zip" CHECKSUM_SHA256_3="3676117c49db1ef1ff2818f6f70713c3a4469f0da8ecb5c98c157499322501fc" - -COMMIT_4="d846fe50a3f0bb7767c7e087a05f4be95f4da0ec" -SOURCE_URI_4="https://github.com/Microsoft/GSL/archive/$COMMIT_4.zip" +srcGitRev_4="d846fe50a3f0bb7767c7e087a05f4be95f4da0ec" +SOURCE_URI_4="https://github.com/Microsoft/GSL/archive/$srcGitRev_4.zip" CHECKSUM_SHA256_4="320e2d7707aaa6f7bcc0d6ddc95e2e4413b433ddcc1c8afa0a93fb85a47db47b" - -COMMIT_5="5ca44b68721833ae3731802ed99af67c6f38a53a" -SOURCE_URI_5="https://github.com/philsquared/Catch/archive/$COMMIT_5.zip" +srcGitRev_5="5ca44b68721833ae3731802ed99af67c6f38a53a" +SOURCE_URI_5="https://github.com/philsquared/Catch/archive/$srcGitRev_5.zip" CHECKSUM_SHA256_5="bec93e64dea2dd0c6662a75a81cdd1747a753ccd86025ef436b7d2fac3b408d2" - -COMMIT_6="9bc641f2d4ab140a84aea64c7f2d4669f7633246" -SOURCE_URI_6="https://github.com/telegramdesktop/crl/archive/$COMMIT_6.zip" +srcGitRev_6="9bc641f2d4ab140a84aea64c7f2d4669f7633246" +SOURCE_URI_6="https://github.com/telegramdesktop/crl/archive/$srcGitRev_6.zip" CHECKSUM_SHA256_6="563424b0a56c8a3c7b05d82a0e3551a467051057b53e8f7e68f4815921e6953a" - -COMMIT_7="4b10be9cbadd7d0880437f48f875185589fd86d3" -SOURCE_URI_7="https://github.com/ericniebler/range-v3/archive/$COMMIT_7.zip" +srcGitRev_7="4b10be9cbadd7d0880437f48f875185589fd86d3" +SOURCE_URI_7="https://github.com/ericniebler/range-v3/archive/$srcGitRev_7.zip" CHECKSUM_SHA256_7="67095606bd533dcffefb6a9ae6be0dc5176d77912928b60ad4e60cc66fc611c7" - PATCHES=" telegram_desktop-$portVersion-systemqt.patch telegram_desktop-$portVersion.patchset " - PATCHES_2=" telegram_desktop-$portVersion-libtgvoip.patchset " - ADDITIONAL_FILES="telegram_desktop.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" @@ -71,6 +61,7 @@ REQUIRES=" lib:libswscale$secondaryArchSuffix lib:libz$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libavcodec$secondaryArchSuffix diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe index 0da770b90..d143f38fc 100644 --- a/net-misc/berdp/berdp-1.recipe +++ b/net-misc/berdp/berdp-1.recipe @@ -4,36 +4,33 @@ the BeOS platform utilizing the rdesktop project. RDP is a protocol designed \ by Microsoft to remotely administer / run a session on Windows 2000/2003 \ Servers / Windows XP Professional workstations." HOMEPAGE="https://github.com/HaikuArchives/BeRDP/" -COMMIT="f5dc795ec3816febc1b3c524dcf3884107547a59" -SOURCE_URI="https://github.com/HaikuArchives/BeRDP/archive/$COMMIT.tar.gz" -SOURCE_DIR="BeRDP-$COMMIT" -CHECKSUM_SHA256="893e8b3f89c636285d59f63acf7c7586479e7bf6f38064dc48bfb761e808b548" COPYRIGHT="2003-2004 Sikos" LICENSE="BSD (4-clause)" REVISION="2" +srcGitRev="f5dc795ec3816febc1b3c524dcf3884107547a59" +SOURCE_URI="https://github.com/HaikuArchives/BeRDP/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="893e8b3f89c636285d59f63acf7c7586479e7bf6f38064dc48bfb761e808b548" +SOURCE_DIR="BeRDP-$srcGitRev" + ARCHITECTURES="x86_gcc2 x86_64" PROVIDES=" berdp = $portVersion app:BeRDP = $portVersion " - -BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc - cmd:make - " - - -BUILD_REQUIRES=" - haiku_devel - " - REQUIRES=" haiku cmd:rdesktop " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + " BUILD() { diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe index 69770471c..821410ccc 100644 --- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe +++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe @@ -8,10 +8,10 @@ HOMEPAGE="https://sourceforge.net/projects/eiskaltdcpp/" COPYRIGHT="EiskaltDC++ team" LICENSE="GNU GPL v3" REVISION="3" -COMMIT="1e72256ac5e8fe6735f81bfbc3f9d90514ada578" -SOURCE_URI="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/$COMMIT.tar.gz" +srcGitRev="1e72256ac5e8fe6735f81bfbc3f9d90514ada578" +SOURCE_URI="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="712088e14bdaa659e819656cd07b040651197e25ff63e82453d7fec601251fca" -SOURCE_DIR="eiskaltdcpp-$COMMIT" +SOURCE_DIR="eiskaltdcpp-$srcGitRev" PATCHES="eiskaltdcpp-$portVersion.patchset" ADDITIONAL_FILES="eiskaltdcpp.rdef.in" diff --git a/net-p2p/ktorrent/ktorrent-5.1.1~git.recipe b/net-p2p/ktorrent/ktorrent-5.1.1~git.recipe index 48728f802..e8289b65a 100644 --- a/net-p2p/ktorrent/ktorrent-5.1.1~git.recipe +++ b/net-p2p/ktorrent/ktorrent-5.1.1~git.recipe @@ -28,10 +28,10 @@ HOMEPAGE="https://www.kde.org/applications/internet/ktorrent/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" -COMMIT="d018720d638197683c24dbcd2603128149367a76" -SOURCE_URI="https://github.com/KDE/ktorrent/archive/$COMMIT.tar.gz" -SOURCE_DIR="ktorrent-$COMMIT" +srcGitRev="d018720d638197683c24dbcd2603128149367a76" +SOURCE_URI="https://github.com/KDE/ktorrent/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="e68de0196f11acff49d5fd5c9d7b89f40c08ec95eb2ff9aef67b6fd0dba77528" +SOURCE_DIR="ktorrent-$srcGitRev" ADDITIONAL_FILES="ktorrent.rdef.in" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe b/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe index e20e7e747..063bf4823 100644 --- a/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe +++ b/sys-block/partitionmanager/partitionmanager-3.3.1~git.recipe @@ -26,10 +26,10 @@ HOMEPAGE="https://github.com/KDE/partitionmanager/" COPYRIGHT="2008-2018 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" -COMMIT="dfca46250e5ea5261d66e44223500cf1b94bdcb6" -SOURCE_URI="https://github.com/kde/partitionmanager/archive/$COMMIT.tar.gz" -SOURCE_DIR="partitionmanager-$COMMIT" +srcGitRev="dfca46250e5ea5261d66e44223500cf1b94bdcb6" +SOURCE_URI="https://github.com/kde/partitionmanager/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="9d840520a5289a3f9086cd03efa0742f7b90541879ee36354ca66495834c4680" +SOURCE_DIR="partitionmanager-$srcGitRev" ADDITIONAL_FILES="partitionmanager.rdef.in" ARCHITECTURES="?x86_64" diff --git a/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe b/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe index ab33ce8e0..c92f336fa 100644 --- a/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe +++ b/sys-libs/kpmcore/kpmcore-3.3.0~git.recipe @@ -20,15 +20,20 @@ HOMEPAGE="https://github.com/KDE/kpmcore/" COPYRIGHT="2010-2018 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" -COMMIT="9e6cf4063a29dd13fafed939e2ee4ae3061a37d6" -SOURCE_URI="https://github.com/KDE/kpmcore/archive/$COMMIT.zip" -SOURCE_DIR="kpmcore-$COMMIT" +srcGitRev="9e6cf4063a29dd13fafed939e2ee4ae3061a37d6" +SOURCE_URI="https://github.com/KDE/kpmcore/archive/$srcGitRev.zip" CHECKSUM_SHA256="0b641ca970c6f109fdf40d3693fb7eddeb8cb1f6e0e807310ce9f1d41dbe87cd" +SOURCE_DIR="kpmcore-$srcGitRev" PATCHES="kpmcore-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" +GLOBAL_WRITABLE_FILES=" + settings/dbus-1/system.d/org.kde.kpmcore.externalcommand.conf keep-old + settings/dbus-1/system.d/org.kde.kpmcore.helperinterface.conf keep-old + " + PROVIDES=" kpmcore$secondaryArchSuffix = $portVersion lib:libkpmcore$secondaryArchSuffix @@ -67,11 +72,6 @@ BUILD_PREREQUIRES=" cmd:make " -GLOBAL_WRITABLE_FILES=" - settings/dbus-1/system.d/org.kde.kpmcore.externalcommand.conf keep-old - settings/dbus-1/system.d/org.kde.kpmcore.helperinterface.conf keep-old - " - BUILD() { mkdir -p build diff --git a/www-client/bezilla/bezilla-2.0.0.22.recipe b/www-client/bezilla/bezilla-2.0.0.22.recipe index 92b7d0bb9..b0e9a3b29 100644 --- a/www-client/bezilla/bezilla-2.0.0.22.recipe +++ b/www-client/bezilla/bezilla-2.0.0.22.recipe @@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/mmadia/bezilla/" COPYRIGHT="1995-2009 Mozilla Developers and Contributors" LICENSE="MPL v1.1" REVISION="7" -COMMIT="6862542e81d0407f8fbdb8cf96a48fdc3156e902" -SOURCE_URI="https://github.com/mmadia/bezilla/archive/$COMMIT.zip" -SOURCE_DIR="bezilla-$COMMIT" +srcGitRev="6862542e81d0407f8fbdb8cf96a48fdc3156e902" +SOURCE_URI="https://github.com/mmadia/bezilla/archive/$srcGitRev.zip" +SOURCE_DIR="bezilla-$srcGitRev" CHECKSUM_SHA256="61dd1e12fc0a183d2ded7cbc16adbe1fb7bee565ce7d12acc48bfbe5954f80ce" PATCHES="bezilla-$portVersion.patchset"