From acd33012126e720f65a721269ccdbef6b2f313bf Mon Sep 17 00:00:00 2001 From: Jim Date: Mon, 22 Jun 2015 12:26:13 -0700 Subject: [PATCH] update yab to 1.7.5, update yab-IDE to 2.2.5 --- .../{yab-1.7.4.5.recipe => yab-1.7.5.recipe} | 28 +++++++++++++------ ...de-2.2.4.4.recipe => yab_ide-2.2.5.recipe} | 18 ++++++------ 2 files changed, 27 insertions(+), 19 deletions(-) rename dev-lang/yab/{yab-1.7.4.5.recipe => yab-1.7.5.recipe} (67%) rename haiku-apps/yab_ide/{yab_ide-2.2.4.4.recipe => yab_ide-2.2.5.recipe} (80%) diff --git a/dev-lang/yab/yab-1.7.4.5.recipe b/dev-lang/yab/yab-1.7.5.recipe similarity index 67% rename from dev-lang/yab/yab-1.7.4.5.recipe rename to dev-lang/yab/yab-1.7.5.recipe index 78722d2e7..c7153e7ed 100644 --- a/dev-lang/yab/yab-1.7.4.5.recipe +++ b/dev-lang/yab/yab-1.7.5.recipe @@ -4,8 +4,8 @@ yab is an extended version of yabasic, a BASIC programming language, with \ special commands designed for Haiku. " HOMEPAGE="http://yab.orgfree.com" -SRC_URI="https://github.com/bbjimmy/YAB/archive/1.7.4.5.tar.gz" -CHECKSUM_SHA256="c3863ced3937add92e968bbbe437b5ce1d8306516e672ca319b866053899b825" +SRC_URI="https://github.com/bbjimmy/YAB/archive/1.7.5.tar.gz" +CHECKSUM_SHA256="45ea5fccd6ec0989e93bdb4dc31c271cf8eb8f39cce9ca9c2f4ab02f3ee8cc10" REVISION="1" LICENSE="Artistic" @@ -18,8 +18,13 @@ COPYRIGHT=" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - yab = $portVersion - cmd:yab= $portVersion + yab=$portVersion + cmd:yab= $portVersion + libyab=$portVersion + lib:libyab=$portVersion + " +PROVIDES_devel=" + devel:libyab=$portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -34,24 +39,29 @@ BUILD_PREREQUIRES=" cmd:make cmd:mkdepend " -SOURCE_DIR=YAB-1.7.4.5 +SOURCE_DIR=YAB-1.7.5 BUILD() { mkdir -p tmp cp -r src/* tmp cd tmp - make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` - ./fixattributes.sh + make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() { mkdir -p $binDir - cp tmp/yab $binDir/ + mkdir -p $libDir mkdir -p $appsDir/yab-IDE + cp tmp/yab $binDir/ + cp tmp/libyab.so $libDir/ cp -r src $appsDir/yab-IDE/src + cp tmp/bison.h $appsDir/yab-IDE/src/ cp -r Documentation $appsDir/yab-IDE/Documentation mkdir -p $documentationDir - ln -s $appsDir/yab-IDE/Documentation $documentationDir/yab-1.7.4.4 + ln -s $appsDir/yab-IDE/Documentation $documentationDir/yab-1.7.6 + prepareInstalledDevelLibs libyab + + } diff --git a/haiku-apps/yab_ide/yab_ide-2.2.4.4.recipe b/haiku-apps/yab_ide/yab_ide-2.2.5.recipe similarity index 80% rename from haiku-apps/yab_ide/yab_ide-2.2.4.4.recipe rename to haiku-apps/yab_ide/yab_ide-2.2.5.recipe index ab2555b5e..793acda54 100644 --- a/haiku-apps/yab_ide/yab_ide-2.2.4.4.recipe +++ b/haiku-apps/yab_ide/yab_ide-2.2.5.recipe @@ -7,15 +7,13 @@ yab wouldn't be complete without the yab-IDE, a powerful development \ environment, which of course is programmed in yab itself. " HOMEPAGE="http://yab.orgfree.com" -SRC_URI="https://github.com/bbjimmy/YAB/archive/1.7.4.5.tar.gz" -CHECKSUM_SHA256="c3863ced3937add92e968bbbe437b5ce1d8306516e672ca319b866053899b825" +SRC_URI="https://github.com/bbjimmy/YAB/archive/1.7.5.tar.gz" +CHECKSUM_SHA256="45ea5fccd6ec0989e93bdb4dc31c271cf8eb8f39cce9ca9c2f4ab02f3ee8cc10" REVISION="1" LICENSE="Artistic" COPYRIGHT=" - 1995-2006 Marc-Oliver Ihm (yabasic) - 2006-2009 Jan Bungeroth (yab improvements) - 2013-2015 Jim Saxton (yab improvements) + 2006-2015 Jan Bungeroth " ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -27,13 +25,15 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix - yab$secondaryArchSuffix >= 1.7.4.4 + yab$secondaryArchSuffix >= 1.7.5 devel:libz$secondaryArchSuffix " # devel:libz$secondaryArchSuffix is needed both to build and for the BuildFactory to do its work. + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix + devel:libyab$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:bison @@ -41,14 +41,14 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:mkdepend + cmd:yab " -SOURCE_DIR=YAB-1.7.4.5 +SOURCE_DIR=YAB-1.7.5 BUILD() { pushd src make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` - fixattributes.sh popd pushd yab-IDE/BuildFactory gcc -o yab-compress yab-compress.c -lz @@ -67,10 +67,8 @@ BUILD() INSTALL() { - mkdir -p $binDir mkdir -p $appsDir cp -r yab-IDE/ $appsDir/ cp tmp/buildfactory/yab-IDE $appsDir/yab-IDE/ - cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/ addAppDeskbarSymlink $appsDir/yab-IDE/yab-IDE "Yab IDE" }