From 4b87f53b6ac3365dd029d90c979a05536c4cd2c7 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Wed, 26 Aug 2015 19:16:44 +0200 Subject: [PATCH] Mostly recipe cosmetics: improved SUMMARY/DESCRIPTION and re-ordering blocks and: * befar Remove unneeded $secondaryArchSuffix Use g++ * mirrormagic Remove unneeded $secondaryArchSuffix * slime_volley Replaced slime_volley with slimevolley in PROVIDES Add lib:libsdl_net in REQUIRES * super_transball Remove unneeded $secondaryArchSuffix Replaced super_transball with stransball2 in PROVIDES --- .../slime_volley/slime_volley-2.4.2.recipe | 29 +++++++------- .../super_transball-2.1.5.recipe | 38 +++++++++---------- .../mirrormagic/mirrormagic-2.0.2.recipe | 17 ++++----- haiku-apps/befar/befar-4.2_beta.recipe | 18 +++++---- haiku-apps/bepodder/bepodder-1.3.0.recipe | 28 +++++++------- .../blogpositive/blogpositive-0.4.0.recipe | 29 +++++++------- haiku-apps/chat/chat-20100903.recipe | 17 ++++----- haiku-apps/clockwerk/clockwerk-git.recipe | 27 ++++++------- haiku-apps/jammin/jammin-0.1.0.recipe | 22 +++++------ haiku-apps/mkdepend/mkdepend-1.7.recipe | 4 +- haiku-apps/netpulse/netpulse-0.2.3.recipe | 7 +++- 11 files changed, 116 insertions(+), 120 deletions(-) diff --git a/games-arcade/slime_volley/slime_volley-2.4.2.recipe b/games-arcade/slime_volley/slime_volley-2.4.2.recipe index 592199ffd..af134b271 100644 --- a/games-arcade/slime_volley/slime_volley-2.4.2.recipe +++ b/games-arcade/slime_volley/slime_volley-2.4.2.recipe @@ -1,21 +1,21 @@ -SUMMARY="A volley-ball game" -DESCRIPTION="Slime volley is a Volley ball simulation. You control a slime \ -(a semicircular blob) on which the ball bounces. Up to 6 players can play \ -Slime Volley, locally or through the network. An AI is also available if you \ -want to play alone. -" -LICENSE="GNU GPL v3" -ARCHITECTURES="x86_gcc2" -REVISION="1" -COPYRIGHT="2008-2014 VinDuv, McMic" +SUMMARY="A slimy volleyball game" +DESCRIPTION="Slime volley is a volleyball simulation in which you control a \ +slime (a semicircular blob) on which the ball bounces. Up to 6 players can \ +play Slime Volley, locally or over the network. Lone fighters can also \ +play against the computer." HOMEPAGE="http://slime.tuxfamily.org/" +COPYRIGHT="2008-2014 VinDuv, McMic" +LICENSE="GNU GPL v3" +REVISION="2" SOURCE_URI="http://slime.tuxfamily.org/down.php?id=1&os=src" SOURCE_FILENAME="slimevolley-$portVersion.tar.bz2" CHECKSUM_SHA256="be8f461c6f1188ba709b1fbcbe64edffca4b8eb358bd2ed8825f8ebf30e660d3" SOURCE_DIR="slimevolley" +ARCHITECTURES="x86_gcc2" + PROVIDES=" - slime_voley = $portVersion + slimevolley = $portVersion cmd:slimevolley " REQUIRES=" @@ -23,9 +23,12 @@ REQUIRES=" lib:libintl lib:libsdl lib:libsdl_image + lib:libsdl_net lib:libsdl_ttf " + BUILD_REQUIRES=" + haiku_devel devel:libintl devel:libsdl devel:libsdl_image @@ -33,7 +36,6 @@ BUILD_REQUIRES=" devel:libsdl_ttf " BUILD_PREREQUIRES=" - haiku_devel cmd:cmake cmd:gcc cmd:make @@ -41,7 +43,8 @@ BUILD_PREREQUIRES=" BUILD() { - cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DI10N_DIR=$dataDir/locale -DDATA_DIR=$dataDir/games/slimevolley + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DI10N_DIR=$dataDir/locale \ + -DDATA_DIR=$dataDir/games/slimevolley make $jobArgs } diff --git a/games-arcade/super_transball/super_transball-2.1.5.recipe b/games-arcade/super_transball/super_transball-2.1.5.recipe index 9df9da6c0..ee5152be5 100644 --- a/games-arcade/super_transball/super_transball-2.1.5.recipe +++ b/games-arcade/super_transball/super_transball-2.1.5.recipe @@ -1,34 +1,36 @@ SUMMARY="The sequel of Transball and Transball 2" -DESCRIPTION=" -\"Super Transball 2\" is the sequel of \"Transball\" and \"Transball 2\", \ -Inspired in THRUST type of games (and concretely in ZARA THRUSTA for the \ -Amiga 500). -In each level of Transball, the goal is to find the SPHERE, capture it \ -and carry it to the upper part of the level. The main obstacle is the \ -gravity, that impulses you towards the ground. But many other obstacles, \ -canons, tanks, doors, etc. will try to make difficult your journey... -" +DESCRIPTION="Super Transball 2 is inspired by 'thrust' type of games (and \ +especially by ZARA THRUSTA for the Amiga 500). +The goal of each level is to find the 'Sphere', capture it and carry it to \ +the upper part of the level. The main obstacle is the gravity that impulses \ +you towards the ground. Other obstacles like cannons, tanks, doors, etc. \ +will try to make your journey difficult as well..." HOMEPAGE="http://www2.braingames.getput.com/stransball2/default.asp" -LICENSE="GNU GPL v2" COPYRIGHT="2003-2005 Brain Games" +LICENSE="GNU GPL v2" +REVISION="2" SOURCE_URI="http://www2.braingames.getput.com/stransball2/downloads/stransball2-v15-windows.zip" CHECKSUM_SHA256="644cf89c8b7084abe0451ff433db25b41e43da77d5d92edad8253baf48b018db" -REVISION="1" +SOURCE_DIR="stransball2" +PATCHES="super_transball-$portVersion.patchset" + ARCHITECTURES="x86_gcc2" PROVIDES=" - super_transball = $portVersion - app:super_transball = $portVersion + stransball2 = $portVersion + app:stransball2 = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix + haiku lib:libsdl$secondaryArchSuffix lib:libSDL_image$secondaryArchSuffix lib:libSDL_mixer$secondaryArchSuffix lib:libSDL_sound$secondaryArchSuffix lib:libSGE$secondaryArchSuffix " + BUILD_REQUIRES=" + haiku_devel devel:libsdl$secondaryArchSuffix devel:libSDL_image$secondaryArchSuffix devel:libSDL_mixer$secondaryArchSuffix @@ -36,15 +38,11 @@ BUILD_REQUIRES=" devel:libSGE$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - haiku_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix + cmd:gcc + cmd:ld cmd:make " -SOURCE_DIR="stransball2" -PATCHES="super_transball-$portVersion.patchset" BUILD() { cd sources diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe index 1db5e5eeb..d705409eb 100644 --- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe +++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe @@ -1,14 +1,14 @@ SUMMARY="A game like Deflektor (C64) or Mindbender (Amiga)" -DESCRIPTION=" -Make the Laser reach the target by rotating mirrors, but take care of not \ -overheating. -" +DESCRIPTION="Make the laser reach the target by rotating mirrors. Beware of \ +overheating!" HOMEPAGE="http://www.artsoft.org/mirrormagic/" -LICENSE="GNU GPL v2" COPYRIGHT="1989-2003 Artsoft Entertainment" +LICENSE="GNU GPL v2" +REVISION="1" SOURCE_URI="http://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz" CHECKSUM_SHA256="79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2" -REVISION="1" +PATCHES="mirrormagic-2.0.2.patchset" + ARCHITECTURES="x86_gcc2" PROVIDES=" @@ -21,20 +21,19 @@ REQUIRES=" lib:libsdl_image$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix " + BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix devel:libsdl_mixer$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make " -PATCHES="mirrormagic-2.0.2.patchset" BUILD() { # parallel build not available. diff --git a/haiku-apps/befar/befar-4.2_beta.recipe b/haiku-apps/befar/befar-4.2_beta.recipe index 09da5d36b..f2d676a10 100644 --- a/haiku-apps/befar/befar-4.2_beta.recipe +++ b/haiku-apps/befar/befar-4.2_beta.recipe @@ -1,10 +1,12 @@ -SUMMARY="A filemanager for Haiku" -DESCRIPTION="Classic Norton Commander look with modern multithreading inside." +SUMMARY="A two-panel filemanager" +DESCRIPTION="A classic Norton Commander look with modern multithreading \ +inside." HOMEPAGE="https://github.com/HaikuArchives/BeFar" -SOURCE_URI="git://github.com/HaikuArchives/BeFar#2897e9658c" COPYRIGHT="1999-2001 Bazarov Max" LICENSE="Public Domain" REVISION="3" +SOURCE_URI="git://github.com/HaikuArchives/BeFar#2897e9658c" +SOURCE_DIR="$portVersionedName/source" ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -13,15 +15,17 @@ PROVIDES=" app:BeFAR = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix + haiku + " + +BUILD_REQUIRES=" + haiku_devel " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix + cmd:g++ cmd:make makefile_engine " -SOURCE_DIR="$portVersionedName/source" BUILD() { diff --git a/haiku-apps/bepodder/bepodder-1.3.0.recipe b/haiku-apps/bepodder/bepodder-1.3.0.recipe index 88f122e5a..7c61afe40 100644 --- a/haiku-apps/bepodder/bepodder-1.3.0.recipe +++ b/haiku-apps/bepodder/bepodder-1.3.0.recipe @@ -5,22 +5,20 @@ news published around the web in RSS format. It's a Podcaster software. BePodder includes many cool features: - * Easy to use yet powerful Graphical User Interface - * Handles all news/podcast feeds in RSS 0.9, 2.0, Atom, RDF and iTunes - * Fully integrated with BFS - * Integrated podcast, videoblog, imagefeeds, BitTorrentfeeds, newsfeeds and \ -Iternationalfeeds built-in OPML directories with thousands of feeds - * Advanced channels/lists management with drag and drop support - * Easy to integrate with other applications like BitTorrent / Installer / \ +- Easy to use yet powerful graphical user interface +- Handles all news/podcast feeds in RSS 0.9, 2.0, Atom, RDF and iTunes +- Fully integrated with Haiku's BFS file system +- Integrated podcast, videoblog, imagefeeds, BitTorrentfeeds, newsfeeds and \ +Internationalfeeds, built-in OPML directories with thousands of feeds +- Advanced channels/lists management with drag and drop support +- Easy to integrate with other applications like BitTorrent / Installer / \ Unzip / etc. - * Players integration with a new Auto option - * BePodder is 100% adwares/spywares free - * You don't need an iPod or any kind of MP3 player to use and enjoy BePodder - * The same licence-keyfile can be use on to unlock BeOS R5, Haiku and Zeta \ -version - * Proxy support - * Automatic channels check - * Up to 5 enclosure downloads at the same time (multi-threading)" +- Players integration with a new 'Auto' option +- BePodder is 100% adwares/spywares free +- You don't need an iPod or any kind of MP3 player to use and enjoy BePodder +- Proxy support +- Automatic channels check +- Up to 5 enclosure downloads at the same time (multi-threading)" HOMEPAGE="https://github.com/HaikuArchives/BePodder" COPYRIGHT="2006-2007 Funky Idea Software" LICENSE="MIT" diff --git a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe index 24cd889e8..3502fd73d 100644 --- a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe @@ -1,37 +1,36 @@ -SUMMARY="The one blog app to rule them all!" -DESCRIPTION="Want to blog, but WebPositive isn't quick enough? Now you can use\ -the new blog app: BlogPositive! It can connect to Wordpress, LiveJournal \ -and OnSugar blogs." +SUMMARY="An application for easy blogging" +DESCRIPTION="You want to blog, but WebPositive isn't quick enough? Now you \ +can use BlogPositive to connect to Wordpress, LiveJournal and OnSugar \ +blogs directly." HOMEPAGE="http://blogpositive.puckipedia.com" -SOURCE_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.4" -REVISION="2" -LICENSE="MIT" COPYRIGHT="2013 Puck Meerburg" +LICENSE="MIT" +REVISION="2" +SOURCE_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.4" + ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" blogpositive = $portVersion app:BlogPositive = $portVersion " - REQUIRES=" + haiku lib:libcurl lib:libz - haiku " +BUILD_REQUIRES=" + haiku_devel + devel:libcurl + devel:libz + " BUILD_PREREQUIRES=" makefile_engine cmd:g++ cmd:xres " -BUILD_REQUIRES=" - devel:libcurl - devel:libz - haiku_devel - " - USER_SETTINGS_FILES=" settings/BlogPositive directory " diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe index baaba4f7c..a3e54376d 100644 --- a/haiku-apps/chat/chat-20100903.recipe +++ b/haiku-apps/chat/chat-20100903.recipe @@ -1,16 +1,14 @@ SUMMARY="A XMPP client" -DESCRIPTION=" -Haiku Chat is tiny, about 300KB XMPP client. It supports core XMPP protocol, \ -multi-user chat, Google accounts, Psi bookmarks, In-band registration and \ -other features. It is written for Haiku, free open-source operating system \ -inspired by BeOS. Haiku Chat is simplest and smallest client that supports \ -XMPP Advanced Client 2009 profile. -" +DESCRIPTION="Chat is a tiny (about 300KiB) XMPP client. It supports core XMPP \ +protocol, multi-user chat, Google accounts, Psi bookmarks, In-band \ +registration and other features. Chat is the simplest and smallest client \ +that supports XMPP Advanced Client 2009 profile." HOMEPAGE="http://synrc.com/client/chat/haiku/" -SOURCE_URI="git+https://github.com/devaspot/chat.git" -LICENSE="MIT" COPYRIGHT="2010-2014 Maxim Sokhatsky" +LICENSE="MIT" REVISION="2" +SOURCE_URI="git+https://github.com/devaspot/chat.git" + ARCHITECTURES="x86_gcc2 x86" PROVIDES=" @@ -22,6 +20,7 @@ REQUIRES=" lib:libssl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe index c2153a432..3dfe635da 100644 --- a/haiku-apps/clockwerk/clockwerk-git.recipe +++ b/haiku-apps/clockwerk/clockwerk-git.recipe @@ -1,20 +1,16 @@ -SUMMARY="An open source media compositing tool" -DESCRIPTION="Clockwerk is an open source media compositing tool for the \ -Haiku platform. It had been in development from January 2006 to July 2008 \ +SUMMARY="A multimedia compositing tool" +DESCRIPTION="Clockwerk has been in development from January 2006 to July 2008 \ by Mindwork (www.mindwork.de) as one of the main in-house components of \ -an application suite to realize distributed multimedia playback on \ -Haiku client machines." - +an application suite to realize distributed multimedia playback on Haiku \ +client machines. +With Clockwerk you can combine audio, video and images for presentation or \ +save in any audio/video format supported by Haiku." HOMEPAGE="https://github.com/stippi/Clockwerk" -SOURCE_URI="git+https://github.com/stippi/Clockwerk.git#6eab4202c857c7dc6f21b6e3262cff0b503acb0e" - -REVISION="3" - +COPYRIGHT="2001-2009 Stephan Aßmus + 2000-2006 Ingo Weinhold" LICENSE="GNU GPL v2" -COPYRIGHT=" - 2001-2009 Stephan Aßmus - 2000-2006 Ingo Weinhold - " +REVISION="3" +SOURCE_URI="git+https://github.com/stippi/Clockwerk.git#6eab4202c857c7dc6f21b6e3262cff0b503acb0e" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -26,6 +22,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix @@ -42,7 +39,7 @@ USER_SETTINGS_FILES=" BUILD() { - jam -q $jobArgs + jam -q $jobArgs } INSTALL() diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe index ce593b893..6e961caf4 100644 --- a/haiku-apps/jammin/jammin-0.1.0.recipe +++ b/haiku-apps/jammin/jammin-0.1.0.recipe @@ -1,15 +1,14 @@ SUMMARY="The Jamfile Administrator" DESCRIPTION=" -The JamMin manages your jamfiles. Jamfiles are the thing that is most \ -important to the user, bacause they declare the targets that should be built. \ -Jamfiles are also used for organizing targets— each Jamfile is a separate \ -project that can be built independently from the other projects. -" +The JamMin manages jamfiles, because they are most important to the user, \ +as they declare the targets that should be built. Jamfiles are also \ +used for organizing targets - each Jamfile is a separate project that can \ +be built independently from the other projects." HOMEPAGE="https://github.com/HaikuArchives/JamMin" -SOURCE_URI="git+https://github.com/HaikuArchives/JamMin.git#85ce20ccc0" -REVISION="3" COPYRIGHT="2003 Guido Casiraghi" LICENSE="MIT" +REVISION="3" +SOURCE_URI="git+https://github.com/HaikuArchives/JamMin.git#85ce20ccc0" ARCHITECTURES="x86_gcc2 !x86 !x86_64" @@ -17,22 +16,19 @@ PROVIDES=" jammin = $portVersion app:JamMin = $portVersion " +REQUIRES=" + haiku + " BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc cmd:make " -REQUIRES=" - haiku - " - - BUILD() { cd source diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index af67b0b3c..69514d5ac 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -18,15 +18,15 @@ PROVIDES=" REQUIRES=" haiku " + BUILD_REQUIRES=" + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel cmd:gcc cmd:ld " - BUILD() { rc mkdepend.rdef diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe index d6ae38224..f72629c8f 100644 --- a/haiku-apps/netpulse/netpulse-0.2.3.recipe +++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe @@ -2,10 +2,10 @@ SUMMARY="A replicant showing the network status" DESCRIPTION="NetPulse is status replicant that gives an indication of data \ being sent or received over the network." HOMEPAGE="https://github.com/HaikuArchives/NetPulse" -SOURCE_URI="git://github.com/HaikuArchives/NetPulse#102c1cc" COPYRIGHT="2001 Carlos Hasan" LICENSE="MIT" REVISION="5" +SOURCE_URI="git://github.com/HaikuArchives/NetPulse#102c1cc" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -17,8 +17,11 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " -BUILD_PREREQUIRES=" + +BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" makefile_engine cmd:gcc$secondaryArchSuffix cmd:make