From f0165ec2a6e9f035a22afb2a439c884727ed11c1 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 4 Dec 2014 11:07:00 -0800 Subject: [PATCH 1/9] add TextSaver screensaver recipe --- haiku-apps/textsaver/textsaver-1.0.recipe | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/textsaver/textsaver-1.0.recipe diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe new file mode 100644 index 000000000..9f52bc9a0 --- /dev/null +++ b/haiku-apps/textsaver/textsaver-1.0.recipe @@ -0,0 +1,45 @@ +SUMMARY="TextSaver screensaver" +DESCRIPTION="Displays yout text at random locations in random colors." +SRC_URI="git+https://github.com/bbjimmy/TextSaver.git#1.0" +LICENSE="MIT" +COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton + ... FAT ELK SOFTWARE" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + sortsave = $portVersion + app:sortsave = $portVersion" + +REVISION="1" + +REQUIRES=" + haiku >= $haikuVersion" + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + makefile_engine" + +BUILD() +{ + cd source + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` +} + +INSTALL() +{ + + mkdir -p $addOnsDir/Screen\ Savers + cd source + cp TextSaver $addOnsDir/Screen\ Savers/sort-save + mkdir -p $dataDir/FatElk + cd .. + unzip -o fatelk + cp "FAT ELK" $dataDir/FatElk/ + cp "Fat Elk" $dataDir/FatElk/ + +} From 68b86bdb869cea418e3baf197adb0718a1792841 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 4 Dec 2014 11:33:41 -0800 Subject: [PATCH 2/9] Add Textsaver recipe --- haiku-apps/textsaver/textsaver-1.0.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe index 9f52bc9a0..86716e48f 100644 --- a/haiku-apps/textsaver/textsaver-1.0.recipe +++ b/haiku-apps/textsaver/textsaver-1.0.recipe @@ -1,5 +1,6 @@ SUMMARY="TextSaver screensaver" DESCRIPTION="Displays yout text at random locations in random colors." +HOMEPAGE="https://github.com/bbjimmy/TextSaver" SRC_URI="git+https://github.com/bbjimmy/TextSaver.git#1.0" LICENSE="MIT" COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton @@ -8,8 +9,8 @@ COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" - sortsave = $portVersion - app:sortsave = $portVersion" + testsaver = $portVersion + app:textsaver = $portVersion" REVISION="1" @@ -35,7 +36,7 @@ INSTALL() mkdir -p $addOnsDir/Screen\ Savers cd source - cp TextSaver $addOnsDir/Screen\ Savers/sort-save + cp TextSaver $addOnsDir/Screen\ Savers/TextSaver mkdir -p $dataDir/FatElk cd .. unzip -o fatelk From fe4b726f757f36b02630734a4867f791b14dbcf6 Mon Sep 17 00:00:00 2001 From: Jim Saxton Date: Fri, 5 Dec 2014 02:26:01 +0000 Subject: [PATCH 3/9] textsaver-1.0.recipe edited online with Bitbucket --- haiku-apps/textsaver/textsaver-1.0.recipe | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe index 86716e48f..d55855877 100644 --- a/haiku-apps/textsaver/textsaver-1.0.recipe +++ b/haiku-apps/textsaver/textsaver-1.0.recipe @@ -3,16 +3,17 @@ DESCRIPTION="Displays yout text at random locations in random colors." HOMEPAGE="https://github.com/bbjimmy/TextSaver" SRC_URI="git+https://github.com/bbjimmy/TextSaver.git#1.0" LICENSE="MIT" -COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton - ... FAT ELK SOFTWARE" +COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton, FAT ELK SOFTWARE" + +REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" testsaver = $portVersion - app:textsaver = $portVersion" + app:textsaver = $portVersion + " -REVISION="1" REQUIRES=" haiku >= $haikuVersion" @@ -23,12 +24,13 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc cmd:make - makefile_engine" + makefile_engine + " BUILD() { - cd source - make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + cd source + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() From 3b305df40b15845092183e8b4a84d38cb5b78a99 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 4 Dec 2014 21:43:23 -0800 Subject: [PATCH 4/9] change to the tar.gz url --- haiku-apps/textsaver/textsaver-1.0.recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe index d55855877..1852fd9e2 100644 --- a/haiku-apps/textsaver/textsaver-1.0.recipe +++ b/haiku-apps/textsaver/textsaver-1.0.recipe @@ -1,7 +1,10 @@ SUMMARY="TextSaver screensaver" DESCRIPTION="Displays yout text at random locations in random colors." HOMEPAGE="https://github.com/bbjimmy/TextSaver" -SRC_URI="git+https://github.com/bbjimmy/TextSaver.git#1.0" +SRC_URI="https://github.com/bbjimmy/TextSaver/archive/1.0.tar.gz" +CHECKSUM_SHA256="00ecaba878786fce07620946124bdb42ec52e9d1c597cc2a876355229a786747" +SOURCE_DIR="TextSaver-1.0" + LICENSE="MIT" COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton, FAT ELK SOFTWARE" From 5762b782cfd05de259cdf30441fc9ca415b602ed Mon Sep 17 00:00:00 2001 From: Jim Date: Fri, 5 Dec 2014 08:49:33 -0800 Subject: [PATCH 5/9] repair typeo, change copyright section. --- haiku-apps/textsaver/textsaver-1.0.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe index 1852fd9e2..f02a03927 100644 --- a/haiku-apps/textsaver/textsaver-1.0.recipe +++ b/haiku-apps/textsaver/textsaver-1.0.recipe @@ -1,12 +1,14 @@ SUMMARY="TextSaver screensaver" -DESCRIPTION="Displays yout text at random locations in random colors." +DESCRIPTION="Displays your text at random locations in random colors." HOMEPAGE="https://github.com/bbjimmy/TextSaver" SRC_URI="https://github.com/bbjimmy/TextSaver/archive/1.0.tar.gz" CHECKSUM_SHA256="00ecaba878786fce07620946124bdb42ec52e9d1c597cc2a876355229a786747" SOURCE_DIR="TextSaver-1.0" LICENSE="MIT" -COPYRIGHT="2002 Marcus Overhagen, 2004-2013 Jim Saxton, FAT ELK SOFTWARE" +COPYRIGHT="2002 Marcus Overhagen + 2004-2013 Jim Saxton, FAT ELK SOFTWARE +" REVISION="1" @@ -17,7 +19,6 @@ PROVIDES=" app:textsaver = $portVersion " - REQUIRES=" haiku >= $haikuVersion" From 5ec7c9b5cd3ece20ed7e63151df407e98125dfab Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Fri, 5 Dec 2014 19:27:31 +0100 Subject: [PATCH 6/9] Add recipe for Peek --- haiku-apps/peek/peek-20140206.recipe | 47 ++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 haiku-apps/peek/peek-20140206.recipe diff --git a/haiku-apps/peek/peek-20140206.recipe b/haiku-apps/peek/peek-20140206.recipe new file mode 100644 index 000000000..40d499dfc --- /dev/null +++ b/haiku-apps/peek/peek-20140206.recipe @@ -0,0 +1,47 @@ +SUMMARY="Image browser" +DESCRIPTION=" +Peek is a free image browser and viewer with the aim of of being small, fast, \ +efficient, very functional and intuitive. +" +HOMEPAGE="https://github.com/HaikuArchives/Peek" +SRC_URI="git+https://github.com/HaikuArchives/Peek.git#ce06fe5" +REVISION="1" +COPYRIGHT="2001 Durand John Miller" +LICENSE="BSD (3-clause)" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + peek = $portVersion + app:Peek = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:mkdepend + cmd:make + cmd:gcc + cmd:g++ + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + cd source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir/Peek + cp source/objects/Peek $appsDir/Peek/Peek + cp -r languages $appsDir/Peek/ + addAppDeskbarSymlink $appsDir/Peek/Peek +} From db2f18c1264a1dbc0415f74a62e6133c062b59b1 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 5 Dec 2014 11:59:41 -0500 Subject: [PATCH 7/9] ResourceEdit: create working recipe. --- .../resourceedit/resourceedit-1.0_git.recipe | 46 ++++++++++++++++ haiku-apps/resourceedit/resourceedit-1.recipe | 52 ------------------- 2 files changed, 46 insertions(+), 52 deletions(-) create mode 100644 haiku-apps/resourceedit/resourceedit-1.0_git.recipe delete mode 100644 haiku-apps/resourceedit/resourceedit-1.recipe diff --git a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe new file mode 100644 index 000000000..d1b8a0cc2 --- /dev/null +++ b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe @@ -0,0 +1,46 @@ +SUMMARY="Graphical RSRC resource editor" +DESCRIPTION="An editor for binary resource files (.rsrc) that get compiled \ +into an application and can then be used within the application." +HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit" +LICENSE="MIT" +COPYRIGHT="2012-2013 Tri-Edge AI" +SRC_URI="https://github.com/HaikuArchives/ResourceEdit/archive/8c3f779d08525ed1e607627213278436a0502125.tar.gz" +CHECKSUM_SHA256="848b4e6d8a30737793d858d95360d33219efa615635b0b79c845bc4b78f6a64b" +SOURCE_DIR="ResourceEdit-8c3f779d08525ed1e607627213278436a0502125" +REVISION="1" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + resourceedit = $portVersion + app:ResourceEdit = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd source + mkdir -p $appsDir + cp objects/ResourceEdit $appsDir + addAppDeskbarSymlink $appsDir/ResourceEdit +} diff --git a/haiku-apps/resourceedit/resourceedit-1.recipe b/haiku-apps/resourceedit/resourceedit-1.recipe deleted file mode 100644 index 76bd028e5..000000000 --- a/haiku-apps/resourceedit/resourceedit-1.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION=" -This is an editor for resource files (.rsrc), binary files that get compiled \ -into an application and can then be accessed by that application. -" -SUMMARY="Resource editor" -HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit" -LICENSE="MIT" -COPYRIGHT="2012-2013 Tri-Edge AI" -SRC_URI="git+https://github.com/HaikuArchives/ResourceEdit.git#1873c33591e2d2ccb3dccb692c175e9f10a0e450" -REVISION="1" - -ARCHITECTURES="!x86 ?x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - # x86_gcc2 is fine as primary target architecture as long as we're building - # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -else - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" -fi -SECONDARY_ARCHITECTURES="!x86" - -PROVIDES=" - resourceedit$secondaryArchSuffix = $portVersion - app:ResourceEdit = $portVersion - " - -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:mkdepend - " - -BUILD() -{ - make -} - -INSTALL() -{ - # supports "x86" architecture only - mkdir $appsDir - cp objects.x86-gcc4-release/ResourceEdit $appsDir - addAppDeskbarSymlink $appsDir/ResourceEdit -} From 20f32e787327c14016588adcf2dad2d0f7e193e7 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 5 Dec 2014 22:41:24 -0500 Subject: [PATCH 8/9] sword: fix some stupid typos. Someone needs to be more careful next time... --- app-text/sword/sword-1.7.3.recipe | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe index 836e1dd43..2fea2020d 100644 --- a/app-text/sword/sword-1.7.3.recipe +++ b/app-text/sword/sword-1.7.3.recipe @@ -1,24 +1,28 @@ -SUMMARY="the biblical text research engine" - +SUMMARY="The biblical text research engine" DESCRIPTION="The SWORD Project is the CrossWire Bible Society's free Bible \ software project. Its purpose is to create cross-platform open-source tools-- \ covered by the GNU General Public License-- that allow programmers and Bible \ societies to write new Bible software more quickly and easily. We also create \ Bible study software for all readers, students, scholars, and translators of \ -the Bible, and have a growing collection of over 200 texts in over 50 languages -" - +the Bible, and have a growing collection of over 200 texts in over 50 languages." HOMEPAGE="http://www.crosswire.org/sword" LICENSE="GNU GPL v2" -COPYRIGHT="Copyright 1998-2014 CrossWire Bible Society" +COPYRIGHT="1998-2014 CrossWire Bible Society" SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz" CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea" -REVISION="1" -ARCHITECTURES="x86_gcc2 x86" +REVISION="2" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - libsword$secondaryArchSuffix = $portVersion + sword$secondaryArchSuffix = $portVersion cmd:diatheke$secondaryArchSuffix = $portVersion cmd:imp2gbs$secondaryArchSuffix = $portVersion cmd:imp2ld$secondaryArchSuffix = $portVersion @@ -36,7 +40,6 @@ PROVIDES=" cmd:vs2osisreftxt$secondaryArchSuffix = $portVersion cmd:xml2gbs$secondaryArchSuffix = $portVersion lib:libsword$secondaryArchSuffix = $portVersion - lib:libsword$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -44,7 +47,7 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix - lib:libz$libcrypto$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -66,7 +69,6 @@ BUILD_PREREQUIRES=" BUILD() { - echo true runConfigure ./configure --without-conf --without-clucene make $jobArgs } From ada1decfb323aa66652c2f96acf9e449bb454684 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 5 Dec 2014 23:42:20 -0500 Subject: [PATCH 9/9] sword: create devel package. --- app-text/sword/sword-1.7.3.recipe | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe index 2fea2020d..1ea0242ac 100644 --- a/app-text/sword/sword-1.7.3.recipe +++ b/app-text/sword/sword-1.7.3.recipe @@ -10,7 +10,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="1998-2014 CrossWire Bible Society" SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz" CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea" -REVISION="2" +REVISION="3" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -41,6 +41,11 @@ PROVIDES=" cmd:xml2gbs$secondaryArchSuffix = $portVersion lib:libsword$secondaryArchSuffix = $portVersion " + +PROVIDES_devel=" + sword${secondaryArchSuffix}_devel = $portVersion + devel:libsword$secondaryArchSuffix = $portVersion + " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -50,6 +55,11 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + sword$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libcurl$secondaryArchSuffix @@ -76,4 +86,10 @@ BUILD() INSTALL() { make $jobArgs install + + prepareInstalledDevelLibs \ + libsword + + packageEntries devel \ + $developDir }