From bd4b583fc809cf0d0f740403fbda322fba9270f0 Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Sat, 26 Dec 2015 10:44:26 +0000 Subject: [PATCH] Reformat 10 recipes --- .../espeak/espeak-1.48.04.recipe | 31 +++++++++---------- app-accessibility/flite/flite-2.0.0.recipe | 10 +++--- haiku-apps/a_book/a_book-1.1.recipe | 6 ++-- .../aalibtranslator-0.0.1.recipe | 11 +++---- haiku-apps/aesaddon/aesaddon-0.3.1.recipe | 14 ++++----- haiku-apps/album/album-0.9.4.recipe | 8 +++-- haiku-apps/aplayer/aplayer-4.0_svn.recipe | 30 +++++++++--------- haiku-apps/armyknife/armyknife-4.3.0.recipe | 4 ++- haiku-apps/artpaint/artpaint-2.1.0git.recipe | 8 +++-- haiku-apps/backup/backup-0.0.1.recipe | 9 ++---- haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 8 +++-- haiku-apps/beae/beae-1.2.recipe | 8 +++-- haiku-apps/beam/beam-1.2.recipe | 16 +++++----- 13 files changed, 83 insertions(+), 80 deletions(-) diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe index 23eb19831..37d902d12 100644 --- a/app-accessibility/espeak/espeak-1.48.04.recipe +++ b/app-accessibility/espeak/espeak-1.48.04.recipe @@ -1,20 +1,20 @@ SUMMARY="Speech synthesizer for English and other languages" -DESCRIPTION=" - eSpeak is a compact open source software speech synthesizer \ - for English and other languages, for Linux and Windows. - - eSpeak uses a \"formant synthesis\" method. \ - This allows many languages to be provided in a small size. \ - The speech is clear, and can be used at high speeds, \ - but is not as natural or smooth as larger synthesizers \ - which are based on human speech recordings. - " +DESCRIPTION="eSpeak is a compact open source software speech synthesizer \ +for English and other languages, for Linux and Windows. \ +\ +eSpeak uses a \"formant synthesis\" method. \ +This allows many languages to be provided in a small size. \ +The speech is clear, and can be used at high speeds, \ +but is not as natural or smooth as larger synthesizers \ +which are based on human speech recordings." HOMEPAGE="http://espeak.sourceforge.net/" +COPYRIGHT="2005-2014 Jonathan Duddington" +LICENSE="GNU GPL v3" +REVISION="1" SOURCE_URI="http://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/espeak-1.48.04-source.zip" CHECKSUM_SHA256="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" -REVISION="1" -LICENSE="GNU GPL v3" -COPYRIGHT="2005-2014 Jonathan Duddington" +SOURCE_DIR="espeak-${portVersion}-source" +PATCHES="espeak-1.48.04.patch" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" @@ -27,6 +27,7 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" haiku_devel " @@ -35,10 +36,6 @@ BUILD_PREREQUIRES=" cmd:gcc " -SOURCE_DIR="espeak-${portVersion}-source" - -PATCHES="espeak-1.48.04.patch" - BUILD() { cd src diff --git a/app-accessibility/flite/flite-2.0.0.recipe b/app-accessibility/flite/flite-2.0.0.recipe index 48488f099..aa1b1bffb 100644 --- a/app-accessibility/flite/flite-2.0.0.recipe +++ b/app-accessibility/flite/flite-2.0.0.recipe @@ -17,11 +17,11 @@ COPYRIGHT="1986 University of Toronto # Although individually many files have different licenses, as a whole this # license covers all the files. LICENSE="Flite" +REVISION="2" SOURCE_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2" CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411" SOURCE_DIR="flite-${portVersion}-release" PATCHES="flite-$portVersion.patchset" -REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86 x86_gcc2" @@ -51,6 +51,10 @@ PROVIDES=" lib:libflite_cmulex$secondaryArchSuffix = $portVersion compat >= 2 lib:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2 " +REQUIRES=" + haiku$secondaryArchSuffix + " + PROVIDES_devel=" flite${secondaryArchSuffix}_devel = $portVersion devel:libflite$secondaryArchSuffix = $portVersion compat >= 2 @@ -67,10 +71,6 @@ PROVIDES_devel=" devel:libflite_cmulex$secondaryArchSuffix = $portVersion compat >= 2 devel:libflite_usenglish$secondaryArchSuffix = $portVersion compat >= 2 " - -REQUIRES=" - haiku$secondaryArchSuffix - " REQUIRES_devel=" haiku${secondaryArchSuffix}_devel flite$secondaryArchSuffix == $portVersion base diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe index 831e573fc..830a7000c 100644 --- a/haiku-apps/a_book/a_book-1.1.recipe +++ b/haiku-apps/a_book/a_book-1.1.recipe @@ -3,10 +3,11 @@ DESCRIPTION="You can use this application to organize upcoming events that \ you have scheduled. You can add tasks to any day and schedule reminders at \ particular times for them." HOMEPAGE="https://github.com/HaikuArchives/A-Book" -SOURCE_URI="git+https://github.com/HaikuArchives/A-Book.git#b52be13bbf3f2" -REVISION="3" COPYRIGHT="2002 Maurice Michalski" LICENSE="MIT" +REVISION="3" +SOURCE_URI="git+https://github.com/HaikuArchives/A-Book.git#b52be13bbf3f2" + ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" @@ -16,6 +17,7 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" haiku_devel " diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe index 4ff9f8e43..a4763c1cf 100644 --- a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe +++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe @@ -1,19 +1,18 @@ SUMMARY="Save image files as ASCII text art" -DESCRIPTION=" -The AalibTranslator for Haiku allows you to save image files as ASCII text art. -" +DESCRIPTION="The AalibTranslator for Haiku allows you to save image files \ +as ASCII text art." HOMEPAGE="https://github.com/noryb009/AalibTranslator/" -SOURCE_URI="git://github.com/noryb009/AalibTranslator.git#e69df6765106af986454611fa2c960e0ecdb1562" -LICENSE="MIT" COPYRIGHT="2013 Luke (noryb009)" +LICENSE="MIT" REVISION="1" +SOURCE_URI="git://github.com/noryb009/AalibTranslator.git#e69df6765106af986454611fa2c960e0ecdb1562" + ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" aalibtranslator = $portVersion app:AALIBTranslator = $portVersion " - REQUIRES=" haiku lib:libaa diff --git a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe index 5a818a417..8c2b3a1b0 100644 --- a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe +++ b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe @@ -2,10 +2,10 @@ SUMMARY="Tracker add-on to encrypt files using AES cipher" DESCRIPTION="AESAddOn is a Tracker add-on which adds the functionality of encrypting files \ with AES 128, 192, and 256 bit. It works only as a Tracker add-on." HOMEPAGE="https://github.com/HaikuArchives/AESAddOn" -SOURCE_URI="git://github.com/HaikuArchives/AESAddOn#78dd4c50634a97bbe04bd68479cedc114a14cb4d" -REVISION="1" -LICENSE="MIT" COPYRIGHT="2003 Jason Grenier" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="git://github.com/HaikuArchives/AESAddOn#78dd4c50634a97bbe04bd68479cedc114a14cb4d" ARCHITECTURES="!x86_gcc2 ?x86" #Resulting Tracker add-on doesn't seem to be working. @@ -16,18 +16,18 @@ PROVIDES=" " REQUIRES=" haiku - " + " BUILD_REQUIRES=" - haiku_devel - " - + haiku_devel + " BUILD_PREREQUIRES=" makefile_engine cmd:make cmd:gcc cmd:g++ " + BUILD() { cd src diff --git a/haiku-apps/album/album-0.9.4.recipe b/haiku-apps/album/album-0.9.4.recipe index 9880f4510..e486c91c5 100644 --- a/haiku-apps/album/album-0.9.4.recipe +++ b/haiku-apps/album/album-0.9.4.recipe @@ -1,15 +1,16 @@ SUMMARY="An image viewer/organiser designed for BeOS-compatible systems" -DESCRIPTION="Album is a file browsing and tagging utility for BeOS/Haiku.\ +DESCRIPTION="Album is a file browsing and tagging utility for BeOS/Haiku. \ The idea is to have a work pad for pictures from different locations so they \ may be viewed and tagged. The program is not limited to pictures and BFS (Be File System) volumes, \ although that makes most sense since some of the functionality has to do with \ file attributes." HOMEPAGE="http://users.volja.net/mkovac1/proj/album/" -SOURCE_URI="git+https://github.com/HaikuArchives/Album#5506328" -LICENSE="MIT" COPYRIGHT="2006-2015 by Matjaž Kovač" +LICENSE="MIT" REVISION="2" +SOURCE_URI="git+https://github.com/HaikuArchives/Album#5506328" + ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" @@ -20,6 +21,7 @@ REQUIRES=" haiku lib:libiptcdata$secondaryArchSuffix " + BUILD_REQUIRES=" haiku_devel devel:libiptcdata$secondaryArchSuffix diff --git a/haiku-apps/aplayer/aplayer-4.0_svn.recipe b/haiku-apps/aplayer/aplayer-4.0_svn.recipe index b7d18dc45..0e97ffba3 100644 --- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe +++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe @@ -1,13 +1,15 @@ SUMMARY="A player for Amiga modules and other formats" -DESCRIPTION="APlayer is a module player and can play a lot of different music file formats, from Amiga and elsewhere." +DESCRIPTION="APlayer is a module player and can play a lot of different \ +music file formats, from Amiga and elsewhere." HOMEPAGE="http://pulkomandy.tk/projects/APlayer" -SOURCE_URI="svn://pulkomandy.tk/APlayer/trunk" -REVISION="2" +COPYRIGHT="1994-2002 Polycode + 2011-2012 Adrien Destugues" LICENSE="Artistic" -COPYRIGHT=" - 1994-2002 Polycode - 2011-2012 Adrien Destugues -" +REVISION="2" +SOURCE_URI="svn://pulkomandy.tk/APlayer/trunk" +SOURCE_DIR="trunk" +PATCHES="aplayer.patch + aplayer_2.patch" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" @@ -17,25 +19,21 @@ PROVIDES=" app:APlayer = $portVersion lib:PolyKit = $portVersion lib:APlayerKit = $portVersion -" + " REQUIRES=" haiku$secondaryArchSuffix -" + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel -" + " BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make cmd:nasm$secondaryArchSuffix -" -SOURCE_DIR="trunk" + " -PATCHES=" - aplayer.patch - aplayer_2.patch -" BUILD() { cd Master diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe index 559c41cd0..b67b056cd 100644 --- a/haiku-apps/armyknife/armyknife-4.3.0.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -5,10 +5,11 @@ copy data to and from ID3 tags and attributes, and rename files according to \ attributes or fill attributes according to file name. Now also with support for cover art!" HOMEPAGE="https://github.com/HaikuArchives/ArmyKnife" -SOURCE_URI="git://github.com/HaikuArchives/ArmyKnife.git#49f9a12cf288b061449edf5049e5de6a6501093c" COPYRIGHT="2000-2001 Jason Burgess" LICENSE="MIT" REVISION="3" +SOURCE_URI="git://github.com/HaikuArchives/ArmyKnife.git#49f9a12cf288b061449edf5049e5de6a6501093c" + ARCHITECTURES="x86_gcc2 !x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 !x86" @@ -21,6 +22,7 @@ REQUIRES=" lib:libtag$secondaryArchSuffix lib:libsanta$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel taglib${secondaryArchSuffix}_devel diff --git a/haiku-apps/artpaint/artpaint-2.1.0git.recipe b/haiku-apps/artpaint/artpaint-2.1.0git.recipe index 7b405e608..245ed8576 100644 --- a/haiku-apps/artpaint/artpaint-2.1.0git.recipe +++ b/haiku-apps/artpaint/artpaint-2.1.0git.recipe @@ -5,13 +5,14 @@ The key design principle has been to let the user see what they are doing \ instead of just forcing them to type in some numbers and then hoping that \ the result will not be too far from the expected." HOMEPAGE="https://github.com/HaikuArchives/ArtPaint" -SOURCE_URI="https://github.com/HaikuArchives/ArtPaint/archive/3e4be5a29e2966b390d668b7e96ef3f7901fa001.tar.gz" -CHECKSUM_SHA256="2990682bb932f4fbd8f156511171ae09d61038eddfa88fc7646af715f6fc83d8" -SOURCE_DIR="ArtPaint-3e4be5a29e2966b390d668b7e96ef3f7901fa001" COPYRIGHT="2003 Heikki Suhonen 2009 Karsten Heimrich" LICENSE="MIT" REVISION="1" +SOURCE_URI="https://github.com/HaikuArchives/ArtPaint/archive/3e4be5a29e2966b390d668b7e96ef3f7901fa001.tar.gz" +CHECKSUM_SHA256="2990682bb932f4fbd8f156511171ae09d61038eddfa88fc7646af715f6fc83d8" +SOURCE_DIR="ArtPaint-3e4be5a29e2966b390d668b7e96ef3f7901fa001" + ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" @@ -21,6 +22,7 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" haiku_devel " diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe index 0e7433453..1f395f10d 100644 --- a/haiku-apps/backup/backup-0.0.1.recipe +++ b/haiku-apps/backup/backup-0.0.1.recipe @@ -1,12 +1,10 @@ SUMMARY="A backup application for Haiku" -DESCRIPTION=" -A backup application for Haiku. -" +DESCRIPTION="A backup application for Haiku." +HOMEPAGE="https://github.com/kallisti5/backup" COPYRIGHT="2013 Alexander von Gluck IV" LICENSE="MIT" -HOMEPAGE="https://github.com/kallisti5/backup" -SOURCE_URI="git+https://github.com/kallisti5/backup#4c01c5b6f0" REVISION="3" +SOURCE_URI="git+https://github.com/kallisti5/backup#4c01c5b6f0" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -18,7 +16,6 @@ PROVIDES=" BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe index cf10f3d95..702676c80 100644 --- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe +++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe @@ -5,10 +5,11 @@ multiplying as well as bitwise operators. You can choose the word size and \ whether the sign is considered to simulate any integral data type. Moreover \ the calculator supports binary, decimal and hexadecimal conversion." HOMEPAGE="http://github.com/HaikuArchives/BDH-Calc" -SOURCE_URI="git://github.com/HaikuArchives/BDH-Calc.git#6a3433a5fb558f592dd246b400221f2223770e75" -REVISION="1" -LICENSE="Zlib" COPYRIGHT="1999 Scott Hammond" +LICENSE="Zlib" +REVISION="1" +SOURCE_URI="git://github.com/HaikuArchives/BDH-Calc.git#6a3433a5fb558f592dd246b400221f2223770e75" + ARCHITECTURES="x86 x86_gcc2 ?x86_64" PROVIDES=" @@ -18,6 +19,7 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" haiku_devel " diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index 9e714ac16..2f9cddbc0 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -2,10 +2,12 @@ SUMMARY="A well featured audio editor" DESCRIPTION="BeAE is an audio editor with features like silencing, fading \ in/out, analyzing, etc." HOMEPAGE="https://github.com/HaikuArchives/BeAE" -SOURCE_URI="git+https://github.com/HaikuArchives/BeAE.git#a90a987" -REVISION="3" COPYRIGHT="2003 Xentronix" LICENSE="BSD (3-clause)" +REVISION="3" +SOURCE_URI="git+https://github.com/HaikuArchives/BeAE.git#a90a987" +SOURCE_DIR=beae-1.2 + ARCHITECTURES="x86_gcc2 !x86 ?x86_64" SECONDARY_ARCHITECTURES="!x86" @@ -16,6 +18,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -26,7 +29,6 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix " -SOURCE_DIR=beae-1.2 BUILD() { diff --git a/haiku-apps/beam/beam-1.2.recipe b/haiku-apps/beam/beam-1.2.recipe index 1654fe982..cabb53f64 100644 --- a/haiku-apps/beam/beam-1.2.recipe +++ b/haiku-apps/beam/beam-1.2.recipe @@ -1,17 +1,16 @@ SUMMARY="An e-mail client" -DESCRIPTION=" -Beam (BEware, Another Mailer) is an open source e-mail client for BeOS (R5 and \ -onwards) that aims to be fast, stable and feature-complete. -" +DESCRIPTION="Beam (BEware, Another Mailer) is an open source e-mail client \ +for BeOS (R5 and \ +onwards) that aims to be fast, stable and feature-complete." HOMEPAGE="http://github.com/olta/beam" - +COPYRIGHT="2000-2014 Oliver Tappe" +LICENSE="GNU GPL v2" +REVISION="2" SOURCE_URI="https://github.com/olta/beam/archive/v1.2.tar.gz" CHECKSUM_SHA256="c1cec0355e6771f398e685eceb65acbbfa948f24f2e60df877ed6007db1a4b6b" -REVISION="2" -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2014 Oliver Tappe" ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" beam = $portVersion app:Beam = $portVersion @@ -21,6 +20,7 @@ REQUIRES=" libpcre >= 8.00 lib:libssl " + BUILD_REQUIRES=" devel:liblayout >= 1.4.0 devel:libpcre