From e93a3bfd17605cc9cef246f20d8171b6d86b52ef Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 13:50:12 +0000 Subject: [PATCH 001/326] Added cmd:huge_app --- dev-cpp/hugen/hugen-1.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index ccbbc4733..4a6c4807b 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -17,6 +17,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" hugen$secondaryArchSuffix = $portVersion cmd:hugen$secondaryArchSuffix = $portVersion + cmd:hugen_app = $portVersion " REQUIRES=" From 47b47edd0764b704380b7ad1231c886d63a9e309 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 13:55:48 +0000 Subject: [PATCH 002/326] Removed cmd:hugen_app --- dev-cpp/hugen/hugen-1.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 4a6c4807b..ccbbc4733 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -17,7 +17,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" hugen$secondaryArchSuffix = $portVersion cmd:hugen$secondaryArchSuffix = $portVersion - cmd:hugen_app = $portVersion " REQUIRES=" From 6211bc60f66a2e63e161c314e45a1930e8c0a41d Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 3 Dec 2014 17:28:01 +0000 Subject: [PATCH 003/326] Update cdrtools to 3.01 a25 --- app-cdr/cdrtools/cdrtools-3.01~a25.recipe | 159 ++++++++++++++++ .../cdrtools/patches/cdrtools-3.01~a25.patch | 171 ++++++++++++++++++ 2 files changed, 330 insertions(+) create mode 100644 app-cdr/cdrtools/cdrtools-3.01~a25.recipe create mode 100644 app-cdr/cdrtools/patches/cdrtools-3.01~a25.patch diff --git a/app-cdr/cdrtools/cdrtools-3.01~a25.recipe b/app-cdr/cdrtools/cdrtools-3.01~a25.recipe new file mode 100644 index 000000000..c608b18db --- /dev/null +++ b/app-cdr/cdrtools/cdrtools-3.01~a25.recipe @@ -0,0 +1,159 @@ +SUMMARY="A highly portable CD/DVD/BluRay command line recording software" +DESCRIPTION=" +Cdrtools is a set of command line programs that allows to record CD/DVD/BluRay \ +media. +The suite includes the following programs: +- cdrecord A CD/DVD/BD recording program +- readcd A program to read CD/DVD/BD media with CD-clone features +- cdda2wav The most evolved CD-audio extraction program with paranoia support +- mkisofs A program to create hybrid ISO9660/JOLIET/HFS filesystes with \ +optional Rock Ridge attributes +- isodebug A program to print mkisofs debug information from media +- isodump A program to dump ISO-9660 media +- isoinfo A program to analyse/verify ISO/9660/Joliet/Rock-Ridge Filesystems +- isovfy A program to verify the ISO-9660 structures +- rscsi A Remote SCSI enabling daemon +" +HOMEPAGE="http://cdrecord.berlios.de" +COPYRIGHT=" + 1993-1997 Eric Youngdale, 1997-2010 J. Schilling (mkisofs) + 1995-2013 J. Schilling (cdrecord) + " +LICENSE=" + GNU GPL v2 + CDDL v1 + " +SRC_URI="http://sourceforge.net/projects/cdrtools/files/alpha/cdrtools-3.01a25.tar.bz2" +CHECKSUM_SHA256="12c555263c9b56d83ea104918c0c6c7df41c3dd51206ae1986e88aed892b29be" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PATCHES='cdrtools-3.01~a25.patch' + +PROVIDES=" + cdrtools = $portVersion compat >= 3 + cmd:devdump = $portVersion compat >= 3 + cmd:rscsi = $portVersion compat >= 3 + cmd:scgcheck = $portVersion compat >= 3 + cmd:mkisofs = $portVersion compat >= 3 + cmd:btcflash = $portVersion compat >= 3 + cmd:scgskeleton = $portVersion compat >= 3 + cmd:isovfy = $portVersion compat >= 3 + cmd:readcd = $portVersion compat >= 3 + cmd:isodebug = $portVersion compat >= 3 + cmd:cdda2mp3 = $portVersion compat >= 3 + cmd:cdda2ogg = $portVersion compat >= 3 + cmd:cdda2wav = $portVersion compat >= 3 + cmd:mkhybrid = $portVersion compat >= 3 + cmd:cdrecord = $portVersion compat >= 3 + cmd:isodump = $portVersion compat >= 3 + cmd:isoinfo = $portVersion compat >= 3 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:gcc + cmd:grep + cmd:ld + cmd:make + cmd:sed + " + +GLOBAL_WRITABLE_FILES=" + settings/cdrecord keep-old + settings/rscsi keep-old + " + +SOURCE_DIR="cdrtools-3.01" + +patchInsdir() +{ + # Usage: patchInsdir ... + oldDir=$1 + newDir=$2 + shift 2 + + sed -i "s,^INSDIR=\s*$oldDir,INSDIR= $newDir," $@ +} + +PATCH() +{ + allMakefiles="$(find . -name Makefile\*) $(find . -name \*.mk)" + + patchInsdir bin $relativeBinDir $allMakefiles + patchInsdir sbin $relativeBinDir $allMakefiles + patchInsdir share/doc $relativeDocDir $allMakefiles + patchInsdir include $relativeIncludeDir $allMakefiles + patchInsdir lib $relativeLibDir $allMakefiles + patchInsdir etc/default settings $allMakefiles + + sed -i "s,/etc/default,$sysconfDir," \ + btcflash/btcflash.1 \ + cdda2wav/cdda2mp3 \ + cdda2wav/cdda2ogg \ + cdda2wav/cdda2*.1 \ + cdrecord/COPYING \ + cdrecord/README.* \ + cdrecord/auinfo.c \ + cdrecord/cdrecord.1 \ + doc/*.man \ + doc/*.ps \ + include/schily/deflts.h \ + libcdrdeflt/cdrdeflt.c \ + libcdrdeflt/cdrdeflt.h \ + mkisofs/diag/isoinfo.8 \ + readcd/readcd.1 \ + rscsi/rscsi.1 \ + rscsi/rscsi.c \ + scgskeleton/scgskeleton.1 +} + +BUILD() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir + # not multi-job safe +} + +INSTALL() +{ + make GMAKE_NOWARN=true INS_BASE=$prefix INS_RBASE=$prefix LDPATH="" \ + RUNPATH="" DEFMANBASE=$relativeDocumentationDir install + + # The whole lib folder only contains static libraries (even in several + # subdirectories). + mkdir -p $developLibDir + mv $libDir/* $developLibDir/ + rmdir $libDir + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + cdrtools_devel = $portVersion + devel:libcdrdeflt = $portVersion compat >= 3 + devel:libedc_ecc = $portVersion compat >= 3 + devel:libedc_ecc_dec = $portVersion compat >= 3 + devel:libdeflt = $portVersion compat >= 3 + devel:libfile = $portVersion compat >= 3 + devel:libfind = $portVersion compat >= 3 + devel:libhfs = $portVersion compat >= 3 + devel:libmdigest = $portVersion compat >= 3 + devel:libparanoia = $portVersion compat >= 3 + devel:librscg = $portVersion compat >= 3 + devel:libscg = $portVersion compat >= 3 + devel:libsiconv = $portVersion compat >= 3 + devel:libscgcmd = $portVersion compat >= 3 + devel:libschily = $portVersion compat >= 3 + " +REQUIRES_devel=" + cdrtools == $portVersion + " diff --git a/app-cdr/cdrtools/patches/cdrtools-3.01~a25.patch b/app-cdr/cdrtools/patches/cdrtools-3.01~a25.patch new file mode 100644 index 000000000..2ede43e04 --- /dev/null +++ b/app-cdr/cdrtools/patches/cdrtools-3.01~a25.patch @@ -0,0 +1,171 @@ +diff -urN cdrtools-3.01/DEFAULTS/Defaults.haiku cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +--- cdrtools-3.01/DEFAULTS/Defaults.haiku ++++ cdrtools-3.01-haiku/DEFAULTS/Defaults.haiku +@@ -29,16 +29,16 @@ + CWARNOPTS= + + DEFINCDIRS= $(SRCROOT)/include + DEFOSINCDIRS= +-LDPATH= -L/opt/schily/lib ++LDPATH= -L$(shell finddir B_SYSTEM_LIB_DIRECTORY) + #RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib -R$(OLIBSDIR) +-RUNPATH= -R$(INS_BASE)/lib -R/opt/schily/lib ++RUNPATH= -R$(INS_BASE)/lib + + ########################################################################### + # + # Installation config stuff + # + ########################################################################### +-INS_BASE= /boot/opt/schily ++INS_BASE= $(shell finddir B_SYSTEM_DIRECTORY) + INS_KBASE= / + INS_RBASE= / + # +diff -urN cdrtools-3.01/RULES/x86_64-haiku-cc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-cc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-cc.rul 2012-12-08 19:24:57.418643968 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-cc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -urN cdrtools-3.01/RULES/x86_64-haiku-gcc.rul cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul +--- cdrtools-3.01/RULES/x86_64-haiku-gcc.rul 1970-01-01 00:00:00.000000000 +0000 ++++ cdrtools-3.01-haiku/RULES/x86_64-haiku-gcc.rul 2012-12-08 19:24:57.421265408 +0000 +@@ -0,0 +1,54 @@ ++#ident "@(#)bepc-haiku-gcc.rul 1.3 09/02/05 " ++########################################################################### ++# Written 1996 by J. Schilling ++########################################################################### ++# ++# Platform dependent MACROS for Haiku, a BeOS like OS ++# ++########################################################################### ++# Copyright (c) J. Schilling ++########################################################################### ++# The contents of this file are subject to the terms of the ++# Common Development and Distribution License, Version 1.0 only ++# (the "License"). You may not use this file except in compliance ++# with the License. ++# ++# See the file CDDL.Schily.txt in this distribution for details. ++# ++# When distributing Covered Code, include this CDDL HEADER in each ++# file and include the License file CDDL.Schily.txt from this distribution. ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/rules.prg ++########################################################################### ++include $(SRCROOT)/$(RULESDIR)/cc-gcc.rul ++ ++# ++# XXX Old BeOS needs libroot.so to get [efg]cvt() ++# XXX New BeOS seems to have this in libc and in addition we include ++# XXX strtod.c for floating point conversion on OS without such code. ++# XXX For this reason, -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS has been ++# XXX removed and printing floating numbers will work with old/new BeOS ++# ++#OSDEFS += -DNO_FLOATINGPOINT -DUSE_FLOATINGARGS ++OSDEFS += ++ ++KDEFINES= -DKERNEL -D_KERNEL ++ ++#CONFFLAGS= i586 ++ ++LIB_PREFIX= lib ++LIB_SUFFIX= .a ++SHL_SUFFIX= .so ++ ++#LIB_SOCKET= -lsocket -lbind ++LIB_SOCKET= -lnetwork ++LIB_MATH= ++LIB_KVM= ++ ++#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH:-R%=-Wl,-R%) ++LDOPTS= $(LIBS_PATH) $(LDPATH) ++ ++LORDER= echo ++TSORT= cat ++ ++LN= /bin/ln -s +diff -up cdrtools-3.01/libscg/scsi-beos.c.orig cdrtools-3.01/libscg/scsi-beos.c +--- cdrtools-3.01/libscg/scsi-beos.c.orig 2009-06-30 12:34:03.022282240 -0600 ++++ cdrtools-3.01/libscg/scsi-beos.c 2012-07-19 18:25:01.146800640 -0600 +@@ -292,7 +292,11 @@ scgo_havebus(scgp, busno) + char buf[128]; + + if (busno < 8) ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), "/dev/disk/scsi/%d", busno); ++#else + js_snprintf(buf, sizeof (buf), "/dev/bus/scsi/%d", busno); ++#endif + else + #ifdef __HAIKU__ + js_snprintf(buf, sizeof (buf), "/dev/disk/atapi/%d", busno-8); +@@ -320,9 +324,15 @@ scgo_fileno(scgp, busno, tgt, tlun) + return (f->fd); + } + if (busno < 8) { ++#ifdef __HAIKU__ ++ js_snprintf(buf, sizeof (buf), ++ "/dev/disk/scsi/%d/%d/%d/raw", ++ busno, tgt, tlun); ++#else + js_snprintf(buf, sizeof (buf), + "/dev/bus/scsi/%d/%d/%d/raw", + busno, tgt, tlun); ++#endif + } else { + char *tgtstr = (tgt == 0) ? "master" : (tgt == 1) ? "slave" : "dummy"; + js_snprintf(buf, sizeof (buf), From 38f5ddce5954bdac3c7e606d20520cfcaa254fc2 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 9 Dec 2014 14:08:20 -0500 Subject: [PATCH 004/326] HaikuTwitter: update from BEP to recipe. Does not build as HaikuTwitter itself needs to be upgraded to use a newer version of TwitCurl. --- .../haikutwitter/haikutwitter-1.0.recipe | 20 ------- .../haikutwitter/haikutwitter-1.0_git.recipe | 55 +++++++++++++++++++ 2 files changed, 55 insertions(+), 20 deletions(-) delete mode 100644 haiku-apps/haikutwitter/haikutwitter-1.0.recipe create mode 100644 haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0.recipe deleted file mode 100644 index 69e242081..000000000 --- a/haiku-apps/haikutwitter/haikutwitter-1.0.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="Twitter client for Haiku OS" -HOMEPAGE="http://code.google.com/p/haikutwitter/" -SRC_URI="svn+http://haikutwitter.googlecode.com/svn/tags/1.0/HaikuTwitter" -REVISION="1" -STATUS_HAIKUE="broken" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." -DEPEND="net-misc/curl >= 7.26.0" -BUILD() -{ - cd haikutwitter-1.0 - make -} - -INSTALL() -{ - cd haikutwitter-1.0 - make install -} -LICENSE="MIT" -COPYRIGHT="2010-2012 Martin Hebnes Pedersen" diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe new file mode 100644 index 000000000..f4f974d05 --- /dev/null +++ b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe @@ -0,0 +1,55 @@ +SUMMARY="Native Twitter client for Haiku" +DESCRIPTION="HaikuTwitter is an open-source Twitter client for Haiku. It's \ +based off the open-source TwitCurl library." +COPYRIGHT="2012 Martin Pedersen" +LICENSE="MIT" +HOMEPAGE="https://github.com/HaikuArchives/HaikuTwitter" +SRC_URI="https://github.com/HaikuArchives/HaikuTwitter/archive/a9241f8de96e8427ddc12c947dadcfc6350c1124.tar.gz" +CHECKSUM_SHA256="2b5f1906cea0d863ac3dca5a2d064cfeb28f99c2880eaf1b5e69e9197ac351a1" +SOURCE_DIR="HaikuTwitter-a9241f8de96e8427ddc12c947dadcfc6350c1124" +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" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + haikutwitter$secondaryArchSuffix = $portVersion + app:HaikuTwitter = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libcurl$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libcurl$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:mkdepend + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp objects/HaikuTwitter $appsDir + + addAppDeskbarSymlink $appsDir/HaikuTwitter +} From a1d2a10ce82c1ff027206f594821e7332b7b71f1 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 9 Dec 2014 20:24:01 +0100 Subject: [PATCH 005/326] becheckers: Fix the build --- haiku-games/becheckers/becheckers-1.0.1.recipe | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe index 525258e52..b1479ef31 100644 --- a/haiku-games/becheckers/becheckers-1.0.1.recipe +++ b/haiku-games/becheckers/becheckers-1.0.1.recipe @@ -4,10 +4,10 @@ BeCheckers is a simple checkers game for two players. It follows almost all \ American Checker Federation (ACF) rules. " HOMEPAGE="https://github.com/HaikuArchives/BeCheckers" -SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#930d3e37339c4570d58e59c3300dba7d69dd4439" +SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#d4fbfc69656ba5861184d37f7932b9a53ff28373" LICENSE="MIT" COPYRIGHT="2000 Jeremy J. Gibbons" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" @@ -28,7 +28,6 @@ BUILD_PREREQUIRES=" BUILD() { - cd trunk g++ -o BeCheckers -lbe \ BeCheckers.cpp BeCheckersWindow.cpp \ Checker.cpp CheckerBoard.cpp @@ -37,6 +36,6 @@ BUILD() INSTALL() { mkdir -p $appsDir - cp trunk/BeCheckers $appsDir + cp BeCheckers $appsDir addAppDeskbarSymlink $appsDir/BeCheckers } From 6b67396578a7622a9bc0bd885d4720f1ff717712 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 21:29:20 +0000 Subject: [PATCH 006/326] Switched install directory of python files to correct directory --- dev-cpp/hugen/hugen-1.recipe | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index ccbbc4733..887b33bb7 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -23,8 +23,10 @@ REQUIRES=" cmd:python$secondaryArchSuffix " BUILD_REQUIRES=" + cmd:python " BUILD_PREREQUIRES=" + cmd:python " BUILD() @@ -35,8 +37,9 @@ BUILD() INSTALL() { - mkdir -p $binDir/hugen_app - cp -R hugen.py configs/ templates/ $binDir/hugen_app - echo python $binDir/hugen_app/hugen.py > $binDir/hugen - chmod +x $binDir/hugen + installLocation=lib/python$version/vendor-packages + mkdir -p $installLocation/hugen_app + cp -R hugen.py configs/ templates/ $installLocation/hugen_app + echo python $installLocation/hugen_app/hugen.py > $installLocation/hugen + chmod +x $installLocation/hugen } From 84db457c3ed058759d0e7250ffe69738f8b03052 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 21:35:29 +0000 Subject: [PATCH 007/326] added cmd:hugen_app --- dev-cpp/hugen/hugen-1.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 887b33bb7..910b4d99f 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -17,6 +17,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" hugen$secondaryArchSuffix = $portVersion cmd:hugen$secondaryArchSuffix = $portVersion + cmd:hugen_app = $portVersion " REQUIRES=" From 90598cf0fe268796a2ba5a69d103d8d069de91db Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 22:42:21 +0000 Subject: [PATCH 008/326] hugen-1.recipe edited online with Bitbucket --- dev-cpp/hugen/hugen-1.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 910b4d99f..887b33bb7 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -17,7 +17,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" hugen$secondaryArchSuffix = $portVersion cmd:hugen$secondaryArchSuffix = $portVersion - cmd:hugen_app = $portVersion " REQUIRES=" From 58e1cef72f87f8ad52ce64aa7eb0685717f82330 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 9 Dec 2014 17:47:21 -0500 Subject: [PATCH 009/326] HaikuTwitter: update to latest version. It now builds, but due to not having OAuth tokens it doesn't work. --- haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe index f4f974d05..9fb01b977 100644 --- a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe +++ b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe @@ -4,10 +4,10 @@ based off the open-source TwitCurl library." COPYRIGHT="2012 Martin Pedersen" LICENSE="MIT" HOMEPAGE="https://github.com/HaikuArchives/HaikuTwitter" -SRC_URI="https://github.com/HaikuArchives/HaikuTwitter/archive/a9241f8de96e8427ddc12c947dadcfc6350c1124.tar.gz" -CHECKSUM_SHA256="2b5f1906cea0d863ac3dca5a2d064cfeb28f99c2880eaf1b5e69e9197ac351a1" -SOURCE_DIR="HaikuTwitter-a9241f8de96e8427ddc12c947dadcfc6350c1124" -REVISION="1" +SRC_URI="https://github.com/HaikuArchives/HaikuTwitter/archive/918dd954b6db3c5ed476b3a4826910992f3b4566.tar.gz" +CHECKSUM_SHA256="bc330cb15c8e10362306eef7d85228f5dee08db667d16a15c0a5245f6013b1e1" +SOURCE_DIR="HaikuTwitter-918dd954b6db3c5ed476b3a4826910992f3b4566" +REVISION="2" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then From cf75188655c05eefeb461a3c5703e6ed411a3416 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 23:01:08 +0000 Subject: [PATCH 010/326] Added needed Python commands in INSTALL() --- dev-cpp/hugen/hugen-1.recipe | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 887b33bb7..5338b558c 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -37,6 +37,9 @@ BUILD() INSTALL() { + python=$portPackageLinksDir/cmd~python/bin/python + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + installLocation=lib/python$version/vendor-packages mkdir -p $installLocation/hugen_app cp -R hugen.py configs/ templates/ $installLocation/hugen_app From 9aceabe1e9ae82825616296b6f346d0ccaa005e8 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 23:15:16 +0000 Subject: [PATCH 011/326] fixed variable declaration --- dev-cpp/hugen/hugen-1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 5338b558c..e2c6659f7 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -38,7 +38,7 @@ BUILD() INSTALL() { python=$portPackageLinksDir/cmd~python/bin/python - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + version=$($python --version 2>&1 | sed 's/Python //' | head -c3) installLocation=lib/python$version/vendor-packages mkdir -p $installLocation/hugen_app From b775b255674537aaa56f82610813fe3cd1609c3e Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 23:19:48 +0000 Subject: [PATCH 012/326] $prefix fix --- dev-cpp/hugen/hugen-1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index e2c6659f7..d8dde97ab 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -40,7 +40,7 @@ INSTALL() python=$portPackageLinksDir/cmd~python/bin/python version=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=lib/python$version/vendor-packages + installLocation=$prefix/lib/python$version/vendor-packages mkdir -p $installLocation/hugen_app cp -R hugen.py configs/ templates/ $installLocation/hugen_app echo python $installLocation/hugen_app/hugen.py > $installLocation/hugen From 9031f177181e098138a1396bdd9dc270d20d0c9d Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 23:52:28 +0000 Subject: [PATCH 013/326] switched $installLocation with $binDir --- dev-cpp/hugen/hugen-1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index d8dde97ab..958fc344a 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -43,6 +43,6 @@ INSTALL() installLocation=$prefix/lib/python$version/vendor-packages mkdir -p $installLocation/hugen_app cp -R hugen.py configs/ templates/ $installLocation/hugen_app - echo python $installLocation/hugen_app/hugen.py > $installLocation/hugen + echo python $installLocation/hugen_app/hugen.py > $binDir/hugen chmod +x $installLocation/hugen } From 938c3277c314d0668e0ec894e2241696d8580a56 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 23:54:57 +0000 Subject: [PATCH 014/326] $installLocation to $binDir again --- dev-cpp/hugen/hugen-1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index 958fc344a..ebd4f35ee 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -44,5 +44,5 @@ INSTALL() mkdir -p $installLocation/hugen_app cp -R hugen.py configs/ templates/ $installLocation/hugen_app echo python $installLocation/hugen_app/hugen.py > $binDir/hugen - chmod +x $installLocation/hugen + chmod +x $binDir/hugen } From 148551f2b2b2b015d40f9bbeefe74e5df8dfcd63 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Tue, 9 Dec 2014 23:59:38 +0000 Subject: [PATCH 015/326] created $binDir --- dev-cpp/hugen/hugen-1.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-cpp/hugen/hugen-1.recipe b/dev-cpp/hugen/hugen-1.recipe index ebd4f35ee..b3f776870 100644 --- a/dev-cpp/hugen/hugen-1.recipe +++ b/dev-cpp/hugen/hugen-1.recipe @@ -37,6 +37,7 @@ BUILD() INSTALL() { + mkdir -p $binDir python=$portPackageLinksDir/cmd~python/bin/python version=$($python --version 2>&1 | sed 's/Python //' | head -c3) From 6a368c914595f59e2519abad16d0838e357b1379 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 10 Dec 2014 17:58:09 +0200 Subject: [PATCH 016/326] Move exiv2 to media-gfx --- {dev-libs => media-gfx}/exiv2/exiv2-0.24.recipe | 0 {dev-libs => media-gfx}/exiv2/patches/exiv2-0.24.patch | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {dev-libs => media-gfx}/exiv2/exiv2-0.24.recipe (100%) rename {dev-libs => media-gfx}/exiv2/patches/exiv2-0.24.patch (100%) diff --git a/dev-libs/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.24.recipe similarity index 100% rename from dev-libs/exiv2/exiv2-0.24.recipe rename to media-gfx/exiv2/exiv2-0.24.recipe diff --git a/dev-libs/exiv2/patches/exiv2-0.24.patch b/media-gfx/exiv2/patches/exiv2-0.24.patch similarity index 100% rename from dev-libs/exiv2/patches/exiv2-0.24.patch rename to media-gfx/exiv2/patches/exiv2-0.24.patch From aba2561915cf23e741ad5ea6682a650bbc5b118d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 10 Dec 2014 22:09:16 -0500 Subject: [PATCH 017/326] libburndevice: fix recipe & update to v1.0. --- ...ce-git.recipe => libburndevice-1.0.recipe} | 96 ++++++++----------- 1 file changed, 41 insertions(+), 55 deletions(-) rename haiku-libs/libburndevice/{libburndevice-git.recipe => libburndevice-1.0.recipe} (58%) diff --git a/haiku-libs/libburndevice/libburndevice-git.recipe b/haiku-libs/libburndevice/libburndevice-1.0.recipe similarity index 58% rename from haiku-libs/libburndevice/libburndevice-git.recipe rename to haiku-libs/libburndevice/libburndevice-1.0.recipe index f31c0db88..f13628c13 100644 --- a/haiku-libs/libburndevice/libburndevice-git.recipe +++ b/haiku-libs/libburndevice/libburndevice-1.0.recipe @@ -1,71 +1,24 @@ SUMMARY="A disc burning library for Haiku" -DESCRIPTION=" -LibBurnDevice is a disc burning library for Haiku -" - +DESCRIPTION="LibBurnDevice is a disc burning library for Haiku." HOMEPAGE="https://github.com/HaikuArchives/Lava" -SRC_URI="git+https://github.com/HaikuArchives/Lava.git" - -REVISION="1" - +SRC_URI="https://github.com/HaikuArchives/Lava/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="0c1899141eac1fca086a554d56527f38baa70ae7bff0a6db37cd180084c01c71" +SOURCE_DIR="Lava-$portVersion" LICENSE="Public Domain" -COPYRIGHT=" - 2007, 2010 Team MAUI - 2003-2006 Haiku Inc. - " - +COPYRIGHT="2007, 2010 Team MAUI + 2003-2006 Haiku Inc." +REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTRUES="x86_gcc2 x86" PROVIDES=" - libburndevice = $portVersion + libburndevice$secondaryArchSuffix = $portVersion lib:libburndevice$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion cmd:cdrtools " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:mkdepend - makefile_engine" - -BUILD() -{ - exit 0 - cd LibBurnDevice - make TYPE=SHARED OBJ_DIR=objects-shared \ - BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY) - - make TYPE=STATIC OBJ_DIR=objects-static \ - BUILDHOME=$(finddir B_SYSTEM_DEVELOP_DIRECTORY) -} - -INSTALL() -{ - mkdir -p $libDir $developLibDir $includeDir/burndevice - - cd LibBurnDevice - - cp objects-static/libburndevice.a $developLibDir - cp objects-shared/libburndevice $libDir/libburndevice.so - - cp BurnDevice.h $includeDir/burndevice - - symlinkRelative -s $libDir/libburndevice.so $developLibDir - - packageEntries devel \ - $developLibDir \ - $includeDir - -} - -# -------- devel package -------------------------------------------------- PROVIDES_devel=" libburndevice${secondaryArchSuffix}_devel = $portVersion @@ -74,3 +27,36 @@ PROVIDES_devel=" REQUIRES_devel=" libburndevice$secondaryArchSuffix == $portVersion base " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd LibBurnDevice + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd LibBurnDevice + mkdir -p $libDir $developLibDir $includeDir/burndevice + + cp objects/libburndevice.so $libDir/libburndevice.so + cp BurnDevice.h $includeDir/burndevice + + prepareInstalledDevelLibs \ + libburndevice + + packageEntries devel \ + $developLibDir \ + $includeDir +} From 58c0e562a388e5517fb120878dd4f7687931fcbd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 10 Dec 2014 22:24:01 -0500 Subject: [PATCH 018/326] BurnItNow: recipe for 0.1.0. --- haiku-apps/burnitnow/burnitnow-0.1.0.recipe | 58 +++++++++++++++++++++ haiku-apps/burnitnow/burnitnow-trunk.recipe | 49 ----------------- 2 files changed, 58 insertions(+), 49 deletions(-) create mode 100644 haiku-apps/burnitnow/burnitnow-0.1.0.recipe delete mode 100644 haiku-apps/burnitnow/burnitnow-trunk.recipe diff --git a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe new file mode 100644 index 000000000..ace579a61 --- /dev/null +++ b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe @@ -0,0 +1,58 @@ +SUMMARY="A GUI frontend for burning CDs" +DESCRIPTION="BurnItNow is a GUI frontend for CDRecord and mkisofs. \ +It supports Audio CD, MixCD (on the fly), Data CD (on the fly, multisession), \ +BootableCD and burning an BFS image." +HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" +SRC_URI="https://github.com/HaikuArchives/BurnItNow/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="7db12d261ddebcbfe82e2ab5e7aed4227caef476f01488a1ccec4f58287833d2" +SOURCE_DIR="BurnItNow-$portVersion" +REVISION="1" +COPYRIGHT="2010-2014 BurnItNow Team" +LICENSE="MIT" + +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=" + burnitnow$secondaryArchSuffix = $portVersion + app:BurnItNow = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:cdrecord + cmd:mkisofs + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:mkdepend + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + cd Source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd Source + mkdir -p $appsDir + cp objects/BurnItNow $appsDir + addAppDeskbarSymlink $appsDir/BurnItNow +} diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe deleted file mode 100644 index a948a91ed..000000000 --- a/haiku-apps/burnitnow/burnitnow-trunk.recipe +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY="A utility for burning CD" -DESCRIPTION=" -BurnItNow is a CD burning utility application for Haiku. -" -HOMEPAGE="https://github.com/HaikuArchives/BurnItNow" -SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#a790db9a87" -REVISION="1" -COPYRIGHT=" - 2010-2013 BurnItNow Team - " -LICENSE="MIT" - -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - burnitnow = $portVersion - app:BurnItNow = $portVersion - " - -REQUIRES=" - haiku >= $haikuVersion - cmd:cdrecord - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " - -BUILD_PREREQUIRES=" - cmd:cmake - cmd:make - cmd:gcc$secondaryArchSuffix - " - -#SOURCE_DIR="$portName/burnitnow2" - -BUILD() -{ - cmake . - make -} - -INSTALL() -{ - mkdir -p $appsDir/BurnItNow - cp BurnItNow $appsDir/BurnItNow - addAppDeskbarSymlink $appsDir/BurnItNow/BurnItNow -} From 0d5ca0970fbb40a09c1facd2ddcea3ff3acc8fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 11 Dec 2014 16:12:40 +0100 Subject: [PATCH 019/326] virtualbox_guest_additions: add TODO about post_install We want VBoxTray to be installed in Deskbar automatically --- .../virtualbox_guest_additions-4.3.53_svn.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe index b95af61af..cc75347cf 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe +++ b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe @@ -26,6 +26,8 @@ PROVIDES=" cmd:VBoxTray$secondaryArchSuffix = $portVersion " +# TODO: POST_INSTALL_SCRIPTS="" + REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion openssl$secondaryArchSuffix >= 1.0.0 From da5f30bcf1eb99cd32c249f7cac418518b347235 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 9 Dec 2014 17:43:55 +0100 Subject: [PATCH 020/326] Add recipe for gcal --- app-misc/gcal/gcal-3.6.3.recipe | 56 +++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 app-misc/gcal/gcal-3.6.3.recipe diff --git a/app-misc/gcal/gcal-3.6.3.recipe b/app-misc/gcal/gcal-3.6.3.recipe new file mode 100644 index 000000000..326acaa90 --- /dev/null +++ b/app-misc/gcal/gcal-3.6.3.recipe @@ -0,0 +1,56 @@ +SUMMARY="Program for calculating and printing calendars" +DESCRIPTION=" +Gcal is a program for calculating and printing calendars. Gcal displays hybrid \ +and proleptic Julian and Gregorian calendar sheets, respectively for one month, \ +three months, or a whole year. It also displays eternal holiday lists for many \ +countries around the globe, and features a very powerful creation of fixed date \ +lists that can be used for reminding purposes. +" +HOMEPAGE="http://www.gnu.org/software/gcal/" +SRC_URI="http://ftp.gnu.org/gnu/gcal/gcal-3.6.3.tar.gz" +CHECKSUM_SHA256="9d9be60841150a5c60e27fc5e0f2c06c06635ac44c18698d6a48ef7bb47ba86d" +LICENSE="GNU GPL v3" +REVISION="1" +COPYRIGHT="1994-2013 Free Software Foundation Inc." + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + gcal = $portVersion + cmd:gcal + cmd:gcal2txt + cmd:tcal + cmd:txt2gcal + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + cmd:grep + cmd:make + cmd:sed + cmd:gcc + cmd:awk + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} From 7d2fc2d2686c6ac4a40543511346aab3611fe435 Mon Sep 17 00:00:00 2001 From: Jim Date: Thu, 11 Dec 2014 09:32:15 -0800 Subject: [PATCH 021/326] Update yab recipe to use tar.gz archive. --- dev-lang/yab/yab-1.7.02.recipe | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe index cd45c0cbc..76692b48f 100644 --- a/dev-lang/yab/yab-1.7.02.recipe +++ b/dev-lang/yab/yab-1.7.02.recipe @@ -4,10 +4,14 @@ yab is an extended version of yabasic, a BASIC programming language, with \ special commands designed for Haiku. " HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" -SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4" +SRC_URI="https://github.com/HaikuArchives/Yab/archive/v1.7.3.tar.gz" +CHECKSUM_SIZE="1176449" +CHECKSUM_RMD160="f62fa02a585d9f6c5ee3eb9b781a06083352bd6f" +CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7fdd0738e126b9a2e5d2f8d84fd0c153d9b7702e806cc91c6a97537dda11411e915" +SOURCE_DIR="Yab-1.7.3" -REVISION="2" +REVISION="3" LICENSE="Artistic" From bb4b3f855fd54aa7efaf3f35c96a8bf930f38d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 11 Dec 2014 19:16:23 +0000 Subject: [PATCH 022/326] Added recipe for xmoto --- games-sports/xmoto/patches/xmoto-0.5.11.patch | 100 ++++++++++++++++++ games-sports/xmoto/xmoto-0.5.11.recipe | 91 ++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 games-sports/xmoto/patches/xmoto-0.5.11.patch create mode 100644 games-sports/xmoto/xmoto-0.5.11.recipe diff --git a/games-sports/xmoto/patches/xmoto-0.5.11.patch b/games-sports/xmoto/patches/xmoto-0.5.11.patch new file mode 100644 index 000000000..a21deb0fd --- /dev/null +++ b/games-sports/xmoto/patches/xmoto-0.5.11.patch @@ -0,0 +1,100 @@ +Only in xmoto-0.5.11-patch/: autom4te.cache +diff -ur xmoto-0.5.11/configure xmoto-0.5.11-patch/configure +--- xmoto-0.5.11/configure 2014-03-29 10:38:54.037748736 +0000 ++++ xmoto-0.5.11-patch/configure 2014-12-11 05:23:06.159383552 +0000 +@@ -7565,13 +7565,13 @@ + + + # m +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +-$as_echo_n "checking for floor in -lm... " >&6; } +-if ${ac_cv_lib_m_floor+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lroot" >&5 ++$as_echo_n "checking for floor in -lroot... " >&6; } ++if ${ac_cv_lib_root_floor+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS="-lroot $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -7591,22 +7591,22 @@ + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_m_floor=yes ++ ac_cv_lib_root_floor=yes + else +- ac_cv_lib_m_floor=no ++ ac_cv_lib_root_floor=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 +-$as_echo "$ac_cv_lib_m_floor" >&6; } +-if test "x$ac_cv_lib_m_floor" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_floor" >&5 ++$as_echo "$ac_cv_lib_root_floor" >&6; } ++if test "x$ac_cv_lib_root_floor" = xyes; then : + cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBM 1 ++#define HAVE_LIBROOT 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS="-lroot $LIBS" + + else + as_fn_error $? "No math library found" "$LINENO" 5 +diff -ur xmoto-0.5.11/configure.in xmoto-0.5.11-patch/configure.in +--- xmoto-0.5.11/configure.in 2014-03-29 10:35:24.036700160 +0000 ++++ xmoto-0.5.11-patch/configure.in 2014-12-11 05:18:39.246153216 +0000 +@@ -155,7 +155,7 @@ + AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") + + # m +-AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) ++AC_CHECK_LIB(root, floor, , AC_MSG_ERROR(No math library found)) + + AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) + AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) +diff -ur xmoto-0.5.11/src/GameInit.cpp xmoto-0.5.11-patch/src/GameInit.cpp +--- xmoto-0.5.11/src/GameInit.cpp 2011-10-11 20:18:35.013369344 +0000 ++++ xmoto-0.5.11-patch/src/GameInit.cpp 2014-12-11 05:17:55.756023296 +0000 +@@ -269,7 +269,7 @@ + struct sigaction v_act; + + v_act.sa_handler = xmexit_term; +-#if !defined(__APPLE__) && !defined(__FreeBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__HAIKU__) + v_act.sa_restorer = NULL; + #endif + sigemptyset(&v_act.sa_mask); +diff -ur xmoto-0.5.11/src/net/extSDL_net.cpp xmoto-0.5.11-patch/src/net/extSDL_net.cpp +--- xmoto-0.5.11/src/net/extSDL_net.cpp 2011-10-11 20:18:28.058720256 +0000 ++++ xmoto-0.5.11-patch/src/net/extSDL_net.cpp 2014-12-11 02:57:51.884998144 +0000 +@@ -22,7 +22,7 @@ + #include + + // read the .h to understand why i redefine SDLNet_TCP_Send +-#if !defined(WIN32) && !defined(__APPLE__) ++#if !defined(WIN32) && !defined(__APPLE__) && !defined(__HAIKU__) + #include + + #define SOCKET int +diff -ur xmoto-0.5.11/src/VFileIO.cpp xmoto-0.5.11-patch/src/VFileIO.cpp +--- xmoto-0.5.11/src/VFileIO.cpp 2011-10-11 20:18:35.002883584 +0000 ++++ xmoto-0.5.11-patch/src/VFileIO.cpp 2014-12-11 05:09:19.959709184 +0000 +@@ -106,7 +106,7 @@ + #endif + } + +-#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) ++#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__HAIKU__) + void strlwr(char *pc) { + for(unsigned int i=0; i Date: Tue, 9 Dec 2014 21:15:42 +0000 Subject: [PATCH 023/326] Add autoconf 2.13 --- sys-devel/autoconf213/autoconf213-2.13.recipe | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 sys-devel/autoconf213/autoconf213-2.13.recipe diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe new file mode 100644 index 000000000..3c9e90005 --- /dev/null +++ b/sys-devel/autoconf213/autoconf213-2.13.recipe @@ -0,0 +1,57 @@ +SUMMARY="A tool for automatically configuring source code" +DESCRIPTION="GNU Autoconf is a tool for configuring source code and makefiles. Using \ +autoconf, programmers can create portable and configurable packages, because \ +the person building the package is allowed to specify various configuration \ +options." +HOMEPAGE="http://www.gnu.org/software/autoconf/" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz" +CHECKSUM_SHA256="f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" +REVISION="1" + +SOURCE_DIR="autoconf-2.13" + +LICENSE="GNU GPL v2" +COPYRIGHT="1992-1998 Free Software Foundation, Inc." + +ARCHITECTURES="x86_gcc2 x86 arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 arm" + +PROVIDES=" + autoconf_2.13$secondaryArchSuffix = $portVersion + cmd:autoconf_2.13$secondaryArchSuffix = $portVersion + cmd:autoheader_2.13$secondaryArchSuffix = $portVersion + cmd:autoreconf_2.13$secondaryArchSuffix = $portVersion + cmd:autoscan_2.13$secondaryArchSuffix = $portVersion + cmd:autoupdate_2.13$secondaryArchSuffix = $portVersion + cmd:ifnames_2.13$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:autoconf + " + +BUILD() +{ + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + for bin in $(ls $binDir); do + mv $binDir/$bin $binDir/${bin}-2.13 + done +} From 5f6bcadfeede56f186959851fe767bd15a342f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 11 Dec 2014 23:54:50 +0000 Subject: [PATCH 024/326] Made xmoto's configure search for floor --- games-sports/xmoto/patches/xmoto-0.5.11.patch | 65 ++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/games-sports/xmoto/patches/xmoto-0.5.11.patch b/games-sports/xmoto/patches/xmoto-0.5.11.patch index a21deb0fd..6fe7e593b 100644 --- a/games-sports/xmoto/patches/xmoto-0.5.11.patch +++ b/games-sports/xmoto/patches/xmoto-0.5.11.patch @@ -1,64 +1,83 @@ Only in xmoto-0.5.11-patch/: autom4te.cache diff -ur xmoto-0.5.11/configure xmoto-0.5.11-patch/configure --- xmoto-0.5.11/configure 2014-03-29 10:38:54.037748736 +0000 -+++ xmoto-0.5.11-patch/configure 2014-12-11 05:23:06.159383552 +0000 -@@ -7565,13 +7565,13 @@ ++++ xmoto-0.5.11-patch/configure 2014-12-11 21:25:12.893386752 +0000 +@@ -7565,13 +7565,12 @@ # m -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -$as_echo_n "checking for floor in -lm... " >&6; } -if ${ac_cv_lib_m_floor+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lroot" >&5 -+$as_echo_n "checking for floor in -lroot... " >&6; } -+if ${ac_cv_lib_root_floor+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 ++$as_echo_n "checking for library containing floor... " >&6; } ++if ${ac_cv_search_floor+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -+LIBS="-lroot $LIBS" ++ ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -7591,22 +7591,22 @@ +@@ -7590,23 +7589,35 @@ + return 0; } _ACEOF - if ac_fn_c_try_link "$LINENO"; then : +-if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_floor=yes -+ ac_cv_lib_root_floor=yes - else +-else - ac_cv_lib_m_floor=no -+ ac_cv_lib_root_floor=no ++for ac_lib in '' ; do ++ if test -z "$ac_lib"; then ++ ac_res="none required" ++ else ++ ac_res=-l$ac_lib ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ fi ++ if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_search_floor=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++ conftest$ac_exeext ++ if ${ac_cv_search_floor+:} false; then : ++ break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -$as_echo "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_floor" >&5 -+$as_echo "$ac_cv_lib_root_floor" >&6; } -+if test "x$ac_cv_lib_root_floor" = xyes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -+#define HAVE_LIBROOT 1 - _ACEOF +-_ACEOF ++done ++if ${ac_cv_search_floor+:} false; then : - LIBS="-lm $LIBS" -+ LIBS="-lroot $LIBS" ++else ++ ac_cv_search_floor=no ++fi ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5 ++$as_echo "$ac_cv_search_floor" >&6; } ++ac_res=$ac_cv_search_floor ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else as_fn_error $? "No math library found" "$LINENO" 5 diff -ur xmoto-0.5.11/configure.in xmoto-0.5.11-patch/configure.in --- xmoto-0.5.11/configure.in 2014-03-29 10:35:24.036700160 +0000 -+++ xmoto-0.5.11-patch/configure.in 2014-12-11 05:18:39.246153216 +0000 ++++ xmoto-0.5.11-patch/configure.in 2014-12-11 21:40:34.446955520 +0000 @@ -155,7 +155,7 @@ AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") # m -AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) -+AC_CHECK_LIB(root, floor, , AC_MSG_ERROR(No math library found)) ++AC_SEARCH_LIBS(floor, , , AC_MSG_ERROR(No math library found)) AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) From 38291e1fb7d1448385243e44d1e3a952c001bd13 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 11 Dec 2014 10:24:37 +0100 Subject: [PATCH 025/326] Add recipe for Substrate --- haiku-apps/substrate/substrate-1.0.recipe | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 haiku-apps/substrate/substrate-1.0.recipe diff --git a/haiku-apps/substrate/substrate-1.0.recipe b/haiku-apps/substrate/substrate-1.0.recipe new file mode 100644 index 000000000..932eb950a --- /dev/null +++ b/haiku-apps/substrate/substrate-1.0.recipe @@ -0,0 +1,42 @@ +SUMMARY="Screensaver drawing interesting city-like structures." +DESCRIPTION=" +Substrate is a screensaver which creates interesting images from lines and circles. \ +Inspired by xscreensaver's Substrate. +" +HOMEPAGE="https://github.com/atalax/haiku-substrate" +SRC_URI="git+https://github.com/atalax/haiku-substrate.git#1bd0a5" +REVISION="1" +COPYRIGHT="2014 Josef Gajdusek" +LICENSE="MIT" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + substrate = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:mkdepend + cmd:make + cmd:gcc + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $addOnsDir/Screen\ Savers/ + cp objects/Substrate $addOnsDir/Screen\ Savers/ +} From 097caf6c050521cbcc4d8af6b392c5b81733cc37 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Thu, 11 Dec 2014 22:18:58 +0200 Subject: [PATCH 026/326] Add Bezilla port --- www-client/bezilla/bezilla-git.recipe | 72 +++++++++++++++++++ .../bezilla/patches/bezilla-git.patchset | 31 ++++++++ 2 files changed, 103 insertions(+) create mode 100644 www-client/bezilla/bezilla-git.recipe create mode 100644 www-client/bezilla/patches/bezilla-git.patchset diff --git a/www-client/bezilla/bezilla-git.recipe b/www-client/bezilla/bezilla-git.recipe new file mode 100644 index 000000000..924ef3d18 --- /dev/null +++ b/www-client/bezilla/bezilla-git.recipe @@ -0,0 +1,72 @@ +SUMMARY="Bezilla is a version of Firefox 2 for Haiku" +DESCRIPTION="Bezilla is an open source web browser. \ +It achieves balance between ease of use and customization, catering to the \ +needs of both casual and power users." +HOMEPAGE="https://github.com/mmadia/bezilla" +SRC_URI="git+https://github.com/mmadia/bezilla.git#686254" +REVISION="1" +LICENSE="MPL v1.1" +COPYRIGHT="1998-1999 Netscape Communications Corporation" + +ARCHITECTURES="x86_gcc2 x86 ?arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 ?arm" + +PROVIDES=" + bezilla$secondaryArchSuffix = $portVersion + app:Bezilla$secondaryArchSuffix = $portVersion + cmd:Bezilla_config$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + devel:libidl$secondaryArchSuffix + devel:libglib$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:m4 + cmd:gawk + cmd:perl + cmd:xargs + cmd:tar + cmd:autoconf_2.13$secondaryArchSuffix + " + +PATCHES="bezilla-git.patchset" + +BUILD() +{ + cd mozilla + autoconf-2.13 + + cd nsprpub + autoconf-2.13 + cd .. + + cd directory/c-sdk + autoconf-2.13 + cd ../.. + + runConfigure --omit-dirs 'docDir dataRootDir' ./configure \ + --enable-application=browser --disable-canvas \ + --disable-svg --disable-updater + make +} + +INSTALL() +{ + cd mozilla + make install + + mkdir $appsDir + + mv $binDir/firefox $appsDir/Bezilla + mv $libDir/firefox-2.0.0.22pre/firefox-bin $libDir/firefox-2.0.0.22pre/Bezilla-bin + mv $binDir/firefox-config $binDir/Bezilla-config +} diff --git a/www-client/bezilla/patches/bezilla-git.patchset b/www-client/bezilla/patches/bezilla-git.patchset new file mode 100644 index 000000000..e37edf2c2 --- /dev/null +++ b/www-client/bezilla/patches/bezilla-git.patchset @@ -0,0 +1,31 @@ +From 7b84740f39ed0292e8f726705590ba24581c2c52 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Fri, 12 Dec 2014 13:45:46 +0200 +Subject: [PATCH] Enable Haiku support in configure.in + +--- + mozilla/configure.in | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/mozilla/configure.in b/mozilla/configure.in +index 23cc7e7..9bd8cb5 100755 +--- a/mozilla/configure.in ++++ b/mozilla/configure.in +@@ -885,12 +885,8 @@ if test -n "$CROSS_COMPILE"; then + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; +- beos* | haiku*) OS_ARCH=BeOS OS_TARGET=BeOS ;; +-dnl ------------------------------------------------------- +-dnl Cross-compiling-haiku - This should probably be +-dnl beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;; +-dnl haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;; +-dnl ------------------------------------------------------- ++ beos*) OS_ARCH=BeOS OS_TARGET=BeOS ;; ++ haiku*) OS_ARCH=Haiku OS_TARGET=Haiku ;; + esac + else + OS_TARGET=`uname -s` +-- +1.8.3.4 + From 01a43a2a06abf99fe1e2978b8a1c55dae723a067 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 12 Dec 2014 10:02:28 -0500 Subject: [PATCH 027/326] Lava: v1.0. This recipe does not work yet, as cdrtools is broken due to a bug in HaikuPorter [1] ... [1]: https://bitbucket.org/haikuports/haikuporter/issue/49 --- haiku-apps/lava/lava-1.0.recipe | 46 +++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 haiku-apps/lava/lava-1.0.recipe diff --git a/haiku-apps/lava/lava-1.0.recipe b/haiku-apps/lava/lava-1.0.recipe new file mode 100644 index 000000000..c10365b3f --- /dev/null +++ b/haiku-apps/lava/lava-1.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="A disc burning suite for Haiku" +DESCRIPTION="Lava is a disc burning suite for Haiku. It's a Tracker add-on." +HOMEPAGE="https://github.com/HaikuArchives/Lava" +SRC_URI="https://github.com/HaikuArchives/Lava/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="0c1899141eac1fca086a554d56527f38baa70ae7bff0a6db37cd180084c01c71" +SOURCE_DIR="Lava-$portVersion" +LICENSE="Public Domain" +COPYRIGHT="2007, 2010 Team MAUI + 2003-2006 Haiku Inc." +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + lava = $portVersion + add_on:Lava = $portVersion + " +REQUIRES=" + haiku >= $haikuVersion + lib:libburndevice + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libburndevice + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:ld + cmd:make + cmd:mkdepend + " + +BUILD() +{ + cd Add-On + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd Add-On + mkdir -p $addOnsDir/Tracker/ + + cp objects/Lava-L $addOnsDir/Tracker/ +} From 5a036e5d2923af07790c08c2d066781d4a37a8c7 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 19:23:36 +0200 Subject: [PATCH 028/326] Fixed the recipe for apr_x86-1.5.0 --- dev-libs/apr/apr-1.5.0.recipe | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index 33f922f0b..b0a6c1112 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -6,23 +6,27 @@ COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" PATCHES="apr-1.5.0.patch" PROVIDES=" - apr = $portVersion compat >= 1 - lib:libapr_1 = 0.5.0 compat >= 0 + apr$secondaryArchSuffix = $portVersion compat >= 1 + lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 + cmd:apr_1_config$secondaryArchSuffix " REQUIRES=" haiku >= $haikuVersion + lib:libnetwork$secondaryArchSuffix >= $haikuVersion + lib:libroot$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:ld cmd:libtoolize cmd:make @@ -109,3 +113,4 @@ PROVIDES_devel=" REQUIRES_devel=" apr == $portVersion base " + From 781dfed6b51d9f2e3dc36c6084ca06b4e244e9e0 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 19:30:26 +0200 Subject: [PATCH 029/326] Fixed the recipe for apr_x86-1.5.0 --- dev-libs/apr/apr-1.5.0.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index b0a6c1112..f70fae35b 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -13,7 +13,6 @@ PATCHES="apr-1.5.0.patch" PROVIDES=" apr$secondaryArchSuffix = $portVersion compat >= 1 lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 - cmd:apr_1_config$secondaryArchSuffix " REQUIRES=" haiku >= $haikuVersion @@ -106,11 +105,11 @@ following: # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - apr_devel = portVersion compat >= 1 - cmd:apr_1_config = portVersion compat >= 1 - devel:libapr_1 = 0.5.0 compat >= 0 + apr_devel$secondaryArchSuffix = portVersion compat >= 1 + cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1 + devel:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 " REQUIRES_devel=" - apr == $portVersion base + apr$secondaryArchSuffix == $portVersion base " From e0a28b803fe2e49000ac06b0d539bbc54994db92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Fri, 12 Dec 2014 17:01:00 +0000 Subject: [PATCH 030/326] Changed xmoto recipe - now uses autoconf and patchset. --- games-sports/xmoto/patches/xmoto-0.5.11.patch | 119 ------------------ .../xmoto/patches/xmoto_x86-0.5.11.patchset | 61 +++++++++ games-sports/xmoto/xmoto-0.5.11.recipe | 6 +- 3 files changed, 65 insertions(+), 121 deletions(-) delete mode 100644 games-sports/xmoto/patches/xmoto-0.5.11.patch create mode 100644 games-sports/xmoto/patches/xmoto_x86-0.5.11.patchset diff --git a/games-sports/xmoto/patches/xmoto-0.5.11.patch b/games-sports/xmoto/patches/xmoto-0.5.11.patch deleted file mode 100644 index 6fe7e593b..000000000 --- a/games-sports/xmoto/patches/xmoto-0.5.11.patch +++ /dev/null @@ -1,119 +0,0 @@ -Only in xmoto-0.5.11-patch/: autom4te.cache -diff -ur xmoto-0.5.11/configure xmoto-0.5.11-patch/configure ---- xmoto-0.5.11/configure 2014-03-29 10:38:54.037748736 +0000 -+++ xmoto-0.5.11-patch/configure 2014-12-11 21:25:12.893386752 +0000 -@@ -7565,13 +7565,12 @@ - - - # m --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 --$as_echo_n "checking for floor in -lm... " >&6; } --if ${ac_cv_lib_m_floor+:} false; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 -+$as_echo_n "checking for library containing floor... " >&6; } -+if ${ac_cv_search_floor+:} false; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" -+ ac_func_search_save_LIBS=$LIBS - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -7590,23 +7589,35 @@ - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_m_floor=yes --else -- ac_cv_lib_m_floor=no -+for ac_lib in '' ; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_floor=$ac_res - fi - rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ conftest$ac_exeext -+ if ${ac_cv_search_floor+:} false; then : -+ break - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 --$as_echo "$ac_cv_lib_m_floor" >&6; } --if test "x$ac_cv_lib_m_floor" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBM 1 --_ACEOF -+done -+if ${ac_cv_search_floor+:} false; then : - -- LIBS="-lm $LIBS" -+else -+ ac_cv_search_floor=no -+fi -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5 -+$as_echo "$ac_cv_search_floor" >&6; } -+ac_res=$ac_cv_search_floor -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - else - as_fn_error $? "No math library found" "$LINENO" 5 -diff -ur xmoto-0.5.11/configure.in xmoto-0.5.11-patch/configure.in ---- xmoto-0.5.11/configure.in 2014-03-29 10:35:24.036700160 +0000 -+++ xmoto-0.5.11-patch/configure.in 2014-12-11 21:40:34.446955520 +0000 -@@ -155,7 +155,7 @@ - AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") - - # m --AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) -+AC_SEARCH_LIBS(floor, , , AC_MSG_ERROR(No math library found)) - - AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) - AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) -diff -ur xmoto-0.5.11/src/GameInit.cpp xmoto-0.5.11-patch/src/GameInit.cpp ---- xmoto-0.5.11/src/GameInit.cpp 2011-10-11 20:18:35.013369344 +0000 -+++ xmoto-0.5.11-patch/src/GameInit.cpp 2014-12-11 05:17:55.756023296 +0000 -@@ -269,7 +269,7 @@ - struct sigaction v_act; - - v_act.sa_handler = xmexit_term; --#if !defined(__APPLE__) && !defined(__FreeBSD__) -+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__HAIKU__) - v_act.sa_restorer = NULL; - #endif - sigemptyset(&v_act.sa_mask); -diff -ur xmoto-0.5.11/src/net/extSDL_net.cpp xmoto-0.5.11-patch/src/net/extSDL_net.cpp ---- xmoto-0.5.11/src/net/extSDL_net.cpp 2011-10-11 20:18:28.058720256 +0000 -+++ xmoto-0.5.11-patch/src/net/extSDL_net.cpp 2014-12-11 02:57:51.884998144 +0000 -@@ -22,7 +22,7 @@ - #include - - // read the .h to understand why i redefine SDLNet_TCP_Send --#if !defined(WIN32) && !defined(__APPLE__) -+#if !defined(WIN32) && !defined(__APPLE__) && !defined(__HAIKU__) - #include - - #define SOCKET int -diff -ur xmoto-0.5.11/src/VFileIO.cpp xmoto-0.5.11-patch/src/VFileIO.cpp ---- xmoto-0.5.11/src/VFileIO.cpp 2011-10-11 20:18:35.002883584 +0000 -+++ xmoto-0.5.11-patch/src/VFileIO.cpp 2014-12-11 05:09:19.959709184 +0000 -@@ -106,7 +106,7 @@ - #endif - } - --#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) -+#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__HAIKU__) - void strlwr(char *pc) { - for(unsigned int i=0; i +Date: Fri, 12 Dec 2014 16:46:15 +0000 +Subject: Patched the files to make them work on haiku. + + +diff --git a/configure.in b/configure.in +index 452f196..0948bc8 100644 +--- a/configure.in ++++ b/configure.in +@@ -155,7 +155,7 @@ fi + AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") + + # m +-AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(No math library found)) ++AC_SEARCH_LIBS(floor, m, , AC_MSG_ERROR(No math library found)) + + AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) + AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) +diff --git a/src/GameInit.cpp b/src/GameInit.cpp +index 0ae9373..86f23d7 100644 +--- a/src/GameInit.cpp ++++ b/src/GameInit.cpp +@@ -269,7 +269,7 @@ void GameApp::run_load(int nNumArgs, char** ppcArgs) { + struct sigaction v_act; + + v_act.sa_handler = xmexit_term; +-#if !defined(__APPLE__) && !defined(__FreeBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__HAIKU__) + v_act.sa_restorer = NULL; + #endif + sigemptyset(&v_act.sa_mask); +diff --git a/src/VFileIO.cpp b/src/VFileIO.cpp +index 7d6c7d9..cd95f58 100644 +--- a/src/VFileIO.cpp ++++ b/src/VFileIO.cpp +@@ -106,7 +106,7 @@ std::string getPWDDir(bool i_asUtf8 = false) { + #endif + } + +-#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) ++#if !defined(WIN32) && !defined(__MORPHOS__) && !defined(__amigaos4__) && !defined(__HAIKU__) + void strlwr(char *pc) { + for(unsigned int i=0; i + + // read the .h to understand why i redefine SDLNet_TCP_Send +-#if !defined(WIN32) && !defined(__APPLE__) ++#if !defined(WIN32) && !defined(__APPLE__) && !defined(__HAIKU__) + #include + + #define SOCKET int +-- +1.8.3.4 + diff --git a/games-sports/xmoto/xmoto-0.5.11.recipe b/games-sports/xmoto/xmoto-0.5.11.recipe index e20fc7e82..141fe5c52 100644 --- a/games-sports/xmoto/xmoto-0.5.11.recipe +++ b/games-sports/xmoto/xmoto-0.5.11.recipe @@ -11,7 +11,7 @@ REVISION="1" ARCHITECTURES="x86_gcc2" SECONDARY_ARCHITECTURES="x86" -PATCHES="xmoto-0.5.11.patch" +PATCHES="xmoto_x86-0.5.11.patchset" PROVIDES=" xmoto$secondaryArchSuffix = $portVersion @@ -62,16 +62,18 @@ BUILD_PREREQUIRES=" cmd:make cmd:sed cmd:grep - cmd:ode_config + cmd:ode_config$secondaryArchSuffix cmd:awk cmd:find cmd:gettext$secondaryArchSuffix cmd:automake cmd:pkg_config$secondaryArchSuffix + cmd:autoconf " BUILD() { + autoconf export CFLAGS="-lGL" export CXXFLAGS="-lGL" runConfigure ./configure --with-internal-xdg=1 From a960f3ca3b81ed2b1e213cda966911496b1b254b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Fri, 12 Dec 2014 20:05:49 +0000 Subject: [PATCH 031/326] Added libraries to libode REQUIRES. --- dev-games/ode/ode-0.12.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 09da5fc0d..7cc7d6f16 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -25,6 +25,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" From fb18f921871fd8adc1dfa9aa808b97454cdb5b2e Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 22:24:57 +0200 Subject: [PATCH 032/326] Fixed revision at apr-1.5.0.recipe --- dev-libs/apr/apr-1.5.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index f70fae35b..72cace833 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz" CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="2" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" From 241ab26fd972518776cdd803499766a42c9c64c4 Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 12 Dec 2014 23:12:11 +0200 Subject: [PATCH 033/326] Updated recipe --- dev-libs/apr/apr-1.5.0.recipe | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index 72cace833..4c42f26ff 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz" CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7" COPYRIGHT="2012 The Apache Software Foundation." LICENSE="Apache v2" -REVISION="1" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -15,9 +15,7 @@ PROVIDES=" lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion - lib:libnetwork$secondaryArchSuffix >= $haikuVersion - lib:libroot$secondaryArchSuffix + haiku$secondaryArchSuffix >= $haikuVersion " BUILD_REQUIRES=" " From f939fb9db5366fbb4482dd612b44fd81fa1aa971 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 12 Dec 2014 22:56:22 +0000 Subject: [PATCH 034/326] wget: bump version * strip the patchset: uptream is now gcc2 friendly. --- net-misc/wget/patches/wget-1.16.1.patchset | 120 +++ net-misc/wget/patches/wget-1.16.patchset | 829 ------------------ .../{wget-1.16.recipe => wget-1.16.1.recipe} | 13 +- 3 files changed, 128 insertions(+), 834 deletions(-) create mode 100644 net-misc/wget/patches/wget-1.16.1.patchset delete mode 100644 net-misc/wget/patches/wget-1.16.patchset rename net-misc/wget/{wget-1.16.recipe => wget-1.16.1.recipe} (85%) diff --git a/net-misc/wget/patches/wget-1.16.1.patchset b/net-misc/wget/patches/wget-1.16.1.patchset new file mode 100644 index 000000000..febc906fc --- /dev/null +++ b/net-misc/wget/patches/wget-1.16.1.patchset @@ -0,0 +1,120 @@ +From d95daf9cb193a1fad78540947f57e8737c170835 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 May 2014 15:38:37 +0000 +Subject: apply wget-1.14.patch + + +diff --git a/configure.ac b/configure.ac +index 3cbe618..e617bb2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -170,6 +170,7 @@ AC_HEADER_STDBOOL + AC_CHECK_HEADERS(unistd.h sys/time.h) + AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) + AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) ++AC_CHECK_HEADERS(arpa/inet.h) + + AC_CHECK_DECLS(h_errno,,,[#include ]) + +diff --git a/m4/wget.m4 b/m4/wget.m4 +index 777e973..5a8b75d 100644 +--- a/m4/wget.m4 ++++ b/m4/wget.m4 +@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ + + dnl Check whether we need to link with -lnsl and -lsocket, as is the + dnl case on e.g. Solaris. ++dnl Haiku needs libnetwork + + AC_DEFUN([WGET_NSL_SOCKET], [ + dnl On Solaris, -lnsl is needed to use gethostbyname. But checking +@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [ + AC_CHECK_LIB(nsl, $wget_check_in_nsl) + fi + AC_CHECK_LIB(socket, socket) ++ AC_CHECK_LIB(network, gethostbyname) ++ AC_CHECK_LIB(network, socket) + ]) + + +diff --git a/src/config.h.in b/src/config.h.in +index 879ce64..22bd801 100644 +--- a/src/config.h.in ++++ b/src/config.h.in +@@ -699,6 +699,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LANGINFO_H + ++/* Define to 1 if you have the `bind' library (-lbind). */ ++#undef HAVE_LIBBIND ++ + /* Define to 1 if you have the `dl' library (-ldl). */ + #undef HAVE_LIBDL + +@@ -711,6 +714,9 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_LIBINTL_H + ++/* Define to 1 if you have the `network' library (-lnetwork). */ ++#undef HAVE_LIBNETWORK ++ + /* Define to 1 if you have the `nsl' library (-lnsl). */ + #undef HAVE_LIBNSL + +diff --git a/src/connect.c b/src/connect.c +index 1fb1819..f2c832b 100644 +--- a/src/connect.c ++++ b/src/connect.c +@@ -46,7 +46,7 @@ as that of the covered work. */ + # include + # endif /* def __VMS [else] */ + # include +-# ifndef __BEOS__ ++# ifdef HAVE_ARPA_INET_H + # include + # endif + #endif /* not WINDOWS */ +diff --git a/src/host.h b/src/host.h +index 84f3d13..e664e7f 100644 +--- a/src/host.h ++++ b/src/host.h +@@ -42,9 +42,9 @@ as that of the covered work. */ + # endif /* def __VMS [else] */ + # include + # include +-#ifndef __BEOS__ +-# include +-#endif ++# ifdef HAVE_ARPA_INET_H ++# include ++# endif + #endif + + struct url; +-- +1.8.3.4 + + +From 429d0bbb2c9d1243d009df399045028cc062684e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Mon, 19 May 2014 15:47:24 +0000 +Subject: apply and augment wget-1.14-build-fixes.patch + + +diff --git a/src/utils.c b/src/utils.c +index 78c282e..6a21164 100644 +--- a/src/utils.c ++++ b/src/utils.c +@@ -64,7 +64,9 @@ as that of the covered work. */ + #include + + /* For TIOCGWINSZ and friends: */ ++#ifndef __HAIKU__ + #include ++#endif + #include + + /* Needed for Unix version of run_with_timeout. */ +-- +1.8.3.4 + diff --git a/net-misc/wget/patches/wget-1.16.patchset b/net-misc/wget/patches/wget-1.16.patchset deleted file mode 100644 index d97b6e476..000000000 --- a/net-misc/wget/patches/wget-1.16.patchset +++ /dev/null @@ -1,829 +0,0 @@ -From d95daf9cb193a1fad78540947f57e8737c170835 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 15:38:37 +0000 -Subject: apply wget-1.14.patch - - -diff --git a/configure.ac b/configure.ac -index 3cbe618..e617bb2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,6 +170,7 @@ AC_HEADER_STDBOOL - AC_CHECK_HEADERS(unistd.h sys/time.h) - AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h) - AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h) -+AC_CHECK_HEADERS(arpa/inet.h) - - AC_CHECK_DECLS(h_errno,,,[#include ]) - -diff --git a/m4/wget.m4 b/m4/wget.m4 -index 777e973..5a8b75d 100644 ---- a/m4/wget.m4 -+++ b/m4/wget.m4 -@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [ - - dnl Check whether we need to link with -lnsl and -lsocket, as is the - dnl case on e.g. Solaris. -+dnl Haiku needs libnetwork - - AC_DEFUN([WGET_NSL_SOCKET], [ - dnl On Solaris, -lnsl is needed to use gethostbyname. But checking -@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [ - AC_CHECK_LIB(nsl, $wget_check_in_nsl) - fi - AC_CHECK_LIB(socket, socket) -+ AC_CHECK_LIB(network, gethostbyname) -+ AC_CHECK_LIB(network, socket) - ]) - - -diff --git a/src/config.h.in b/src/config.h.in -index 879ce64..22bd801 100644 ---- a/src/config.h.in -+++ b/src/config.h.in -@@ -699,6 +699,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LANGINFO_H - -+/* Define to 1 if you have the `bind' library (-lbind). */ -+#undef HAVE_LIBBIND -+ - /* Define to 1 if you have the `dl' library (-ldl). */ - #undef HAVE_LIBDL - -@@ -711,6 +714,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_LIBINTL_H - -+/* Define to 1 if you have the `network' library (-lnetwork). */ -+#undef HAVE_LIBNETWORK -+ - /* Define to 1 if you have the `nsl' library (-lnsl). */ - #undef HAVE_LIBNSL - -diff --git a/src/connect.c b/src/connect.c -index 1fb1819..f2c832b 100644 ---- a/src/connect.c -+++ b/src/connect.c -@@ -46,7 +46,7 @@ as that of the covered work. */ - # include - # endif /* def __VMS [else] */ - # include --# ifndef __BEOS__ -+# ifdef HAVE_ARPA_INET_H - # include - # endif - #endif /* not WINDOWS */ -diff --git a/src/host.h b/src/host.h -index 84f3d13..e664e7f 100644 ---- a/src/host.h -+++ b/src/host.h -@@ -42,9 +42,9 @@ as that of the covered work. */ - # endif /* def __VMS [else] */ - # include - # include --#ifndef __BEOS__ --# include --#endif -+# ifdef HAVE_ARPA_INET_H -+# include -+# endif - #endif - - struct url; --- -1.8.3.4 - - -From 429d0bbb2c9d1243d009df399045028cc062684e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 15:47:24 +0000 -Subject: apply and augment wget-1.14-build-fixes.patch - - -diff --git a/src/ftp-basic.c b/src/ftp-basic.c -index b6e67e2..61cf7a4 100644 ---- a/src/ftp-basic.c -+++ b/src/ftp-basic.c -@@ -965,8 +965,6 @@ ftp_list (int csock, const char *file, bool avoid_list_a, bool avoid_list, - bool ok = false; - size_t i = 0; - -- *list_a_used = false; -- - /* 2013-10-12 Andrea Urbani (matfanjol) - For more information about LIST and "LIST -a" please look at ftp.c, - function getftp, text "__LIST_A_EXPLANATION__". -@@ -975,7 +973,9 @@ ftp_list (int csock, const char *file, bool avoid_list_a, bool avoid_list, - later "i" variable. */ - const char *list_commands[] = { "LIST -a", - "LIST" }; -+ *list_a_used = false; - -+ - if (avoid_list_a) - { - i = countof (list_commands)- 1; -diff --git a/src/html-url.c b/src/html-url.c -index 903864e..ebeb382 100644 ---- a/src/html-url.c -+++ b/src/html-url.c -@@ -790,6 +790,7 @@ get_urls_file (const char *file) - char *url_text; - struct urlpos *entry; - struct url *url; -+ char *new_url; - - const char *line_beg = text; - const char *line_end = memchr (text, '\n', text_end - text); -@@ -822,7 +823,7 @@ get_urls_file (const char *file) - url_text = merged; - } - -- char *new_url = rewrite_shorthand_url (url_text); -+ new_url = rewrite_shorthand_url (url_text); - if (new_url) - { - xfree (url_text); -diff --git a/src/http.c b/src/http.c -index 4b99c17..5ecf43b 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -1532,6 +1532,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, - int warc_payload_offset = 0; - FILE *warc_tmp = NULL; - int warcerr = 0; -+ int flags; - - if (opt.warc_filename != NULL) - { -@@ -1568,7 +1569,7 @@ read_response_body (struct http_stat *hs, int sock, FILE *fp, wgint contlen, - } - - /* Read the response body. */ -- int flags = 0; -+ flags = 0; - if (contlen != -1) - /* If content-length is present, read that much; otherwise, read - until EOF. The HTTP spec doesn't require the server to -@@ -1673,6 +1674,7 @@ static uerr_t - gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, - struct iri *iri, int count) - { -+ int warc_tmp_written; - struct request *req; - - char *type; -@@ -2141,10 +2143,11 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy, - if (write_error >= 0 && warc_tmp != NULL) - { - /* Remember end of headers / start of payload. */ -+ int warc_tmp_written; - warc_payload_offset = ftello (warc_tmp); - - /* Write a copy of the data to the WARC record. */ -- int warc_tmp_written = fwrite (opt.body_data, 1, body_data_size, warc_tmp); -+ warc_tmp_written = fwrite (opt.body_data, 1, body_data_size, warc_tmp); - if (warc_tmp_written != body_data_size) - write_error = -2; - } -@@ -2325,6 +2328,7 @@ read_header: - - if (statcode == HTTP_STATUS_UNAUTHORIZED) - { -+ uerr_t auth_err; - /* Authorization is required. */ - - /* Normally we are not interested in the response body. -@@ -2363,7 +2367,7 @@ read_header: - } - - pconn.authorized = false; -- uerr_t auth_err = RETROK; -+ auth_err = RETROK; - if (!auth_finished && (user && passwd)) - { - /* IIS sends multiple copies of WWW-Authenticate, one with -diff --git a/src/main.c b/src/main.c -index 1ada822..a72249d 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -987,13 +987,18 @@ main (int argc, char **argv) - int i, ret, longindex; - int nurl; - bool append_to_log = false; -+ struct ptimer *timer; -+ double start_time; -+ int arglen; -+ int argstring_length; -+ char *p; - - total_downloaded_bytes = 0; - - program_name = argv[0]; - -- struct ptimer *timer = ptimer_new (); -- double start_time = ptimer_measure (timer); -+ timer = ptimer_new (); -+ start_time = ptimer_measure (timer); - - i18n_initialize (); - -@@ -1015,10 +1020,10 @@ main (int argc, char **argv) - #endif - - /* Construct the arguments string. */ -- int argstring_length = 1; -+ argstring_length = 1; - for (i = 1; i < argc; i++) - argstring_length += strlen (argv[i]) + 2 + 1; -- char *p = program_argstring = malloc (argstring_length * sizeof (char)); -+ p = program_argstring = malloc (argstring_length * sizeof (char)); - if (p == NULL) - { - fprintf (stderr, _("Memory allocation problem\n")); -@@ -1027,7 +1032,7 @@ main (int argc, char **argv) - for (i = 1; i < argc; i++) - { - *p++ = '"'; -- int arglen = strlen (argv[i]); -+ arglen = strlen (argv[i]); - memcpy (p, argv[i], arglen); - p += arglen; - *p++ = '"'; -@@ -1702,10 +1707,12 @@ outputting to a regular file.\n")); - total_downloaded_bytes != 0) - { - double end_time = ptimer_measure (timer); -+ char *wall_time; -+ char *download_time; - ptimer_destroy (timer); - -- char *wall_time = xstrdup (secs_to_human_time (end_time - start_time)); -- char *download_time = xstrdup (secs_to_human_time (total_download_time)); -+ wall_time = xstrdup (secs_to_human_time (end_time - start_time)); -+ download_time = xstrdup (secs_to_human_time (total_download_time)); - logprintf (LOG_NOTQUIET, - _("FINISHED --%s--\nTotal wall clock time: %s\n" - "Downloaded: %d files, %s in %s (%s)\n"), -diff --git a/src/retr.c b/src/retr.c -index 71b5c28..0c7c29f 100644 ---- a/src/retr.c -+++ b/src/retr.c -@@ -378,8 +378,9 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread, - - if (ret > 0) - { -+ int write_res; - sum_read += ret; -- int write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written); -+ write_res = write_data (out, out2, dlbuf, ret, &skip, &sum_written); - if (write_res < 0) - { - ret = (write_res == -3) ? -3 : -2; -diff --git a/src/utils.c b/src/utils.c -index 78c282e..6a21164 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -64,7 +64,9 @@ as that of the covered work. */ - #include - - /* For TIOCGWINSZ and friends: */ -+#ifndef __HAIKU__ - #include -+#endif - #include - - /* Needed for Unix version of run_with_timeout. */ -diff --git a/src/warc.c b/src/warc.c -index 46459ac..fdef2d6 100644 ---- a/src/warc.c -+++ b/src/warc.c -@@ -163,10 +163,11 @@ warc_write_buffer (const char *buffer, size_t size) - static bool - warc_write_string (const char *str) - { -+ size_t n; - if (!warc_write_ok) - return false; - -- size_t n = strlen (str); -+ n = strlen (str); - if (n != warc_write_buffer (str, n)) - warc_write_ok = false; - -@@ -254,6 +255,8 @@ static bool - warc_write_block_from_file (FILE *data_in) - { - /* Add the Content-Length header. */ -+ char buffer[BUFSIZ]; -+ size_t s; - char content_length[MAX_INT_TO_STRING_LEN(off_t)]; - fseeko (data_in, 0L, SEEK_END); - number_to_string (content_length, ftello (data_in)); -@@ -266,8 +269,6 @@ warc_write_block_from_file (FILE *data_in) - warc_write_ok = false; - - /* Copy the data in the file to the WARC record. */ -- char buffer[BUFSIZ]; -- size_t s; - while (warc_write_ok && (s = fread (buffer, 1, BUFSIZ, data_in)) > 0) - { - if (warc_write_buffer (buffer, s) < s) -@@ -292,6 +293,12 @@ warc_write_end_record (void) - /* We start a new gzip stream for each record. */ - if (warc_write_ok && warc_current_gzfile) - { -+ size_t result; -+ char static_header[GZIP_STATIC_HEADER_SIZE]; -+ off_t current_offset; -+ off_t uncompressed_size; -+ off_t compressed_size; -+ char extra_header[EXTRA_GZIP_HEADER_SIZE]; - if (gzclose (warc_current_gzfile) != Z_OK) - { - warc_write_ok = false; -@@ -317,17 +324,16 @@ warc_write_end_record (void) - */ - - /* Calculate the uncompressed and compressed sizes. */ -- off_t current_offset = ftello (warc_current_file); -- off_t uncompressed_size = current_offset - warc_current_gzfile_offset; -- off_t compressed_size = warc_current_gzfile_uncompressed_size; -+ current_offset = ftello (warc_current_file); -+ uncompressed_size = current_offset - warc_current_gzfile_offset; -+ compressed_size = warc_current_gzfile_uncompressed_size; - - /* Go back to the static GZIP header. */ - fseeko (warc_current_file, warc_current_gzfile_offset - + EXTRA_GZIP_HEADER_SIZE, SEEK_SET); - - /* Read the header. */ -- char static_header[GZIP_STATIC_HEADER_SIZE]; -- size_t result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE, -+ result = fread (static_header, 1, GZIP_STATIC_HEADER_SIZE, - warc_current_file); - if (result != GZIP_STATIC_HEADER_SIZE) - { -@@ -344,7 +350,6 @@ warc_write_end_record (void) - fwrite (static_header, 1, GZIP_STATIC_HEADER_SIZE, warc_current_file); - - /* Prepare the extra GZIP header. */ -- char extra_header[EXTRA_GZIP_HEADER_SIZE]; - /* XLEN, the length of the extra header fields. */ - extra_header[0] = ((EXTRA_GZIP_HEADER_SIZE - 2) & 255); - extra_header[1] = ((EXTRA_GZIP_HEADER_SIZE - 2) >> 8) & 255; -@@ -661,13 +666,15 @@ warc_write_warcinfo_record (char *filename) - /* Write warc-info record as the first record of the file. */ - /* We add the record id of this info record to the other records in the - file. */ -+ char timestamp[22]; -+ char *filename_copy, *filename_basename; -+ FILE *warc_tmp; -+ - warc_current_warcinfo_uuid_str = (char *) malloc (48); - warc_uuid_str (warc_current_warcinfo_uuid_str); - -- char timestamp[22]; - warc_timestamp (timestamp); - -- char *filename_copy, *filename_basename; - filename_copy = strdup (filename); - filename_basename = strdup (basename (filename_copy)); - -@@ -679,7 +686,7 @@ warc_write_warcinfo_record (char *filename) - warc_write_header ("WARC-Filename", filename_basename); - - /* Create content. */ -- FILE *warc_tmp = warc_tempfile (); -+ warc_tmp = warc_tempfile (); - if (warc_tmp == NULL) - { - free (filename_copy); -@@ -729,6 +736,10 @@ warc_write_warcinfo_record (char *filename) - static bool - warc_start_new_file (bool meta) - { -+ int base_filename_length; -+ char *new_filename; -+ const char *extension; -+ - if (opt.warc_filename == NULL) - return false; - -@@ -740,9 +751,9 @@ warc_start_new_file (bool meta) - - warc_current_file_number++; - -- int base_filename_length = strlen (opt.warc_filename); -+ base_filename_length = strlen (opt.warc_filename); - /* filename format: base + "-" + 5 digit serial number + ".warc.gz" */ -- char *new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); -+ new_filename = malloc (base_filename_length + 1 + 5 + 8 + 1); - warc_current_filename = new_filename; - - #ifdef __VMS -@@ -752,9 +763,9 @@ warc_start_new_file (bool meta) - #endif /* def __VMS [else] */ - - #ifdef HAVE_LIBZ -- const char *extension = (opt.warc_compression_enabled ? WARC_GZ : "warc"); -+ extension = (opt.warc_compression_enabled ? WARC_GZ : "warc"); - #else -- const char *extension = "warc"; -+ extension = "warc"; - #endif - - /* If max size is enabled, we add a serial number to the file names. */ -@@ -828,12 +839,13 @@ static bool - warc_parse_cdx_header (char *lineptr, int *field_num_original_url, - int *field_num_checksum, int *field_num_record_id) - { -+ char *token; -+ char *save_ptr; -+ - *field_num_original_url = -1; - *field_num_checksum = -1; - *field_num_record_id = -1; - -- char *token; -- char *save_ptr; - token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); - - if (token != NULL && strcmp (token, "CDX") == 0) -@@ -877,10 +889,12 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, - - char *token; - char *save_ptr; -+ int field_num; -+ - token = strtok_r (lineptr, CDX_FIELDSEP, &save_ptr); - - /* Read this line to get the fields we need. */ -- int field_num = 0; -+ field_num = 0; - while (token != NULL) - { - char **val; -@@ -942,10 +956,7 @@ warc_process_cdx_line (char *lineptr, int field_num_original_url, - static bool - warc_load_cdx_dedup_file (void) - { -- FILE *f = fopen (opt.warc_cdx_dedup_filename, "r"); -- if (f == NULL) -- return false; -- -+ FILE *f; - int field_num_original_url = -1; - int field_num_checksum = -1; - int field_num_record_id = -1; -@@ -954,6 +965,10 @@ warc_load_cdx_dedup_file (void) - size_t n = 0; - ssize_t line_length; - -+ f = fopen (opt.warc_cdx_dedup_filename, "r"); -+ if (f == NULL) -+ return false; -+ - /* The first line should contain the CDX header. - Format: " CDX x x x x x" - where x are field type indicators. For our purposes, we only -@@ -981,6 +996,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); - } - else - { -+ int nrecords; - /* Initialize the table. */ - warc_cdx_dedup_table = hash_table_new (1000, warc_hash_sha1_digest, - warc_cmp_sha1_digest); -@@ -998,7 +1014,7 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); - while (line_length != -1); - - /* Print results. */ -- int nrecords = hash_table_count (warc_cdx_dedup_table); -+ nrecords = hash_table_count (warc_cdx_dedup_table); - logprintf (LOG_VERBOSE, ngettext ("Loaded %d record from CDX.\n\n", - "Loaded %d records from CDX.\n\n", - nrecords), -@@ -1018,10 +1034,11 @@ _("CDX file does not list record ids. (Missing column 'u'.)\n")); - static struct warc_cdx_record * - warc_find_duplicate_cdx_record (char *url, char *sha1_digest_payload) - { -+ struct warc_cdx_record *rec_existing; - if (warc_cdx_dedup_table == NULL) - return NULL; - -- struct warc_cdx_record *rec_existing -+ rec_existing - = hash_table_get (warc_cdx_dedup_table, sha1_digest_payload); - - if (rec_existing && strcmp (rec_existing->url, url) == 0) -@@ -1093,11 +1110,13 @@ warc_init (void) - static void - warc_write_metadata (void) - { -+ char manifest_uuid [48]; -+ FILE * warc_tmp_fp; -+ - /* If there are multiple WARC files, the metadata should be written to a separate file. */ - if (opt.warc_maxsize > 0) - warc_start_new_file (true); - -- char manifest_uuid [48]; - warc_uuid_str (manifest_uuid); - - fflush (warc_manifest_fp); -@@ -1107,7 +1126,7 @@ warc_write_metadata (void) - warc_manifest_fp, -1); - /* warc_write_resource_record has closed warc_manifest_fp. */ - -- FILE * warc_tmp_fp = warc_tempfile (); -+ warc_tmp_fp = warc_tempfile (); - if (warc_tmp_fp == NULL) - { - logprintf (LOG_NOTQUIET, _("Could not open temporary WARC file.\n")); -@@ -1161,6 +1180,7 @@ warc_close (void) - FILE * - warc_tempfile (void) - { -+ int fd; - char filename[100]; - if (path_search (filename, 100, opt.warc_tempdir, "wget", true) == -1) - return NULL; -@@ -1180,7 +1200,7 @@ warc_tempfile (void) - return fopen (tfn, "w+", "fop=tmd"); /* Create auto-delete temp file. */ - } - #else /* def __VMS */ -- int fd = mkostemp (filename, O_TEMPORARY); -+ fd = mkostemp (filename, O_TEMPORARY); - if (fd < 0) - return NULL; - -@@ -1242,8 +1262,11 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, - off_t offset, const char *warc_filename _GL_UNUSED, - const char *response_uuid) - { -- /* Transform the timestamp. */ -+ char offset_string[MAX_INT_TO_STRING_LEN(off_t)]; - char timestamp_str_cdx [15]; -+ const char *checksum; -+ -+ /* Transform the timestamp. */ - memcpy (timestamp_str_cdx , timestamp_str , 4); /* "YYYY" "-" */ - memcpy (timestamp_str_cdx + 4, timestamp_str + 5, 2); /* "mm" "-" */ - memcpy (timestamp_str_cdx + 6, timestamp_str + 8, 2); /* "dd" "T" */ -@@ -1253,7 +1276,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, - timestamp_str_cdx[14] = '\0'; - - /* Rewrite the checksum. */ -- const char *checksum; - if (payload_digest != NULL) - checksum = payload_digest + 5; /* Skip the "sha1:" */ - else -@@ -1264,7 +1286,6 @@ warc_write_cdx_record (const char *url, const char *timestamp_str, - if (redirect_location == NULL || strlen(redirect_location) == 0) - redirect_location = "-"; - -- char offset_string[MAX_INT_TO_STRING_LEN(off_t)]; - number_to_string (offset_string, offset); - - /* Print the CDX line. */ -@@ -1296,10 +1317,11 @@ warc_write_revisit_record (char *url, char *timestamp_str, - char *refers_to, ip_address *ip, FILE *body) - { - char revisit_uuid [48]; -- warc_uuid_str (revisit_uuid); -- - char *block_digest = NULL; - char sha1_res_block[SHA1_DIGEST_SIZE]; -+ -+ warc_uuid_str (revisit_uuid); -+ - sha1_stream (body, sha1_res_block); - block_digest = warc_base32_sha1_digest (sha1_res_block); - -@@ -1350,6 +1372,9 @@ warc_write_response_record (char *url, char *timestamp_str, - char sha1_res_block[SHA1_DIGEST_SIZE]; - char sha1_res_payload[SHA1_DIGEST_SIZE]; - -+ char response_uuid [48]; -+ off_t offset; -+ - if (opt.warc_digests_enabled) - { - /* Calculate the block and payload digests. */ -@@ -1393,11 +1418,10 @@ warc_write_response_record (char *url, char *timestamp_str, - - /* Not a revisit, just store the record. */ - -- char response_uuid [48]; - warc_uuid_str (response_uuid); - - fseeko (warc_current_file, 0L, SEEK_END); -- off_t offset = ftello (warc_current_file); -+ offset = ftello (warc_current_file); - - warc_write_start_record (); - warc_write_header ("WARC-Type", "response"); --- -1.8.3.4 - - -From 9c955c94b7c3c9da50351fd68bfa1a9d6dca80ba Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 1 Dec 2014 18:00:02 +0000 -Subject: Fix OpenSSL compile-time check for TLSv1.1 and TLSv1.2 - -from upstream - -diff --git a/src/openssl.c b/src/openssl.c -index e24954a..3f42b8f 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -216,13 +216,20 @@ ssl_init (void) - case secure_protocol_tlsv1: - meth = TLSv1_client_method (); - break; --#if OPENSSL_VERSION_NUMBER >= 0x01001000 -+#if OPENSSL_VERSION_NUMBER >= 0x10001000 - case secure_protocol_tlsv1_1: - meth = TLSv1_1_client_method (); - break; - case secure_protocol_tlsv1_2: - meth = TLSv1_2_client_method (); - break; -+#else -+ case secure_protocol_tlsv1_1: -+ logprintf (LOG_NOTQUIET, _("Your OpenSSL version is too old to support TLSv1.1\n")); -+ goto error; -+ case secure_protocol_tlsv1_2: -+ logprintf (LOG_NOTQUIET, _("Your OpenSSL version is too old to support TLSv1.2\n")); -+ goto error; - #endif - default: - abort (); --- -1.8.3.4 - - -From 02ca916f8dddcb1c27cefa1f6ab4c99525d6bdc2 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 1 Dec 2014 18:14:50 +0000 -Subject: gcc2 fixes - - -diff --git a/src/ftp.c b/src/ftp.c -index 054cb61..723776c 100644 ---- a/src/ftp.c -+++ b/src/ftp.c -@@ -2220,9 +2220,9 @@ has_insecure_name_p (const char *s) - static bool - is_invalid_entry (struct fileinfo *f) - { -+ char *f_name = f->name; - struct fileinfo *cur; - cur = f; -- char *f_name = f->name; - /* If the node we're currently checking has a duplicate later, we eliminate - * the current node and leave the next one intact. */ - while (cur->next) -diff --git a/src/http.c b/src/http.c -index 5ecf43b..4176678 100644 ---- a/src/http.c -+++ b/src/http.c -@@ -1189,8 +1189,8 @@ static bool - parse_content_disposition (const char *hdr, char **filename) - { - param_token name, value; -- *filename = NULL; - bool is_url_encoded = false; -+ *filename = NULL; - for ( ; extract_param (&hdr, &name, &value, ';', &is_url_encoded); - is_url_encoded = false) - { -diff --git a/src/main.c b/src/main.c -index a72249d..50dc562 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -992,6 +992,9 @@ main (int argc, char **argv) - int arglen; - int argstring_length; - char *p; -+ int retconf; -+ bool use_userconfig = false; -+ bool noconfig = false; - - total_downloaded_bytes = 0; - -@@ -1048,9 +1051,6 @@ main (int argc, char **argv) - /* This separate getopt_long is needed to find the user config file - option ("--config") and parse it before the other user options. */ - longindex = -1; -- int retconf; -- bool use_userconfig = false; -- bool noconfig = false; - - while ((retconf = getopt_long (argc, argv, - short_options, long_options, &longindex)) != -1) -diff --git a/src/openssl.c b/src/openssl.c -index 3f42b8f..c1d1f52 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -167,6 +167,8 @@ static int ssl_true_initialized = 0; - bool - ssl_init (void) - { -+ SSL_METHOD const *meth; -+ - #if OPENSSL_VERSION_NUMBER >= 0x00907000 - if (ssl_true_initialized == 0) - { -@@ -174,9 +176,7 @@ ssl_init (void) - ssl_true_initialized = 1; - } - #endif -- -- SSL_METHOD const *meth; -- -+ - if (ssl_ctx) - /* The SSL has already been initialized. */ - return true; -diff --git a/src/progress.c b/src/progress.c -index 5ba542d..f0da019 100644 ---- a/src/progress.c -+++ b/src/progress.c -@@ -903,6 +903,8 @@ get_eta (int *bcd) - static void - create_image (struct bar_progress *bp, double dl_total_time, bool done) - { -+ int cols_diff; -+ const char * down_size; - const int MAX_FILENAME_COLS = bp->width / 4; - char *p = bp->buffer; - wgint size = bp->initial_length + bp->count; -@@ -964,6 +966,7 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) - } - else - { -+ int padding; - int offset_cols; - int bytes_in_filename, offset_bytes, col; - int *cols_ret = &col; -@@ -976,7 +979,7 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) - bytes_in_filename = cols_to_bytes (bp->f_download + offset_bytes, MAX_FILENAME_COLS, cols_ret); - memcpy (p, bp->f_download + offset_bytes, bytes_in_filename); - p += bytes_in_filename; -- int padding = MAX_FILENAME_COLS - *cols_ret; -+ padding = MAX_FILENAME_COLS - *cols_ret; - for (;padding;padding--) - *p++ = ' '; - *p++ = ' '; -@@ -1059,8 +1062,8 @@ create_image (struct bar_progress *bp, double dl_total_time, bool done) - ++bp->tick; - - /* " 234.56M" */ -- const char * down_size = human_readable (size, 1000, 2); -- int cols_diff = 7 - count_cols (down_size); -+ down_size = human_readable (size, 1000, 2); -+ cols_diff = 7 - count_cols (down_size); - while (cols_diff > 0) - { - *p++=' '; -diff --git a/src/retr.c b/src/retr.c -index 0c7c29f..cb5fa3f 100644 ---- a/src/retr.c -+++ b/src/retr.c -@@ -1059,6 +1059,7 @@ retrieve_from_file (const char *file, bool html, int *count) - int dt; - struct iri *tmpiri = iri_dup (iri); - struct url *parsed_url = NULL; -+ char *proxy; - - if (cur_url->ignore_when_downloading) - continue; -@@ -1071,7 +1072,7 @@ retrieve_from_file (const char *file, bool html, int *count) - - parsed_url = url_parse (cur_url->url->url, NULL, tmpiri, true); - -- char *proxy = getproxy (cur_url->url); -+ proxy = getproxy (cur_url->url); - if ((opt.recursive || opt.page_requisites) - && (cur_url->url->scheme != SCHEME_FTP || proxy)) - { -@@ -1283,10 +1284,11 @@ getproxy (struct url *u) - bool - url_uses_proxy (struct url * u) - { -+ char *proxy; - bool ret; - if (!u) - return false; -- char *proxy = getproxy (u); -+ proxy = getproxy (u); - ret = proxy != NULL; - free(proxy); - return ret; --- -1.8.3.4 - diff --git a/net-misc/wget/wget-1.16.recipe b/net-misc/wget/wget-1.16.1.recipe similarity index 85% rename from net-misc/wget/wget-1.16.recipe rename to net-misc/wget/wget-1.16.1.recipe index db80df47a..3dd4d2231 100644 --- a/net-misc/wget/wget-1.16.recipe +++ b/net-misc/wget/wget-1.16.1.recipe @@ -6,7 +6,7 @@ scripts. " HOMEPAGE="http://www.gnu.org/software/wget" SRC_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz" -CHECKSUM_SHA256="b977fc10ac7a72d987d48136251aeb332f2dced1aabd50d6d56bdf72e2b79101" +CHECKSUM_SHA256="3b834ce69366d4681f295307fce36ee14e122c4ee68a4d1291b62b0b26755a77" LICENSE="GNU GPL v3" COPYRIGHT="1996-2014 Free Software Foundation" REVISION="1" @@ -20,6 +20,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion + lib:libintl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -30,6 +31,7 @@ BUILD_REQUIRES=" devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix >= 1.2.3 + devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix @@ -39,6 +41,9 @@ BUILD_PREREQUIRES=" cmd:make cmd:makeinfo cmd:pod2man + cmd:gettext + cmd:find + cmd:pkg_config$secondaryArchSuffix " USER_SETTINGS_FILES=" @@ -49,13 +54,11 @@ GLOBAL_WRITABLE_FILES=" settings/wgetrc keep-old " -PATCHES="wget-1.16.patchset" +PATCHES="wget-$portVersion.patchset" BUILD() { - libtoolize --force --copy --install - aclocal -I m4 - autoconf + autoreconf -fi runConfigure ./configure --with-ssl=openssl make } From b54dd3d4b2bb743857ff283a86713a8d2cc71830 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 13 Dec 2014 00:00:20 +0000 Subject: [PATCH 035/326] python: enable 2.7 for x86 --- dev-lang/python/python-2.7.1.recipe | 41 ----------------------------- dev-lang/python/python-2.7.8.recipe | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 dev-lang/python/python-2.7.1.recipe diff --git a/dev-lang/python/python-2.7.1.recipe b/dev-lang/python/python-2.7.1.recipe deleted file mode 100644 index a9294c883..000000000 --- a/dev-lang/python/python-2.7.1.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.7.1/Python-2.7.1.tar.bz2" -CHECKSUM_MD5="aa27bc25725137ba155910bd8e5ddc4f" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD() -{ - cd Python-2.7.1/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared \ - LDFLAGS=-L/boot/common/lib \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.7.1 - make install -} - -TEST() -{ - cd Python-2.7.1 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.7.8.recipe b/dev-lang/python/python-2.7.8.recipe index 4ec8cdbc4..15d017e8c 100644 --- a/dev-lang/python/python-2.7.8.recipe +++ b/dev-lang/python/python-2.7.8.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a" REVISION="1" -ARCHITECTURES="x86_gcc2 !x86 x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 4beeb05bc887c2e12fd6ed9a0eddd5b8c52722d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 13 Dec 2014 01:34:45 +0100 Subject: [PATCH 036/326] libburndevice: Fix require There's no such cmd:cdrtools, just cdrtools or cmd:cdrecord. --- haiku-libs/libburndevice/libburndevice-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-libs/libburndevice/libburndevice-1.0.recipe b/haiku-libs/libburndevice/libburndevice-1.0.recipe index f13628c13..f4377bbf7 100644 --- a/haiku-libs/libburndevice/libburndevice-1.0.recipe +++ b/haiku-libs/libburndevice/libburndevice-1.0.recipe @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion - cmd:cdrtools + cmd:cdrecord " PROVIDES_devel=" From 8e49231363132404fbe2a37c54bc8f725fb789ee Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Fri, 12 Dec 2014 21:52:36 +0100 Subject: [PATCH 037/326] Add recipe for flare --- games-rpg/flare/flare-0.19.recipe | 66 ++++++++++++++++++++++++ games-rpg/flare/patches/flare-0.19.patch | 58 +++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 games-rpg/flare/flare-0.19.recipe create mode 100644 games-rpg/flare/patches/flare-0.19.patch diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe new file mode 100644 index 000000000..fcfebb1ab --- /dev/null +++ b/games-rpg/flare/flare-0.19.recipe @@ -0,0 +1,66 @@ +SUMMARY="Single-player 2D action RPG." +DESCRIPTION="Flare is a a single-player 2D action RPG with fast-paced action \ +and a dark fantasy style." +HOMEPAGE="http://flarerpg.org" +SRC_URI="http://downloads.sourceforge.net/project/flare-game/Linux/flare.0.19.tar.gz" +CHECKSUM_SHA256="c96995fff6b71d44ddeae611b1ae4cd35162655f73088000786d03478f0a924e" +SOURCE_DIR="flare.0.19" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2010-2013 Clint Bellanger" + +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + flare$secondaryArchSuffix = $portVersion + app:Flare$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + lib:libsdl_ttf$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl$secondaryArchSuffix + devel:sdl_mixer$secondaryArchSuffix + devel:sdl_image$secondaryArchSuffix + devel:sdl_ttf$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:cmake + cmd:gcc$secondaryArchSuffix + " + +PATCHES="flare-0.19.patch" + +USER_SETTINGS_FILES=" + settings/flare + " + +BUILD() +{ + cmake . + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + mkdir -p $dataDir/flare + cp flare $appsDir + cp -r mods $dataDir/flare/ + addAppDeskbarSymlink $appsDir/flare "Flare" +} diff --git a/games-rpg/flare/patches/flare-0.19.patch b/games-rpg/flare/patches/flare-0.19.patch new file mode 100644 index 000000000..d40cbc0e8 --- /dev/null +++ b/games-rpg/flare/patches/flare-0.19.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef6577f..b7631b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,10 @@ elseif () + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-enforce-eh-specs") + endif () + ++if(HAIKU) ++ set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS}" "-lbe") ++endif() ++ + if(CMAKE_BUILD_TYPE STREQUAL "Release") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -g0") + elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") +diff --git a/src/Settings.cpp b/src/Settings.cpp +index 8beaeed..c22cc09 100644 +--- a/src/Settings.cpp ++++ b/src/Settings.cpp +@@ -34,6 +34,12 @@ using namespace std; + #include "UtilsFileSystem.h" + #include "SharedResources.h" + ++#ifdef __HAIKU__ ++#include ++#include ++#include ++#endif ++ + #ifdef _MSC_VER + #define log2(x) logf(x)/logf(2) + #endif +@@ -232,6 +238,25 @@ void setPaths() { + if (dirExists(CUSTOM_PATH_DATA)) PATH_DATA = CUSTOM_PATH_DATA; + else if (!CUSTOM_PATH_DATA.empty()) fprintf(stderr, "Error: Could not find specified game data directory.\n"); + } ++ ++#elif __HAIKU__ ++// Haiku paths ++void setPaths() { ++ BPath path; ++ find_directory(B_USER_SETTINGS_DIRECTORY, &path); ++ BString str = path.Path(); ++ str << "/flare/"; ++ createDir(str.String()); ++ PATH_CONF = str; ++ PATH_USER = str; ++ PATH_DEFAULT_USER = str; ++ find_directory(B_SYSTEM_DATA_DIRECTORY, &path); ++ str = path.Path(); ++ str << "/flare/"; ++ PATH_DATA = str; ++ PATH_DEFAULT_DATA = str; ++} ++ + #else + void setPaths() { + From 7f69e026349f74c644927a9112ab8bbaa78e6463 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 14 Dec 2014 00:44:24 +0200 Subject: [PATCH 038/326] Fixed apr_util-1.5.4 recipe for x86 build --- dev-libs/apr_util/apr_util-1.5.4.recipe | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-libs/apr_util/apr_util-1.5.4.recipe b/dev-libs/apr_util/apr_util-1.5.4.recipe index 175ba1f1f..14c99b0f6 100644 --- a/dev-libs/apr_util/apr_util-1.5.4.recipe +++ b/dev-libs/apr_util/apr_util-1.5.4.recipe @@ -16,30 +16,31 @@ LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" PATCHES="apr_util-1.5.3.patch" PROVIDES=" - apr_util = $portVersion compat >= 1 - lib:libaprutil_1 = 0.5.4 compat >= 0 + apr_util$secondaryArchSuffix = $portVersion compat >= 1 + lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion - lib:libapr_1 - lib:libexpat - lib:libiconv + haiku$secondaryArchSuffix >= $haikuVersion + lib:libapr_1$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" - devel:libapr_1 >= 0.5.0 - devel:libexpat - devel:libiconv + devel:libapr_1$secondaryArchSuffix >= 0.5.0 + devel:libexpat$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf cmd:autoheader - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:ld cmd:libtoolize cmd:make @@ -54,8 +55,7 @@ PATCH() BUILD() { - aprInstallDir=$portPackageLinksDir/lib~libapr_1 - expatInstallDir=$portPackageLinksDir/lib~libexpat + expatInstallDir=$portPackageLinksDir/lib~libexpat$secondaryArchSuffix rm -rf aclocal.m4 mkdir -p m4 @@ -77,7 +77,7 @@ BUILD() ln -sfn $sourceDir/libtool /libtool runConfigure ./configure \ - --with-apr=$aprInstallDir \ + --with-apr=/$relativeBinDir \ --with-expat=$expatInstallDir make $jobArgs } @@ -108,10 +108,10 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - apr_util_devel = portVersion compat >= 1 - cmd:apu_1_config = $portVersion compat >= 1 - devel:libaprutil_1 = 0.5.4 compat >= 0 + apr_util_devel$secondaryArchSuffix = portVersion compat >= 1 + cmd:apu_1_config$secondaryArchSuffix = $portVersion compat >= 1 + devel:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0 " REQUIRES_devel=" - apr_util == $portVersion base + apr_util$secondaryArchSuffix == $portVersion base " From ea5a602d8de8bf628e9e929b29ff38d09f2e7692 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 13 Dec 2014 11:57:32 +0000 Subject: [PATCH 039/326] autoconf213: use --program-suffix --- sys-devel/autoconf213/autoconf213-2.13.recipe | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe index 3c9e90005..1d2598027 100644 --- a/sys-devel/autoconf213/autoconf213-2.13.recipe +++ b/sys-devel/autoconf213/autoconf213-2.13.recipe @@ -4,26 +4,26 @@ autoconf, programmers can create portable and configurable packages, because \ the person building the package is allowed to specify various configuration \ options." HOMEPAGE="http://www.gnu.org/software/autoconf/" -SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz" +SRC_URI="http://ftp.gnu.org/gnu/autoconf/autoconf-$portVersion.tar.gz" CHECKSUM_SHA256="f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e" -REVISION="1" +REVISION="2" -SOURCE_DIR="autoconf-2.13" +SOURCE_DIR="autoconf-$portVersion" LICENSE="GNU GPL v2" COPYRIGHT="1992-1998 Free Software Foundation, Inc." -ARCHITECTURES="x86_gcc2 x86 arm" -SECONDARY_ARCHITECTURES="x86_gcc2 x86 arm" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - autoconf_2.13$secondaryArchSuffix = $portVersion - cmd:autoconf_2.13$secondaryArchSuffix = $portVersion - cmd:autoheader_2.13$secondaryArchSuffix = $portVersion - cmd:autoreconf_2.13$secondaryArchSuffix = $portVersion - cmd:autoscan_2.13$secondaryArchSuffix = $portVersion - cmd:autoupdate_2.13$secondaryArchSuffix = $portVersion - cmd:ifnames_2.13$secondaryArchSuffix = $portVersion + autoconf213$secondaryArchSuffix = $portVersion + cmd:autoconf_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoheader_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoreconf_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoscan_$portVersion$secondaryArchSuffix = $portVersion + cmd:autoupdate_$portVersion$secondaryArchSuffix = $portVersion + cmd:ifnames_$portVersion$secondaryArchSuffix = $portVersion " REQUIRES=" @@ -31,10 +31,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:make cmd:autoconf @@ -43,15 +43,11 @@ BUILD_PREREQUIRES=" BUILD() { autoconf - runConfigure ./configure + runConfigure ./configure --program-suffix=-$portVersion make $jobArgs } INSTALL() { make install - - for bin in $(ls $binDir); do - mv $binDir/$bin $binDir/${bin}-2.13 - done } From 16334779a46df9c3eded43bc703543fb28b78e2c Mon Sep 17 00:00:00 2001 From: begasus Date: Sun, 14 Dec 2014 11:36:07 +0100 Subject: [PATCH 040/326] pachi, new recipe and patch file --- games-arcade/pachi/pachi-03_29_04.recipe | 61 +++++++++++++++++++ .../pachi/patches/pachi-03_29_04.patch | 43 +++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 games-arcade/pachi/pachi-03_29_04.recipe create mode 100644 games-arcade/pachi/patches/pachi-03_29_04.patch diff --git a/games-arcade/pachi/pachi-03_29_04.recipe b/games-arcade/pachi/pachi-03_29_04.recipe new file mode 100644 index 000000000..8dbbfaad7 --- /dev/null +++ b/games-arcade/pachi/pachi-03_29_04.recipe @@ -0,0 +1,61 @@ +SUMMARY="Pachi el marciano is a cool 2D platforms game" +DESCRIPTION="Pachi el marciano is a cool 2D platforms game inspired in games like\ +Manic Miner, Jet set Willy and more from the 80s." +HOMEPAGE="http://dragontech.sourceforge.net/index.php?lang=en&main=about" +LICENSE="GNU GPL v2" +COPYRIGHT="Santiago Radeff, Nicolas Radeff, Peter Hajba" +SRC_URI="http://prdownloads.sf.net/dragontech/pachi_source.tgz" +CHECKSUM_SHA256="134a51773d5e441dc31aed4e57b3543afdefe2d8efedeaa05acb85cac0fa9c52" +REVISION="1" + +ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" +SECONDARY_ARCHITECTURES="?x86 ?x86_64" + +PATCHES="pachi-$portVersion.patch" + +SOURCE_DIR="Pachi" + +PROVIDES=" + pachi = $portVersion + app:pachi = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + lib:libsdl + lib:libsdl_image + lib:libsdl_mixer + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + devel:libsdl + devel:libsdl_image + devel:libsdl_mixer + " + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc + cmd:libtoolize + cmd:make + " + +BUILD() +{ + libtoolize -fci + aclocal -I m4 + automake --add-missing --force-missing + ./configure --prefix=$appsDir/Pachi + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/Pachi + make install + ln -s $appsDir/Pachi/bin/pachi $appsDir/Pachi/Pachi + addAppDeskbarSymlink $appsDir/Pachi/bin/pachi Pachi +} diff --git a/games-arcade/pachi/patches/pachi-03_29_04.patch b/games-arcade/pachi/patches/pachi-03_29_04.patch new file mode 100644 index 000000000..aa5a62a52 --- /dev/null +++ b/games-arcade/pachi/patches/pachi-03_29_04.patch @@ -0,0 +1,43 @@ +--- Pachi/Makefile.am.org 2014-12-13 14:43:32.076021760 +0100 ++++ Pachi/Makefile.am 2014-12-13 14:41:07.499646464 +0100 +@@ -1 +1,2 @@ + SUBDIRS = src Tgfx data fonts music sounds docs ++ACLOCAL_AMFLAGS = -I m4 +--- Pachi/data/Makefile.am.org 2002-12-08 14:30:17.000000000 +0100 ++++ Pachi/data/Makefile.am 2014-12-13 14:46:22.102236160 +0100 +@@ -14,9 +14,3 @@ + scores.dat + + EXTRA_DIST = $(dat_DATA) $(score_DATA) +- +-install-data-local: +- for file in $(score_DATA); do\ +- chgrp $(group) $(scoredir)/$$file; \ +- chmod $(perms) $(scoredir)/$$file; \ +- done +--- Pachi/configure.in.org 2014-12-14 10:34:54.227278848 +0100 ++++ Pachi/configure.in 2014-12-14 10:31:37.060555264 +0100 +@@ -1,7 +1,7 @@ + # Process this file with autoconf to produce a configure script. + AC_INIT(src/faes.cpp, 0.1, T-1000@Bigfoot.com) + AM_INIT_AUTOMAKE(pachi, 0.1) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + # Checks for programs. + AC_PROG_CC +@@ -44,7 +44,7 @@ + SCOREDIR="." + else + DATADIR="$datadir/$PACKAGE" +- SCOREDIR="/var/lib/games/$PACKAGE" ++ SCOREDIR="$datadir /$PACKAGE" + fi + + eval DATAPATH=`eval echo "$DATADIR"` +@@ -55,3 +55,5 @@ + AC_SUBST(SCOREPATH) + + AC_OUTPUT(Makefile src/Makefile Tgfx/Makefile data/Makefile fonts/Makefile music/Makefile sounds/Makefile docs/Makefile) ++ ++AC_CONFIG_MACRO_DIR([m4]) From a7a8cf91c91888926036f5bbd2b62836f5ff7114 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 Dec 2014 10:39:05 +0000 Subject: [PATCH 041/326] sqlite: bump version --- .../{sqlite-3.8.7.1.recipe => sqlite-3.8.7.4.recipe} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename dev-db/sqlite/{sqlite-3.8.7.1.recipe => sqlite-3.8.7.4.recipe} (86%) diff --git a/dev-db/sqlite/sqlite-3.8.7.1.recipe b/dev-db/sqlite/sqlite-3.8.7.4.recipe similarity index 86% rename from dev-db/sqlite/sqlite-3.8.7.1.recipe rename to dev-db/sqlite/sqlite-3.8.7.4.recipe index 16696d240..bd9edac62 100644 --- a/dev-db/sqlite/sqlite-3.8.7.1.recipe +++ b/dev-db/sqlite/sqlite-3.8.7.4.recipe @@ -6,8 +6,9 @@ SQLite is the most widely deployed SQL database engine in the world. The \ source code for SQLite is in the public domain. " HOMEPAGE="http://www.sqlite.org/" -SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz" -CHECKSUM_SHA256="9d2854bec7b26dfe9aceb1faa17d40674daa15a23bbab67018191ffbe0339533" +sqliteVersion=$(echo $portVersion | sed 's/\.\([0-9]\)/0\1/g') +SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-$sqliteVersion.tar.gz" +CHECKSUM_SHA256="86370f139405fdfe03334fd618171a74e50f589f17ccbe5933361ed1f58359ec" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -41,7 +42,7 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="sqlite-autoconf-3080701" +SOURCE_DIR="sqlite-autoconf-$sqliteVersion" BUILD() { From 33cf1cd2b2f68fad579fab92b293cc424a8be417 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 14 Dec 2014 13:00:04 +0000 Subject: [PATCH 042/326] Add doctranslator recipe --- .../doctranslator/doctranslator-0.1.0.recipe | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 haiku-apps/doctranslator/doctranslator-0.1.0.recipe diff --git a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe new file mode 100644 index 000000000..af437ba46 --- /dev/null +++ b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe @@ -0,0 +1,36 @@ +SUMMARY="A translator for DOC documents." +DESCRIPTION="This translator translates DOC files to plain text, PostScript or + PDF using antiword." +HOMEPAGE="http://github.com/TwoFX/DOCTranslator" +SRC_URI="https://github.com/TwoFX/DOCTranslator/archive/7b8fa2b6d0ce027ce9e9b03cbdc21016190436de.zip" +CHECKSUM_SHA256="d7db1df858c2e775412bf5fcafaf1b6010461a208fe0c3bc680f582794dd8dea" + +SOURCE_DIR="DOCTranslator-7b8fa2b6d0ce027ce9e9b03cbdc21016190436de" + +REVISION="2" +LICENSE="MIT" +COPYRIGHT="Copyright (c) 2014 Markus Himmel" + +ARCHITECTURES="x86 x86_gcc2" + +REQUIRES="antiword >= 0.37" + +PROVIDES="doctranslator = $portVersion" + +BUILD_REQUIRES="haiku_devel >= $haikuVersion + makefile_engine" + +BUILD_PREREQUIRES="cmd:make + cmd:gcc" + +BUILD() +{ + mkdir -p bin + make TARGET_DIR=bin +} + +INSTALL() +{ + mkdir -p $addOnsDir/Translators + cp bin/DOCTranslator $addOnsDir/Translators +} From 66a25497c0bf0eb106f949c7bc3e6992b6d221ba Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Sun, 14 Dec 2014 15:55:11 +0000 Subject: [PATCH 043/326] Create recipe file --- games-engines/gemrb/gemrb-0.8.1.recipe | 65 ++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 games-engines/gemrb/gemrb-0.8.1.recipe diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe new file mode 100644 index 000000000..02fc55866 --- /dev/null +++ b/games-engines/gemrb/gemrb-0.8.1.recipe @@ -0,0 +1,65 @@ +SUMMARY="GemRB is an Infinite game engine generator that allows \ + players to play in sandbox mode + " +DESCRIPTION="GemRB (Game Engine Made with preRendered Background) \ + is a port (actually a new implementation) of the original Infinity \ + Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \ + to Linux/Unix, MacOS X and Windows with some enhancements. Would \ + you like to create a game like Baldur's Gate? + " + +LICENSE="MIT" +COPYRIGHT="2003-2010 The GemRB Team" + +HOMEPAGE="https://github.com/gemrb/gemrb" +SRC_URI="https://github.com/gemrb/gemrb/archive/v0.8.1.tar.gz" + +SOURCE_DIR="gemrb-$portVersion" + +ARCHITECTURES="x86 x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +CHECKSUM_SHA256="02e7d70f5f3f37d424a3bd2ceb705b8d532fb58d5a1da0a88fb20bc1b67e11b1" + +REVISION="1" + +PROVIDES=" + gemrb = $portVersion + app:gemrb = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libSDL_1.2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libutil$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl_1.2$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:python + " + +PATCHES="gemrb_x86-0.8.1.patchset" + +BUILD() +{ + mkdir -p build + cd build + cmake -DPREFIX=$appsDir ../ + make $jobArgs +} + +INSTALL() +{ + cd build + make install +} \ No newline at end of file From 4f7a286d7452a316f60c1bca27276d3270d21f5e Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Sun, 14 Dec 2014 15:56:45 +0000 Subject: [PATCH 044/326] Create patch for CMakeFile.txt --- .../gemrb/patches/gemrb_x86-0.8.1.patchset | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 games-engines/gemrb/patches/gemrb_x86-0.8.1.patchset diff --git a/games-engines/gemrb/patches/gemrb_x86-0.8.1.patchset b/games-engines/gemrb/patches/gemrb_x86-0.8.1.patchset new file mode 100644 index 000000000..723e00457 --- /dev/null +++ b/games-engines/gemrb/patches/gemrb_x86-0.8.1.patchset @@ -0,0 +1,24 @@ +From 837d5f413216f4136a86d6dadf4efba56a07c078 Mon Sep 17 00:00:00 2001 +From: DarkmatterVale +Date: Sat, 13 Dec 2014 19:53:47 +0000 +Subject: Fix Haiku build + +NFD_OpenDialog + +Haiku needs libbsd to use posix_openpty + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a54b37b..e81df43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -369,6 +369,8 @@ MACRO(ADD_GEMRB_PLUGIN plugin_name) + TARGET_LINK_LIBRARIES(${plugin_name} -shared-libgcc) + elseif (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") + TARGET_LINK_LIBRARIES(${plugin_name} -lc) ++ elseif (CMAKE_SYSTEM_NAME STREQUAL "Haiku") ++ TARGET_LINK_LIBRARIES(${plugin_name} -lbsd) + endif (CMAKE_SYSTEM_NAME STREQUAL "NetBSD") + INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR}) + endif (STATIC_LINK) +-- +1.8.3.4 \ No newline at end of file From 402538f3bc5ed904aeedb14bfb9405b396cbf533 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Sun, 14 Dec 2014 16:04:00 +0000 Subject: [PATCH 045/326] Shortened summary --- games-engines/gemrb/gemrb-0.8.1.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe index 02fc55866..eac368a39 100644 --- a/games-engines/gemrb/gemrb-0.8.1.recipe +++ b/games-engines/gemrb/gemrb-0.8.1.recipe @@ -1,6 +1,4 @@ -SUMMARY="GemRB is an Infinite game engine generator that allows \ - players to play in sandbox mode - " +SUMMARY="GemRB is an Infinite game engine generator" DESCRIPTION="GemRB (Game Engine Made with preRendered Background) \ is a port (actually a new implementation) of the original Infinity \ Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \ From 9e59694be4371b4e5a269d68af9cb162a02280be Mon Sep 17 00:00:00 2001 From: kaesaecracker Date: Sat, 13 Dec 2014 21:21:50 +0100 Subject: [PATCH 046/326] new file: media-fonts/croscorefonts/croscorefonts-1.21.0.recipe new file: media-fonts/essays-1743/essays1743-2.001.recipe new file: media-fonts/mplus/mplus-2.2.4.recipe new file: media-fonts/unifont/unifont-7.0.06.recipe modified: media-fonts/mplus/mplus-2.2.4.recipe modified: media-fonts/unifont/unifont-7.0.06.recipe modified: media-fonts/mplus/mplus-2.2.4.recipe modified: media-fonts/unifont/unifont-7.0.06.recipe --- .../croscorefonts/croscorefonts-1.21.0.recipe | 39 +++++++++++++++++++ .../essays-1743/essays1743-2.001.recipe | 35 +++++++++++++++++ media-fonts/mplus/mplus-2.2.4.recipe | 30 ++++++++++++++ media-fonts/unifont/unifont-7.0.06.recipe | 31 +++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 media-fonts/croscorefonts/croscorefonts-1.21.0.recipe create mode 100644 media-fonts/essays-1743/essays1743-2.001.recipe create mode 100644 media-fonts/mplus/mplus-2.2.4.recipe create mode 100644 media-fonts/unifont/unifont-7.0.06.recipe diff --git a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe new file mode 100644 index 000000000..6fc578aa2 --- /dev/null +++ b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe @@ -0,0 +1,39 @@ +SUMMARY="Croscore fonts" +DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts.\ +Included fonts are Arimo, Cousine and Timo. \ +They are also called Chrome OS core fonts." +HOMEPAGE="http://en.wikipedia.org/wiki/Croscore_fonts" +SRC_URI_1="http://www.google.com/fonts/download?kit=32ci3aiii8TFh9L2O_kK1w" +CHECKSUM_SHA256_1="800bbc41f20dce6c7f61dcd54489a8d8db5d701d9918a3a412d430d044eca2bb", +SRC_URI_2="http://www.google.com/fonts/download?kit=M2CeFoF86bDfqp_rSFi-T6CWcynf_cDxXwCLxiixG1c" +CHECKSUM_SHA256_2="bc0b9e33073e91d89abe6d780d0cff7a55d1cf05d9f792d5d221af426abb915f" +SRC_URI_3="http://www.google.com/fonts/download?kit=2Cuw8DPRXKIbXwFmqbUecA" +CHECKSUM_SHA256_3="89619d3f06b55495e94458eb8fbd69ae7c654db5782b2cecfdaffa2c8b291c1b" + +SOURCE_DIR="" + +LICENSE="Apache v2" +COPYRIGHT="Mike Frysinger" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE="yes" + +PROVIDES="croscorefonts = $portVersion" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts/croscorefonts/ + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} + cp ../sources-2/*.ttf ${FONTDIR} + cp ../sources-3/*.ttf ${FONTDIR} +} \ No newline at end of file diff --git a/media-fonts/essays-1743/essays1743-2.001.recipe b/media-fonts/essays-1743/essays1743-2.001.recipe new file mode 100644 index 000000000..64afcbf84 --- /dev/null +++ b/media-fonts/essays-1743/essays1743-2.001.recipe @@ -0,0 +1,35 @@ +SUMMARY="Essays 1743 font" +DESCRIPTION="Essays 1743 is a font based on the typeface used in \ +a 1743 English translation of Montaigne's Essays. It contains normal, bold, \ +italic and bold italic versions of 979 characters" +HOMEPAGE="http://thibault.org/fonts/essays/" + +SRC_URI="http://www.thibault.org/fonts/essays/essays1743-2.001-1-ttf.tar.gz" +CHECKSUM_SHA256="83a293f52dc0767adc5c57c619d99db0a5e1ba6fcdfa240ca719aa5643f10c5d" + + +SOURCE_DIR="" + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="John Stracke" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE="yes" + +PROVIDES="essays1743 = $portVersion" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts/essays1743/ + mkdir -p ${FONTDIR} + + cp essays1743/*.ttf ${FONTDIR} +} \ No newline at end of file diff --git a/media-fonts/mplus/mplus-2.2.4.recipe b/media-fonts/mplus/mplus-2.2.4.recipe new file mode 100644 index 000000000..bd30c546a --- /dev/null +++ b/media-fonts/mplus/mplus-2.2.4.recipe @@ -0,0 +1,30 @@ +SUMMARY="M+ Japanese outline fonts" +DESCRIPTION="M+ FONTS are Japanese font families designed by Coji Morishita. +The 'M' stands for 'Minimum', while the plus sign means above minimum." +HOMEPAGE="mplus-fonts.sourceforge.jp" +SRC_URI="http://jaist.dl.sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz" +SOURCE_DIR="." +CHECKSUM_SHA256="7862e113e04986646117267c4baee30aea163d43a382c14693f15287f16bbf25" +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2008 M+ Fonts Project" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE="yes" + +PROVIDES="mplus = $portVersion" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts/mplus/ + mkdir -p ${FONTDIR} + + cp mplus-TESTFLIGHT-059/*.ttf ${FONTDIR} +} \ No newline at end of file diff --git a/media-fonts/unifont/unifont-7.0.06.recipe b/media-fonts/unifont/unifont-7.0.06.recipe new file mode 100644 index 000000000..918e787d4 --- /dev/null +++ b/media-fonts/unifont/unifont-7.0.06.recipe @@ -0,0 +1,31 @@ +SUMMARY="Unifoundry unifont" +DESCRIPTION="GNU Unifont is part of the GNU Project +The GNU Unifont by Roman Czyborra is a free bitmap font that covers the \ +Unicode Basic Multilingual Plane (BMP), \ +using an intermediate bitmapped font format." +HOMEPAGE="http://unifoundry.com" +SRC_URI="http://unifoundry.com/pub/unifont-7.0.06.tar.gz" +SOURCE_DIR="" +LICENSE="GNU GPL v2" +COPYRIGHT="Unifoundry" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE="yes" + +PROVIDES="unifont = $portVersion" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts/unifont/ + mkdir -p ${FONTDIR} + + cp unifont-7.0.06/font/precompiled/*.ttf ${FONTDIR} +} From 9df4927d764b203ca20410d6f8d753359f40d2ea Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Sun, 14 Dec 2014 16:36:28 +0000 Subject: [PATCH 047/326] Fixed spacing issue --- games-engines/gemrb/gemrb-0.8.1.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe index eac368a39..a5def5e45 100644 --- a/games-engines/gemrb/gemrb-0.8.1.recipe +++ b/games-engines/gemrb/gemrb-0.8.1.recipe @@ -1,10 +1,9 @@ SUMMARY="GemRB is an Infinite game engine generator" DESCRIPTION="GemRB (Game Engine Made with preRendered Background) \ - is a port (actually a new implementation) of the original Infinity \ - Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \ - to Linux/Unix, MacOS X and Windows with some enhancements. Would \ - you like to create a game like Baldur's Gate? - " +is a port (actually a new implementation) of the original Infinity \ +Engine (the one of Baldur's Gate, Icewind Dale, Planescape: Torment, ...) \ +to Linux/Unix, MacOS X and Windows with some enhancements. Would \ +you like to create a game like Baldur's Gate?" LICENSE="MIT" COPYRIGHT="2003-2010 The GemRB Team" From 5ab7ea8f561bf116f314a885febd822981806b7f Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 14 Dec 2014 18:28:38 +0100 Subject: [PATCH 048/326] Point BDH Calc website towards github page --- haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe index 552321b93..3d2fab87a 100644 --- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe +++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe @@ -6,7 +6,7 @@ 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://haikuware.com/directory/view-details/science-math/calculators/bdh-calc-for-haiku" +HOMEPAGE="http://github.com/ThomasCompix/BDH-Calc" SRC_URI="git://github.com/ThomasCompix/BDH-Calc.git#4a6865932ae0e95244ed0149b6e8c4f437ea742a" REVISION="1" LICENSE="Undetermined" From b90ac0b740c40750a5c673fb782d6486168782e5 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 14 Dec 2014 18:29:10 +0100 Subject: [PATCH 049/326] Remove clockwerk-80 recipe, as the SVN doesn't exist anymore and there is no exact mirror --- haiku-apps/clockwerk/clockwerk-80.recipe | 26 ------------------------ 1 file changed, 26 deletions(-) delete mode 100644 haiku-apps/clockwerk/clockwerk-80.recipe diff --git a/haiku-apps/clockwerk/clockwerk-80.recipe b/haiku-apps/clockwerk/clockwerk-80.recipe deleted file mode 100644 index f01c3cb30..000000000 --- a/haiku-apps/clockwerk/clockwerk-80.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION=" -Clockwerk is a multi-track audio/video compositing and animation software. -" -HOMEPAGE="http://dev.osdrawer.net/projects/clockwerk" -SRC_URI="svn+http://svn.osdrawer.net/clockwerk#80" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -#CHECKSUM_MD5="" -BUILD() -{ - cd clockwerk-80 - jam -} - -INSTALL() -{ - cd clockwerk-80 - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk - cp generated/distro-haiku/* ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Clockwerk -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2002-2012 Stephan Aßmus - 2005-2006 Axel Dörfler - 2006-2009 Ingo Weinhold" From e7ee22485946384223d62c793e44e939634f2c91 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 14 Dec 2014 18:47:53 +0100 Subject: [PATCH 050/326] clockwerk: Reflow DESCRIPTION --- haiku-apps/clockwerk/clockwerk-git.recipe | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe index 42e439a01..c1921e6ff 100644 --- a/haiku-apps/clockwerk/clockwerk-git.recipe +++ b/haiku-apps/clockwerk/clockwerk-git.recipe @@ -1,7 +1,9 @@ SUMMARY="An open source media compositing tool for the Haiku platform" -DESCRIPTION="Clockwerk is an Open Source media compositing tool for the Haiku platform. - -It has been in development from Jan 2006 to July 2008 by Mindwork (www.mindwork.de) as one of the main in-house components of an application suit to realize distributed multimedia playback on Haiku client machines." +DESCRIPTION="Clockwerk is an Open Source media compositing tool for the +Haiku platform. It has been in development from Jan 2006 to July 2008 +by Mindwork (www.mindwork.de) as one of the main in-house components of +an application suit to realize distributed multimedia playback on +Haiku client machines." HOMEPAGE="https://github.com/stippi/Clockwerk" SRC_URI="git+https://github.com/stippi/Clockwerk.git#8c3a33e" From 57553045649e72f86f3931a03ceeb2fff71fedfe Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 13 Dec 2014 18:15:11 -0500 Subject: [PATCH 051/326] Add Mupen64 v0.5. --- games-emulation/mupen64/mupen64-0.5.recipe | 69 +++++++ .../mupen64/patches/mupen64-0.5.patch | 188 ++++++++++++++++++ 2 files changed, 257 insertions(+) create mode 100644 games-emulation/mupen64/mupen64-0.5.recipe create mode 100644 games-emulation/mupen64/patches/mupen64-0.5.patch diff --git a/games-emulation/mupen64/mupen64-0.5.recipe b/games-emulation/mupen64/mupen64-0.5.recipe new file mode 100644 index 000000000..312f38858 --- /dev/null +++ b/games-emulation/mupen64/mupen64-0.5.recipe @@ -0,0 +1,69 @@ +SUMMARY="A portable Nintendo 64 emulator" +DESCRIPTION="Mupen64 is a portable Nintendo 64 emulator. It emulates most Nintendo \ +64 games perfectly enough that they are playable." +HOMEPAGE="http://mupen64.emulation64.com/" +COPYRIGHT="2005 Hacktarux & Azimer" +SRC_URI="http://mupen64.emulation64.com/files/0.5/mupen64_src-0.5.tar.bz2" +CHECKSUM_SHA256="1b8e4188ab7a94d8125b77aed8725ee348c24818622b881adfe16be510487dfd" +SOURCE_DIR="mupen64_src-$portVersion" +PATCHES="mupen64-$portVersion.patch" +REVISION="1" +LICENSE="GNU GPL v2" + +DISABLE_SOURCE_PACKAGE="YES" # bug in HaikuPorter that makes this fail + +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=" + mupen64$secondaryArchSuffix = $portVersion + cmd:mupen64_nogui = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libgl$secondaryArchSuffix + lib:libsdl_1.2$secondaryArchSuffix >= 0.11.4 + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libgl$secondaryArchSuffix + devel:libsdl_1.2$secondaryArchSuffix >= 0.11.4 + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:pkg_config$secondaryArchSuffix + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + export WITH_HOME="$prefix/" + make -e $jobArgs \ + mupen64_nogui \ + plugins/mupen64_input.so \ + plugins/mupen64_hle_rsp_azimer.so \ + plugins/dummyaudio.so \ + plugins/jttl_audio.so \ + plugins/mupen64_soft_gfx.so +} + +INSTALL() +{ + mkdir -p $prefix $prefix/bin $prefix/data/mupen64 + + cp mupen64_nogui $prefix/bin + cp mupen64.ini $prefix/data/mupen64 + cp -rv lang $prefix/data/mupen64 + cp -rv plugins $prefix/data/mupen64 + cp -rv doc $prefix/data/mupen64 +} diff --git a/games-emulation/mupen64/patches/mupen64-0.5.patch b/games-emulation/mupen64/patches/mupen64-0.5.patch new file mode 100644 index 000000000..0fd780c64 --- /dev/null +++ b/games-emulation/mupen64/patches/mupen64-0.5.patch @@ -0,0 +1,188 @@ +From 480f35785b23c25194d5b6c00df041597e6547ac Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Sat, 13 Dec 2014 18:01:23 -0500 +Subject: [PATCH] Fix build on Haiku. + +--- + Makefile | 16 ++++++++-------- + config.h | 1 - + main/main.c | 11 ++++++----- + rsp_hle/wintypes.h | 12 ++++-------- + 4 files changed, 18 insertions(+), 22 deletions(-) + +diff --git a/Makefile b/Makefile +index e1370e5..ffdc78d 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ CC =gcc + CXX =g++ + + #CFLAGS =-DX86 -O3 -mpentium -Wall -DEMU64_DEBUG +-CFLAGS =-DX86 -O3 -fexpensive-optimizations -fomit-frame-pointer -funroll-loops -ffast-math -fno-strict-aliasing -mcpu=athlon -Wall -pipe ++CFLAGS =-DX86 -O3 -fexpensive-optimizations -fomit-frame-pointer -funroll-loops -ffast-math -fno-strict-aliasing -Wall -pipe -DWITH_HOME=\"$(WITH_HOME)\" -DNOGUI_VERSION + #CFLAGS =-DX86 -O3 -mcpu=pentium -Wall -g -pg + #CFLAGS =-DX86 -Wall -pipe -g3 -DEMU64_DEBUG + #CFLAGS =-DX86 -Wall -pipe -g -DEMU64_DEBUG -DCOMPARE_CORE +@@ -153,7 +153,7 @@ HEADER =main/rom.h \ + r4300/recomp.h \ + memory/pif.h + +-LIB =-lz -lm ++LIB =-lz + + ifneq ("$(shell grep GTK2 config.h)","\#define GTK2_SUPPORT 1") + GTK_FLAGS =`gtk-config --cflags` +@@ -206,7 +206,7 @@ main/gui_gtk/romproperties.o: main/gui_gtk/romproperties.c + $(CC) $(CFLAGS) -c -o $@ $< $(GTK_FLAGS) + + main/gui_gtk/config.o: main/gui_gtk/config.c +- $(CC) $(CFLAGS) -c -o $@ $< $(GTK_FLAGS) ++ $(CC) $(CFLAGS) -c -o $@ $< + + main/gui_gtk/dirbrowser.o: main/gui_gtk/dirbrowser.c + $(CC) $(CFLAGS) -c -o $@ $< $(GTK_FLAGS) +@@ -218,7 +218,7 @@ main/vcr_compress.o: main/vcr_compress.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< `avifile-config --cflags` + + mupen64_input/main.o: mupen64_input/main.c +- $(CC) $(CFLAGS) -DUSE_GTK -c -o $@ $< $(GTK_FLAGS) `sdl-config --cflags` ++ $(CC) $(CFLAGS) -c -o $@ $< `sdl-config --cflags` + + blight_input/plugin.o: blight_input/plugin.c + $(CC) $(CFLAGS) "-DPACKAGE=\"$(shell grep PACKAGE blight_input/package | cut -d "=" -f 2)\"" "-DVERSION=\"$(shell grep VERSION blight_input/package | cut -d "=" -f 2)\"" `sdl-config --cflags` -DGUI_SDL -c -o $@ $< +@@ -243,13 +243,13 @@ blight_input/pad.o: blight_input/pad.c + $(CC) $(CFLAGS) -DGUI_SDL -c -o $@ $< + + rsp_hle/main.o: rsp_hle/main.c +- $(CC) $(CFLAGS) $(GTK_FLAGS) -DUSE_GTK -c -o $@ $< ++ $(CC) $(CFLAGS) -c -o $@ $< + + mupen64_audio/main.o: mupen64_audio/main.c + $(CC) $(CFLAGS) $(GTK_FLAGS) -DUSE_GTK -c -o $@ $< + + jttl_audio/main.o: jttl_audio/main.c +- $(CC) $(CFLAGS) $(GTK_FLAGS) -DUSE_GTK `sdl-config --cflags` -c -o $@ $< ++ $(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $< + + mupen64_soft_gfx/main.o: mupen64_soft_gfx/main.cpp + $(CXX) $(CFLAGS) `sdl-config --cflags` -c -o $@ $< +@@ -342,7 +342,7 @@ glN64/F3DWRUS.o: glN64/F3DWRUS.cpp + $(CXX) $(CFLAGS) -D__LINUX__ -DX86_ASM `sdl-config --cflags` -c -o $@ $< + + mupen64_nogui: $(OBJ) $(OBJ_X86) main/main.o main/gui_gtk/config.o +- $(CC) $^ $(LIB) -Wl,-export-dynamic -L/usr/X11R6/lib `sdl-config --libs` -lGL -lpthread -ldl -o $@ ++ $(CC) $^ $(LIB) -Wl,-export-dynamic -L/usr/X11R6/lib `sdl-config --libs` -lGL -o $@ + strip --strip-all $@ + + ifneq ("$(shell grep VCR config.h)","\#define VCR_SUPPORT 1") +@@ -363,7 +363,7 @@ mupen64_oldgui: $(OBJ) $(OBJ_X86) main/main_gtk.o + strip --strip-all $@ + + plugins/mupen64_input.so: $(OBJ_INPUT) +- $(CC) $^ -Wl,-Bsymbolic -shared $(GTK_LIBS) -o $@ ++ $(CC) $^ -Wl,-Bsymbolic -shared -o $@ + strip --strip-all $@ + + plugins/blight_input.so: $(OBJ_BLIGHT) +diff --git a/config.h b/config.h +index f2ef9b7..303d655 100644 +--- a/config.h ++++ b/config.h +@@ -1,7 +1,6 @@ + #ifndef CONFIG_H + #define CONFIG_H + +-#undef WITH_HOME + #undef VCR_SUPPORT + #define GTK2_SUPPORT 1 + +diff --git a/main/main.c b/main/main.c +index 00a12a0..78ed1c9 100644 +--- a/main/main.c ++++ b/main/main.c +@@ -37,6 +37,7 @@ + + #include + #include ++#include + + #include "main.h" + #include "guifuncs.h" +@@ -263,7 +264,7 @@ int main (int argc, char *argv[]) + unsigned char byte; + dest = fopen(temp, "wb"); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/mupen64.ini"); ++ strcat(orig, "data/mupen64/mupen64.ini"); + src = fopen(orig, "rb"); + while(fread(&byte, 1, 1, src)) + fwrite(&byte, 1, 1, dest); +@@ -275,7 +276,7 @@ int main (int argc, char *argv[]) + strcpy(temp, g_WorkingDir); + strcat(temp, "lang"); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/lang"); ++ strcat(orig, "data/mupen64/lang"); + symlink(orig, temp); + + /*strcpy(temp, g_WorkingDir); +@@ -288,14 +289,14 @@ int main (int argc, char *argv[]) + strcat(temp, "plugins"); + mkdir(temp, 0700); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins"); ++ strcat(orig, "data/mupen64/plugins"); + dir = opendir(orig); + while((entry = readdir(dir)) != NULL) + { + if(strcmp(entry->d_name + strlen(entry->d_name) - 3, ".so")) + { + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins/"); ++ strcat(orig, "data/mupen64/plugins/"); + strcat(orig, entry->d_name); + src = fopen(orig, "rb"); + if(src == NULL) continue; +@@ -321,7 +322,7 @@ int main (int argc, char *argv[]) + strcat(temp, "plugins/"); + strcat(temp, entry->d_name); + strcpy(orig, WITH_HOME); +- strcat(orig, "share/mupen64/plugins/"); ++ strcat(orig, "data/mupen64/plugins/"); + strcat(orig, entry->d_name); + symlink(orig, temp); + } +diff --git a/rsp_hle/wintypes.h b/rsp_hle/wintypes.h +index 7e01c9d..0d820b2 100644 +--- a/rsp_hle/wintypes.h ++++ b/rsp_hle/wintypes.h +@@ -1,7 +1,7 @@ + #ifndef __WINTYPES_H__ + #define __WINTYPES_H__ + +-#include ++#include + + typedef int HWND; + typedef int HINSTANCE; +@@ -12,14 +12,10 @@ typedef void* LPVOID; + #define _cdecl + #define WINAPI + +-typedef u_int32_t DWORD; +-typedef u_int16_t WORD; +-typedef u_int8_t BYTE, byte; ++typedef uint32 DWORD; ++typedef uint16 WORD; ++typedef uint8 BYTE, byte; + typedef int BOOL, BOOLEAN; +-#define __int8 char +-#define __int16 short +-#define __int32 int +-#define __int64 long long + + /** HRESULT stuff **/ + typedef long HRESULT; +-- +1.8.3.4 + From 6874ba159dd483fc4bf842b9debf654035e38e93 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 14 Dec 2014 19:15:52 +0000 Subject: [PATCH 052/326] Sources are now pulled from HaikuArchives --- haiku-apps/doctranslator/doctranslator-0.1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe index af437ba46..0b8cf224f 100644 --- a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe +++ b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe @@ -2,7 +2,7 @@ SUMMARY="A translator for DOC documents." DESCRIPTION="This translator translates DOC files to plain text, PostScript or PDF using antiword." HOMEPAGE="http://github.com/TwoFX/DOCTranslator" -SRC_URI="https://github.com/TwoFX/DOCTranslator/archive/7b8fa2b6d0ce027ce9e9b03cbdc21016190436de.zip" +SRC_URI="https://github.com/HaikuArchives/DOCTranslator/archive/7b8fa2b6d0ce027ce9e9b03cbdc21016190436de.zip" CHECKSUM_SHA256="d7db1df858c2e775412bf5fcafaf1b6010461a208fe0c3bc680f582794dd8dea" SOURCE_DIR="DOCTranslator-7b8fa2b6d0ce027ce9e9b03cbdc21016190436de" From 52b344b97bbbb721ee0f3524e21aba053d9eb24f Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 14 Dec 2014 23:08:52 +0100 Subject: [PATCH 053/326] Drop references to $haikuVersion. * Referring the current haiku version explicitly is not needed, since the RequiresUpdater takes care of setting the version of Haiku used for building a package. --- .../espeak/espeak-1.48.04.recipe | 4 +- app-admin/keepassx/keepassx-2.0a5.recipe | 4 +- app-admin/keepassx/keepassx-2.0a6.recipe | 4 +- app-admin/pwgen/pwgen-2.06.recipe | 4 +- app-admin/testdisk/testdisk-7.0_git.recipe | 4 +- app-arch/arc/arc-5.21p.recipe | 4 +- app-arch/bzip2/bzip2-1.0.6.recipe | 4 +- app-arch/cabextract/cabextract-1.4.recipe | 4 +- app-arch/cpio/cpio-2.11.recipe | 4 +- app-arch/fastjar/fastjar-0.98.recipe | 4 +- app-arch/gzip/gzip-1.6.recipe | 4 +- app-arch/ha/ha-0999.recipe | 4 +- app-arch/lha/lha-1.14i.recipe | 4 +- app-arch/libarchive/libarchive-3.1.2.recipe | 4 +- app-arch/lz4/lz4-r117.recipe | 4 +- app-arch/lzip/lzip-1.16.recipe | 4 +- app-arch/ncompress/ncompress-4.2.4.4.recipe | 2 +- app-arch/p7zip/p7zip-9.13.recipe | 4 +- app-arch/p7zip/p7zip-9.20.1.recipe | 4 +- app-arch/pigz/pigz-2.3.1.recipe | 4 +- app-arch/sharutils/sharutils-4.14.recipe | 4 +- app-arch/snappy/snappy-1.1.2.recipe | 4 +- app-arch/tar/tar-1.26.recipe | 4 +- app-arch/tar/tar-1.27.1.recipe | 4 +- app-arch/unrar/unrar-5.0.14.recipe | 4 +- app-arch/unrar/unrar-5.1.5.recipe | 4 +- app-arch/unrar/unrar-5.1.6.recipe | 4 +- app-arch/unzip/unzip-6.0.recipe | 2 +- app-arch/unzip/unzip-6.10c11.recipe | 4 +- app-arch/xar/xar-1.5.2.recipe | 4 +- app-arch/xz_utils/xz_utils-5.0.7.recipe | 6 +-- app-arch/zip/zip-3.0.recipe | 4 +- app-benchmarks/bonnie++/bonnie++-1.03e.recipe | 4 +- app-benchmarks/ffsb/ffsb-6.0_rc2.recipe | 4 +- .../libmicro/libmicro-0.4.2.hg.recipe | 6 +-- app-benchmarks/ltp/ltp-20140422.recipe | 2 +- app-benchmarks/piozone/piozone-1.0.recipe | 4 +- app-benchmarks/vttest/vttest-20140305.recipe | 4 +- app-cdr/bchunk/bchunk-1.2.0.recipe | 4 +- app-cdr/cdrtools/cdrtools-3.01~a07.recipe | 4 +- app-cdr/cdrtools/cdrtools-3.01~a17.recipe | 4 +- app-cdr/cdrtools/cdrtools-3.01~a18.recipe | 4 +- app-cdr/cdrtools/cdrtools-3.01~a25.recipe | 4 +- app-cdr/daa2iso/daa2iso-0.1.7e.recipe | 4 +- app-crypt/gnupg/gnupg-1.4.11.recipe | 4 +- app-crypt/gnupg/gnupg-1.4.16.recipe | 4 +- app-crypt/gpgme/gpgme-1.5.2.recipe | 4 +- app-dicts/aspell_en/aspell_en-7.1_0.recipe | 4 +- app-doc/doxygen/doxygen-1.6.3.recipe | 4 +- app-editors/nano/nano-2.2.6.recipe | 4 +- app-editors/qemacs/qemacs-0.3.3.recipe | 4 +- app-editors/qemacs/qemacs-0.4.0dev.recipe | 4 +- app-editors/vim/vim-7.4.recipe | 4 +- app-editors/xemacs/xemacs-21.5_hg.recipe | 2 +- app-emulation/aranym/aranym-0.9.15_git.recipe | 2 +- app-emulation/bochs/bochs-2.6.recipe | 4 +- app-emulation/joyce/joyce-2.2.6.recipe | 2 +- app-emulation/libdsk/libdsk-1.3.3.recipe | 6 +-- .../linaro_qemu/linaro_qemu-2014.01.recipe | 4 +- .../oricutron/oricutron-1.1_svn.recipe | 2 +- app-emulation/qemu/qemu-0.15.1.recipe | 4 +- app-emulation/qemu/qemu-1.7.0.recipe | 4 +- app-emulation/qemu/qemu-2.0.0.recipe | 4 +- app-emulation/qemu/qemu-2.1.0.recipe | 4 +- app-emulation/qemu/qemu-2.1.2.recipe | 4 +- app-emulation/simh/simh-4.0.0_git.recipe | 4 +- ...rtualbox_guest_additions-4.3.53_svn.recipe | 6 +-- .../vmware-addons/vmware_addons-1.1.1.recipe | 4 +- app-i18n/becjk/becjk-1.0.1.recipe | 4 +- app-i18n/canna/canna-1.0.1.recipe | 4 +- app-i18n/canna/canna-1.0.2.recipe | 4 +- app-i18n/enca/enca-1.15.recipe | 4 +- app-misc/colordiff/colordiff-1.0.13.recipe | 4 +- app-misc/fdupes/fdupes-1.51.recipe | 4 +- app-misc/gcal/gcal-3.6.3.recipe | 4 +- app-misc/getopt/getopt-1.1.5.recipe | 4 +- app-misc/mc/mc-4.8.13.recipe | 4 +- app-misc/screen/screen-4.2.1_git.recipe | 2 +- app-misc/srm/srm-1.2.12.recipe | 2 +- app-misc/srm/srm-1.2.13_svn.recipe | 2 +- app-misc/strigi/strigi-0.7.5.recipe | 6 +-- app-mobilephone/dfu-util/dfu_util-0.8.recipe | 4 +- app-office/abiword/abiword-2.4.recipe | 2 +- app-office/multitalk/multitalk-1.4.recipe | 4 +- app-shells/bash/bash-4.3.30.recipe | 2 +- .../command_not_found-0.0.1.recipe | 2 +- app-shells/dash/dash-0.5.7.recipe | 4 +- app-shells/fish/fish-1.23.1_git.recipe | 2 +- app-shells/mksh/mksh-r50c.recipe | 4 +- app-shells/zsh/zsh-5.0.2.recipe | 4 +- app-text/aiksaurus/aiksaurus-1.2.1.recipe | 4 +- app-text/antiword/antiword-0.37.recipe | 4 +- app-text/asciidoc/asciidoc-8.6.8.recipe | 4 +- app-text/aspell/aspell-0.60.6.1.recipe | 4 +- app-text/discount/discount-2.1.3.recipe | 4 +- app-text/dos2unix/dos2unix-1.0.1.recipe | 4 +- app-text/dos2unix/dos2unix-1.0.recipe | 4 +- app-text/htmldoc/htmldoc-1.8.27.recipe | 4 +- app-text/htmltidy/htmltidy-20092812.recipe | 4 +- app-text/hunspell/hunspell-1.3.2.recipe | 4 +- app-text/hunspell/hunspell-1.3.3.recipe | 4 +- app-text/libabw/libabw-0.1.0.recipe | 4 +- app-text/libebook/libebook-0.1.1.recipe | 4 +- app-text/libetonyek/libetonyek-0.1.1.recipe | 4 +- app-text/libmspub/libmspub-0.1.1.recipe | 4 +- app-text/libmwaw/libmwaw-0.3.3.recipe | 4 +- app-text/libodfgen/libodfgen-0.1.1.recipe | 4 +- app-text/libpaper/libpaper-1.1.24.recipe | 6 +-- app-text/libwpd/libwpd-0.10.0.recipe | 4 +- app-text/libwpd/libwpd-0.9.9.recipe | 4 +- app-text/libwpg/libwpg-0.2.2.recipe | 4 +- app-text/libwpg/libwpg-0.3.0.recipe | 4 +- app-text/libwps/libwps-0.3.0.recipe | 4 +- app-text/mdocml/mdocml-1.12.2.recipe | 4 +- app-text/mupdf/mupdf-1.6.recipe | 4 +- app-text/podofo/podofo-0.9.3.recipe | 4 +- app-text/psiconv/psiconv-0.9.8.recipe | 4 +- app-text/rman/rman-3.2.recipe | 4 +- app-text/sword/sword-1.7.3.recipe | 6 +-- app-text/texi2html/texi2html-1.82.recipe | 2 +- app-text/tree/tree-1.7.0.recipe | 4 +- dev-cpp/clucene/clucene-2.3.3.4.recipe | 4 +- dev-db/db/db-4.8.30.recipe | 4 +- dev-db/db/db-5.3.28.recipe | 4 +- dev-db/db/db-6.0.30.recipe | 4 +- .../postgresql_server-9.3.4.recipe | 4 +- dev-db/sqlite/sqlite-3.8.7.4.recipe | 6 +-- dev-embedded/avr_libc/avr_libc-1.8.0.recipe | 4 +- dev-embedded/avra/avra-1.3.0.recipe | 4 +- dev-embedded/avrdude/avrdude-6.0.1.recipe | 4 +- .../dfu_programmer-0.6.2.recipe | 4 +- dev-embedded/gcc6809/gcc6809-4.6.1.recipe | 4 +- dev-embedded/libftdi/libftdi-1.0.recipe | 4 +- dev-embedded/lm4tools/lm4tools-0.1.3.recipe | 4 +- dev-embedded/lwtools/lwtools-4.10.recipe | 4 +- dev-embedded/sdcc/sdcc-3.4.0.recipe | 4 +- dev-embedded/stlink/stlink-1.0.0.recipe | 2 +- dev-embedded/stm32flash/stm32flash-0.3.recipe | 4 +- .../u_boot_tools/u_boot_tools-2012.10.recipe | 4 +- dev-games/ode/ode-0.12.recipe | 6 +-- dev-games/physfs/physfs-2.0.3.recipe | 4 +- dev-java/ant_core/ant_core-1.9.2.recipe | 2 +- .../gnu_classpath/gnu_classpath-0.98.recipe | 4 +- dev-java/jamvm/jamvm-1.5.4.recipe | 2 +- dev-java/jamvm/jamvm-2.0.0.recipe | 2 +- dev-lang/brexx/brexx-1.3.2.recipe | 4 +- dev-lang/erlang/erlang-16.03.recipe | 4 +- dev-lang/fpc/fpc-2.6.2.recipe | 4 +- dev-lang/fpc/fpc-2.6.2_bin.recipe | 4 +- dev-lang/golang/golang-1.3.recipe | 4 +- dev-lang/lua/lua-5.1.4.recipe | 4 +- dev-lang/lua/lua-5.2.1.recipe | 4 +- dev-lang/lua/lua-5.2.3.recipe | 4 +- dev-lang/luajit/luajit-2.0.2.recipe | 4 +- dev-lang/nasm/nasm-2.08.01.recipe | 4 +- dev-lang/nasm/nasm-2.11.02.recipe | 4 +- dev-lang/nasm/nasm-2.11.05.recipe | 4 +- dev-lang/ocaml/ocaml-4.00.0.recipe | 4 +- dev-lang/ocaml/ocaml-4.01.0.recipe | 4 +- .../openjdk/openjdk-1.7_2013_11_08.recipe | 4 +- dev-lang/openjdk/openjdk-1.7_u80_b00.recipe | 4 +- dev-lang/openjdk/openjdk-1.7_u80_b02.recipe | 4 +- dev-lang/orc/orc-0.4.19.recipe | 4 +- dev-lang/perl/perl-5.10.1.recipe | 4 +- dev-lang/perl/perl-5.18.1.recipe | 4 +- dev-lang/perl/perl-5.18.2.recipe | 4 +- dev-lang/php/php-5.4.34.recipe | 4 +- dev-lang/php/php-5.6.2.recipe | 4 +- dev-lang/python/python-2.6.8.recipe | 4 +- dev-lang/python/python-2.6.9.recipe | 4 +- dev-lang/python/python-2.7.6.recipe | 4 +- dev-lang/python/python-2.7.8.recipe | 4 +- dev-lang/rebol/rebol-2.101.0.5.75.recipe | 4 +- dev-lang/ruby/ruby-1.9.1.recipe | 4 +- dev-lang/ruby/ruby-1.9.3.recipe | 4 +- dev-lang/ruby/ruby-2.1.2.recipe | 4 +- .../spidermonkey/spidermonkey-1.8.5.recipe | 4 +- dev-lang/squirrel/squirrel-3.0.4.recipe | 4 +- dev-lang/swi_prolog/swi_prolog-6.2.0.recipe | 4 +- dev-lang/swi_prolog/swi_prolog-6.6.6.recipe | 4 +- dev-lang/swig/swig-2.0.11.recipe | 4 +- dev-lang/tcc/tcc-0.9.26.recipe | 4 +- dev-lang/tcl/tcl-8.5.15.recipe | 4 +- dev-lang/tcl/tcl-8.5.9.recipe | 4 +- dev-lang/v8/v8-3.16.1.recipe | 4 +- dev-lang/xamos/xamos-0.29.recipe | 2 +- dev-lang/yab/yab-1.7.02.recipe | 4 +- dev-lang/yasm/yasm-1.1.0.recipe | 4 +- dev-lang/yasm/yasm-1.2.0.recipe | 4 +- dev-libs/apr/apr-1.4.6.recipe | 4 +- dev-libs/apr/apr-1.5.0.recipe | 4 +- dev-libs/apr_util/apr_util-1.3.10.recipe | 4 +- dev-libs/apr_util/apr_util-1.4.1.recipe | 4 +- dev-libs/apr_util/apr_util-1.5.3.recipe | 4 +- dev-libs/apr_util/apr_util-1.5.4.recipe | 4 +- dev-libs/boehm_gc/boehm_gc-7.2d.recipe | 4 +- dev-libs/boost/boost-1.55.0.recipe | 52 +++++++++---------- dev-libs/check/check-0.9.13.recipe | 4 +- dev-libs/check/check-0.9.14.recipe | 4 +- dev-libs/chmlib/chmlib-0.40.recipe | 4 +- dev-libs/cloog/cloog-0.18.1.recipe | 4 +- dev-libs/confuse/confuse-2.7.recipe | 4 +- dev-libs/cyassl/cyassl-2.8.0.recipe | 4 +- dev-libs/expat/expat-2.0.1.recipe | 4 +- dev-libs/expat/expat-2.1.0.recipe | 4 +- dev-libs/fribidi/fribidi-0.19.5.recipe | 4 +- dev-libs/fribidi/fribidi-0.19.6.recipe | 4 +- dev-libs/glib/glib-1.2.10.recipe | 4 +- dev-libs/glib/glib2-2.38.1.recipe | 4 +- dev-libs/gmp/gmp-5.1.3.recipe | 4 +- dev-libs/gmp/gmp-6.0.0.recipe | 4 +- dev-libs/gnulib/gnulib-2013_12_17.recipe | 2 +- dev-libs/hyphen/hyphen-2.8.8.recipe | 4 +- dev-libs/icu/icu-4.8.1.1.recipe | 4 +- dev-libs/icu/icu-54.1.recipe | 4 +- dev-libs/isl/isl-0.13.recipe | 4 +- dev-libs/isl/isl-0.14.recipe | 4 +- dev-libs/jansson/jansson-2.5.recipe | 4 +- dev-libs/json_c/json_c-0.12.recipe | 4 +- dev-libs/libassuan/libassuan-2.1.3.recipe | 4 +- dev-libs/libcdio/libcdio-0.92.recipe | 4 +- dev-libs/libclaw/libclaw-1.7.4.recipe | 6 +-- dev-libs/libdwarf/libdwarf-20130729.recipe | 4 +- dev-libs/libebml/libebml-1.3.0.recipe | 4 +- .../libedit/libedit-2014_10_30_3.1.recipe | 4 +- dev-libs/libelf/libelf-0.8.13.recipe | 4 +- dev-libs/libevent/libevent-1.4.14b.recipe | 4 +- dev-libs/libevent/libevent-2.0.21.recipe | 6 +-- dev-libs/libffi/libffi-3.0.13.recipe | 4 +- dev-libs/libffi/libffi-3.2.1.recipe | 4 +- dev-libs/libgcrypt/libgcrypt-1.5.3.recipe | 4 +- dev-libs/libgcrypt/libgcrypt-1.6.1.recipe | 6 +-- dev-libs/libgcrypt/libgcrypt-1.6.2.recipe | 6 +-- .../libgpg_error/libgpg_error-1.17.recipe | 4 +- dev-libs/libiconv/libiconv-1.13.1.recipe | 4 +- dev-libs/libidl/libidl-0.6.8.recipe | 4 +- .../libmaxminddb/libmaxminddb-1.0.1.recipe | 4 +- dev-libs/libpcre/libpcre-8.21.recipe | 4 +- dev-libs/libpcre/libpcre-8.33.recipe | 4 +- dev-libs/libpcre/libpcre-8.36.recipe | 4 +- dev-libs/libpcre/libpcre0-8.21.recipe | 4 +- .../libpthread_stubs-0.3.recipe | 4 +- dev-libs/librevenge/librevenge-0.0.0.recipe | 4 +- dev-libs/librevenge/librevenge-0.0.1.recipe | 4 +- .../libsolv-0.3.0_haiku_2013_04_18.recipe | 4 +- .../libsolv-0.3.0_haiku_2013_05_20.recipe | 4 +- .../libsolv-0.3.0_haiku_2013_05_30.recipe | 4 +- .../libsolv-0.3.0_haiku_2013_06_16.recipe | 4 +- .../libsolv-0.3.0_haiku_2013_10_01.recipe | 4 +- dev-libs/libtar/libtar-1.2.20.recipe | 4 +- dev-libs/libtasn1/libtasn1-4.2.recipe | 4 +- dev-libs/libtommath/libtommath-0.42.0.recipe | 6 +-- .../libusb-compat/libusb_compat-0.1.5.recipe | 4 +- dev-libs/libusb/libusb-1.0.19.recipe | 4 +- dev-libs/libxml2/libxml2-2.8.0.recipe | 6 +-- dev-libs/libxml2/libxml2-2.9.1.recipe | 6 +-- dev-libs/libxml2/libxml2-2.9.2.recipe | 6 +-- dev-libs/libxslt/libxslt-1.1.28.recipe | 6 +-- dev-libs/libzip/libzip-0.10.1.recipe | 4 +- dev-libs/libzip/libzip-0.11.2.recipe | 4 +- dev-libs/lzo/lzo-2.06.recipe | 4 +- dev-libs/nspr/nspr-4.10.6.recipe | 4 +- dev-libs/nspr/nspr-4.10.7.recipe | 4 +- dev-libs/nss/nss-3.16.3.recipe | 4 +- dev-libs/nss/nss-3.16.5.recipe | 4 +- dev-libs/openssl/openssl-1.0.0n.recipe | 4 +- dev-libs/openssl/openssl-1.0.0o.recipe | 4 +- dev-libs/openssl/openssl-1.0.1g.recipe | 4 +- dev-libs/openssl/openssl-1.0.1h.recipe | 4 +- dev-libs/polarssl/polarssl-1.3.7.recipe | 4 +- dev-libs/polarssl/polarssl-1.3.8.recipe | 4 +- dev-libs/popt/popt-1.16.recipe | 4 +- dev-libs/protobuf/protobuf-2.4.1.recipe | 4 +- dev-libs/tinyxml/tinyxml-2.6.2.recipe | 4 +- dev-libs/tinyxml2/tinyxml2-2.recipe | 4 +- dev-libs/udis86/udis86-1.7.2.recipe | 4 +- .../luafilesystem-1.6.2_git.recipe | 4 +- dev-perl/alien_svn/alien_svn-1.7.17.1.recipe | 2 +- dev-perl/html_parser/html_parser-3.70.recipe | 4 +- dev-perl/html_parser/html_parser-3.71.recipe | 4 +- dev-perl/xml_parser/xml_parser-2.36.recipe | 4 +- dev-python/argh/argh-0.26.1.recipe | 4 +- dev-python/cython/cython-0.20.2.recipe | 2 +- dev-python/docutils/docutils-0.11.recipe | 4 +- dev-python/dulwich/dulwich-0.9.7.recipe | 4 +- .../imaging/python_imaging-1.1.7.recipe | 2 +- dev-python/iniparse/iniparse-0.4.recipe | 4 +- dev-python/lxml/python_lxml-3.3.5.recipe | 4 +- .../mechanize/python_mechanize-0.2.5.recipe | 4 +- dev-python/mock/python_mock-1.0.1.recipe | 4 +- dev-python/ordereddict/ordereddict-1.1.recipe | 4 +- dev-python/pathtools/pathtools-0.1.2.recipe | 4 +- dev-python/pygame/pygame-1.9.1.recipe | 2 +- dev-python/pygments/pygments-1.6.recipe | 4 +- .../python_dateutil-1.5.recipe | 4 +- .../python_setuptools-5.3.recipe | 4 +- dev-python/pyyaml/pyyaml-3.11.recipe | 4 +- .../requests/python_requests-2.3.0.recipe | 4 +- .../twisted/python_twisted-13.2.0.recipe | 4 +- dev-python/urllib3/urllib3-1.9.1.recipe | 4 +- dev-python/watchdog/watchdog-0.8.2.recipe | 4 +- .../python_zope.interface-4.1.1.recipe | 4 +- dev-qt/automoc/automoc-0.9.88.recipe | 4 +- dev-qt/kdelibs4/kdelibs4-4.13.2.recipe | 6 +-- dev-qt/libattica/libattica-0.4.2.recipe | 6 +-- .../libdbusmenu_qt-0.9.2.recipe | 4 +- dev-qt/libqt4/libqt4-4.8.6.3.recipe | 6 +-- dev-qt/libqt4/libqt4-4.8.6.4.recipe | 6 +-- .../monkeystudio/monkeystudio-1.9.0.4.recipe | 4 +- dev-qt/qca2/qca2-2.0.3.recipe | 6 +-- dev-qt/qjson/qjson-0.8.1.recipe | 4 +- dev-scheme/chicken/chicken-4.8.0.5.recipe | 4 +- .../abi_compliance_checker-1.98.3.recipe | 4 +- dev-util/acr/acr-0.9.9_git.recipe | 4 +- .../arm_none_eabi_gdb-7.7.recipe | 4 +- dev-util/astyle/astyle-2.05.recipe | 4 +- dev-util/bakefile/bakefile-0.2.8.recipe | 4 +- .../buildbot_slave-0.8.8.recipe | 4 +- dev-util/byacc/byacc-20140422.recipe | 4 +- dev-util/ccache/ccache-3.1.9.recipe | 4 +- dev-util/cmake/cmake-2.8.11.2.recipe | 4 +- dev-util/cmake/cmake-3.0.0.recipe | 6 +-- dev-util/cppunit/cppunit-1.12.1.recipe | 4 +- dev-util/cscope/cscope-15.7a.recipe | 4 +- dev-util/ctags/ctags-5.8.recipe | 4 +- dev-util/fastdep/fastdep-0.16.recipe | 4 +- dev-util/fenris/fenris-0.07.recipe | 4 +- dev-util/gdb/gdb-7.7.recipe | 4 +- dev-util/global/global-6.3.recipe | 4 +- dev-util/gperf/gperf-3.0.4.recipe | 6 +-- dev-util/gtk_doc/gtk_doc-1.20.recipe | 2 +- dev-util/gyp/gyp-r1948.recipe | 4 +- dev-util/idutils/idutils-4.6.recipe | 4 +- dev-util/indent/indent-2.2.10.recipe | 6 +-- dev-util/intltool/intltool-0.40.6.recipe | 4 +- dev-util/ninja/ninja-1.5.1.recipe | 6 +-- dev-util/patchutils/patchutils-0.3.3.recipe | 4 +- dev-util/pkgconfig/pkgconfig-0.27.1.recipe | 4 +- .../posixtestsuite-1.5.2.recipe | 2 +- dev-util/ragel/ragel-6.8.recipe | 4 +- dev-util/scons/scons-2.2.0.recipe | 2 +- dev-util/scons/scons-2.3.1.recipe | 2 +- dev-util/uncrustify/uncrustify-0.60.recipe | 6 +-- dev-vcs/bzr/bzr-2.6.0.recipe | 4 +- dev-vcs/cvs/cvs-1.12.13.1.recipe | 4 +- dev-vcs/cvsps/cvsps-2.2b1.recipe | 4 +- dev-vcs/fossil/fossil-1.28.recipe | 4 +- dev-vcs/fossil/fossil-1.29.recipe | 4 +- dev-vcs/git/git-1.7.10.2.recipe | 14 ++--- dev-vcs/git/git-1.8.3.4.recipe | 16 +++--- dev-vcs/mercurial/mercurial-2.2.2.recipe | 4 +- dev-vcs/mercurial/mercurial-2.8.1.recipe | 4 +- dev-vcs/mercurial/mercurial-2.9.1.recipe | 4 +- dev-vcs/mercurial/mercurial-2.9.2.recipe | 4 +- dev-vcs/mercurial/mercurial-3.2.1.recipe | 4 +- dev-vcs/subversion/subversion-1.6.18.recipe | 4 +- dev-vcs/subversion/subversion-1.8.10.recipe | 4 +- dev-vcs/tig/tig-2.0.2.recipe | 4 +- games-action/barrage/barrage-1.0.4.recipe | 4 +- games-action/maelstrom/maelstrom-3.0.6.recipe | 4 +- games-action/quake3/quake3-0.6.1.recipe | 4 +- .../alienblaster/alienblaster-1.1.0.recipe | 4 +- .../circuslinux/circuslinux-1.0.3.recipe | 4 +- games-arcade/edgar/edgar-1.16_1.recipe | 4 +- .../f1spirit/f1spirit-0.rc9.1615.recipe | 6 +-- games-arcade/giddy3/giddy3-1.4.recipe | 2 +- games-arcade/goonies/goonies-1.4.1528.recipe | 6 +-- games-arcade/mog/mog-0.63.1548.recipe | 6 +-- .../moleinvasion/moleinvasion-0.4.recipe | 4 +- .../plee_the_bear/plee_the_bear-0.7.0.recipe | 4 +- .../roadfighter/roadfighter-1.0.1269.recipe | 6 +-- .../rocksndiamonds-3.3.1.2.recipe | 4 +- .../sdlscavenger/sdlscavenger-145.1.recipe | 6 +-- .../slime_volley/slime_volley-2.4.2.recipe | 4 +- .../super_transball-2.1.5.recipe | 6 +-- games-arcade/supertux/supertux-0.1.3.recipe | 4 +- games-arcade/xrick/xrick-021212.recipe | 6 +-- games-emulation/dosbox/dosbox-0.74.recipe | 4 +- .../visualboyadvance-1.8.recipe | 2 +- games-engines/gemrb/gemrb-0.8.1.recipe | 4 +- games-engines/love/love-0.9.1.recipe | 4 +- .../ponscripter/ponscripter-20111009.recipe | 4 +- .../scummvm-tools/scummvm_tools-1.7.0.recipe | 4 +- games-engines/scummvm/scummvm-1.6.0.recipe | 4 +- games-engines/scummvm/scummvm-1.7.0.recipe | 4 +- games-engines/solarus/solarus-1.1.1.recipe | 4 +- games-kids/dragonmemory/dragonmemory-1.recipe | 4 +- games-kids/pipepanic/pipepanic-0.1.3.recipe | 4 +- games-puzzle/abrick/abrick-1.12.recipe | 4 +- games-puzzle/blobwars/blobwars-1.19.recipe | 4 +- games-puzzle/gemdropx/gemdropx-0.9.recipe | 4 +- games-puzzle/gemz/gemz-0.97.0.recipe | 4 +- .../lbreakout2/lbreakout2-2.6.4.recipe | 4 +- games-puzzle/lgeneral/lgeneral-1.2.3.recipe | 4 +- games-puzzle/lmarbles/lmarbles-1.0.8.recipe | 4 +- games-puzzle/lpairs/lpairs-1.0.4.recipe | 4 +- games-puzzle/ltris/ltris-1.0.19.recipe | 4 +- .../mirrormagic/mirrormagic-2.0.2.recipe | 6 +-- games-puzzle/neverball/neverball-1.5.4.recipe | 4 +- games-puzzle/neverball/neverball-1.6.0.recipe | 4 +- games-puzzle/rezerwar/rezerwar-0.4.2.recipe | 4 +- games-puzzle/sdllopan/sdllopan-10.recipe | 6 +-- games-puzzle/wizznic/wizznic-0.9.9.recipe | 4 +- games-roguelike/angband/angband-3.5.0.recipe | 4 +- games-rpg/fheroes2/fheroes2-r3182.recipe | 4 +- games-rpg/flare/flare-0.19.recipe | 4 +- .../freedroidrpg/freedroidrpg-0.15.1.recipe | 6 +-- .../corsix_th/corsix_th-0.30.recipe | 4 +- games-simulation/openttd/openttd-1.4.3.recipe | 4 +- games-sports/xmoto/xmoto-0.5.11.recipe | 4 +- games-strategy/freeciv/freeciv-2.4.3.recipe | 4 +- .../homeworld_sdl/homeworld_sdl-0.6.recipe | 4 +- games-strategy/uqm/uqm-0.7.0.recipe | 4 +- games-strategy/vcmi/vcmi-0.94.recipe | 4 +- haiku-apps/a_book/a_book-1.1.recipe | 4 +- .../aalibtranslator-0.0.1.recipe | 4 +- haiku-apps/album/album-0.9.3.recipe | 4 +- haiku-apps/aplayer/aplayer-4.0_svn.recipe | 4 +- haiku-apps/armyknife/armyknife-4.3.0.recipe | 4 +- haiku-apps/artpaint/artpaint-2.1.0git.recipe | 4 +- haiku-apps/backup/backup-0.0.1.recipe | 2 +- haiku-apps/bafx/bafx-0.0.1.recipe | 2 +- haiku-apps/bdhcalc/bdhcalc-1.1.recipe | 4 +- haiku-apps/beae/beae-1.2.recipe | 4 +- haiku-apps/beam/beam-1.2alpha.recipe | 2 +- haiku-apps/becasso/becasso-2.0.recipe | 4 +- haiku-apps/beezer/beezer-0.99.hg.recipe | 4 +- haiku-apps/beget/beget-1.2.3.recipe | 4 +- haiku-apps/behappy/behappy-1.06e_git.recipe | 4 +- .../beindexed/beindexed-0.2.0_alpha.recipe | 4 +- haiku-apps/belife/belife-1.0.0.recipe | 4 +- haiku-apps/bemines/bemines-1.0b2.recipe | 2 +- haiku-apps/bepdf/bepdf-1.2.0.recipe | 4 +- .../bescreencapture-1.9.2.recipe | 4 +- .../bescreencapture-1.9.3.recipe | 4 +- .../bescreencapture-1.9.4.recipe | 4 +- haiku-apps/beshare/beshare-4.recipe | 4 +- .../binary_clock/binary_clock-2.0.recipe | 4 +- .../blogpositive/blogpositive-0.1.0.recipe | 4 +- .../blogpositive/blogpositive-0.2.0.recipe | 4 +- .../blogpositive/blogpositive-0.3.0.recipe | 4 +- .../blogpositive/blogpositive-0.4.0.recipe | 4 +- haiku-apps/burnitnow/burnitnow-0.1.0.recipe | 4 +- haiku-apps/butterfly/butterfly-1.6.2.recipe | 4 +- haiku-apps/capitalbe/capitalbe-1.1.recipe | 4 +- haiku-apps/caya/caya-2013.10.12.recipe | 4 +- haiku-apps/cdplayer/cdplayer-1.0.recipe | 4 +- haiku-apps/chat/chat-20100903.recipe | 4 +- .../cherry_blossom/cherry_blossom-1.0.recipe | 4 +- haiku-apps/clipup/clipup-2.0.3.recipe | 4 +- haiku-apps/clockwerk/clockwerk-git.recipe | 4 +- haiku-apps/cmake_haiku/cmake_haiku-git.recipe | 4 +- haiku-apps/colors/colors-2.3.recipe | 2 +- .../converttolf/converttolf-0.0.0.recipe | 4 +- .../copynametoclipboard-1.0.1.recipe | 4 +- .../coveredcalc/coveredcalc-1.10.0.recipe | 4 +- haiku-apps/digiclock/digiclock-1.0.recipe | 4 +- haiku-apps/dockbert/dockbert-1.0.2b1.recipe | 4 +- .../documentviewer-0.3_git.recipe | 4 +- haiku-apps/ducksaver/ducksaver-1.1.0.recipe | 4 +- .../einsteinium/einsteinium-20141023.recipe | 4 +- haiku-apps/filecropper/filecropper-1.recipe | 4 +- haiku-apps/filer/filer-1.0.0beta3.recipe | 4 +- haiku-apps/filwip/filwip-1.0.0.recipe | 4 +- haiku-apps/finance/finance-1.0.0.recipe | 4 +- .../foldershaper/foldershaper-1.0.recipe | 4 +- haiku-apps/fontboy/fontboy-0.9.7.recipe | 4 +- haiku-apps/fortuna/fortuna-1.0.0.recipe | 4 +- haiku-apps/friss/friss-0.8.0.recipe | 2 +- haiku-apps/ftppositive/ftppositive-1.0.recipe | 4 +- haiku-apps/globe/globe-0.4.recipe | 4 +- .../haikutwitter/haikutwitter-1.0_git.recipe | 4 +- haiku-apps/hare/hare-1.1.1.recipe | 4 +- haiku-apps/hdialog/hdialog-0.1_git.recipe | 4 +- haiku-apps/jammin/jammin-0.1.0.recipe | 4 +- .../keymapswitcher-1.2.7.10.recipe | 4 +- .../keymapswitcher-1.2.7.11.recipe | 4 +- .../keymapswitcher-1.2.7.9.recipe | 4 +- haiku-apps/konfetti/konfetti-1.0.0.recipe | 4 +- haiku-apps/launchpad/launchpad-1.3.recipe | 6 +-- haiku-apps/lava/lava-1.0.recipe | 4 +- haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe | 2 +- .../masterpiece/masterpiece-r742.recipe | 4 +- haiku-apps/microbe/microbe-20130728.recipe | 4 +- .../minimizeall/minimizeall-1.0.0.recipe | 4 +- haiku-apps/mkdepend/mkdepend-1.7.recipe | 4 +- haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 4 +- haiku-apps/netpulse/netpulse-0.2.3.recipe | 2 +- .../nightandday/nightsandday-0.1.2.recipe | 4 +- .../optipngtranslator-0.0.1.recipe | 4 +- haiku-apps/organizer/organizer-0.1.recipe | 6 +-- .../orphilia_dropbox-1.recipe | 4 +- haiku-apps/paladin/paladin-1.3.recipe | 4 +- haiku-apps/paladin/paladin-20141022.recipe | 4 +- haiku-apps/pecorename/pecorename-1.5.recipe | 4 +- haiku-apps/peek/peek-20140206.recipe | 4 +- haiku-apps/phantomlimb/phantomlimb-1.recipe | 4 +- haiku-apps/ppviewer/ppviewer-1.0.0.recipe | 4 +- .../querywatcher/querywatcher-1.4.recipe | 4 +- .../quicklaunch/quicklaunch-0.9.6.recipe | 4 +- .../quicklaunch/quicklaunch-0.9.7.recipe | 4 +- .../randomizer/randomizer-1.0.0b1.recipe | 4 +- haiku-apps/recibe/recibe-1.0b1.recipe | 4 +- .../remotecontrol/remotecontrol-1.1.recipe | 4 +- haiku-apps/rename/rename-3.9.0.recipe | 4 +- .../resourceedit/resourceedit-1.0_git.recipe | 4 +- haiku-apps/resourcer/resourcer-1.0.recipe | 4 +- haiku-apps/rez/rez-108.recipe | 6 +-- .../runprogram/runprogram-1.0rc1.recipe | 4 +- .../scriptureguide-0.9.0.recipe | 4 +- haiku-apps/seeker/seeker-1.0.recipe | 4 +- haiku-apps/shredder/shredder-1.0.0.recipe | 4 +- haiku-apps/slayer/slayer-0.9.recipe | 2 +- haiku-apps/sortsave/sortsave-1.0.recipe | 4 +- haiku-apps/substrate/substrate-1.0.recipe | 4 +- haiku-apps/sum_it/sum_it-0.2beta.recipe | 2 +- haiku-apps/systeminfo/systeminfo-2.recipe | 4 +- haiku-apps/takenotes/takenotes-1.0.0.recipe | 4 +- .../taskmanager/taskmanager-0.1.7.recipe | 4 +- haiku-apps/textsaver/textsaver-1.0.recipe | 4 +- .../thememanager/thememanager-1.0_git.recipe | 4 +- haiku-apps/timecop/timecop-0.61.recipe | 4 +- haiku-apps/tolmach/tolmach-1.1.0.recipe | 2 +- haiku-apps/torrentor/torrentor-0.0.5.recipe | 4 +- haiku-apps/trackergrep/trackergrep-5.1.recipe | 4 +- haiku-apps/ubertuber/ubertuber-0.9.10.recipe | 4 +- haiku-apps/ubertuber/ubertuber-0.9.7.recipe | 4 +- haiku-apps/ubertuber/ubertuber-0.9.8.recipe | 4 +- haiku-apps/ubertuber/ubertuber-0.9.9.recipe | 4 +- .../virtualbelive-20140718.recipe | 4 +- haiku-apps/vision/vision-0.9.7.r949.recipe | 4 +- haiku-apps/waveview/waveview-1.0.recipe | 6 +-- haiku-apps/whisper/whisper-1.2.recipe | 2 +- haiku-apps/yab_ide/yab_ide-2.2.2.recipe | 4 +- haiku-apps/yab_ide/yab_ide-2.2.3.recipe | 4 +- .../becheckers/becheckers-1.0.1.recipe | 4 +- haiku-games/bespider/bespider-0.1.0.recipe | 4 +- haiku-games/bevexed/bevexed-1.1.recipe | 4 +- .../guitarmaster/guitarmaster-r21.recipe | 4 +- haiku-games/puri/puri-0.3.9.1.recipe | 4 +- haiku-games/w6/w6-1.7.recipe | 4 +- haiku-libs/ale/ale-0.9.1.recipe | 4 +- .../haikuwebkit-1.1.3_2013_08_09.recipe | 4 +- .../haikuwebkit-1.1.3_2013_10_11.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.2.0.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.2.1.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.2.2.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.2.3.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.2.4.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.2.5.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.3.0.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.3.1.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.3.2.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.0.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.1.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.2.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.3.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.4.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.5.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.6.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.7.recipe | 6 +-- .../haikuwebkit/haikuwebkit-1.4.8.recipe | 6 +-- .../libburndevice/libburndevice-1.0.recipe | 4 +- haiku-libs/libprefs/libprefs-1.2.5.recipe | 8 +-- haiku-libs/libsanta/libsanta-3.0.1.recipe | 4 +- haiku-libs/libwalter/libwalter-97.recipe | 4 +- haiku-misc/rssavers/rssavers-0.2.recipe | 4 +- kde-misc/kdiff3/kdiff3-0.9.97.recipe | 2 +- media-gfx/exiv2/exiv2-0.24.recipe | 4 +- media-gfx/fontforge/fontforge-20141126.recipe | 6 +-- media-gfx/graphite2/graphite2-1.2.4.recipe | 6 +-- media-gfx/graphviz/graphviz-2.26.3.recipe | 4 +- .../imagemagick/imagemagick-6.8.9_8.recipe | 4 +- media-gfx/optipng/optipng-0.7.4.recipe | 4 +- media-gfx/pngcrush/pngcrush-1.7.81.recipe | 4 +- media-gfx/qrencode/qrencode-3.3.0.recipe | 4 +- media-gfx/qrencode/qrencode_kdl-3.3.0.recipe | 4 +- media-gfx/tuxpaint/tuxpaint-0.9.22.recipe | 4 +- media-libs/a52dec/a52dec-0.7.4.recipe | 4 +- media-libs/aalib/aalib-1.4rc4.recipe | 4 +- media-libs/allegro/allegro-4.4.1.1.recipe | 6 +-- media-libs/allegro/allegro-4.4.2.recipe | 6 +-- media-libs/devil/devil-1.7.8.recipe | 6 +-- media-libs/djvulibre/djvulibre-3.5.25.recipe | 4 +- media-libs/faac/faac-1.28.recipe | 4 +- media-libs/faad2/faad2-2.7.recipe | 4 +- media-libs/flac/flac-1.3.1.recipe | 4 +- media-libs/flickcurl/flickcurl-1.26.recipe | 4 +- .../fontconfig/fontconfig-2.11.0.recipe | 4 +- .../fontconfig/fontconfig-2.11.1.recipe | 4 +- media-libs/freetype/freetype-2.5.3.recipe | 4 +- media-libs/gd/gd-2.1.recipe | 4 +- media-libs/giflib/giflib-5.0.5.recipe | 4 +- media-libs/giflib/giflib-5.1.0.recipe | 4 +- media-libs/glew/glew-1.10.0.recipe | 6 +-- media-libs/glew/glew-1.11.0.recipe | 6 +-- media-libs/guilib/guilib-1.2.1.recipe | 2 +- media-libs/harfbuzz/harfbuzz-0.9.29.recipe | 2 +- media-libs/harfbuzz/harfbuzz-0.9.36.recipe | 4 +- media-libs/ilmbase/ilmbase-2.1.0.recipe | 4 +- media-libs/ilmbase/ilmbase-2.2.0.recipe | 4 +- media-libs/im/im-3.8.recipe | 4 +- media-libs/jasper/jasper-1.900.1.recipe | 6 +-- media-libs/jbig2dec/jbig2dec-0.11.recipe | 4 +- media-libs/jgmod/jgmod-0.99.recipe | 2 +- media-libs/jpeg/jpeg-8d.recipe | 6 +-- media-libs/jpeg/jpeg-9.recipe | 6 +-- media-libs/jpeg/jpeg-9a.recipe | 6 +-- media-libs/lcms/lcms-2.6.recipe | 4 +- media-libs/leptonica/leptonica-1.69.recipe | 8 +-- media-libs/leptonica/leptonica-1.71.recipe | 8 +-- media-libs/libaacs/libaacs-0.7.1.recipe | 4 +- media-libs/libao/libao-1.2.0.recipe | 4 +- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 4 +- media-libs/libass/libass-0.11.2.recipe | 4 +- media-libs/libass/libass-0.12.0.recipe | 4 +- media-libs/libaubio/libaubio-0.4.1.recipe | 4 +- media-libs/libbdplus/libbdplus-0.1.1.recipe | 4 +- media-libs/libbluray/libbluray-0.6.1.recipe | 4 +- media-libs/libbluray/libbluray-0.6.2.recipe | 4 +- media-libs/libcddb/libcddb-1.3.2.recipe | 4 +- media-libs/libcdr/libcdr-0.1.1.recipe | 4 +- .../libcoverart/libcoverart-1.0.0.recipe | 4 +- media-libs/libcuefile/libcuefile-r475.recipe | 4 +- media-libs/libdca/libdca-0.0.5.recipe | 4 +- media-libs/libdv/libdv-1.0.0.recipe | 4 +- media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe | 4 +- media-libs/libdvdcss/libdvdcss-1.2.12.recipe | 4 +- media-libs/libdvdcss/libdvdcss-1.3.0.recipe | 4 +- media-libs/libdvdnav/libdvdnav-4.2.0.recipe | 6 +-- media-libs/libdvdnav/libdvdnav-4.2.1.recipe | 4 +- media-libs/libdvdnav/libdvdnav-5.0.1.recipe | 4 +- media-libs/libdvdread/libdvdread-4.2.0.recipe | 6 +-- media-libs/libdvdread/libdvdread-4.2.1.recipe | 4 +- media-libs/libdvdread/libdvdread-5.0.0.recipe | 4 +- media-libs/libebur128/libebur128-1.0.1.recipe | 4 +- .../libfreehand/libfreehand-0.1.0.recipe | 4 +- media-libs/libharu/libharu-2.3.0.recipe | 4 +- media-libs/libicns/libicns-0.8.1.recipe | 4 +- media-libs/libid3tag/libid3tag-0.15.1b.recipe | 4 +- .../libiptcdata/libiptcdata-1.0.4.recipe | 4 +- media-libs/liblo/liblo-0.28.recipe | 4 +- .../libmatroska/libmatroska-1.4.1.recipe | 4 +- .../libmetalink/libmetalink-0.1.2.recipe | 4 +- media-libs/libmkv/libmkv-0.6.5.1.recipe | 4 +- media-libs/libmng/libmng-1.0.10.recipe | 4 +- media-libs/libmng/libmng-2.0.2.recipe | 4 +- .../libmodplug/libmodplug-0.8.8.5.recipe | 4 +- media-libs/libmp4v2/libmp4v2-2.0.0.recipe | 4 +- .../libmpdclient/libmpdclient-2.10_git.recipe | 4 +- media-libs/libmpeg2/libmpeg2-0.5.1.recipe | 4 +- media-libs/libmtp/libmtp-1.1.6.recipe | 4 +- media-libs/libmtp/libmtp-1.1.8.recipe | 4 +- media-libs/libnsbmp/libnsbmp-0.1.1.recipe | 4 +- media-libs/libnsgif/libnsgif-0.1.1.recipe | 4 +- media-libs/libogg/libogg-1.3.2.recipe | 4 +- media-libs/libopus/libopus-1.1.recipe | 4 +- media-libs/libpng/libpng-1.5.20.recipe | 4 +- media-libs/libpng/libpng12-1.2.51.recipe | 4 +- media-libs/libpng/libpng16-1.6.15.recipe | 6 +-- .../libquicktime/libquicktime-1.2.4.recipe | 4 +- .../libreplaygain/libreplaygain-r475.recipe | 4 +- .../libsamplerate/libsamplerate-0.1.8.recipe | 4 +- media-libs/libsdl/libsdl-1.2.15.recipe | 4 +- media-libs/libsdl2/libsdl2-2.0.0.recipe | 4 +- media-libs/libsdl2/libsdl2-2.0.1.recipe | 4 +- media-libs/libsdl2/libsdl2-2.0.3.recipe | 4 +- .../libsndfile/libsndfile-1.0.25.recipe | 4 +- media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe | 4 +- media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe | 4 +- media-libs/libtheora/libtheora-1.1.1.recipe | 4 +- media-libs/libvisio/libvisio-0.0.31.recipe | 4 +- media-libs/libvisio/libvisio-0.1.0.recipe | 4 +- media-libs/libvorbis/libvorbis-1.3.2.recipe | 4 +- media-libs/libvorbis/libvorbis-1.3.4.recipe | 4 +- media-libs/libvpx/libvpx-1.0.0.recipe | 4 +- media-libs/libwebp/libwebp-0.3.1.recipe | 4 +- media-libs/libwebp/libwebp-0.4.1.recipe | 4 +- media-libs/libxcm/libxcm-0.5.3.recipe | 4 +- media-libs/openal/openal-1.13.0.recipe | 6 +-- media-libs/openexr/openexr-2.1.0.recipe | 4 +- media-libs/openexr/openexr-2.2.0.recipe | 4 +- media-libs/openjpeg/openjpeg-1.5.0.recipe | 4 +- media-libs/openjpeg/openjpeg-2.1.0.recipe | 4 +- media-libs/pnglite/pnglite-0.1.17.recipe | 4 +- media-libs/portaudio/portaudio-19.recipe | 4 +- .../schroedinger/schroedinger-1.0.11.recipe | 4 +- media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe | 2 +- media-libs/sdl2_image/sdl2_image-2.0.0.recipe | 4 +- media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 4 +- media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe | 4 +- media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe | 4 +- media-libs/sdl_image/sdl_image-1.2.12.recipe | 2 +- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 4 +- media-libs/sdl_net/sdl_net-1.2.8.recipe | 2 +- media-libs/sdl_sound/sdl_sound-1.0.3.recipe | 2 +- media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe | 4 +- media-libs/smpeg/smpeg-0.4.5.recipe | 2 +- media-libs/speex/speex-1.2~rc1.recipe | 4 +- media-libs/taglib/taglib-1.7.2.recipe | 4 +- media-libs/taglib/taglib-1.9.1.recipe | 4 +- media-libs/tiff/tiff-3.9.6.recipe | 6 +-- media-libs/tiff/tiff4-4.0.3.recipe | 6 +-- media-libs/vigra/vigra-1.10.0.recipe | 4 +- media-libs/x264/x264-20140308.recipe | 4 +- media-sound/bladeenc/bladeenc-0.94.2.recipe | 4 +- .../fluidsynth/fluidsynth-1.1.6.recipe | 4 +- .../gogo_no_coda/gogo_no_coda-3.13.recipe | 4 +- .../hivelytracker/hivelytracker-1.8.recipe | 4 +- media-sound/lame/lame-3.99.5.recipe | 4 +- .../milkytracker/milkytracker-0.90.86.recipe | 4 +- media-sound/mpc/musicpc-0.26.recipe | 4 +- media-sound/mpd/mpd-0.18.12_git.recipe | 4 +- media-sound/mpg123/mpg123-1.12.1.recipe | 6 +-- .../musepack_tools/musepack_tools-r475.recipe | 4 +- media-sound/ocp/ocp-0.1.21_git.recipe | 2 +- .../opensound/opensound-4.2_git.recipe | 4 +- media-sound/protrekkr/protrekkr-2.5.4.recipe | 4 +- media-sound/redoflacs/redoflacs-0.30.recipe | 2 +- media-sound/twolame/twolame-0.3.13.recipe | 4 +- .../vorbis_tools/vorbis_tools-1.4.0.recipe | 4 +- media-video/ffmpeg/ffmpeg-0.10.14.recipe | 4 +- media-video/ffmpeg/ffmpeg-0.11.5.recipe | 4 +- media-video/ffmpeg/ffmpeg-2.3.recipe | 4 +- media-video/ffmpeg/ffmpeg-2.4.2.recipe | 4 +- media-video/gnash/gnash-0.8.10.recipe | 4 +- media-video/handbrake/handbrake-0.9.9.recipe | 4 +- .../mjpegtools/mjpegtools-2.1.0.recipe | 4 +- media-video/rtmpdump/rtmpdump-2.4_git.recipe | 4 +- media-video/vcdimager/vcdimager-0.7.24.recipe | 4 +- media-video/vlc/vlc-0.8.6i.recipe | 4 +- net-analyzer/mtr/mtr-0.73.recipe | 6 +-- net-analyzer/netcat/netcat-1.10.recipe | 4 +- net-analyzer/netperf/netperf-2.6.0.recipe | 4 +- net-dialup/minicom/minicom-2.6.2.recipe | 4 +- net-dns/c_ares/c_ares-1.10.0.recipe | 4 +- net-dns/libidn/libidn-1.29.recipe | 4 +- net-fs/samba/samba-3.6.24.recipe | 4 +- net-ftp/lftp/lftp-4.4.16.recipe | 4 +- net-irc/quassel/quassel-0.10.0.recipe | 4 +- net-irc/quassel/quassel-0.9.2.recipe | 4 +- net-libs/enet/enet-1.3.0.recipe | 4 +- net-libs/gloox/gloox-1.0.12.recipe | 4 +- net-libs/gloox/gloox-1.0.9.recipe | 4 +- net-libs/gnutls/gnutls-2.8.6.recipe | 4 +- net-libs/hubbub/hubbub-0.3.0.recipe | 4 +- net-libs/libdom/libdom-0.1.0.recipe | 4 +- net-libs/libdom/libdom-0.1.1.recipe | 4 +- net-libs/libnatpmp/libnatpmp-20140401.recipe | 4 +- net-libs/libssh2/libssh2-1.4.3.recipe | 4 +- net-libs/neon/neon-0.29.6.recipe | 4 +- net-libs/neon/neon-0.30.1.recipe | 4 +- net-libs/serf/serf-1.3.8.recipe | 4 +- net-misc/axel/axel-2.4.recipe | 4 +- net-misc/berdp/berdp-1.recipe | 4 +- net-misc/curl/curl-7.38.0.recipe | 4 +- net-misc/curl/curl-7.39.0.recipe | 4 +- net-misc/gophernicus/gophernicus-1.5.recipe | 4 +- net-misc/mosh/mosh-1.2.4.recipe | 4 +- net-misc/muscle/muscle-6.00.recipe | 4 +- net-misc/openssh/openssh-5.8p2.recipe | 4 +- net-misc/openssh/openssh-6.0p1.recipe | 4 +- net-misc/openssh/openssh-6.5p1.recipe | 4 +- net-misc/openssh/openssh-6.6p1.recipe | 4 +- net-misc/openssh/openssh-6.7p1.recipe | 4 +- net-misc/rdesktop/rdesktop-1.8.0.recipe | 4 +- net-misc/rsync/rsync-3.1.1.recipe | 4 +- net-misc/tor/tor-0.2.4.20.recipe | 4 +- net-misc/vncviewer/vncviewer-3.3.1r6.recipe | 2 +- net-misc/wget/wget-1.16.1.recipe | 4 +- .../youtube_dl/youtube_dl-2013.12.20.recipe | 4 +- .../youtube_dl/youtube_dl-2014.01.08.recipe | 4 +- .../youtube_dl/youtube_dl-2014.01.23.recipe | 4 +- .../youtube_dl/youtube_dl-2014.02.08.recipe | 4 +- .../youtube_dl/youtube_dl-2014.06.19.recipe | 4 +- .../youtube_dl/youtube_dl-2014.10.15.recipe | 4 +- net-nds/openldap/openldap-2.4.40.recipe | 4 +- net-p2p/transmission/transmission-2.82.recipe | 4 +- net-p2p/transmission/transmission-2.84.recipe | 4 +- net-print/gutenprint/gutenprint-5.2.10.recipe | 4 +- net-print/gutenprint/gutenprint-5.2.9.recipe | 4 +- net-proxy/privoxy/privoxy-3.0.21.recipe | 4 +- .../wpa_supplicant-0.7.3.recipe | 4 +- .../wpa_supplicant/wpa_supplicant-2.0.recipe | 4 +- sci-astronomy/celestia/celestia-1.6.1.recipe | 4 +- .../verilator/verilator-3.864.recipe | 4 +- sci-libs/fftw/fftw-3.2.2.recipe | 4 +- sci-libs/fftw/fftw-3.3.3.recipe | 4 +- sci-libs/fftw/fftw-3.3.4.recipe | 4 +- sci-libs/gdal/gdal-1.11.0.recipe | 4 +- sci-libs/geos/geos-3.4.2.recipe | 4 +- sci-libs/libgeotiff/libgeotiff-1.4.0.recipe | 4 +- sci-libs/libsvm/libsvm-v320.recipe | 6 +-- sci-libs/proj/proj-4.8.0.recipe | 4 +- sci-mathematics/pari/pari-2.7.0.recipe | 4 +- sci-visualization/gri/gri-2.12.23.recipe | 4 +- sys-apps/coreutils/coreutils-8.22.recipe | 4 +- sys-apps/dbus/dbus-1.8.6.recipe | 6 +-- sys-apps/dialog/dialog-1.2.recipe | 4 +- sys-apps/diffutils/diffutils-3.3.recipe | 4 +- sys-apps/dmidecode/dmidecode-2.12.recipe | 2 +- sys-apps/dtc/dtc-1.4.0.recipe | 4 +- sys-apps/ed/ed-1.7.recipe | 4 +- sys-apps/file/file-5.15.recipe | 4 +- sys-apps/findutils/findutils-4.4.2.recipe | 4 +- sys-apps/fxload/fxload-20120810.recipe | 4 +- sys-apps/gawk/gawk-3.1.8.recipe | 4 +- sys-apps/gawk/gawk-4.1.0.recipe | 4 +- sys-apps/getconf/getconf-r260000.recipe | 4 +- sys-apps/gptfdisk/gptfdisk-0.8.10.recipe | 2 +- sys-apps/grep/grep-2.14.recipe | 4 +- sys-apps/grep/grep-2.20.recipe | 4 +- sys-apps/grep/grep-2.21.recipe | 4 +- sys-apps/groff/groff-1.20.1.recipe | 4 +- sys-apps/help2man/help2man-1.43.3.recipe | 4 +- sys-apps/help2man/help2man-1.44.1.recipe | 4 +- sys-apps/help2man/help2man-1.46.3.recipe | 4 +- sys-apps/less/less-451.recipe | 4 +- sys-apps/less/less-458.recipe | 4 +- sys-apps/less/less-466.recipe | 4 +- sys-apps/man/man-1.6g.recipe | 4 +- sys-apps/pciutils/pciutils-3.2.1.recipe | 4 +- sys-apps/pciutils/pciutils-3.2.1_git.recipe | 4 +- sys-apps/sed/sed-4.2.1.recipe | 4 +- sys-apps/spiff/spiff-1.recipe | 6 +-- sys-apps/texinfo/texinfo-4.13a.recipe | 4 +- .../the_silver_searcher-0.18.1.recipe | 4 +- .../the_silver_searcher-0.26.recipe | 4 +- sys-apps/which/which-2.20.recipe | 4 +- sys-block/parted/parted-3.1.53_git.recipe | 4 +- ..._none_eabi_binutils-2.24_2014_03_19.recipe | 4 +- .../arm_none_eabi_gcc-4.8.4.recipe | 4 +- .../arm_none_eabi_gcc_nolibc-4.8.4.recipe | 4 +- sys-devel/autoconf/autoconf-2.68.recipe | 4 +- sys-devel/autoconf/autoconf-2.69.recipe | 4 +- sys-devel/autoconf213/autoconf213-2.13.recipe | 4 +- sys-devel/automake/automake-1.11.1.recipe | 4 +- sys-devel/automake/automake-1.12.2.recipe | 4 +- sys-devel/automake/automake-1.13.1.recipe | 4 +- .../avr_binutils-2.24_2014_03_19.recipe | 4 +- .../avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe | 4 +- sys-devel/bc/bc-1.06.recipe | 4 +- sys-devel/bin86/bin86-0.16.21.recipe | 4 +- .../binutils/binutils-2.17_2013_04_21.recipe | 4 +- .../binutils-2.23.2_2013_04_09.recipe | 4 +- .../binutils/binutils-2.24_2014_03_19.recipe | 4 +- sys-devel/bison/bison-2.4.3.recipe | 4 +- sys-devel/bison/bison-2.6.5.recipe | 4 +- sys-devel/bmake/bmake-20140214.recipe | 4 +- sys-devel/clang/clang-3.2.recipe | 4 +- sys-devel/clang/clang-3.4.recipe | 4 +- sys-devel/distcc/distcc-3.1.recipe | 4 +- sys-devel/flex/flex-2.5.35.recipe | 4 +- sys-devel/flex/flex-2.5.39.recipe | 4 +- sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe | 4 +- sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe | 4 +- sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe | 4 +- sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe | 6 +-- sys-devel/gettext/gettext-0.18.1.1.recipe | 6 +-- sys-devel/gettext/gettext-0.19.2.recipe | 6 +-- sys-devel/jam/jam-2.5_2012_10_12.recipe | 4 +- sys-devel/libtool/libtool-2.4.2.recipe | 6 +-- sys-devel/libtool/libtool-2.4.recipe | 6 +-- sys-devel/libuuid/libuuid-1.0.3.recipe | 4 +- sys-devel/llvm/llvm-3.0.recipe | 4 +- sys-devel/llvm/llvm-3.2.recipe | 4 +- sys-devel/llvm/llvm-3.3.recipe | 4 +- sys-devel/llvm/llvm-3.4.1.recipe | 4 +- sys-devel/llvm/llvm-3.4.2.recipe | 4 +- sys-devel/llvm/llvm-3.4.recipe | 4 +- sys-devel/m4/m4-1.4.16.recipe | 4 +- sys-devel/make/make-3.82.recipe | 4 +- sys-devel/openwatcom/openwatcom-1.9.0.recipe | 2 +- sys-devel/patch/patch-2.7.1.recipe | 4 +- sys-fs/ddrescue/ddrescue-1.19.recipe | 4 +- sys-fs/mtools/mtools-4.0.18.recipe | 4 +- sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe | 2 +- .../arm_none_eabi_newlib-2.1.0.recipe | 2 +- sys-libs/glu/glu-9.0.0.recipe | 4 +- sys-libs/libexecinfo/libexecinfo-1.1.recipe | 4 +- sys-libs/mesa/mesa-10.0.1.recipe | 4 +- sys-libs/mesa/mesa-10.0.2.recipe | 4 +- sys-libs/mesa/mesa-10.1.0.recipe | 4 +- sys-libs/mesa/mesa-10.1.1.recipe | 4 +- sys-libs/mesa/mesa-10.2.9.recipe | 4 +- sys-libs/mesa/mesa-7.9.2.recipe | 4 +- sys-libs/mesa/mesa-9.1.1.recipe | 4 +- sys-libs/ncurses/ncurses-5.9.recipe | 4 +- sys-libs/readline/readline-6.2.recipe | 4 +- sys-libs/readline/readline-6.3.recipe | 4 +- sys-libs/zlib/zlib-1.2.8.recipe | 4 +- sys-process/dcron/dcron-4.5.recipe | 4 +- www-client/bezilla/bezilla-git.recipe | 4 +- www-client/links/links-2.3pre2.recipe | 4 +- www-client/links/links-2.8.recipe | 4 +- www-client/lynx/lynx-2.8.9dev.1.recipe | 4 +- www-client/netsurf/netsurf-3.1.recipe | 4 +- www-client/netsurf/netsurf-3.2.recipe | 4 +- www-client/qupzilla/qupzilla-1.4.x.recipe | 4 +- www-client/qupzilla/qupzilla-1.7.x.recipe | 4 +- www-client/w3m/w3m-0.5.3.recipe | 4 +- www-servers/haproxy/haproxy-1.4.22.recipe | 4 +- www-servers/lighttpd/lighttpd-1.4.35.recipe | 4 +- www-servers/nginx/nginx-1.7.4_hg.recipe | 4 +- x11-libs/agg/agg-2.5.recipe | 6 +-- x11-libs/cairo/cairo-1.12.16.recipe | 4 +- x11-libs/cairo/cairo-1.12.18.recipe | 4 +- x11-libs/cd/cd-5.8.recipe | 4 +- x11-libs/iup/iup-3.8.recipe | 4 +- x11-libs/libxau/libxau-1.0.5.recipe | 6 +-- x11-libs/libxau/libxau-1.0.8.recipe | 6 +-- x11-libs/libxcb/libxcb-1.6.recipe | 4 +- x11-libs/pango/pango-1.36.8.recipe | 4 +- x11-libs/pixman/pixman-0.20.0.recipe | 4 +- x11-libs/pixman/pixman-0.32.4.recipe | 4 +- x11-libs/pixman/pixman-0.32.6.recipe | 4 +- x11-libs/xtrans/xtrans-1.2.5.recipe | 4 +- .../shared_mime_info-1.3.recipe | 4 +- x11-misc/synergy/synergy-1.5.0.recipe | 2 +- .../util_macros/util_macros-1.17.0_git.recipe | 4 +- .../util_macros/util_macros-1.19.0.recipe | 4 +- x11-proto/inputproto/inputproto-2.0.recipe | 4 +- x11-proto/kbproto/kbproto-1.0.4.recipe | 4 +- x11-proto/xcb_proto/xcb_proto-1.6.recipe | 4 +- x11-proto/xextproto/xextproto-7.1.1.recipe | 4 +- x11-proto/xproto/xproto-7.0.23_git.recipe | 4 +- x11-proto/xproto/xproto-7.0.26.recipe | 4 +- 927 files changed, 1925 insertions(+), 1925 deletions(-) diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe index 67f44ec87..4cd815173 100644 --- a/app-accessibility/espeak/espeak-1.48.04.recipe +++ b/app-accessibility/espeak/espeak-1.48.04.recipe @@ -25,10 +25,10 @@ PROVIDES=" devel:libespeak = 1.1.4 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:make diff --git a/app-admin/keepassx/keepassx-2.0a5.recipe b/app-admin/keepassx/keepassx-2.0a5.recipe index f033585f2..9cebda6a5 100644 --- a/app-admin/keepassx/keepassx-2.0a5.recipe +++ b/app-admin/keepassx/keepassx-2.0a5.recipe @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgcrypt lib:libQtCore lib:libQtGui @@ -43,7 +43,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz devel:libgcrypt devel:libQtCore diff --git a/app-admin/keepassx/keepassx-2.0a6.recipe b/app-admin/keepassx/keepassx-2.0a6.recipe index 0f32ce326..2d64448c3 100644 --- a/app-admin/keepassx/keepassx-2.0a6.recipe +++ b/app-admin/keepassx/keepassx-2.0a6.recipe @@ -36,7 +36,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgcrypt lib:libQtCore lib:libQtGui @@ -44,7 +44,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz devel:libgcrypt devel:libgpg_error diff --git a/app-admin/pwgen/pwgen-2.06.recipe b/app-admin/pwgen/pwgen-2.06.recipe index f17975be6..28c768ad8 100644 --- a/app-admin/pwgen/pwgen-2.06.recipe +++ b/app-admin/pwgen/pwgen-2.06.recipe @@ -33,11 +33,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-admin/testdisk/testdisk-7.0_git.recipe b/app-admin/testdisk/testdisk-7.0_git.recipe index c9bdb4836..2f5e1b8da 100644 --- a/app-admin/testdisk/testdisk-7.0_git.recipe +++ b/app-admin/testdisk/testdisk-7.0_git.recipe @@ -46,7 +46,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv lib:libjpeg lib:libncurses @@ -55,7 +55,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libiconv devel:libjpeg devel:libncurses diff --git a/app-arch/arc/arc-5.21p.recipe b/app-arch/arc/arc-5.21p.recipe index ec7f29b62..3232278b0 100644 --- a/app-arch/arc/arc-5.21p.recipe +++ b/app-arch/arc/arc-5.21p.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_REQUIRES=" diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe index b6b8b6462..84a7aa805 100644 --- a/app-arch/bzip2/bzip2-1.0.6.recipe +++ b/app-arch/bzip2/bzip2-1.0.6.recipe @@ -37,12 +37,12 @@ PROVIDES="$PROVIDES fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:ar cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe index 0c6466083..228ccb467 100644 --- a/app-arch/cabextract/cabextract-1.4.recipe +++ b/app-arch/cabextract/cabextract-1.4.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-arch/cpio/cpio-2.11.recipe b/app-arch/cpio/cpio-2.11.recipe index cdcf15414..c95fdb0ab 100644 --- a/app-arch/cpio/cpio-2.11.recipe +++ b/app-arch/cpio/cpio-2.11.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" @@ -33,7 +33,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:awk diff --git a/app-arch/fastjar/fastjar-0.98.recipe b/app-arch/fastjar/fastjar-0.98.recipe index 3ed7d949d..4ae625219 100644 --- a/app-arch/fastjar/fastjar-0.98.recipe +++ b/app-arch/fastjar/fastjar-0.98.recipe @@ -21,12 +21,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz " diff --git a/app-arch/gzip/gzip-1.6.recipe b/app-arch/gzip/gzip-1.6.recipe index 8e1ee5898..4c4bfffab 100644 --- a/app-arch/gzip/gzip-1.6.recipe +++ b/app-arch/gzip/gzip-1.6.recipe @@ -33,11 +33,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:make diff --git a/app-arch/ha/ha-0999.recipe b/app-arch/ha/ha-0999.recipe index 0b7d0d31e..442d7116f 100644 --- a/app-arch/ha/ha-0999.recipe +++ b/app-arch/ha/ha-0999.recipe @@ -16,11 +16,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-arch/lha/lha-1.14i.recipe b/app-arch/lha/lha-1.14i.recipe index a2191e31d..a9cc20ebf 100644 --- a/app-arch/lha/lha-1.14i.recipe +++ b/app-arch/lha/lha-1.14i.recipe @@ -18,12 +18,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libiconv " diff --git a/app-arch/libarchive/libarchive-3.1.2.recipe b/app-arch/libarchive/libarchive-3.1.2.recipe index 1e2e9d781..ed2231bed 100644 --- a/app-arch/libarchive/libarchive-3.1.2.recipe +++ b/app-arch/libarchive/libarchive-3.1.2.recipe @@ -52,7 +52,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:liblzma$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libssl$secondaryArchSuffix @@ -71,7 +71,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtoolize cmd:aclocal cmd:autoconf diff --git a/app-arch/lz4/lz4-r117.recipe b/app-arch/lz4/lz4-r117.recipe index d515d5dac..2c3d03ed7 100644 --- a/app-arch/lz4/lz4-r117.recipe +++ b/app-arch/lz4/lz4-r117.recipe @@ -31,10 +31,10 @@ PROVIDES="$PROVIDES fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:ar diff --git a/app-arch/lzip/lzip-1.16.recipe b/app-arch/lzip/lzip-1.16.recipe index 6955f6a8c..78060e421 100644 --- a/app-arch/lzip/lzip-1.16.recipe +++ b/app-arch/lzip/lzip-1.16.recipe @@ -53,13 +53,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/app-arch/ncompress/ncompress-4.2.4.4.recipe b/app-arch/ncompress/ncompress-4.2.4.4.recipe index 7fb17a28d..0c3815ef2 100644 --- a/app-arch/ncompress/ncompress-4.2.4.4.recipe +++ b/app-arch/ncompress/ncompress-4.2.4.4.recipe @@ -29,7 +29,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:cpio cmd:find diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe index de8bdead4..d30f5473b 100644 --- a/app-arch/p7zip/p7zip-9.13.recipe +++ b/app-arch/p7zip/p7zip-9.13.recipe @@ -19,12 +19,12 @@ PROVIDES=" cmd:7za = $portVersion compat >= 9 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe index b612f3456..8cb19d55b 100644 --- a/app-arch/p7zip/p7zip-9.20.1.recipe +++ b/app-arch/p7zip/p7zip-9.20.1.recipe @@ -20,12 +20,12 @@ PROVIDES=" cmd:7za = $portVersion compat >= 9 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-arch/pigz/pigz-2.3.1.recipe b/app-arch/pigz/pigz-2.3.1.recipe index a4bbb2611..558f84bdb 100644 --- a/app-arch/pigz/pigz-2.3.1.recipe +++ b/app-arch/pigz/pigz-2.3.1.recipe @@ -24,12 +24,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz " diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.14.recipe index 62e5a4d99..ccefcdd8b 100644 --- a/app-arch/sharutils/sharutils-4.14.recipe +++ b/app-arch/sharutils/sharutils-4.14.recipe @@ -31,11 +31,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/app-arch/snappy/snappy-1.1.2.recipe b/app-arch/snappy/snappy-1.1.2.recipe index f5ceb7d84..9c835c1fd 100644 --- a/app-arch/snappy/snappy-1.1.2.recipe +++ b/app-arch/snappy/snappy-1.1.2.recipe @@ -28,12 +28,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/app-arch/tar/tar-1.26.recipe b/app-arch/tar/tar-1.26.recipe index d5b53a11f..e68193336 100644 --- a/app-arch/tar/tar-1.26.recipe +++ b/app-arch/tar/tar-1.26.recipe @@ -25,12 +25,12 @@ PROVIDES=" cmd:tar = $portVersion compat >= 1 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:automake cmd:autoreconf cmd:gcc diff --git a/app-arch/tar/tar-1.27.1.recipe b/app-arch/tar/tar-1.27.1.recipe index 49f1036d3..cf4e8b4bb 100644 --- a/app-arch/tar/tar-1.27.1.recipe +++ b/app-arch/tar/tar-1.27.1.recipe @@ -25,12 +25,12 @@ PROVIDES=" cmd:tar = $portVersion compat >= 1 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:automake cmd:autoreconf cmd:gcc diff --git a/app-arch/unrar/unrar-5.0.14.recipe b/app-arch/unrar/unrar-5.0.14.recipe index 0b5d2ea72..bc33fb981 100644 --- a/app-arch/unrar/unrar-5.0.14.recipe +++ b/app-arch/unrar/unrar-5.0.14.recipe @@ -33,10 +33,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:g++ " diff --git a/app-arch/unrar/unrar-5.1.5.recipe b/app-arch/unrar/unrar-5.1.5.recipe index 09777cfb2..00064427d 100644 --- a/app-arch/unrar/unrar-5.1.5.recipe +++ b/app-arch/unrar/unrar-5.1.5.recipe @@ -33,10 +33,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:g++ " diff --git a/app-arch/unrar/unrar-5.1.6.recipe b/app-arch/unrar/unrar-5.1.6.recipe index 732886ce7..559384024 100644 --- a/app-arch/unrar/unrar-5.1.6.recipe +++ b/app-arch/unrar/unrar-5.1.6.recipe @@ -33,10 +33,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:g++ " diff --git a/app-arch/unzip/unzip-6.0.recipe b/app-arch/unzip/unzip-6.0.recipe index fdfede7af..5e21f809c 100644 --- a/app-arch/unzip/unzip-6.0.recipe +++ b/app-arch/unzip/unzip-6.0.recipe @@ -15,7 +15,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/app-arch/unzip/unzip-6.10c11.recipe b/app-arch/unzip/unzip-6.10c11.recipe index c7f8c1047..724e7b74c 100644 --- a/app-arch/unzip/unzip-6.10c11.recipe +++ b/app-arch/unzip/unzip-6.10c11.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv " @@ -32,7 +32,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/app-arch/xar/xar-1.5.2.recipe b/app-arch/xar/xar-1.5.2.recipe index 5e53622bf..325c5e40b 100644 --- a/app-arch/xar/xar-1.5.2.recipe +++ b/app-arch/xar/xar-1.5.2.recipe @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -40,7 +40,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libxml2$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/app-arch/xz_utils/xz_utils-5.0.7.recipe b/app-arch/xz_utils/xz_utils-5.0.7.recipe index c45c91eb3..ec402ecb7 100644 --- a/app-arch/xz_utils/xz_utils-5.0.7.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.7.recipe @@ -60,13 +60,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize @@ -79,7 +79,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel xz_utils$secondaryArchSuffix == $portVersion base " diff --git a/app-arch/zip/zip-3.0.recipe b/app-arch/zip/zip-3.0.recipe index 9680e4ed4..49dd40b9f 100644 --- a/app-arch/zip/zip-3.0.recipe +++ b/app-arch/zip/zip-3.0.recipe @@ -23,14 +23,14 @@ PROVIDES=" cmd:zipsplit = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe index 44068d926..98896e3b2 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe +++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe @@ -33,11 +33,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe index a6b9b6312..9bebc4f1f 100644 --- a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe +++ b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe index 84822cf58..173b9b9ee 100644 --- a/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe +++ b/app-benchmarks/libmicro/libmicro-0.4.2.hg.recipe @@ -21,11 +21,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" @@ -49,5 +49,5 @@ INSTALL() TEST() { - ./bench > output_$haikuVersion + ./bench > output_$(date) } diff --git a/app-benchmarks/ltp/ltp-20140422.recipe b/app-benchmarks/ltp/ltp-20140422.recipe index f57f45422..be37d5ac3 100644 --- a/app-benchmarks/ltp/ltp-20140422.recipe +++ b/app-benchmarks/ltp/ltp-20140422.recipe @@ -19,7 +19,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/app-benchmarks/piozone/piozone-1.0.recipe b/app-benchmarks/piozone/piozone-1.0.recipe index 8db2ca30e..3ebadc463 100644 --- a/app-benchmarks/piozone/piozone-1.0.recipe +++ b/app-benchmarks/piozone/piozone-1.0.recipe @@ -16,11 +16,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-benchmarks/vttest/vttest-20140305.recipe b/app-benchmarks/vttest/vttest-20140305.recipe index 3f0351474..f56180d47 100644 --- a/app-benchmarks/vttest/vttest-20140305.recipe +++ b/app-benchmarks/vttest/vttest-20140305.recipe @@ -24,11 +24,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/app-cdr/bchunk/bchunk-1.2.0.recipe b/app-cdr/bchunk/bchunk-1.2.0.recipe index 36515db57..b5a12b0fc 100644 --- a/app-cdr/bchunk/bchunk-1.2.0.recipe +++ b/app-cdr/bchunk/bchunk-1.2.0.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe index e9736228d..72ac0b9c7 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a07.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a07.recipe @@ -49,12 +49,12 @@ PROVIDES=" cmd:isoinfo = $portVersion compat >= 3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe index 2bf1cc15a..e8089f62c 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a17.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a17.recipe @@ -49,12 +49,12 @@ PROVIDES=" cmd:isoinfo = $portVersion compat >= 3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe index dd38107d9..db6aeb53f 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a18.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a18.recipe @@ -50,12 +50,12 @@ PROVIDES=" cmd:isoinfo = $portVersion compat >= 3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-cdr/cdrtools/cdrtools-3.01~a25.recipe b/app-cdr/cdrtools/cdrtools-3.01~a25.recipe index c608b18db..9a7631015 100644 --- a/app-cdr/cdrtools/cdrtools-3.01~a25.recipe +++ b/app-cdr/cdrtools/cdrtools-3.01~a25.recipe @@ -50,12 +50,12 @@ PROVIDES=" cmd:isoinfo = $portVersion compat >= 3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:grep cmd:ld diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe index 80c5e6764..b89bde111 100644 --- a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe +++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe index 816b44b3d..3a4d3ceec 100644 --- a/app-crypt/gnupg/gnupg-1.4.11.recipe +++ b/app-crypt/gnupg/gnupg-1.4.11.recipe @@ -23,13 +23,13 @@ PROVIDES="gnupg = $portVersion cmd:gpgv = $portVersion compat >= 1.4 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:gcc cmd:ld diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe index 3d7f80f87..9186f8dde 100644 --- a/app-crypt/gnupg/gnupg-1.4.16.recipe +++ b/app-crypt/gnupg/gnupg-1.4.16.recipe @@ -23,7 +23,7 @@ PROVIDES="gnupg = $portVersion cmd:gpgv = $portVersion compat >= 1.4 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libcurl lib:libiconv lib:libintl @@ -40,7 +40,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:bison cmd:gcc diff --git a/app-crypt/gpgme/gpgme-1.5.2.recipe b/app-crypt/gpgme/gpgme-1.5.2.recipe index cd2b8c081..e6ed91019 100644 --- a/app-crypt/gpgme/gpgme-1.5.2.recipe +++ b/app-crypt/gpgme/gpgme-1.5.2.recipe @@ -30,7 +30,7 @@ PROVIDES=" lib:libgpgme${secondaryArchSuffix} = 11.13.1 compat >= 11 " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libgpg_error${secondaryArchSuffix} cmd:gpg lib:libglib_2.0$secondaryArchSuffix @@ -42,7 +42,7 @@ BUILD_REQUIRES=" devel:libassuan${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:bison diff --git a/app-dicts/aspell_en/aspell_en-7.1_0.recipe b/app-dicts/aspell_en/aspell_en-7.1_0.recipe index 0a2adb8a6..420de1d7a 100644 --- a/app-dicts/aspell_en/aspell_en-7.1_0.recipe +++ b/app-dicts/aspell_en/aspell_en-7.1_0.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku aspell >= 0.60 " @@ -28,7 +28,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:prezip_bin cmd:which diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe index eefdf0252..785467d1e 100644 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ b/app-doc/doxygen/doxygen-1.6.3.recipe @@ -35,14 +35,14 @@ PROVIDES=" cmd:doxytag = $portVersion compat >= 1.6 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv " BUILD_REQUIRES=" devel:libiconv " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:bison cmd:flex cmd:gcc diff --git a/app-editors/nano/nano-2.2.6.recipe b/app-editors/nano/nano-2.2.6.recipe index 6b6fb9740..eb5257d61 100644 --- a/app-editors/nano/nano-2.2.6.recipe +++ b/app-editors/nano/nano-2.2.6.recipe @@ -27,7 +27,7 @@ PROVIDES=" cmd:rnano = $portVersion compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:groff lib:libncurses " @@ -35,7 +35,7 @@ BUILD_REQUIRES=" devel:libncurses " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoreconf cmd:gcc cmd:groff diff --git a/app-editors/qemacs/qemacs-0.3.3.recipe b/app-editors/qemacs/qemacs-0.3.3.recipe index 3589eb2db..22b89e2b6 100644 --- a/app-editors/qemacs/qemacs-0.3.3.recipe +++ b/app-editors/qemacs/qemacs-0.3.3.recipe @@ -30,7 +30,7 @@ PROVIDES=" cmd:html2png$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix # lib:libavcodec$secondaryArchSuffix @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-editors/qemacs/qemacs-0.4.0dev.recipe b/app-editors/qemacs/qemacs-0.4.0dev.recipe index 6acdb9102..15d44e238 100644 --- a/app-editors/qemacs/qemacs-0.4.0dev.recipe +++ b/app-editors/qemacs/qemacs-0.4.0dev.recipe @@ -31,7 +31,7 @@ PROVIDES=" cmd:qemacs_pe2qe$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix # lib:libavcodec$secondaryArchSuffix @@ -45,7 +45,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:which cmd:make cmd:gcc$secondaryArchSuffix diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe index d2c2ca598..0fd8ecb79 100644 --- a/app-editors/vim/vim-7.4.recipe +++ b/app-editors/vim/vim-7.4.recipe @@ -36,7 +36,7 @@ PROVIDES=" cmd:xxd = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses lib:libintl " @@ -45,7 +45,7 @@ BUILD_REQUIRES=" gettext " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:autoconf cmd:gcc diff --git a/app-editors/xemacs/xemacs-21.5_hg.recipe b/app-editors/xemacs/xemacs-21.5_hg.recipe index 81191cc87..28c5b07ab 100644 --- a/app-editors/xemacs/xemacs-21.5_hg.recipe +++ b/app-editors/xemacs/xemacs-21.5_hg.recipe @@ -50,7 +50,7 @@ REQUIRES=" # lib:libxpm$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libz$secondaryArchSuffix >= 1.2.8 diff --git a/app-emulation/aranym/aranym-0.9.15_git.recipe b/app-emulation/aranym/aranym-0.9.15_git.recipe index 8f151ee34..da4e31444 100644 --- a/app-emulation/aranym/aranym-0.9.15_git.recipe +++ b/app-emulation/aranym/aranym-0.9.15_git.recipe @@ -25,7 +25,7 @@ REQUIRES=" lib:libsdl_image_1.2 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl_1.2 >= 0.10 devel:libSDL_image_1.2 >= 0.8.4 " diff --git a/app-emulation/bochs/bochs-2.6.recipe b/app-emulation/bochs/bochs-2.6.recipe index 12d51ee3b..62cc02cec 100644 --- a/app-emulation/bochs/bochs-2.6.recipe +++ b/app-emulation/bochs/bochs-2.6.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-emulation/joyce/joyce-2.2.6.recipe b/app-emulation/joyce/joyce-2.2.6.recipe index 3f733088a..ba9f1f6b4 100644 --- a/app-emulation/joyce/joyce-2.2.6.recipe +++ b/app-emulation/joyce/joyce-2.2.6.recipe @@ -28,7 +28,7 @@ REQUIRES=" lib:libgl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libpng devel:libxml2 diff --git a/app-emulation/libdsk/libdsk-1.3.3.recipe b/app-emulation/libdsk/libdsk-1.3.3.recipe index 5ff6ac982..17a7b0892 100644 --- a/app-emulation/libdsk/libdsk-1.3.3.recipe +++ b/app-emulation/libdsk/libdsk-1.3.3.recipe @@ -34,13 +34,13 @@ REQUIRES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel + haiku${secondaryArchSuffix}_devel cmd:libtoolize cmd:autoconf cmd:make diff --git a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe index 2c01e0b63..60e04e194 100644 --- a/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe +++ b/app-emulation/linaro_qemu/linaro_qemu-2014.01.recipe @@ -57,7 +57,7 @@ PROVIDES=" PATCHES="qemu-2.0.0.patchset" REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -75,7 +75,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe index 69a096b3b..0b4c72f8f 100644 --- a/app-emulation/oricutron/oricutron-1.1_svn.recipe +++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe @@ -24,7 +24,7 @@ REQUIRES=" libsdl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl_1.2 >= 0.10 " BUILD_PREREQUIRES=" diff --git a/app-emulation/qemu/qemu-0.15.1.recipe b/app-emulation/qemu/qemu-0.15.1.recipe index 754e28869..d336e8679 100644 --- a/app-emulation/qemu/qemu-0.15.1.recipe +++ b/app-emulation/qemu/qemu-0.15.1.recipe @@ -35,12 +35,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz " diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe index bb7338657..cd4783813 100644 --- a/app-emulation/qemu/qemu-1.7.0.recipe +++ b/app-emulation/qemu/qemu-1.7.0.recipe @@ -51,7 +51,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -67,7 +67,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-emulation/qemu/qemu-2.0.0.recipe b/app-emulation/qemu/qemu-2.0.0.recipe index 1d14d34bd..22ee8978b 100644 --- a/app-emulation/qemu/qemu-2.0.0.recipe +++ b/app-emulation/qemu/qemu-2.0.0.recipe @@ -57,7 +57,7 @@ PROVIDES=" PATCHES="qemu-$portVersion.patchset" REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -75,7 +75,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-emulation/qemu/qemu-2.1.0.recipe b/app-emulation/qemu/qemu-2.1.0.recipe index 47316b789..a5e1eb41f 100644 --- a/app-emulation/qemu/qemu-2.1.0.recipe +++ b/app-emulation/qemu/qemu-2.1.0.recipe @@ -54,7 +54,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -70,7 +70,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-emulation/qemu/qemu-2.1.2.recipe b/app-emulation/qemu/qemu-2.1.2.recipe index dc712ab09..c8d4a4435 100644 --- a/app-emulation/qemu/qemu-2.1.2.recipe +++ b/app-emulation/qemu/qemu-2.1.2.recipe @@ -54,7 +54,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -70,7 +70,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/app-emulation/simh/simh-4.0.0_git.recipe b/app-emulation/simh/simh-4.0.0_git.recipe index 3566f8034..078e215d3 100644 --- a/app-emulation/simh/simh-4.0.0_git.recipe +++ b/app-emulation/simh/simh-4.0.0_git.recipe @@ -74,14 +74,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libSDL2_2.0${secondaryArchSuffix} #TODO:pcap " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL2$secondaryArchSuffix #TODO:pcap " diff --git a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe index cc75347cf..a20e20814 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe +++ b/app-emulation/virtualbox-guest-additions/virtualbox_guest_additions-4.3.53_svn.recipe @@ -29,7 +29,7 @@ PROVIDES=" # TODO: POST_INSTALL_SCRIPTS="" REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix openssl$secondaryArchSuffix >= 1.0.0 lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -47,8 +47,8 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" # required for kmk_* which are compiled with gcc4 - haiku_x86 >= $haikuVersion - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_x86 + haiku${secondaryArchSuffix}_devel cmd:mkisofs cmd:grep cmd:gcc$secondaryArchSuffix diff --git a/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe b/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe index cfd68bb58..12c192d8b 100644 --- a/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe +++ b/app-emulation/vmware-addons/vmware_addons-1.1.1.recipe @@ -38,7 +38,7 @@ PROVIDES=" cmd:run_backdoor$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -50,7 +50,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel makefile_engine cmd:gcc$secondaryArchSuffix cmd:make diff --git a/app-i18n/becjk/becjk-1.0.1.recipe b/app-i18n/becjk/becjk-1.0.1.recipe index e26018d13..87f330cb1 100644 --- a/app-i18n/becjk/becjk-1.0.1.recipe +++ b/app-i18n/becjk/becjk-1.0.1.recipe @@ -18,10 +18,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:python diff --git a/app-i18n/canna/canna-1.0.1.recipe b/app-i18n/canna/canna-1.0.1.recipe index c2907190d..7fb2d39c9 100644 --- a/app-i18n/canna/canna-1.0.1.recipe +++ b/app-i18n/canna/canna-1.0.1.recipe @@ -33,14 +33,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:jam " diff --git a/app-i18n/canna/canna-1.0.2.recipe b/app-i18n/canna/canna-1.0.2.recipe index 88686a9c6..e705b134d 100644 --- a/app-i18n/canna/canna-1.0.2.recipe +++ b/app-i18n/canna/canna-1.0.2.recipe @@ -21,14 +21,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:jam " diff --git a/app-i18n/enca/enca-1.15.recipe b/app-i18n/enca/enca-1.15.recipe index 3c7cc8537..51cd0bd49 100644 --- a/app-i18n/enca/enca-1.15.recipe +++ b/app-i18n/enca/enca-1.15.recipe @@ -27,11 +27,11 @@ if [ -z "$secondaryArchSuffix" ]; then " fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/app-misc/colordiff/colordiff-1.0.13.recipe b/app-misc/colordiff/colordiff-1.0.13.recipe index a37d90217..12f9ef6d5 100644 --- a/app-misc/colordiff/colordiff-1.0.13.recipe +++ b/app-misc/colordiff/colordiff-1.0.13.recipe @@ -20,13 +20,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:diff cmd:perl " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make " diff --git a/app-misc/fdupes/fdupes-1.51.recipe b/app-misc/fdupes/fdupes-1.51.recipe index 25f04a845..4d01d0159 100644 --- a/app-misc/fdupes/fdupes-1.51.recipe +++ b/app-misc/fdupes/fdupes-1.51.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc " diff --git a/app-misc/gcal/gcal-3.6.3.recipe b/app-misc/gcal/gcal-3.6.3.recipe index 326acaa90..95b07b0d8 100644 --- a/app-misc/gcal/gcal-3.6.3.recipe +++ b/app-misc/gcal/gcal-3.6.3.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -36,7 +36,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe index 6607c66a3..2583c5f8a 100644 --- a/app-misc/getopt/getopt-1.1.5.recipe +++ b/app-misc/getopt/getopt-1.1.5.recipe @@ -25,13 +25,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc " diff --git a/app-misc/mc/mc-4.8.13.recipe b/app-misc/mc/mc-4.8.13.recipe index 922397430..8876e3e43 100644 --- a/app-misc/mc/mc-4.8.13.recipe +++ b/app-misc/mc/mc-4.8.13.recipe @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -53,7 +53,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:find cmd:gcc$secondaryArchSuffix diff --git a/app-misc/screen/screen-4.2.1_git.recipe b/app-misc/screen/screen-4.2.1_git.recipe index 3141a9a28..71662d04b 100644 --- a/app-misc/screen/screen-4.2.1_git.recipe +++ b/app-misc/screen/screen-4.2.1_git.recipe @@ -43,7 +43,7 @@ REQUIRES=" lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix >= 5.9 " BUILD_PREREQUIRES=" diff --git a/app-misc/srm/srm-1.2.12.recipe b/app-misc/srm/srm-1.2.12.recipe index 075aa698d..5478e53f3 100644 --- a/app-misc/srm/srm-1.2.12.recipe +++ b/app-misc/srm/srm-1.2.12.recipe @@ -20,7 +20,7 @@ REQUIRES=" haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/app-misc/srm/srm-1.2.13_svn.recipe b/app-misc/srm/srm-1.2.13_svn.recipe index 7dade809b..a5b095bce 100644 --- a/app-misc/srm/srm-1.2.13_svn.recipe +++ b/app-misc/srm/srm-1.2.13_svn.recipe @@ -19,7 +19,7 @@ REQUIRES=" haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/app-misc/strigi/strigi-0.7.5.recipe b/app-misc/strigi/strigi-0.7.5.recipe index 4c6499b8f..faeed35ef 100644 --- a/app-misc/strigi/strigi-0.7.5.recipe +++ b/app-misc/strigi/strigi-0.7.5.recipe @@ -37,7 +37,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -54,7 +54,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix devel:libbz2$secondaryArchSuffix devel:libiconv$secondaryArchSuffix @@ -70,7 +70,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel strigi${secondaryArchSuffix} == $portVersion base " diff --git a/app-mobilephone/dfu-util/dfu_util-0.8.recipe b/app-mobilephone/dfu-util/dfu_util-0.8.recipe index 6d8e57578..ffad7f4cc 100644 --- a/app-mobilephone/dfu-util/dfu_util-0.8.recipe +++ b/app-mobilephone/dfu-util/dfu_util-0.8.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libusb_1.0 " @@ -33,7 +33,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:make diff --git a/app-office/abiword/abiword-2.4.recipe b/app-office/abiword/abiword-2.4.recipe index e252978b2..54fc2bcd4 100644 --- a/app-office/abiword/abiword-2.4.recipe +++ b/app-office/abiword/abiword-2.4.recipe @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:ld diff --git a/app-office/multitalk/multitalk-1.4.recipe b/app-office/multitalk/multitalk-1.4.recipe index 937758bdc..f66b7d092 100644 --- a/app-office/multitalk/multitalk-1.4.recipe +++ b/app-office/multitalk/multitalk-1.4.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku sdl_gfx sdl_image sdl_ttf @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:g++ cmd:make cmd:sdl_config diff --git a/app-shells/bash/bash-4.3.30.recipe b/app-shells/bash/bash-4.3.30.recipe index b9c08c32a..c7429f196 100644 --- a/app-shells/bash/bash-4.3.30.recipe +++ b/app-shells/bash/bash-4.3.30.recipe @@ -55,7 +55,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libreadline lib:libncursesw " diff --git a/app-shells/command_not_found/command_not_found-0.0.1.recipe b/app-shells/command_not_found/command_not_found-0.0.1.recipe index 5a78785f4..37d5ec64f 100644 --- a/app-shells/command_not_found/command_not_found-0.0.1.recipe +++ b/app-shells/command_not_found/command_not_found-0.0.1.recipe @@ -18,7 +18,7 @@ PROVIDES=" cmd:command_not_found = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" diff --git a/app-shells/dash/dash-0.5.7.recipe b/app-shells/dash/dash-0.5.7.recipe index b07f21bce..5422d02ec 100644 --- a/app-shells/dash/dash-0.5.7.recipe +++ b/app-shells/dash/dash-0.5.7.recipe @@ -19,13 +19,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libreadline lib:libncursesw " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:awk cmd:make diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe index 568a6c9b9..ffd475ee7 100644 --- a/app-shells/fish/fish-1.23.1_git.recipe +++ b/app-shells/fish/fish-1.23.1_git.recipe @@ -38,7 +38,7 @@ REQUIRES=" lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix >= 5.9 devel:libgettextlib$secondaryArchSuffix diff --git a/app-shells/mksh/mksh-r50c.recipe b/app-shells/mksh/mksh-r50c.recipe index 9b5612cbc..5a6f09b75 100644 --- a/app-shells/mksh/mksh-r50c.recipe +++ b/app-shells/mksh/mksh-r50c.recipe @@ -29,11 +29,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:ed cmd:gcc cmd:grep diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.2.recipe index 79bf1f231..52d42993f 100644 --- a/app-shells/zsh/zsh-5.0.2.recipe +++ b/app-shells/zsh/zsh-5.0.2.recipe @@ -18,7 +18,7 @@ PROVIDES=" cmd:zsh_$portVersion = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libncurses lib:libpcre " @@ -27,7 +27,7 @@ BUILD_REQUIRES=" devel:libpcre " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:find cmd:gcc diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.recipe b/app-text/aiksaurus/aiksaurus-1.2.1.recipe index 8c1fe2112..17f9de214 100644 --- a/app-text/aiksaurus/aiksaurus-1.2.1.recipe +++ b/app-text/aiksaurus/aiksaurus-1.2.1.recipe @@ -30,10 +30,10 @@ PROVIDES=" cmd:caiksaurus$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe index f823f5fec..f99e8f30e 100644 --- a/app-text/antiword/antiword-0.37.recipe +++ b/app-text/antiword/antiword-0.37.recipe @@ -21,11 +21,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/app-text/asciidoc/asciidoc-8.6.8.recipe b/app-text/asciidoc/asciidoc-8.6.8.recipe index 5f4c086b2..a659fa71f 100644 --- a/app-text/asciidoc/asciidoc-8.6.8.recipe +++ b/app-text/asciidoc/asciidoc-8.6.8.recipe @@ -24,13 +24,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:make cmd:sed diff --git a/app-text/aspell/aspell-0.60.6.1.recipe b/app-text/aspell/aspell-0.60.6.1.recipe index d89de9292..e4d9e5e91 100644 --- a/app-text/aspell/aspell-0.60.6.1.recipe +++ b/app-text/aspell/aspell-0.60.6.1.recipe @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libncurses " @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:libtoolize cmd:aclocal cmd:autoconf diff --git a/app-text/discount/discount-2.1.3.recipe b/app-text/discount/discount-2.1.3.recipe index a8fc46179..58955c434 100644 --- a/app-text/discount/discount-2.1.3.recipe +++ b/app-text/discount/discount-2.1.3.recipe @@ -24,13 +24,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc cmd:g++ diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe index 705802d69..90eb5529e 100644 --- a/app-text/dos2unix/dos2unix-1.0.1.recipe +++ b/app-text/dos2unix/dos2unix-1.0.1.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:g++ " diff --git a/app-text/dos2unix/dos2unix-1.0.recipe b/app-text/dos2unix/dos2unix-1.0.recipe index b3043e6d5..ca2dd5690 100644 --- a/app-text/dos2unix/dos2unix-1.0.recipe +++ b/app-text/dos2unix/dos2unix-1.0.recipe @@ -16,11 +16,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc " diff --git a/app-text/htmldoc/htmldoc-1.8.27.recipe b/app-text/htmldoc/htmldoc-1.8.27.recipe index 2421eb887..9700a2556 100644 --- a/app-text/htmldoc/htmldoc-1.8.27.recipe +++ b/app-text/htmldoc/htmldoc-1.8.27.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libjpeg lib:libpng lib:libz @@ -30,7 +30,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:gcc cmd:ld diff --git a/app-text/htmltidy/htmltidy-20092812.recipe b/app-text/htmltidy/htmltidy-20092812.recipe index 4f46dd7eb..332ab9f4d 100644 --- a/app-text/htmltidy/htmltidy-20092812.recipe +++ b/app-text/htmltidy/htmltidy-20092812.recipe @@ -16,11 +16,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/app-text/hunspell/hunspell-1.3.2.recipe b/app-text/hunspell/hunspell-1.3.2.recipe index 2b3957155..5b63238b2 100644 --- a/app-text/hunspell/hunspell-1.3.2.recipe +++ b/app-text/hunspell/hunspell-1.3.2.recipe @@ -38,12 +38,12 @@ PROVIDES=" lib:libhunspell_1.3 = $portVersion compat >= 1.3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/app-text/hunspell/hunspell-1.3.3.recipe b/app-text/hunspell/hunspell-1.3.3.recipe index 569aad982..e672f239f 100644 --- a/app-text/hunspell/hunspell-1.3.3.recipe +++ b/app-text/hunspell/hunspell-1.3.3.recipe @@ -44,12 +44,12 @@ if [ -z $secondaryArchSuffix ]; then " fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/app-text/libabw/libabw-0.1.0.recipe b/app-text/libabw/libabw-0.1.0.recipe index 1849e898f..b48b96c16 100644 --- a/app-text/libabw/libabw-0.1.0.recipe +++ b/app-text/libabw/libabw-0.1.0.recipe @@ -30,7 +30,7 @@ PROVIDES=" lib:libabw_0.1$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -49,7 +49,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/libebook/libebook-0.1.1.recipe b/app-text/libebook/libebook-0.1.1.recipe index 361053f20..f799fdad0 100644 --- a/app-text/libebook/libebook-0.1.1.recipe +++ b/app-text/libebook/libebook-0.1.1.recipe @@ -32,7 +32,7 @@ PROVIDES=" lib:libe_book_0.1$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libicudata$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix @@ -58,7 +58,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoheader diff --git a/app-text/libetonyek/libetonyek-0.1.1.recipe b/app-text/libetonyek/libetonyek-0.1.1.recipe index 2fe6509aa..9359cb21f 100644 --- a/app-text/libetonyek/libetonyek-0.1.1.recipe +++ b/app-text/libetonyek/libetonyek-0.1.1.recipe @@ -37,7 +37,7 @@ PROVIDES=" lib:libetonyek_0.1$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -57,7 +57,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/libmspub/libmspub-0.1.1.recipe b/app-text/libmspub/libmspub-0.1.1.recipe index 6b5a73ff0..72bffa104 100644 --- a/app-text/libmspub/libmspub-0.1.1.recipe +++ b/app-text/libmspub/libmspub-0.1.1.recipe @@ -31,7 +31,7 @@ PROVIDES=" lib:libmspub_0.1$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libicudata$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix @@ -54,7 +54,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoheader diff --git a/app-text/libmwaw/libmwaw-0.3.3.recipe b/app-text/libmwaw/libmwaw-0.3.3.recipe index a93ef207d..280a4e739 100644 --- a/app-text/libmwaw/libmwaw-0.3.3.recipe +++ b/app-text/libmwaw/libmwaw-0.3.3.recipe @@ -37,7 +37,7 @@ PROVIDES=" lib:libmwaw_0.3$secondaryArchSuffix = 3.0.3 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -54,7 +54,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/libodfgen/libodfgen-0.1.1.recipe b/app-text/libodfgen/libodfgen-0.1.1.recipe index 7e3593964..ac23c13f6 100644 --- a/app-text/libodfgen/libodfgen-0.1.1.recipe +++ b/app-text/libodfgen/libodfgen-0.1.1.recipe @@ -29,7 +29,7 @@ PROVIDES=" lib:libodfgen_0.1$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -46,7 +46,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/libpaper/libpaper-1.1.24.recipe b/app-text/libpaper/libpaper-1.1.24.recipe index faad58af5..0af760b07 100644 --- a/app-text/libpaper/libpaper-1.1.24.recipe +++ b/app-text/libpaper/libpaper-1.1.24.recipe @@ -24,11 +24,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" @@ -76,6 +76,6 @@ PROVIDES_devel=" " REQUIRES_devel=" -# haiku${secondaryArchSuffix}_devel >= $haikuVersion +# haiku${secondaryArchSuffix}_devel libpaper$secondaryArchSuffix == $portVersion base " diff --git a/app-text/libwpd/libwpd-0.10.0.recipe b/app-text/libwpd/libwpd-0.10.0.recipe index 871d4d27a..1e0b06f6a 100644 --- a/app-text/libwpd/libwpd-0.10.0.recipe +++ b/app-text/libwpd/libwpd-0.10.0.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libwpd_0.10$secondaryArchSuffix = 10.0.0 compat >= 10 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix lib:librevenge_stream_0.0$secondaryArchSuffix @@ -49,7 +49,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/libwpd/libwpd-0.9.9.recipe b/app-text/libwpd/libwpd-0.9.9.recipe index 5e2bf3fc6..9f677cdde 100644 --- a/app-text/libwpd/libwpd-0.9.9.recipe +++ b/app-text/libwpd/libwpd-0.9.9.recipe @@ -35,14 +35,14 @@ PROVIDES=" lib:libwpd_stream_0.9$secondaryArchSuffix = 9.0.9 compat >= 9 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel pkgconfig$secondaryArchSuffix >= 0.27 cmd:aclocal cmd:libtoolize diff --git a/app-text/libwpg/libwpg-0.2.2.recipe b/app-text/libwpg/libwpg-0.2.2.recipe index 68fd39386..87700c56c 100644 --- a/app-text/libwpg/libwpg-0.2.2.recipe +++ b/app-text/libwpg/libwpg-0.2.2.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libwpg_0.2$secondaryArchSuffix = 2.0.2 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libwpd_0.9$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -43,7 +43,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel pkgconfig$secondaryArchSuffix >= 0.27 cmd:aclocal cmd:libtoolize diff --git a/app-text/libwpg/libwpg-0.3.0.recipe b/app-text/libwpg/libwpg-0.3.0.recipe index 411f07733..47403a90b 100644 --- a/app-text/libwpg/libwpg-0.3.0.recipe +++ b/app-text/libwpg/libwpg-0.3.0.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libwpg_0.3$secondaryArchSuffix = 3.0.0 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:perl lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -52,7 +52,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/libwps/libwps-0.3.0.recipe b/app-text/libwps/libwps-0.3.0.recipe index 02b67bb18..35b604dcd 100644 --- a/app-text/libwps/libwps-0.3.0.recipe +++ b/app-text/libwps/libwps-0.3.0.recipe @@ -37,7 +37,7 @@ PROVIDES=" lib:libwps_0.3$secondaryArchSuffix = 3.0.0 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -54,7 +54,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/app-text/mdocml/mdocml-1.12.2.recipe b/app-text/mdocml/mdocml-1.12.2.recipe index 230f85987..daaf6f944 100644 --- a/app-text/mdocml/mdocml-1.12.2.recipe +++ b/app-text/mdocml/mdocml-1.12.2.recipe @@ -23,12 +23,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc cmd:ld diff --git a/app-text/mupdf/mupdf-1.6.recipe b/app-text/mupdf/mupdf-1.6.recipe index 016f18e3a..e77ac34d4 100644 --- a/app-text/mupdf/mupdf-1.6.recipe +++ b/app-text/mupdf/mupdf-1.6.recipe @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -52,7 +52,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:find cmd:freetype_config$secondaryArchSuffix cmd:gcc$secondaryArchSuffix diff --git a/app-text/podofo/podofo-0.9.3.recipe b/app-text/podofo/podofo-0.9.3.recipe index d71642a19..10d9e247b 100644 --- a/app-text/podofo/podofo-0.9.3.recipe +++ b/app-text/podofo/podofo-0.9.3.recipe @@ -51,7 +51,7 @@ PROVIDES=" cmd:podofoxmp " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -62,7 +62,7 @@ REQUIRES=" lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/app-text/psiconv/psiconv-0.9.8.recipe b/app-text/psiconv/psiconv-0.9.8.recipe index d48f6bfea..19cf9e1a9 100644 --- a/app-text/psiconv/psiconv-0.9.8.recipe +++ b/app-text/psiconv/psiconv-0.9.8.recipe @@ -31,11 +31,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:gcc diff --git a/app-text/rman/rman-3.2.recipe b/app-text/rman/rman-3.2.recipe index a9cf42844..5d6e57534 100644 --- a/app-text/rman/rman-3.2.recipe +++ b/app-text/rman/rman-3.2.recipe @@ -18,12 +18,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:ld diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe index 1ea0242ac..f04f4b8e0 100644 --- a/app-text/sword/sword-1.7.3.recipe +++ b/app-text/sword/sword-1.7.3.recipe @@ -48,7 +48,7 @@ PROVIDES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix @@ -56,12 +56,12 @@ REQUIRES=" " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel sword$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix diff --git a/app-text/texi2html/texi2html-1.82.recipe b/app-text/texi2html/texi2html-1.82.recipe index e18c38f61..2f1841027 100644 --- a/app-text/texi2html/texi2html-1.82.recipe +++ b/app-text/texi2html/texi2html-1.82.recipe @@ -43,7 +43,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/app-text/tree/tree-1.7.0.recipe b/app-text/tree/tree-1.7.0.recipe index 031ad4075..f1b9a7ec2 100644 --- a/app-text/tree/tree-1.7.0.recipe +++ b/app-text/tree/tree-1.7.0.recipe @@ -22,10 +22,10 @@ PROVIDES=" cmd:tree$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-cpp/clucene/clucene-2.3.3.4.recipe b/dev-cpp/clucene/clucene-2.3.3.4.recipe index 761b8aca8..23fe7074c 100644 --- a/dev-cpp/clucene/clucene-2.3.3.4.recipe +++ b/dev-cpp/clucene/clucene-2.3.3.4.recipe @@ -40,12 +40,12 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} boost$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix devel:libboost_atomic$secondaryArchSuffix " diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe index c6bf1dfa5..cb218b1d5 100644 --- a/dev-db/db/db-4.8.30.recipe +++ b/dev-db/db/db-4.8.30.recipe @@ -34,12 +34,12 @@ PROVIDES=" lib:libdb_cxx_4${secondaryArchSuffix} " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe index 6f59d234b..6cbbadb14 100644 --- a/dev-db/db/db-5.3.28.recipe +++ b/dev-db/db/db-5.3.28.recipe @@ -39,12 +39,12 @@ PROVIDES=" lib:libdb_cxx_5${secondaryArchSuffix} " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool diff --git a/dev-db/db/db-6.0.30.recipe b/dev-db/db/db-6.0.30.recipe index 88069b905..d29447aee 100644 --- a/dev-db/db/db-6.0.30.recipe +++ b/dev-db/db/db-6.0.30.recipe @@ -39,12 +39,12 @@ PROVIDES=" lib:libdb_cxx_6${secondaryArchSuffix} " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtool diff --git a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe index 7510f56bb..56af488cb 100644 --- a/dev-db/postgresql_server/postgresql_server-9.3.4.recipe +++ b/dev-db/postgresql_server/postgresql_server-9.3.4.recipe @@ -42,12 +42,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libreadline lib:libz " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libreadline devel:libz " diff --git a/dev-db/sqlite/sqlite-3.8.7.4.recipe b/dev-db/sqlite/sqlite-3.8.7.4.recipe index bd9edac62..96bd9ea60 100644 --- a/dev-db/sqlite/sqlite-3.8.7.4.recipe +++ b/dev-db/sqlite/sqlite-3.8.7.4.recipe @@ -26,13 +26,13 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-embedded/avr_libc/avr_libc-1.8.0.recipe b/dev-embedded/avr_libc/avr_libc-1.8.0.recipe index f6d7bbf10..a39ef97ef 100644 --- a/dev-embedded/avr_libc/avr_libc-1.8.0.recipe +++ b/dev-embedded/avr_libc/avr_libc-1.8.0.recipe @@ -47,12 +47,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:avr_as$secondaryArchSuffix diff --git a/dev-embedded/avra/avra-1.3.0.recipe b/dev-embedded/avra/avra-1.3.0.recipe index ebb4e332b..cedf95c90 100644 --- a/dev-embedded/avra/avra-1.3.0.recipe +++ b/dev-embedded/avra/avra-1.3.0.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-embedded/avrdude/avrdude-6.0.1.recipe b/dev-embedded/avrdude/avrdude-6.0.1.recipe index f7179a591..6220b7fe7 100644 --- a/dev-embedded/avrdude/avrdude-6.0.1.recipe +++ b/dev-embedded/avrdude/avrdude-6.0.1.recipe @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix lib:libftdi1$secondaryArchSuffix lib:libelf$secondaryArchSuffix @@ -43,7 +43,7 @@ BUILD_REQUIRES=" devel:libelf$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:automake diff --git a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe index 054eff61b..f03f0039b 100644 --- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe +++ b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe @@ -39,7 +39,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix " @@ -48,7 +48,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:automake diff --git a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe index 7bb3e57ec..3d2f2d7a3 100644 --- a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe +++ b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe @@ -31,7 +31,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:m6809_unknown_ld$secondaryArchSuffix " @@ -41,7 +41,7 @@ BUILD_REQUIRES=" devel:libmpc$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find diff --git a/dev-embedded/libftdi/libftdi-1.0.recipe b/dev-embedded/libftdi/libftdi-1.0.recipe index 5aabc734e..2f2accbea 100644 --- a/dev-embedded/libftdi/libftdi-1.0.recipe +++ b/dev-embedded/libftdi/libftdi-1.0.recipe @@ -29,7 +29,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libconfuse$secondaryArchSuffix >= 2.5 lib:libstdc++$secondaryArchSuffix libusb$secondaryArchSuffix >= 1.0 @@ -37,7 +37,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libconfuse${secondaryArchSuffix}_devel >= 2.5 libusb${secondaryArchSuffix}_devel boost${secondaryArchSuffix}_devel diff --git a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe index 1b81b6c35..94c0433b1 100644 --- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe +++ b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe @@ -30,14 +30,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix " BUILD_REQUIRES=" devel:libusb_1.0$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-embedded/lwtools/lwtools-4.10.recipe b/dev-embedded/lwtools/lwtools-4.10.recipe index a5f500803..381b99710 100644 --- a/dev-embedded/lwtools/lwtools-4.10.recipe +++ b/dev-embedded/lwtools/lwtools-4.10.recipe @@ -33,11 +33,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cc$secondaryArchSuffix cmd:make " diff --git a/dev-embedded/sdcc/sdcc-3.4.0.recipe b/dev-embedded/sdcc/sdcc-3.4.0.recipe index e7e459ad4..efeed6cc5 100644 --- a/dev-embedded/sdcc/sdcc-3.4.0.recipe +++ b/dev-embedded/sdcc/sdcc-3.4.0.recipe @@ -63,7 +63,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -73,7 +73,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:automake diff --git a/dev-embedded/stlink/stlink-1.0.0.recipe b/dev-embedded/stlink/stlink-1.0.0.recipe index 0c833830a..b81e3ff60 100644 --- a/dev-embedded/stlink/stlink-1.0.0.recipe +++ b/dev-embedded/stlink/stlink-1.0.0.recipe @@ -36,7 +36,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoreconf cmd:gcc$secondaryArchSuffix diff --git a/dev-embedded/stm32flash/stm32flash-0.3.recipe b/dev-embedded/stm32flash/stm32flash-0.3.recipe index 0fc21057c..500cedf84 100644 --- a/dev-embedded/stm32flash/stm32flash-0.3.recipe +++ b/dev-embedded/stm32flash/stm32flash-0.3.recipe @@ -38,11 +38,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe index 505bfd9ac..d02817585 100644 --- a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe +++ b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe index 7cc7d6f16..f28eb422b 100644 --- a/dev-games/ode/ode-0.12.recipe +++ b/dev-games/ode/ode-0.12.recipe @@ -24,13 +24,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" @@ -70,6 +70,6 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix ode$secondaryArchSuffix == $portVersion base " diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index ce43ae3ca..f66506bd2 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-java/ant_core/ant_core-1.9.2.recipe b/dev-java/ant_core/ant_core-1.9.2.recipe index 79e278601..ff5be6047 100644 --- a/dev-java/ant_core/ant_core-1.9.2.recipe +++ b/dev-java/ant_core/ant_core-1.9.2.recipe @@ -34,7 +34,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:java " diff --git a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe index e182f0ca6..efbb93e8a 100644 --- a/dev-java/gnu_classpath/gnu_classpath-0.98.recipe +++ b/dev-java/gnu_classpath/gnu_classpath-0.98.recipe @@ -26,10 +26,10 @@ PROVIDES=" gnu_classpath = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe index 4a42947dc..d22aaa01e 100644 --- a/dev-java/jamvm/jamvm-1.5.4.recipe +++ b/dev-java/jamvm/jamvm-1.5.4.recipe @@ -33,7 +33,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix >= 1.2.8 " BUILD_PREREQUIRES=" diff --git a/dev-java/jamvm/jamvm-2.0.0.recipe b/dev-java/jamvm/jamvm-2.0.0.recipe index e635eb325..e163a27e5 100644 --- a/dev-java/jamvm/jamvm-2.0.0.recipe +++ b/dev-java/jamvm/jamvm-2.0.0.recipe @@ -33,7 +33,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix >= 1.2.8 " BUILD_PREREQUIRES=" diff --git a/dev-lang/brexx/brexx-1.3.2.recipe b/dev-lang/brexx/brexx-1.3.2.recipe index aa18dd85b..98dc4814c 100644 --- a/dev-lang/brexx/brexx-1.3.2.recipe +++ b/dev-lang/brexx/brexx-1.3.2.recipe @@ -37,11 +37,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:make diff --git a/dev-lang/erlang/erlang-16.03.recipe b/dev-lang/erlang/erlang-16.03.recipe index a3d28d934..1af446d1a 100644 --- a/dev-lang/erlang/erlang-16.03.recipe +++ b/dev-lang/erlang/erlang-16.03.recipe @@ -30,14 +30,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:libtool cmd:perl cmd:gcc " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:perl cmd:make cmd:gcc diff --git a/dev-lang/fpc/fpc-2.6.2.recipe b/dev-lang/fpc/fpc-2.6.2.recipe index 0e4a4b6e5..f4efa3eb3 100644 --- a/dev-lang/fpc/fpc-2.6.2.recipe +++ b/dev-lang/fpc/fpc-2.6.2.recipe @@ -64,10 +64,10 @@ PROVIDES=" cmd:unitdiff$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel fpc == 2.6.2_bin " BUILD_PREREQUIRES=" diff --git a/dev-lang/fpc/fpc-2.6.2_bin.recipe b/dev-lang/fpc/fpc-2.6.2_bin.recipe index 27db1154b..56119e590 100644 --- a/dev-lang/fpc/fpc-2.6.2_bin.recipe +++ b/dev-lang/fpc/fpc-2.6.2_bin.recipe @@ -21,10 +21,10 @@ PROVIDES=" cmd:fpc = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" binutils diff --git a/dev-lang/golang/golang-1.3.recipe b/dev-lang/golang/golang-1.3.recipe index c083ac7c6..c80d3a84e 100644 --- a/dev-lang/golang/golang-1.3.recipe +++ b/dev-lang/golang/golang-1.3.recipe @@ -45,10 +45,10 @@ if [ "$secondaryArchSuffix" != "" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-lang/lua/lua-5.1.4.recipe b/dev-lang/lua/lua-5.1.4.recipe index cdfe57f62..1f3566e52 100644 --- a/dev-lang/lua/lua-5.1.4.recipe +++ b/dev-lang/lua/lua-5.1.4.recipe @@ -14,10 +14,10 @@ PROVIDES=" lib:liblua${secondaryArchSuffix} = $portVersion compat >= 5.1 " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc${secondaryArchSuffix} " diff --git a/dev-lang/lua/lua-5.2.1.recipe b/dev-lang/lua/lua-5.2.1.recipe index f4b4aaa27..f1790b97b 100644 --- a/dev-lang/lua/lua-5.2.1.recipe +++ b/dev-lang/lua/lua-5.2.1.recipe @@ -14,10 +14,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix " diff --git a/dev-lang/lua/lua-5.2.3.recipe b/dev-lang/lua/lua-5.2.3.recipe index 6818abddf..19ced86d0 100644 --- a/dev-lang/lua/lua-5.2.3.recipe +++ b/dev-lang/lua/lua-5.2.3.recipe @@ -14,10 +14,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix " diff --git a/dev-lang/luajit/luajit-2.0.2.recipe b/dev-lang/luajit/luajit-2.0.2.recipe index febaaa841..1fb575692 100644 --- a/dev-lang/luajit/luajit-2.0.2.recipe +++ b/dev-lang/luajit/luajit-2.0.2.recipe @@ -13,10 +13,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix " diff --git a/dev-lang/nasm/nasm-2.08.01.recipe b/dev-lang/nasm/nasm-2.08.01.recipe index c39073082..0dfb9bc71 100644 --- a/dev-lang/nasm/nasm-2.08.01.recipe +++ b/dev-lang/nasm/nasm-2.08.01.recipe @@ -17,12 +17,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/dev-lang/nasm/nasm-2.11.02.recipe b/dev-lang/nasm/nasm-2.11.02.recipe index bd51cb63c..5f633ba0d 100644 --- a/dev-lang/nasm/nasm-2.11.02.recipe +++ b/dev-lang/nasm/nasm-2.11.02.recipe @@ -17,12 +17,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:awk diff --git a/dev-lang/nasm/nasm-2.11.05.recipe b/dev-lang/nasm/nasm-2.11.05.recipe index cd77135c1..54e556c6f 100644 --- a/dev-lang/nasm/nasm-2.11.05.recipe +++ b/dev-lang/nasm/nasm-2.11.05.recipe @@ -17,12 +17,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:awk diff --git a/dev-lang/ocaml/ocaml-4.00.0.recipe b/dev-lang/ocaml/ocaml-4.00.0.recipe index 97fad1ac3..cf3f18c67 100644 --- a/dev-lang/ocaml/ocaml-4.00.0.recipe +++ b/dev-lang/ocaml/ocaml-4.00.0.recipe @@ -65,12 +65,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:gcc " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc " diff --git a/dev-lang/ocaml/ocaml-4.01.0.recipe b/dev-lang/ocaml/ocaml-4.01.0.recipe index ea84a679e..089a50f3f 100644 --- a/dev-lang/ocaml/ocaml-4.01.0.recipe +++ b/dev-lang/ocaml/ocaml-4.01.0.recipe @@ -65,11 +65,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc cmd:awk diff --git a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe index bcbbc290e..f9892e157 100644 --- a/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe +++ b/dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe @@ -96,14 +96,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffx >= $haikuVersion + haiku$secondaryArchSuffx lib:libfreetype$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe index de478b035..9af7e6b87 100644 --- a/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe +++ b/dev-lang/openjdk/openjdk-1.7_u80_b00.recipe @@ -81,14 +81,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffx >= $haikuVersion + haiku$secondaryArchSuffx lib:libfreetype$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe index 492928bb3..0dced0af1 100644 --- a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe +++ b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe @@ -83,14 +83,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffx >= $haikuVersion + haiku$secondaryArchSuffx lib:libfreetype$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/dev-lang/orc/orc-0.4.19.recipe b/dev-lang/orc/orc-0.4.19.recipe index 009d5cbad..b8706ec4d 100644 --- a/dev-lang/orc/orc-0.4.19.recipe +++ b/dev-lang/orc/orc-0.4.19.recipe @@ -25,10 +25,10 @@ PROVIDES=" lib:liborc_test_0.4$secondaryArchSuffix = 0.19.0 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/dev-lang/perl/perl-5.10.1.recipe b/dev-lang/perl/perl-5.10.1.recipe index 8b2d4a341..97e832373 100644 --- a/dev-lang/perl/perl-5.10.1.recipe +++ b/dev-lang/perl/perl-5.10.1.recipe @@ -69,12 +69,12 @@ PROVIDES=" lib:libperl = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/dev-lang/perl/perl-5.18.1.recipe b/dev-lang/perl/perl-5.18.1.recipe index e29d49b9e..20e42b8c0 100644 --- a/dev-lang/perl/perl-5.18.1.recipe +++ b/dev-lang/perl/perl-5.18.1.recipe @@ -78,12 +78,12 @@ PROVIDES=" lib:libperl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/dev-lang/perl/perl-5.18.2.recipe b/dev-lang/perl/perl-5.18.2.recipe index 37ebd474a..a56051732 100644 --- a/dev-lang/perl/perl-5.18.2.recipe +++ b/dev-lang/perl/perl-5.18.2.recipe @@ -78,12 +78,12 @@ PROVIDES=" lib:libperl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:ld diff --git a/dev-lang/php/php-5.4.34.recipe b/dev-lang/php/php-5.4.34.recipe index bdf0a1ad0..8cfc6940f 100644 --- a/dev-lang/php/php-5.4.34.recipe +++ b/dev-lang/php/php-5.4.34.recipe @@ -34,7 +34,7 @@ GLOBAL_WRITABLE_FILES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libxml2 lib:libz " @@ -45,7 +45,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:bison cmd:dos2unix diff --git a/dev-lang/php/php-5.6.2.recipe b/dev-lang/php/php-5.6.2.recipe index 0e0f4c72f..fb1056ae7 100644 --- a/dev-lang/php/php-5.6.2.recipe +++ b/dev-lang/php/php-5.6.2.recipe @@ -33,7 +33,7 @@ GLOBAL_WRITABLE_FILES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libxml2 lib:libz " @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:bison cmd:dos2unix diff --git a/dev-lang/python/python-2.6.8.recipe b/dev-lang/python/python-2.6.8.recipe index a33e1ae05..347e8e5f1 100644 --- a/dev-lang/python/python-2.6.8.recipe +++ b/dev-lang/python/python-2.6.8.recipe @@ -32,7 +32,7 @@ PROVIDES=" lib:libpython2.6 = 1.0 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:nano lib:libbz2 lib:libncurses @@ -50,7 +50,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:find diff --git a/dev-lang/python/python-2.6.9.recipe b/dev-lang/python/python-2.6.9.recipe index bc590b92c..e3eff4ab7 100644 --- a/dev-lang/python/python-2.6.9.recipe +++ b/dev-lang/python/python-2.6.9.recipe @@ -32,7 +32,7 @@ PROVIDES=" lib:libpython2.6 = 1.0 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:nano lib:libbz2 lib:libncurses @@ -50,7 +50,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:find diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index aa1a0bca4..538ea7e82 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libpython2.7 = 1.0 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libbz2 lib:libncurses lib:libssl @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:find diff --git a/dev-lang/python/python-2.7.8.recipe b/dev-lang/python/python-2.7.8.recipe index 15d017e8c..65ae16ac3 100644 --- a/dev-lang/python/python-2.7.8.recipe +++ b/dev-lang/python/python-2.7.8.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libpython2.7 = 1.0 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libbz2 lib:libncurses lib:libssl @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:find diff --git a/dev-lang/rebol/rebol-2.101.0.5.75.recipe b/dev-lang/rebol/rebol-2.101.0.5.75.recipe index af73c4423..e4643121a 100644 --- a/dev-lang/rebol/rebol-2.101.0.5.75.recipe +++ b/dev-lang/rebol/rebol-2.101.0.5.75.recipe @@ -25,11 +25,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe index ce57c7e7b..0d521a28f 100644 --- a/dev-lang/ruby/ruby-1.9.1.recipe +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -38,7 +38,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libedit lib:libz lib:libcrypto @@ -57,7 +57,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:g++ cmd:autoconf diff --git a/dev-lang/ruby/ruby-1.9.3.recipe b/dev-lang/ruby/ruby-1.9.3.recipe index 772fc7477..41550c622 100644 --- a/dev-lang/ruby/ruby-1.9.3.recipe +++ b/dev-lang/ruby/ruby-1.9.3.recipe @@ -54,7 +54,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libedit$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix @@ -75,7 +75,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:autoconf diff --git a/dev-lang/ruby/ruby-2.1.2.recipe b/dev-lang/ruby/ruby-2.1.2.recipe index bb3e99bd6..71092ca80 100644 --- a/dev-lang/ruby/ruby-2.1.2.recipe +++ b/dev-lang/ruby/ruby-2.1.2.recipe @@ -41,7 +41,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libedit$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix @@ -51,7 +51,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libedit$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe index 170ffd3c1..886775857 100644 --- a/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe +++ b/dev-lang/spidermonkey/spidermonkey-1.8.5.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-lang/squirrel/squirrel-3.0.4.recipe b/dev-lang/squirrel/squirrel-3.0.4.recipe index 370f57917..b30cce8e8 100644 --- a/dev-lang/squirrel/squirrel-3.0.4.recipe +++ b/dev-lang/squirrel/squirrel-3.0.4.recipe @@ -28,10 +28,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix " diff --git a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe index a6605227d..6a35acd1f 100644 --- a/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe +++ b/dev-lang/swi_prolog/swi_prolog-6.2.0.recipe @@ -28,14 +28,14 @@ PROVIDES=" cmd:swipl_ld$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix >= 10 lib:libreadline$secondaryArchSuffix >= 6 lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libreadline$secondaryArchSuffix >= 6 devel:libgmp$secondaryArchSuffix >= 10 devel:libncurses$secondaryArchSuffix diff --git a/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe b/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe index feccb15d3..b86c47d9e 100644 --- a/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe +++ b/dev-lang/swi_prolog/swi_prolog-6.6.6.recipe @@ -28,14 +28,14 @@ PROVIDES=" cmd:swipl_ld$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix >= 10 lib:libreadline$secondaryArchSuffix >= 6 lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libreadline$secondaryArchSuffix >= 6 devel:libgmp$secondaryArchSuffix >= 10 devel:libncurses$secondaryArchSuffix diff --git a/dev-lang/swig/swig-2.0.11.recipe b/dev-lang/swig/swig-2.0.11.recipe index 3d9ef9f79..27ada4246 100644 --- a/dev-lang/swig/swig-2.0.11.recipe +++ b/dev-lang/swig/swig-2.0.11.recipe @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpcre " @@ -48,7 +48,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:libtoolize cmd:make cmd:gcc diff --git a/dev-lang/tcc/tcc-0.9.26.recipe b/dev-lang/tcc/tcc-0.9.26.recipe index 25679c42b..d15fe0c85 100644 --- a/dev-lang/tcc/tcc-0.9.26.recipe +++ b/dev-lang/tcc/tcc-0.9.26.recipe @@ -38,11 +38,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/dev-lang/tcl/tcl-8.5.15.recipe b/dev-lang/tcl/tcl-8.5.15.recipe index b2c21199c..3deeeb951 100644 --- a/dev-lang/tcl/tcl-8.5.15.recipe +++ b/dev-lang/tcl/tcl-8.5.15.recipe @@ -25,14 +25,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:make cmd:gcc diff --git a/dev-lang/tcl/tcl-8.5.9.recipe b/dev-lang/tcl/tcl-8.5.9.recipe index dee8be742..4b4b96b50 100644 --- a/dev-lang/tcl/tcl-8.5.9.recipe +++ b/dev-lang/tcl/tcl-8.5.9.recipe @@ -25,14 +25,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:make cmd:gcc diff --git a/dev-lang/v8/v8-3.16.1.recipe b/dev-lang/v8/v8-3.16.1.recipe index df4858b8a..77acb6220 100644 --- a/dev-lang/v8/v8-3.16.1.recipe +++ b/dev-lang/v8/v8-3.16.1.recipe @@ -38,13 +38,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:g++$secondaryArchSuffix cmd:make cmd:python diff --git a/dev-lang/xamos/xamos-0.29.recipe b/dev-lang/xamos/xamos-0.29.recipe index 0f9ae89dd..045a27479 100644 --- a/dev-lang/xamos/xamos-0.29.recipe +++ b/dev-lang/xamos/xamos-0.29.recipe @@ -22,7 +22,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:sdl_image devel:sdl_mixer diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe index 76692b48f..6c28db0fa 100644 --- a/dev-lang/yab/yab-1.7.02.recipe +++ b/dev-lang/yab/yab-1.7.02.recipe @@ -27,12 +27,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " diff --git a/dev-lang/yasm/yasm-1.1.0.recipe b/dev-lang/yasm/yasm-1.1.0.recipe index 30336a0d6..65f7139b9 100644 --- a/dev-lang/yasm/yasm-1.1.0.recipe +++ b/dev-lang/yasm/yasm-1.1.0.recipe @@ -19,12 +19,12 @@ PROVIDES=" lib:libyasm = 1.1.0 compat >= 1.1 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:libtoolize diff --git a/dev-lang/yasm/yasm-1.2.0.recipe b/dev-lang/yasm/yasm-1.2.0.recipe index 95d7575bc..bfe44d291 100644 --- a/dev-lang/yasm/yasm-1.2.0.recipe +++ b/dev-lang/yasm/yasm-1.2.0.recipe @@ -21,12 +21,12 @@ PROVIDES=" devel:libyasm = $portVersion compat >= 1.2 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:libtoolize diff --git a/dev-libs/apr/apr-1.4.6.recipe b/dev-libs/apr/apr-1.4.6.recipe index 6928dafe4..ae6bf599d 100644 --- a/dev-libs/apr/apr-1.4.6.recipe +++ b/dev-libs/apr/apr-1.4.6.recipe @@ -14,12 +14,12 @@ PROVIDES=" lib:libapr_1 = 0.4.6 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:gcc diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index 4c42f26ff..32f103d6c 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -15,12 +15,12 @@ PROVIDES=" lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/apr_util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe index 0cb40c651..be2bff01d 100644 --- a/dev-libs/apr_util/apr_util-1.3.10.recipe +++ b/dev-libs/apr_util/apr_util-1.3.10.recipe @@ -13,7 +13,7 @@ PROVIDES=" lib:libaprutil_1 = $portVersion compat >= 1 " REQUIRES=" - haiku >= $haikuVersion + haiku apr >= 1.3.9 expat >= 2.0 " @@ -21,7 +21,7 @@ BUILD_REQUIRES=" $REQUIRES " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe index cd19d3aa6..dc4c23c11 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -14,7 +14,7 @@ PROVIDES=" lib:libaprutil_1 = 0.4.1 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libapr_1 lib:libexpat lib:libiconv @@ -25,7 +25,7 @@ BUILD_REQUIRES=" devel:libiconv " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/dev-libs/apr_util/apr_util-1.5.3.recipe b/dev-libs/apr_util/apr_util-1.5.3.recipe index 82b307208..d07bfa752 100644 --- a/dev-libs/apr_util/apr_util-1.5.3.recipe +++ b/dev-libs/apr_util/apr_util-1.5.3.recipe @@ -14,7 +14,7 @@ PROVIDES=" lib:libaprutil_1 = 0.5.3 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libapr_1 lib:libexpat lib:libiconv @@ -25,7 +25,7 @@ BUILD_REQUIRES=" devel:libiconv " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/dev-libs/apr_util/apr_util-1.5.4.recipe b/dev-libs/apr_util/apr_util-1.5.4.recipe index 14c99b0f6..c09a934bd 100644 --- a/dev-libs/apr_util/apr_util-1.5.4.recipe +++ b/dev-libs/apr_util/apr_util-1.5.4.recipe @@ -25,7 +25,7 @@ PROVIDES=" lib:libaprutil_1$secondaryArchSuffix = 0.5.4 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libapr_1$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -36,7 +36,7 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe index a2d049729..887ce87ad 100644 --- a/dev-libs/boehm_gc/boehm_gc-7.2d.recipe +++ b/dev-libs/boehm_gc/boehm_gc-7.2d.recipe @@ -23,13 +23,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtoolize cmd:autoconf cmd:make diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index d05f56c8b..4792a93d3 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix boost_atomic$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion boost_context$secondaryArchSuffix == $portVersion @@ -54,7 +54,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libicuuc$secondaryArchSuffix @@ -182,7 +182,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix boost$secondaryArchSuffix == $portVersion boost_atomic$secondaryArchSuffix == $portVersion boost_chrono$secondaryArchSuffix == $portVersion @@ -215,7 +215,7 @@ PROVIDES_atomic=" " REQUIRES_atomic=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -226,7 +226,7 @@ PROVIDES_chrono=" " REQUIRES_chrono=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix == $portVersion lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix @@ -238,7 +238,7 @@ PROVIDES_context=" " REQUIRES_context=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -249,7 +249,7 @@ PROVIDES_coroutine=" " REQUIRES_coroutine=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_context$secondaryArchSuffix == $portVersion lib:libboost_system$secondaryArchSuffix == $portVersion lib:libstdc++$secondaryArchSuffix @@ -262,7 +262,7 @@ PROVIDES_date_time=" " REQUIRES_date_time=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -273,7 +273,7 @@ REQUIRES_date_time=" # " #REQUIRES_exception=" -# haiku$secondaryArchSuffix >= $haikuVersion +# haiku$secondaryArchSuffix # " PROVIDES_filesystem=" @@ -282,7 +282,7 @@ PROVIDES_filesystem=" " REQUIRES_filesystem=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix == $portVersion lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -296,7 +296,7 @@ PROVIDES_graph=" " REQUIRES_graph=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_regex$secondaryArchSuffix == $portVersion lib:libicuuc$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix @@ -311,7 +311,7 @@ PROVIDES_iostreams=" " REQUIRES_iostreams=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -324,7 +324,7 @@ PROVIDES_locale=" " REQUIRES_locale=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_chrono$secondaryArchSuffix == $portVersion lib:libboost_system$secondaryArchSuffix == $portVersion lib:libboost_thread$secondaryArchSuffix == $portVersion @@ -342,7 +342,7 @@ PROVIDES_log=" " REQUIRES_log=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_chrono$secondaryArchSuffix == $portVersion lib:libboost_filesystem$secondaryArchSuffix == $portVersion lib:libboost_system$secondaryArchSuffix == $portVersion @@ -363,7 +363,7 @@ PROVIDES_math=" " REQUIRES_math=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -374,7 +374,7 @@ PROVIDES_program_options=" " REQUIRES_program_options=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -385,7 +385,7 @@ PROVIDES_random=" " REQUIRES_random=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -396,7 +396,7 @@ PROVIDES_regex=" " REQUIRES_regex=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix lib:libicudata$secondaryArchSuffix @@ -411,7 +411,7 @@ PROVIDES_serialization=" " REQUIRES_serialization=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -422,7 +422,7 @@ PROVIDES_signals=" " REQUIRES_signals=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -433,7 +433,7 @@ PROVIDES_system=" " REQUIRES_system=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -445,7 +445,7 @@ PROVIDES_test=" " REQUIRES_test=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -456,7 +456,7 @@ PROVIDES_thread=" " REQUIRES_thread=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix == $portVersion lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix @@ -468,7 +468,7 @@ PROVIDES_timer=" " REQUIRES_timer=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_chrono$secondaryArchSuffix == $portVersion lib:libboost_system$secondaryArchSuffix == $portVersion lib:libstdc++$secondaryArchSuffix @@ -481,7 +481,7 @@ PROVIDES_unit_test_framework=" " REQUIRES_unit_test_framework=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -492,7 +492,7 @@ PROVIDES_wave=" " REQUIRES_wave=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_chrono$secondaryArchSuffix == $portVersion lib:libboost_date_time$secondaryArchSuffix == $portVersion lib:libboost_filesystem$secondaryArchSuffix == $portVersion diff --git a/dev-libs/check/check-0.9.13.recipe b/dev-libs/check/check-0.9.13.recipe index 75bdd1639..7aaaa991c 100644 --- a/dev-libs/check/check-0.9.13.recipe +++ b/dev-libs/check/check-0.9.13.recipe @@ -23,11 +23,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:make diff --git a/dev-libs/check/check-0.9.14.recipe b/dev-libs/check/check-0.9.14.recipe index 45f89e5e2..3527d7f54 100644 --- a/dev-libs/check/check-0.9.14.recipe +++ b/dev-libs/check/check-0.9.14.recipe @@ -26,11 +26,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:make diff --git a/dev-libs/chmlib/chmlib-0.40.recipe b/dev-libs/chmlib/chmlib-0.40.recipe index 877e0b6c4..138ace4bd 100644 --- a/dev-libs/chmlib/chmlib-0.40.recipe +++ b/dev-libs/chmlib/chmlib-0.40.recipe @@ -26,10 +26,10 @@ PROVIDES=" lib:libchm$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/dev-libs/cloog/cloog-0.18.1.recipe b/dev-libs/cloog/cloog-0.18.1.recipe index 1b639b3be..5d02e4ce5 100644 --- a/dev-libs/cloog/cloog-0.18.1.recipe +++ b/dev-libs/cloog/cloog-0.18.1.recipe @@ -30,12 +30,12 @@ PROVIDES=" lib:libcloog_isl$secondaryArchSuffix = 4.0.0 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix lib:libisl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgmp$secondaryArchSuffix devel:libisl$secondaryArchSuffix " diff --git a/dev-libs/confuse/confuse-2.7.recipe b/dev-libs/confuse/confuse-2.7.recipe index f82b8537e..5b9947346 100644 --- a/dev-libs/confuse/confuse-2.7.recipe +++ b/dev-libs/confuse/confuse-2.7.recipe @@ -26,13 +26,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix " diff --git a/dev-libs/cyassl/cyassl-2.8.0.recipe b/dev-libs/cyassl/cyassl-2.8.0.recipe index 4dbc09bff..73712a093 100644 --- a/dev-libs/cyassl/cyassl-2.8.0.recipe +++ b/dev-libs/cyassl/cyassl-2.8.0.recipe @@ -17,14 +17,14 @@ PROVIDES=" lib:libcyassl$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtoolize cmd:aclocal cmd:autoconf diff --git a/dev-libs/expat/expat-2.0.1.recipe b/dev-libs/expat/expat-2.0.1.recipe index 379849856..3cc8366c3 100644 --- a/dev-libs/expat/expat-2.0.1.recipe +++ b/dev-libs/expat/expat-2.0.1.recipe @@ -27,12 +27,12 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/expat/expat-2.1.0.recipe b/dev-libs/expat/expat-2.1.0.recipe index b0bb7ea70..32003d061 100644 --- a/dev-libs/expat/expat-2.1.0.recipe +++ b/dev-libs/expat/expat-2.1.0.recipe @@ -27,12 +27,12 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe index e2eff5772..37bc7e780 100644 --- a/dev-libs/fribidi/fribidi-0.19.5.recipe +++ b/dev-libs/fribidi/fribidi-0.19.5.recipe @@ -27,11 +27,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-libs/fribidi/fribidi-0.19.6.recipe b/dev-libs/fribidi/fribidi-0.19.6.recipe index d8a638bda..0f6910c99 100644 --- a/dev-libs/fribidi/fribidi-0.19.6.recipe +++ b/dev-libs/fribidi/fribidi-0.19.6.recipe @@ -27,11 +27,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe index 92be8b050..38744b2b0 100644 --- a/dev-libs/glib/glib-1.2.10.recipe +++ b/dev-libs/glib/glib-1.2.10.recipe @@ -36,11 +36,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-libs/glib/glib2-2.38.1.recipe b/dev-libs/glib/glib2-2.38.1.recipe index a24266264..abdae921c 100644 --- a/dev-libs/glib/glib2-2.38.1.recipe +++ b/dev-libs/glib/glib2-2.38.1.recipe @@ -52,7 +52,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix gettext$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -68,7 +68,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:libtoolize diff --git a/dev-libs/gmp/gmp-5.1.3.recipe b/dev-libs/gmp/gmp-5.1.3.recipe index 8abc19575..8b75cfa20 100644 --- a/dev-libs/gmp/gmp-5.1.3.recipe +++ b/dev-libs/gmp/gmp-5.1.3.recipe @@ -22,10 +22,10 @@ PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1 lib:libgmp$secondaryArchSuffix = 10.1.3 compat >= 10 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/gmp/gmp-6.0.0.recipe b/dev-libs/gmp/gmp-6.0.0.recipe index b90da91fb..c322f55b7 100644 --- a/dev-libs/gmp/gmp-6.0.0.recipe +++ b/dev-libs/gmp/gmp-6.0.0.recipe @@ -23,10 +23,10 @@ PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 6.0 lib:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/gnulib/gnulib-2013_12_17.recipe b/dev-libs/gnulib/gnulib-2013_12_17.recipe index 272604b39..cc388dcc7 100644 --- a/dev-libs/gnulib/gnulib-2013_12_17.recipe +++ b/dev-libs/gnulib/gnulib-2013_12_17.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES="" # No build, no requirements diff --git a/dev-libs/hyphen/hyphen-2.8.8.recipe b/dev-libs/hyphen/hyphen-2.8.8.recipe index 7366fc354..51649358d 100644 --- a/dev-libs/hyphen/hyphen-2.8.8.recipe +++ b/dev-libs/hyphen/hyphen-2.8.8.recipe @@ -24,10 +24,10 @@ PROVIDES=" cmd:substrings.pl$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/dev-libs/icu/icu-4.8.1.1.recipe b/dev-libs/icu/icu-4.8.1.1.recipe index 79708cb1f..dc85b3b00 100644 --- a/dev-libs/icu/icu-4.8.1.1.recipe +++ b/dev-libs/icu/icu-4.8.1.1.recipe @@ -22,12 +22,12 @@ PROVIDES=" lib:libicuuc$secondaryArchSuffix = 48.1.1 compat >= 48 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/dev-libs/icu/icu-54.1.recipe b/dev-libs/icu/icu-54.1.recipe index 36c2194ed..f9aaf63ee 100644 --- a/dev-libs/icu/icu-54.1.recipe +++ b/dev-libs/icu/icu-54.1.recipe @@ -20,7 +20,7 @@ PROVIDES=" lib:libicuuc$secondaryArchSuffix = 54.1 compat >= 54 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -31,7 +31,7 @@ fi BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/isl/isl-0.13.recipe b/dev-libs/isl/isl-0.13.recipe index a4bae4847..d6ce98d19 100644 --- a/dev-libs/isl/isl-0.13.recipe +++ b/dev-libs/isl/isl-0.13.recipe @@ -31,11 +31,11 @@ PROVIDES=" lib:libisl$secondaryArchSuffix = 13.0.0 compat >= 13 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix >= 10.1.3 " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgmp$secondaryArchSuffix >= 10.1.3 " BUILD_PREREQUIRES=" diff --git a/dev-libs/isl/isl-0.14.recipe b/dev-libs/isl/isl-0.14.recipe index a598e2eae..1dd681ad0 100644 --- a/dev-libs/isl/isl-0.14.recipe +++ b/dev-libs/isl/isl-0.14.recipe @@ -31,11 +31,11 @@ PROVIDES=" lib:libisl$secondaryArchSuffix = 13.1.0 compat >= 13 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix >= 10.1.3 " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgmp$secondaryArchSuffix >= 10.1.3 " BUILD_PREREQUIRES=" diff --git a/dev-libs/jansson/jansson-2.5.recipe b/dev-libs/jansson/jansson-2.5.recipe index e5f8073c3..f2ec4dc88 100644 --- a/dev-libs/jansson/jansson-2.5.recipe +++ b/dev-libs/jansson/jansson-2.5.recipe @@ -24,14 +24,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make " diff --git a/dev-libs/json_c/json_c-0.12.recipe b/dev-libs/json_c/json_c-0.12.recipe index 75493ab67..1f2f43fb0 100644 --- a/dev-libs/json_c/json_c-0.12.recipe +++ b/dev-libs/json_c/json_c-0.12.recipe @@ -20,10 +20,10 @@ PROVIDES=" lib:libjson_c = 2.0.1 compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoreconf cmd:gcc diff --git a/dev-libs/libassuan/libassuan-2.1.3.recipe b/dev-libs/libassuan/libassuan-2.1.3.recipe index 4f19e3d4b..004a168a3 100644 --- a/dev-libs/libassuan/libassuan-2.1.3.recipe +++ b/dev-libs/libassuan/libassuan-2.1.3.recipe @@ -22,12 +22,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgpg_error${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgpg_error${secondaryArchSuffix} " diff --git a/dev-libs/libcdio/libcdio-0.92.recipe b/dev-libs/libcdio/libcdio-0.92.recipe index b96c6bf8e..089a5bb5e 100644 --- a/dev-libs/libcdio/libcdio-0.92.recipe +++ b/dev-libs/libcdio/libcdio-0.92.recipe @@ -33,7 +33,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " @@ -42,7 +42,7 @@ BUILD_REQUIRES=" devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/dev-libs/libclaw/libclaw-1.7.4.recipe b/dev-libs/libclaw/libclaw-1.7.4.recipe index b9c8b138b..990ce95e1 100644 --- a/dev-libs/libclaw/libclaw-1.7.4.recipe +++ b/dev-libs/libclaw/libclaw-1.7.4.recipe @@ -44,7 +44,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -52,7 +52,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -101,6 +101,6 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libclaw$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libdwarf/libdwarf-20130729.recipe b/dev-libs/libdwarf/libdwarf-20130729.recipe index 223fa1316..eefe9126d 100644 --- a/dev-libs/libdwarf/libdwarf-20130729.recipe +++ b/dev-libs/libdwarf/libdwarf-20130729.recipe @@ -47,12 +47,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libelf$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libelf$secondaryArchSuffix " diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.0.recipe index 6bab30d64..3957bf4ce 100644 --- a/dev-libs/libebml/libebml-1.3.0.recipe +++ b/dev-libs/libebml/libebml-1.3.0.recipe @@ -17,12 +17,12 @@ PROVIDES=" lib:libebml$secondaryArchSuffix = 4 " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-libs/libedit/libedit-2014_10_30_3.1.recipe b/dev-libs/libedit/libedit-2014_10_30_3.1.recipe index f5880a2b6..8c2dda9b5 100644 --- a/dev-libs/libedit/libedit-2014_10_30_3.1.recipe +++ b/dev-libs/libedit/libedit-2014_10_30_3.1.recipe @@ -21,14 +21,14 @@ PROVIDES=" lib:libedit$secondaryArchSuffix = 0.0.52 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoreconf cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe index 6bf8245ee..cb805ffd2 100644 --- a/dev-libs/libelf/libelf-0.8.13.recipe +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -20,10 +20,10 @@ PROVIDES=" lib:libelf$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe index c63da7b12..3c56fb503 100644 --- a/dev-libs/libevent/libevent-1.4.14b.recipe +++ b/dev-libs/libevent/libevent-1.4.14b.recipe @@ -23,13 +23,13 @@ PROVIDES=" lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 4eb7d6fb5..4d467655a 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -34,14 +34,14 @@ PROVIDES=" lib:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libssl$secondaryArchSuffix cmd:python " # haiku${secondaryArchSuffix} doesn't define included libraries yet -# lib:libnetwork$secondaryArchSuffix >= $haikuVersion +# lib:libnetwork$secondaryArchSuffix BUILD_REQUIRES=" devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix @@ -49,7 +49,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-libs/libffi/libffi-3.0.13.recipe b/dev-libs/libffi/libffi-3.0.13.recipe index 811077300..5bcde0c5a 100644 --- a/dev-libs/libffi/libffi-3.0.13.recipe +++ b/dev-libs/libffi/libffi-3.0.13.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:awk diff --git a/dev-libs/libffi/libffi-3.2.1.recipe b/dev-libs/libffi/libffi-3.2.1.recipe index 80d18f53f..23d40ca3f 100644 --- a/dev-libs/libffi/libffi-3.2.1.recipe +++ b/dev-libs/libffi/libffi-3.2.1.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:awk diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe index f7d6e9146..31868f7a5 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe +++ b/dev-libs/libgcrypt/libgcrypt-1.5.3.recipe @@ -17,12 +17,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgpg_error " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libgpg_error " diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe index a520e9f33..b494cd769 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe +++ b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libgpg_error${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgpg_error${secondaryArchSuffix} " @@ -62,6 +62,6 @@ PROVIDES_devel=" REQUIRES_devel=" libgcrypt${secondaryArchSuffix} == $portVersion base - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libgpg_error${secondaryArchSuffix} " diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe index 8d0a0e671..158f521b1 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe +++ b/dev-libs/libgcrypt/libgcrypt-1.6.2.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libgpg_error${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgpg_error${secondaryArchSuffix} " @@ -62,6 +62,6 @@ PROVIDES_devel=" REQUIRES_devel=" libgcrypt${secondaryArchSuffix} == $portVersion base - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libgpg_error${secondaryArchSuffix} " diff --git a/dev-libs/libgpg_error/libgpg_error-1.17.recipe b/dev-libs/libgpg_error/libgpg_error-1.17.recipe index 35186975f..60b80cdb6 100644 --- a/dev-libs/libgpg_error/libgpg_error-1.17.recipe +++ b/dev-libs/libgpg_error/libgpg_error-1.17.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-libs/libiconv/libiconv-1.13.1.recipe b/dev-libs/libiconv/libiconv-1.13.1.recipe index fc79a1225..95bb09f51 100644 --- a/dev-libs/libiconv/libiconv-1.13.1.recipe +++ b/dev-libs/libiconv/libiconv-1.13.1.recipe @@ -26,12 +26,12 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe index aa7268aa0..1f09afd2b 100644 --- a/dev-libs/libidl/libidl-0.6.8.recipe +++ b/dev-libs/libidl/libidl-0.6.8.recipe @@ -22,12 +22,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libglib$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libglib$secondaryArchSuffix " diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe index a45bb00fc..1e3988ceb 100644 --- a/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe +++ b/dev-libs/libmaxminddb/libmaxminddb-1.0.1.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " PROVIDES_devel=" @@ -37,7 +37,7 @@ REQUIRES_devel=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:make diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe index a34e8ded8..9e05fac27 100644 --- a/dev-libs/libpcre/libpcre-8.21.recipe +++ b/dev-libs/libpcre/libpcre-8.21.recipe @@ -34,12 +34,12 @@ PROVIDES="$PROVIDES fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe index d50c21a9b..e0de75375 100644 --- a/dev-libs/libpcre/libpcre-8.33.recipe +++ b/dev-libs/libpcre/libpcre-8.33.recipe @@ -34,12 +34,12 @@ PROVIDES="$PROVIDES fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-libs/libpcre/libpcre-8.36.recipe b/dev-libs/libpcre/libpcre-8.36.recipe index 181461f29..b2c65fe5e 100644 --- a/dev-libs/libpcre/libpcre-8.36.recipe +++ b/dev-libs/libpcre/libpcre-8.36.recipe @@ -34,12 +34,12 @@ PROVIDES="$PROVIDES fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-libs/libpcre/libpcre0-8.21.recipe b/dev-libs/libpcre/libpcre0-8.21.recipe index d9357b3fd..cdce583dd 100644 --- a/dev-libs/libpcre/libpcre0-8.21.recipe +++ b/dev-libs/libpcre/libpcre0-8.21.recipe @@ -25,12 +25,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe index a198e21b1..490b4b5d6 100644 --- a/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe +++ b/dev-libs/libpthread_stubs/libpthread_stubs-0.3.recipe @@ -18,14 +18,14 @@ PROVIDES=" devel:libpthread_stubs$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/dev-libs/librevenge/librevenge-0.0.0.recipe b/dev-libs/librevenge/librevenge-0.0.0.recipe index d55003fd7..38b5f626e 100644 --- a/dev-libs/librevenge/librevenge-0.0.0.recipe +++ b/dev-libs/librevenge/librevenge-0.0.0.recipe @@ -29,7 +29,7 @@ PROVIDES=" lib:librevenge_stream_0.0$secondaryArchSuffix = $portVersion compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_filesystem$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -40,7 +40,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-libs/librevenge/librevenge-0.0.1.recipe b/dev-libs/librevenge/librevenge-0.0.1.recipe index 5d626a136..8f10a258c 100644 --- a/dev-libs/librevenge/librevenge-0.0.1.recipe +++ b/dev-libs/librevenge/librevenge-0.0.1.recipe @@ -29,7 +29,7 @@ PROVIDES=" lib:librevenge_stream_0.0$secondaryArchSuffix = $portVersion compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_filesystem$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -41,7 +41,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtoolize cmd:aclocal cmd:autoheader diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe index 921e0572a..204436253 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_04_18.recipe @@ -10,12 +10,12 @@ ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion lib:libsolvext = $portVersion" -REQUIRES="haiku >= $haikuVersion +REQUIRES="haiku lib:libexpat >= 1.5 lib:libz " BUILD_REQUIRES="$REQUIRES" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel cmd:cmake cmd:gcc cmd:ld diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe index 1a7e22288..b9edf6fad 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_20.recipe @@ -10,12 +10,12 @@ ARCHITECTURES="x86_gcc2 ?x86" PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion lib:libsolvext = $portVersion" -REQUIRES="haiku >= $haikuVersion +REQUIRES="haiku lib:libexpat >= 1.5 lib:libz " BUILD_REQUIRES="$REQUIRES" -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel cmd:cmake cmd:gcc cmd:ld diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe index 1f19d399e..8410e24e7 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_05_30.recipe @@ -11,7 +11,7 @@ PROVIDES="libsolv = $portVersion lib:libsolv = $portVersion lib:libsolvext = $portVersion " -REQUIRES="haiku >= $haikuVersion +REQUIRES="haiku lib:libexpat lib:libz " @@ -19,7 +19,7 @@ BUILD_REQUIRES=" devel:libexpat devel:libz " -BUILD_PREREQUIRES="haiku_devel >= $haikuVersion +BUILD_PREREQUIRES="haiku_devel cmd:cmake cmd:gcc cmd:ld diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe index 846d14650..61c0fc94c 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_06_16.recipe @@ -14,7 +14,7 @@ PROVIDES=" lib:libsolvext$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -23,7 +23,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe index d78705f29..8806eadcc 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -17,7 +17,7 @@ PROVIDES=" lib:libsolvext$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -26,7 +26,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/dev-libs/libtar/libtar-1.2.20.recipe b/dev-libs/libtar/libtar-1.2.20.recipe index 6bd5455df..b1375a454 100644 --- a/dev-libs/libtar/libtar-1.2.20.recipe +++ b/dev-libs/libtar/libtar-1.2.20.recipe @@ -23,10 +23,10 @@ PROVIDES=" lib:libtar${secondaryArchSuffix} = 0.0.0 compat >= 0 " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:cmake diff --git a/dev-libs/libtasn1/libtasn1-4.2.recipe b/dev-libs/libtasn1/libtasn1-4.2.recipe index 025addfcd..3fe238562 100644 --- a/dev-libs/libtasn1/libtasn1-4.2.recipe +++ b/dev-libs/libtasn1/libtasn1-4.2.recipe @@ -25,10 +25,10 @@ PROVIDES=" cmd:asn1Parser$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/dev-libs/libtommath/libtommath-0.42.0.recipe b/dev-libs/libtommath/libtommath-0.42.0.recipe index d1fcad3a9..49dbf4c16 100644 --- a/dev-libs/libtommath/libtommath-0.42.0.recipe +++ b/dev-libs/libtommath/libtommath-0.42.0.recipe @@ -22,16 +22,16 @@ PROVIDES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libtommath$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:cc cmd:ar diff --git a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe index 867f53142..c8264cb3e 100644 --- a/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe +++ b/dev-libs/libusb-compat/libusb_compat-0.1.5.recipe @@ -24,7 +24,7 @@ PROVIDES=" cmd:libusb_config$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix " @@ -32,7 +32,7 @@ BUILD_REQUIRES=" devel:libusb_1.0$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:libtool diff --git a/dev-libs/libusb/libusb-1.0.19.recipe b/dev-libs/libusb/libusb-1.0.19.recipe index a43cf62ca..de73f2e0b 100644 --- a/dev-libs/libusb/libusb-1.0.19.recipe +++ b/dev-libs/libusb/libusb-1.0.19.recipe @@ -38,7 +38,7 @@ PROVIDES=" lib:libusb_1.0$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -51,7 +51,7 @@ fi BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:find diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index da585ccd7..2a172bf80 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -38,7 +38,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -53,8 +53,8 @@ if $pythonModuleEnabled; then fi BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel lib:libicudata$secondaryArchSuffix cmd:aclocal cmd:autoconf diff --git a/dev-libs/libxml2/libxml2-2.9.1.recipe b/dev-libs/libxml2/libxml2-2.9.1.recipe index 47729a43c..2c9491ca5 100644 --- a/dev-libs/libxml2/libxml2-2.9.1.recipe +++ b/dev-libs/libxml2/libxml2-2.9.1.recipe @@ -38,7 +38,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -53,8 +53,8 @@ if $pythonModuleEnabled; then fi BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel lib:libicudata$secondaryArchSuffix cmd:aclocal cmd:autoconf diff --git a/dev-libs/libxml2/libxml2-2.9.2.recipe b/dev-libs/libxml2/libxml2-2.9.2.recipe index b9239ee23..5b19d6f69 100644 --- a/dev-libs/libxml2/libxml2-2.9.2.recipe +++ b/dev-libs/libxml2/libxml2-2.9.2.recipe @@ -38,7 +38,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -53,8 +53,8 @@ if $pythonModuleEnabled; then fi BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel lib:libicudata$secondaryArchSuffix cmd:aclocal cmd:autoconf diff --git a/dev-libs/libxslt/libxslt-1.1.28.recipe b/dev-libs/libxslt/libxslt-1.1.28.recipe index f3df75f24..f6d2e5a31 100644 --- a/dev-libs/libxslt/libxslt-1.1.28.recipe +++ b/dev-libs/libxslt/libxslt-1.1.28.recipe @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -26,8 +26,8 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku_devel + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:libtoolize diff --git a/dev-libs/libzip/libzip-0.10.1.recipe b/dev-libs/libzip/libzip-0.10.1.recipe index 10cae8a6e..5aea6a415 100644 --- a/dev-libs/libzip/libzip-0.10.1.recipe +++ b/dev-libs/libzip/libzip-0.10.1.recipe @@ -16,11 +16,11 @@ PROVIDES=" cmd:ziptorrent${secondaryArchSuffix} " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz${secondaryArchSuffix} " BUILD_PREREQUIRES=" diff --git a/dev-libs/libzip/libzip-0.11.2.recipe b/dev-libs/libzip/libzip-0.11.2.recipe index b88c0d0d9..86ff4ab69 100644 --- a/dev-libs/libzip/libzip-0.11.2.recipe +++ b/dev-libs/libzip/libzip-0.11.2.recipe @@ -18,11 +18,11 @@ PROVIDES=" cmd:ziptorrent${secondaryArchSuffix} " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz${secondaryArchSuffix} " BUILD_PREREQUIRES=" diff --git a/dev-libs/lzo/lzo-2.06.recipe b/dev-libs/lzo/lzo-2.06.recipe index 1798a7d80..3233de18d 100644 --- a/dev-libs/lzo/lzo-2.06.recipe +++ b/dev-libs/lzo/lzo-2.06.recipe @@ -33,11 +33,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:awk diff --git a/dev-libs/nspr/nspr-4.10.6.recipe b/dev-libs/nspr/nspr-4.10.6.recipe index a2bde0a5e..34c117777 100644 --- a/dev-libs/nspr/nspr-4.10.6.recipe +++ b/dev-libs/nspr/nspr-4.10.6.recipe @@ -32,12 +32,12 @@ PROVIDES=" lib:libplds4$secondaryArchSuffix = $portVersion compat >= 4 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:aclocal cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/nspr/nspr-4.10.7.recipe b/dev-libs/nspr/nspr-4.10.7.recipe index c1761c43f..1a12568cc 100644 --- a/dev-libs/nspr/nspr-4.10.7.recipe +++ b/dev-libs/nspr/nspr-4.10.7.recipe @@ -32,12 +32,12 @@ PROVIDES=" lib:libplds4$secondaryArchSuffix = $portVersion compat >= 4 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:aclocal cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/nss/nss-3.16.3.recipe b/dev-libs/nss/nss-3.16.3.recipe index a23f6e12f..b4fadc9f0 100644 --- a/dev-libs/nss/nss-3.16.3.recipe +++ b/dev-libs/nss/nss-3.16.3.recipe @@ -92,13 +92,13 @@ PROVIDES=" lib:libssl3${secondaryArchSuffix} = $portVersion compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libnspr4${secondaryArchSuffix} >= 4 lib:libsqlite3$secondaryArchSuffix lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libnspr4${secondaryArchSuffix} >= 4 devel:libsqlite3$secondaryArchSuffix devel:libz${secondaryArchSuffix} diff --git a/dev-libs/nss/nss-3.16.5.recipe b/dev-libs/nss/nss-3.16.5.recipe index 297113144..d4bdb2c9b 100644 --- a/dev-libs/nss/nss-3.16.5.recipe +++ b/dev-libs/nss/nss-3.16.5.recipe @@ -92,13 +92,13 @@ PROVIDES=" lib:libssl3${secondaryArchSuffix} = $portVersion compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libnspr4${secondaryArchSuffix} >= 4 lib:libsqlite3$secondaryArchSuffix lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libnspr4${secondaryArchSuffix} >= 4 devel:libsqlite3$secondaryArchSuffix devel:libz${secondaryArchSuffix} diff --git a/dev-libs/openssl/openssl-1.0.0n.recipe b/dev-libs/openssl/openssl-1.0.0n.recipe index 7861a6d28..1f9f93725 100644 --- a/dev-libs/openssl/openssl-1.0.0n.recipe +++ b/dev-libs/openssl/openssl-1.0.0n.recipe @@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 " if [ -n "$secondaryArchSuffix" ]; then @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/dev-libs/openssl/openssl-1.0.0o.recipe b/dev-libs/openssl/openssl-1.0.0o.recipe index edbcfc882..c1cd4de04 100644 --- a/dev-libs/openssl/openssl-1.0.0o.recipe +++ b/dev-libs/openssl/openssl-1.0.0o.recipe @@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 " if [ -n "$secondaryArchSuffix" ]; then @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/dev-libs/openssl/openssl-1.0.1g.recipe b/dev-libs/openssl/openssl-1.0.1g.recipe index fce0a8dc6..bafc61ee5 100644 --- a/dev-libs/openssl/openssl-1.0.1g.recipe +++ b/dev-libs/openssl/openssl-1.0.1g.recipe @@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 " if [ -n "$secondaryArchSuffix" ]; then @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/dev-libs/openssl/openssl-1.0.1h.recipe b/dev-libs/openssl/openssl-1.0.1h.recipe index 859766d91..a757d73b6 100644 --- a/dev-libs/openssl/openssl-1.0.1h.recipe +++ b/dev-libs/openssl/openssl-1.0.1h.recipe @@ -40,7 +40,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 ca_root_certificates " @@ -54,7 +54,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/dev-libs/polarssl/polarssl-1.3.7.recipe b/dev-libs/polarssl/polarssl-1.3.7.recipe index adf1f4b80..0eb0c9980 100644 --- a/dev-libs/polarssl/polarssl-1.3.7.recipe +++ b/dev-libs/polarssl/polarssl-1.3.7.recipe @@ -25,14 +25,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 " BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:cmake diff --git a/dev-libs/polarssl/polarssl-1.3.8.recipe b/dev-libs/polarssl/polarssl-1.3.8.recipe index 8e0dcb633..2d9a122e4 100644 --- a/dev-libs/polarssl/polarssl-1.3.8.recipe +++ b/dev-libs/polarssl/polarssl-1.3.8.recipe @@ -25,14 +25,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 " BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:cmake diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe index c3a30e42b..c3e996159 100644 --- a/dev-libs/popt/popt-1.16.recipe +++ b/dev-libs/popt/popt-1.16.recipe @@ -25,10 +25,10 @@ PROVIDES=" lib:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:libtoolize diff --git a/dev-libs/protobuf/protobuf-2.4.1.recipe b/dev-libs/protobuf/protobuf-2.4.1.recipe index f72d05f40..e616b0031 100644 --- a/dev-libs/protobuf/protobuf-2.4.1.recipe +++ b/dev-libs/protobuf/protobuf-2.4.1.recipe @@ -26,13 +26,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoreconf cmd:gcc$secondaryArchSuffix cmd:libtoolize diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.recipe b/dev-libs/tinyxml/tinyxml-2.6.2.recipe index 0bc6193b3..7aa37a64d 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2.recipe +++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe @@ -19,7 +19,7 @@ PROVIDES=" lib:libtinyxml$secondaryArchSuffix = $portVersion compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -31,7 +31,7 @@ fi BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:grep diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.recipe index e87544cf0..b90243a4f 100644 --- a/dev-libs/tinyxml2/tinyxml2-2.recipe +++ b/dev-libs/tinyxml2/tinyxml2-2.recipe @@ -18,10 +18,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-libs/udis86/udis86-1.7.2.recipe b/dev-libs/udis86/udis86-1.7.2.recipe index 9a9109c7d..fd3952b15 100644 --- a/dev-libs/udis86/udis86-1.7.2.recipe +++ b/dev-libs/udis86/udis86-1.7.2.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:gcc diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe index 9b4241b95..f9d12d3ec 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe +++ b/dev-lua/luafilesystem/luafilesystem-1.6.2_git.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lua >= 5.2 " @@ -27,7 +27,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc " diff --git a/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe b/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe index 7cac49304..481da4454 100644 --- a/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe +++ b/dev-perl/alien_svn/alien_svn-1.7.17.1.recipe @@ -26,7 +26,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:make diff --git a/dev-perl/html_parser/html_parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe index 746baa915..6586d6050 100644 --- a/dev-perl/html_parser/html_parser-3.70.recipe +++ b/dev-perl/html_parser/html_parser-3.70.recipe @@ -10,7 +10,7 @@ PROVIDES=" html_parser = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku perl " COPYRIGHT=" @@ -23,7 +23,7 @@ LICENSE=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:perl" diff --git a/dev-perl/html_parser/html_parser-3.71.recipe b/dev-perl/html_parser/html_parser-3.71.recipe index b1968d4c7..71b9f2b62 100644 --- a/dev-perl/html_parser/html_parser-3.71.recipe +++ b/dev-perl/html_parser/html_parser-3.71.recipe @@ -24,11 +24,11 @@ PROVIDES=" html_parser = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku perl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/dev-perl/xml_parser/xml_parser-2.36.recipe b/dev-perl/xml_parser/xml_parser-2.36.recipe index fa524dade..e78aecfbe 100644 --- a/dev-perl/xml_parser/xml_parser-2.36.recipe +++ b/dev-perl/xml_parser/xml_parser-2.36.recipe @@ -15,13 +15,13 @@ PROVIDES=" xml_parser = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libexpat perl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libexpat " BUILD_PREREQUIRES=" diff --git a/dev-python/argh/argh-0.26.1.recipe b/dev-python/argh/argh-0.26.1.recipe index 954eabb67..e0cdbfafc 100644 --- a/dev-python/argh/argh-0.26.1.recipe +++ b/dev-python/argh/argh-0.26.1.recipe @@ -21,12 +21,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel python_setuptools " diff --git a/dev-python/cython/cython-0.20.2.recipe b/dev-python/cython/cython-0.20.2.recipe index 9ff03fa10..9c0c17c09 100644 --- a/dev-python/cython/cython-0.20.2.recipe +++ b/dev-python/cython/cython-0.20.2.recipe @@ -19,7 +19,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:python diff --git a/dev-python/docutils/docutils-0.11.recipe b/dev-python/docutils/docutils-0.11.recipe index 5d0125c4a..eeb948ed6 100644 --- a/dev-python/docutils/docutils-0.11.recipe +++ b/dev-python/docutils/docutils-0.11.recipe @@ -34,13 +34,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python " diff --git a/dev-python/dulwich/dulwich-0.9.7.recipe b/dev-python/dulwich/dulwich-0.9.7.recipe index 560e5c3ea..088b9dbff 100644 --- a/dev-python/dulwich/dulwich-0.9.7.recipe +++ b/dev-python/dulwich/dulwich-0.9.7.recipe @@ -23,14 +23,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:gcc " diff --git a/dev-python/imaging/python_imaging-1.1.7.recipe b/dev-python/imaging/python_imaging-1.1.7.recipe index 249abdc3e..25c90fba6 100644 --- a/dev-python/imaging/python_imaging-1.1.7.recipe +++ b/dev-python/imaging/python_imaging-1.1.7.recipe @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel$secondaryArchSuffix >= $haikuVersion + haiku_devel$secondaryArchSuffix cmd:gcc cmd:python " diff --git a/dev-python/iniparse/iniparse-0.4.recipe b/dev-python/iniparse/iniparse-0.4.recipe index a07bc555b..2abd99603 100644 --- a/dev-python/iniparse/iniparse-0.4.recipe +++ b/dev-python/iniparse/iniparse-0.4.recipe @@ -33,12 +33,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:python$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-python/lxml/python_lxml-3.3.5.recipe b/dev-python/lxml/python_lxml-3.3.5.recipe index 90bf1a573..c9f131acb 100644 --- a/dev-python/lxml/python_lxml-3.3.5.recipe +++ b/dev-python/lxml/python_lxml-3.3.5.recipe @@ -30,7 +30,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libxslt$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -39,7 +39,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/dev-python/mechanize/python_mechanize-0.2.5.recipe b/dev-python/mechanize/python_mechanize-0.2.5.recipe index c12dd74ec..f8c809d01 100644 --- a/dev-python/mechanize/python_mechanize-0.2.5.recipe +++ b/dev-python/mechanize/python_mechanize-0.2.5.recipe @@ -42,13 +42,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:python python_setuptools " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel python_setuptools " diff --git a/dev-python/mock/python_mock-1.0.1.recipe b/dev-python/mock/python_mock-1.0.1.recipe index ba2d9764c..db320df76 100644 --- a/dev-python/mock/python_mock-1.0.1.recipe +++ b/dev-python/mock/python_mock-1.0.1.recipe @@ -28,14 +28,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python " diff --git a/dev-python/ordereddict/ordereddict-1.1.recipe b/dev-python/ordereddict/ordereddict-1.1.recipe index 68eb1e0dd..58fa8d2e5 100644 --- a/dev-python/ordereddict/ordereddict-1.1.recipe +++ b/dev-python/ordereddict/ordereddict-1.1.recipe @@ -18,14 +18,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python < 2.7 " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python < 2.7 " diff --git a/dev-python/pathtools/pathtools-0.1.2.recipe b/dev-python/pathtools/pathtools-0.1.2.recipe index 0cda667d2..103c7905b 100644 --- a/dev-python/pathtools/pathtools-0.1.2.recipe +++ b/dev-python/pathtools/pathtools-0.1.2.recipe @@ -22,12 +22,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel python_setuptools " diff --git a/dev-python/pygame/pygame-1.9.1.recipe b/dev-python/pygame/pygame-1.9.1.recipe index 4290a985e..824913455 100644 --- a/dev-python/pygame/pygame-1.9.1.recipe +++ b/dev-python/pygame/pygame-1.9.1.recipe @@ -51,7 +51,7 @@ REQUIRES=" # portmap | BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel python >= 2.6.4 gcc${secondaryArchSuffix} libsdl${secondaryArchSuffix}_devel >= 1.2.14 diff --git a/dev-python/pygments/pygments-1.6.recipe b/dev-python/pygments/pygments-1.6.recipe index 833272325..632cd6bbf 100644 --- a/dev-python/pygments/pygments-1.6.recipe +++ b/dev-python/pygments/pygments-1.6.recipe @@ -29,12 +29,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:python$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-python/python_dateutil/python_dateutil-1.5.recipe b/dev-python/python_dateutil/python_dateutil-1.5.recipe index 1a6acf800..ad556d586 100644 --- a/dev-python/python_dateutil/python_dateutil-1.5.recipe +++ b/dev-python/python_dateutil/python_dateutil-1.5.recipe @@ -21,13 +21,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python #python_setuptools " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel python_setuptools " diff --git a/dev-python/python_setuptools/python_setuptools-5.3.recipe b/dev-python/python_setuptools/python_setuptools-5.3.recipe index 8ec7dde6f..ef864736a 100644 --- a/dev-python/python_setuptools/python_setuptools-5.3.recipe +++ b/dev-python/python_setuptools/python_setuptools-5.3.recipe @@ -18,14 +18,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:sed " diff --git a/dev-python/pyyaml/pyyaml-3.11.recipe b/dev-python/pyyaml/pyyaml-3.11.recipe index 19ad24e4c..c0607c714 100644 --- a/dev-python/pyyaml/pyyaml-3.11.recipe +++ b/dev-python/pyyaml/pyyaml-3.11.recipe @@ -31,13 +31,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " #TODO: eventually depend on http://pyyaml.org/wiki/LibYAML BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:sed python_setuptools " diff --git a/dev-python/requests/python_requests-2.3.0.recipe b/dev-python/requests/python_requests-2.3.0.recipe index ddc46a0e6..4c18ed21f 100644 --- a/dev-python/requests/python_requests-2.3.0.recipe +++ b/dev-python/requests/python_requests-2.3.0.recipe @@ -22,14 +22,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python # actually has its own copy... #ca_root_certificates " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-python/twisted/python_twisted-13.2.0.recipe b/dev-python/twisted/python_twisted-13.2.0.recipe index fb3af8b87..c0a04735f 100644 --- a/dev-python/twisted/python_twisted-13.2.0.recipe +++ b/dev-python/twisted/python_twisted-13.2.0.recipe @@ -67,7 +67,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku python_zope.interface >= 3.6.0 cmd:python " @@ -77,7 +77,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:gcc " diff --git a/dev-python/urllib3/urllib3-1.9.1.recipe b/dev-python/urllib3/urllib3-1.9.1.recipe index 50bbe7846..d800d3f29 100644 --- a/dev-python/urllib3/urllib3-1.9.1.recipe +++ b/dev-python/urllib3/urllib3-1.9.1.recipe @@ -32,12 +32,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-python/watchdog/watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe index bf2ef3f52..602e6cb07 100644 --- a/dev-python/watchdog/watchdog-0.8.2.recipe +++ b/dev-python/watchdog/watchdog-0.8.2.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python argh pathtools @@ -29,7 +29,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel python_setuptools " diff --git a/dev-python/zope.interface/python_zope.interface-4.1.1.recipe b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe index 5fda124cd..362500581 100644 --- a/dev-python/zope.interface/python_zope.interface-4.1.1.recipe +++ b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe @@ -23,14 +23,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python " diff --git a/dev-qt/automoc/automoc-0.9.88.recipe b/dev-qt/automoc/automoc-0.9.88.recipe index 793e17888..291d2ec24 100644 --- a/dev-qt/automoc/automoc-0.9.88.recipe +++ b/dev-qt/automoc/automoc-0.9.88.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 " @@ -35,7 +35,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 " diff --git a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe index 647340d7e..18404de4c 100644 --- a/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe +++ b/dev-qt/kdelibs4/kdelibs4-4.13.2.recipe @@ -69,7 +69,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libqt4$secondaryArchSuffix >= 4.8 lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -115,7 +115,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:pkg_config$secondaryArchSuffix cmd:automoc4 @@ -166,7 +166,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libqt4${secondaryArchSuffix}_devel >= 4.8 kdelibs4${secondaryArchSuffix} == $portVersion base lib:libxml2$secondaryArchSuffix diff --git a/dev-qt/libattica/libattica-0.4.2.recipe b/dev-qt/libattica/libattica-0.4.2.recipe index ad36e6ed1..d9bdab32b 100644 --- a/dev-qt/libattica/libattica-0.4.2.recipe +++ b/dev-qt/libattica/libattica-0.4.2.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libqt4$secondaryArchSuffix >= 4.8 " @@ -36,7 +36,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:pkg_config$secondaryArchSuffix cmd:make @@ -49,7 +49,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libqt4${secondaryArchSuffix}_devel >= 4.8 libattica$secondaryArchSuffix == $portVersion base " diff --git a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe index e39e91016..b6304f7bc 100644 --- a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe +++ b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 lib:libqjson$secondaryArchSuffix lib:libdbus_1$secondaryArchSuffix @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 devel:libqjson$secondaryArchSuffix devel:libdbus_1$secondaryArchSuffix diff --git a/dev-qt/libqt4/libqt4-4.8.6.3.recipe b/dev-qt/libqt4/libqt4-4.8.6.3.recipe index b70d2f9a1..418feaab0 100644 --- a/dev-qt/libqt4/libqt4-4.8.6.3.recipe +++ b/dev-qt/libqt4/libqt4-4.8.6.3.recipe @@ -48,7 +48,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -70,7 +70,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:pkg_config$secondaryArchSuffix cmd:which cmd:make @@ -140,7 +140,7 @@ PROVIDES_devel=" # and thus build Qt apps without any SSL support. REQUIRES_devel=" libqt4$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix diff --git a/dev-qt/libqt4/libqt4-4.8.6.4.recipe b/dev-qt/libqt4/libqt4-4.8.6.4.recipe index 2bd8953e1..3dc452135 100644 --- a/dev-qt/libqt4/libqt4-4.8.6.4.recipe +++ b/dev-qt/libqt4/libqt4-4.8.6.4.recipe @@ -48,7 +48,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -70,7 +70,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:pkg_config$secondaryArchSuffix cmd:which cmd:make @@ -140,7 +140,7 @@ PROVIDES_devel=" # and thus build Qt apps without any SSL support. REQUIRES_devel=" libqt4$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe index 85619506f..060fcc1e1 100644 --- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe +++ b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8.0 " @@ -36,7 +36,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel == $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8.0 " diff --git a/dev-qt/qca2/qca2-2.0.3.recipe b/dev-qt/qca2/qca2-2.0.3.recipe index eb1c9ebe4..a847f86da 100644 --- a/dev-qt/qca2/qca2-2.0.3.recipe +++ b/dev-qt/qca2/qca2-2.0.3.recipe @@ -35,13 +35,13 @@ PROVIDES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libqt4$secondaryArchSuffix >= 4.8 ca_root_certificates " REQUIRES_devel=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 qca2$secondaryArchSuffix == $portVersion base " @@ -54,7 +54,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 " diff --git a/dev-qt/qjson/qjson-0.8.1.recipe b/dev-qt/qjson/qjson-0.8.1.recipe index bdbe23d26..b2d416aca 100644 --- a/dev-qt/qjson/qjson-0.8.1.recipe +++ b/dev-qt/qjson/qjson-0.8.1.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 " @@ -39,7 +39,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 " diff --git a/dev-scheme/chicken/chicken-4.8.0.5.recipe b/dev-scheme/chicken/chicken-4.8.0.5.recipe index e92b84ac1..9c379c2bd 100644 --- a/dev-scheme/chicken/chicken-4.8.0.5.recipe +++ b/dev-scheme/chicken/chicken-4.8.0.5.recipe @@ -29,7 +29,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:gcc cmd:ld " @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:ld diff --git a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe index 8493e7882..a53f9bcfd 100644 --- a/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe +++ b/dev-util/abi_compliance_checker/abi_compliance_checker-1.98.3.recipe @@ -22,11 +22,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-util/acr/acr-0.9.9_git.recipe b/dev-util/acr/acr-0.9.9_git.recipe index cfc83560e..6ef46d1a5 100644 --- a/dev-util/acr/acr-0.9.9_git.recipe +++ b/dev-util/acr/acr-0.9.9_git.recipe @@ -21,7 +21,7 @@ PROVIDES=" cmd:amr = $portVersion compat >= 0.9.9 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk coreutils diffutils @@ -33,7 +33,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:getopt cmd:make diff --git a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe index a686d0f70..6db512e50 100644 --- a/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe +++ b/dev-util/arm_none_eabi_gdb/arm_none_eabi_gdb-7.7.recipe @@ -45,7 +45,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -60,7 +60,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-util/astyle/astyle-2.05.recipe b/dev-util/astyle/astyle-2.05.recipe index 4d3794786..235201377 100644 --- a/dev-util/astyle/astyle-2.05.recipe +++ b/dev-util/astyle/astyle-2.05.recipe @@ -40,11 +40,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:g++$secondaryArchSuffix " diff --git a/dev-util/bakefile/bakefile-0.2.8.recipe b/dev-util/bakefile/bakefile-0.2.8.recipe index 579b3be2f..4bcf695af 100644 --- a/dev-util/bakefile/bakefile-0.2.8.recipe +++ b/dev-util/bakefile/bakefile-0.2.8.recipe @@ -19,14 +19,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:gcc cmd:make diff --git a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe index 4ce8957a1..ac1a17e92 100644 --- a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe +++ b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe @@ -43,7 +43,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python python_twisted " @@ -51,7 +51,7 @@ REQUIRES=" BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python " diff --git a/dev-util/byacc/byacc-20140422.recipe b/dev-util/byacc/byacc-20140422.recipe index c216c2c50..da7138b45 100644 --- a/dev-util/byacc/byacc-20140422.recipe +++ b/dev-util/byacc/byacc-20140422.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe index e7672ad56..89937f905 100644 --- a/dev-util/ccache/ccache-3.1.9.recipe +++ b/dev-util/ccache/ccache-3.1.9.recipe @@ -22,12 +22,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz >= 1 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-util/cmake/cmake-2.8.11.2.recipe b/dev-util/cmake/cmake-2.8.11.2.recipe index 1da2a50f9..b0c9defec 100644 --- a/dev-util/cmake/cmake-2.8.11.2.recipe +++ b/dev-util/cmake/cmake-2.8.11.2.recipe @@ -22,14 +22,14 @@ PROVIDES=" cmd:ctest = $portVersion compat >= 2.8 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libncurses " BUILD_REQUIRES=" devel:libncurses " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:grep cmd:ld diff --git a/dev-util/cmake/cmake-3.0.0.recipe b/dev-util/cmake/cmake-3.0.0.recipe index c0fb5a465..db871e9c3 100644 --- a/dev-util/cmake/cmake-3.0.0.recipe +++ b/dev-util/cmake/cmake-3.0.0.recipe @@ -30,7 +30,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " @@ -40,8 +40,8 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:grep cmd:ld$secondaryArchSuffix diff --git a/dev-util/cppunit/cppunit-1.12.1.recipe b/dev-util/cppunit/cppunit-1.12.1.recipe index 9394c30c3..ae45376b0 100644 --- a/dev-util/cppunit/cppunit-1.12.1.recipe +++ b/dev-util/cppunit/cppunit-1.12.1.recipe @@ -28,12 +28,12 @@ PROVIDES=" lib:libcppunit_1.12 = $portVersion compat >= 1.12 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:libtoolize cmd:autoreconf cmd:g++ diff --git a/dev-util/cscope/cscope-15.7a.recipe b/dev-util/cscope/cscope-15.7a.recipe index dd2641b9e..45675a1dc 100644 --- a/dev-util/cscope/cscope-15.7a.recipe +++ b/dev-util/cscope/cscope-15.7a.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libncurses " @@ -37,7 +37,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:autoreconf diff --git a/dev-util/ctags/ctags-5.8.recipe b/dev-util/ctags/ctags-5.8.recipe index 1d2f2415f..1e0f2483f 100644 --- a/dev-util/ctags/ctags-5.8.recipe +++ b/dev-util/ctags/ctags-5.8.recipe @@ -15,12 +15,12 @@ PROVIDES=" cmd:ctags = $portVersion compat >= 5.8 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe index 39f5492ff..344007c73 100644 --- a/dev-util/fastdep/fastdep-0.16.recipe +++ b/dev-util/fastdep/fastdep-0.16.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-util/fenris/fenris-0.07.recipe b/dev-util/fenris/fenris-0.07.recipe index 2c1e7c885..1e96f2361 100644 --- a/dev-util/fenris/fenris-0.07.recipe +++ b/dev-util/fenris/fenris-0.07.recipe @@ -58,7 +58,7 @@ PROVIDES=" # TODO: add missing optional deps # REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} cmd:awk coreutils diffutils @@ -69,7 +69,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:file cmd:gcc$secondaryArchSuffix diff --git a/dev-util/gdb/gdb-7.7.recipe b/dev-util/gdb/gdb-7.7.recipe index baf71ce9e..a9e9f7354 100644 --- a/dev-util/gdb/gdb-7.7.recipe +++ b/dev-util/gdb/gdb-7.7.recipe @@ -30,7 +30,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv lib:libintl lib:libncurses @@ -43,7 +43,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-util/global/global-6.3.recipe b/dev-util/global/global-6.3.recipe index e314fa1c9..98a986c60 100644 --- a/dev-util/global/global-6.3.recipe +++ b/dev-util/global/global-6.3.recipe @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku ncurses cmd:ctags cmd:sort @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoreconf cmd:aclocal cmd:autoconf diff --git a/dev-util/gperf/gperf-3.0.4.recipe b/dev-util/gperf/gperf-3.0.4.recipe index c4196d033..5c584b8b7 100644 --- a/dev-util/gperf/gperf-3.0.4.recipe +++ b/dev-util/gperf/gperf-3.0.4.recipe @@ -25,13 +25,13 @@ PROVIDES=" cmd:gperf = $portVersion compat >= 3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/dev-util/gtk_doc/gtk_doc-1.20.recipe b/dev-util/gtk_doc/gtk_doc-1.20.recipe index 53e44a96d..93f4f0707 100644 --- a/dev-util/gtk_doc/gtk_doc-1.20.recipe +++ b/dev-util/gtk_doc/gtk_doc-1.20.recipe @@ -32,7 +32,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:awk cmd:gcc diff --git a/dev-util/gyp/gyp-r1948.recipe b/dev-util/gyp/gyp-r1948.recipe index ff9ab967f..988db89d4 100644 --- a/dev-util/gyp/gyp-r1948.recipe +++ b/dev-util/gyp/gyp-r1948.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python python_setuptools " @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python " diff --git a/dev-util/idutils/idutils-4.6.recipe b/dev-util/idutils/idutils-4.6.recipe index 5ec691dd9..843606f00 100644 --- a/dev-util/idutils/idutils-4.6.recipe +++ b/dev-util/idutils/idutils-4.6.recipe @@ -34,14 +34,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:ld diff --git a/dev-util/indent/indent-2.2.10.recipe b/dev-util/indent/indent-2.2.10.recipe index 8330b4660..ea60149ba 100644 --- a/dev-util/indent/indent-2.2.10.recipe +++ b/dev-util/indent/indent-2.2.10.recipe @@ -28,18 +28,18 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel gettext$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe index 5ee52214b..0fff8db85 100644 --- a/dev-util/intltool/intltool-0.40.6.recipe +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -31,13 +31,13 @@ PROVIDES=" cmd:intltoolize$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:file cmd:perl xml_parser " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel xml_parser " BUILD_PREREQUIRES=" diff --git a/dev-util/ninja/ninja-1.5.1.recipe b/dev-util/ninja/ninja-1.5.1.recipe index 0ca0db200..7b52e8348 100644 --- a/dev-util/ninja/ninja-1.5.1.recipe +++ b/dev-util/ninja/ninja-1.5.1.recipe @@ -27,14 +27,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:python cmd:g++$secondaryArchSuffix cmd:gcc$secondaryArchSuffix diff --git a/dev-util/patchutils/patchutils-0.3.3.recipe b/dev-util/patchutils/patchutils-0.3.3.recipe index d74818d29..3564d2789 100644 --- a/dev-util/patchutils/patchutils-0.3.3.recipe +++ b/dev-util/patchutils/patchutils-0.3.3.recipe @@ -45,7 +45,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:perl cmd:diff cmd:patch @@ -53,7 +53,7 @@ REQUIRES=" BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:perl diff --git a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe index 052d0e0aa..9a8f50d0d 100644 --- a/dev-util/pkgconfig/pkgconfig-0.27.1.recipe +++ b/dev-util/pkgconfig/pkgconfig-0.27.1.recipe @@ -23,14 +23,14 @@ PROVIDES=" cmd:pkg_config$secondaryArchSuffix = $portVersion compat >= 0.27 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe index e28258ed7..d8787f913 100644 --- a/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe +++ b/dev-util/posixtestsuite/posixtestsuite-1.5.2.recipe @@ -16,7 +16,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/dev-util/ragel/ragel-6.8.recipe b/dev-util/ragel/ragel-6.8.recipe index 99d3f3f2c..5d9fa3036 100644 --- a/dev-util/ragel/ragel-6.8.recipe +++ b/dev-util/ragel/ragel-6.8.recipe @@ -29,10 +29,10 @@ PROVIDES=" cmd:ragel$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/dev-util/scons/scons-2.2.0.recipe b/dev-util/scons/scons-2.2.0.recipe index 41affab7c..f57695d57 100644 --- a/dev-util/scons/scons-2.2.0.recipe +++ b/dev-util/scons/scons-2.2.0.recipe @@ -26,7 +26,7 @@ PROVIDES=" cmd:sconsign_2.2.0 = $portVersion compat >= 2.2 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe index 9307bc62d..40d5891c9 100644 --- a/dev-util/scons/scons-2.3.1.recipe +++ b/dev-util/scons/scons-2.3.1.recipe @@ -26,7 +26,7 @@ PROVIDES=" cmd:sconsign_$portVersion = $portVersion compat >= 2.3 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" diff --git a/dev-util/uncrustify/uncrustify-0.60.recipe b/dev-util/uncrustify/uncrustify-0.60.recipe index c52ccdf5d..24a9dff2a 100644 --- a/dev-util/uncrustify/uncrustify-0.60.recipe +++ b/dev-util/uncrustify/uncrustify-0.60.recipe @@ -33,13 +33,13 @@ PROVIDES=" cmd:uncrustify = $portVersion compat >= 0.60 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-vcs/bzr/bzr-2.6.0.recipe b/dev-vcs/bzr/bzr-2.6.0.recipe index 70fd830db..4a1ed6c18 100644 --- a/dev-vcs/bzr/bzr-2.6.0.recipe +++ b/dev-vcs/bzr/bzr-2.6.0.recipe @@ -29,13 +29,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpython2.7$secondaryArchSuffix cmd:python " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libpython2.7$secondaryArchSuffix " diff --git a/dev-vcs/cvs/cvs-1.12.13.1.recipe b/dev-vcs/cvs/cvs-1.12.13.1.recipe index 1658ea96b..15aed537c 100644 --- a/dev-vcs/cvs/cvs-1.12.13.1.recipe +++ b/dev-vcs/cvs/cvs-1.12.13.1.recipe @@ -50,7 +50,7 @@ PROVIDES=" cmd:rcs2log = $portVersion compat >= 1.12 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:nano cmd:perl lib:libz @@ -60,7 +60,7 @@ BUILD_REQUIRES=" devel:libz >= 1.1.4 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:libtoolize diff --git a/dev-vcs/cvsps/cvsps-2.2b1.recipe b/dev-vcs/cvsps/cvsps-2.2b1.recipe index 7e2295506..70d83e307 100644 --- a/dev-vcs/cvsps/cvsps-2.2b1.recipe +++ b/dev-vcs/cvsps/cvsps-2.2b1.recipe @@ -27,14 +27,14 @@ PROVIDES=" cmd:cvsps = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/dev-vcs/fossil/fossil-1.28.recipe b/dev-vcs/fossil/fossil-1.28.recipe index 2aee98bff..c17375f54 100644 --- a/dev-vcs/fossil/fossil-1.28.recipe +++ b/dev-vcs/fossil/fossil-1.28.recipe @@ -16,12 +16,12 @@ PROVIDES=" cmd:fossil = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz openssl >= 1.0.0 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz >= 1.2.3 openssl_devel >= 1.0.0 " diff --git a/dev-vcs/fossil/fossil-1.29.recipe b/dev-vcs/fossil/fossil-1.29.recipe index 9950c7af6..bc0561548 100644 --- a/dev-vcs/fossil/fossil-1.29.recipe +++ b/dev-vcs/fossil/fossil-1.29.recipe @@ -18,12 +18,12 @@ PROVIDES=" cmd:fossil = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz openssl >= 1.0.0 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libz >= 1.2.3 openssl_devel >= 1.0.0 " diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe index fb4865ba4..9f0f51fca 100644 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ b/dev-vcs/git/git-1.7.10.2.recipe @@ -58,7 +58,7 @@ PROVIDES_svn=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:man cmd:nano cmd:perl @@ -69,23 +69,23 @@ REQUIRES=" lib:libz " REQUIRES_arch=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_cvs=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_daemon=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_email=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_svn=" - haiku >= $haikuVersion + haiku git == $portVersion base " @@ -101,7 +101,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/dev-vcs/git/git-1.8.3.4.recipe b/dev-vcs/git/git-1.8.3.4.recipe index 6614006ac..e8e512a89 100644 --- a/dev-vcs/git/git-1.8.3.4.recipe +++ b/dev-vcs/git/git-1.8.3.4.recipe @@ -62,7 +62,7 @@ PROVIDES_svn=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:man cmd:nano cmd:perl >= 5 @@ -77,28 +77,28 @@ REQUIRES=" vendor_perl " REQUIRES_arch=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_cvs=" - haiku >= $haikuVersion + haiku git == $portVersion base cmd:cvsps " REQUIRES_daemon=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_email=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_remote_helpers=" - haiku >= $haikuVersion + haiku git == $portVersion base " REQUIRES_svn=" - haiku >= $haikuVersion + haiku git == $portVersion base " @@ -117,7 +117,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:find cmd:gcc diff --git a/dev-vcs/mercurial/mercurial-2.2.2.recipe b/dev-vcs/mercurial/mercurial-2.2.2.recipe index 932a92806..cd852ac67 100644 --- a/dev-vcs/mercurial/mercurial-2.2.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.2.2.recipe @@ -17,7 +17,7 @@ PROVIDES=" cmd:hg = $portVersion compat >= 2 " REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:nano lib:libintl @@ -25,7 +25,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:aclocal cmd:autoconf diff --git a/dev-vcs/mercurial/mercurial-2.8.1.recipe b/dev-vcs/mercurial/mercurial-2.8.1.recipe index cb46dd3b6..368c565e0 100644 --- a/dev-vcs/mercurial/mercurial-2.8.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.8.1.recipe @@ -18,13 +18,13 @@ PROVIDES=" " REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:nano " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe index 0edd1c388..b15b57a97 100644 --- a/dev-vcs/mercurial/mercurial-2.9.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe @@ -18,13 +18,13 @@ PROVIDES=" " REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:nano " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe index af343a973..2c71fb38b 100644 --- a/dev-vcs/mercurial/mercurial-2.9.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.2.recipe @@ -18,13 +18,13 @@ PROVIDES=" " REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:nano " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-vcs/mercurial/mercurial-3.2.1.recipe b/dev-vcs/mercurial/mercurial-3.2.1.recipe index 09095fc0b..0b060f40e 100644 --- a/dev-vcs/mercurial/mercurial-3.2.1.recipe +++ b/dev-vcs/mercurial/mercurial-3.2.1.recipe @@ -18,13 +18,13 @@ PROVIDES=" " REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python < 3 cmd:nano " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 8d6b2d171..ac5800dd0 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -40,7 +40,7 @@ PROVIDES=" lib:libsvn_wc_1 = 0.0.0 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libapr_1 lib:libaprutil_1 lib:libcrypto @@ -65,7 +65,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python cmd:aclocal cmd:autoconf diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.10.recipe index 3fec3ed8e..2d64dd0f5 100644 --- a/dev-vcs/subversion/subversion-1.8.10.recipe +++ b/dev-vcs/subversion/subversion-1.8.10.recipe @@ -40,7 +40,7 @@ PROVIDES=" lib:libsvn_ra_serf_1 = 0.0.0 compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libapr_1 lib:libaprutil_1 lib:libcrypto @@ -65,7 +65,7 @@ BUILD_REQUIRES=" devel:libserf_1 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:pkg_config cmd:python cmd:aclocal diff --git a/dev-vcs/tig/tig-2.0.2.recipe b/dev-vcs/tig/tig-2.0.2.recipe index 0602a4ab4..358b14280 100644 --- a/dev-vcs/tig/tig-2.0.2.recipe +++ b/dev-vcs/tig/tig-2.0.2.recipe @@ -20,7 +20,7 @@ PROVIDES=" cmd:tig$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libreadline$secondaryArchSuffix @@ -34,7 +34,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:asciidoc cmd:autoconf cmd:git diff --git a/games-action/barrage/barrage-1.0.4.recipe b/games-action/barrage/barrage-1.0.4.recipe index dd2c33da5..3579a3060 100644 --- a/games-action/barrage/barrage-1.0.4.recipe +++ b/games-action/barrage/barrage-1.0.4.recipe @@ -21,13 +21,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libsdl_mixer " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_mixer " diff --git a/games-action/maelstrom/maelstrom-3.0.6.recipe b/games-action/maelstrom/maelstrom-3.0.6.recipe index def64fb01..8af9c3d85 100644 --- a/games-action/maelstrom/maelstrom-3.0.6.recipe +++ b/games-action/maelstrom/maelstrom-3.0.6.recipe @@ -29,7 +29,7 @@ PROVIDES=" app:Maelstrom " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libSDL_net$secondaryArchSuffix " @@ -38,7 +38,7 @@ BUILD_REQUIRES=" devel:libSDL_net$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autom4te cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/games-action/quake3/quake3-0.6.1.recipe b/games-action/quake3/quake3-0.6.1.recipe index 65890bf45..3146395b3 100644 --- a/games-action/quake3/quake3-0.6.1.recipe +++ b/games-action/quake3/quake3-0.6.1.recipe @@ -21,13 +21,13 @@ PROVIDES=" quake3$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/alienblaster/alienblaster-1.1.0.recipe b/games-arcade/alienblaster/alienblaster-1.1.0.recipe index ce8bb32fc..64813668f 100644 --- a/games-arcade/alienblaster/alienblaster-1.1.0.recipe +++ b/games-arcade/alienblaster/alienblaster-1.1.0.recipe @@ -19,13 +19,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libsdl_mixer " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_mixer " diff --git a/games-arcade/circuslinux/circuslinux-1.0.3.recipe b/games-arcade/circuslinux/circuslinux-1.0.3.recipe index 75ac37ce5..42e655527 100644 --- a/games-arcade/circuslinux/circuslinux-1.0.3.recipe +++ b/games-arcade/circuslinux/circuslinux-1.0.3.recipe @@ -19,14 +19,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libSDL_image lib:libSDL_mixer " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libSDL_image devel:libSDL_mixer diff --git a/games-arcade/edgar/edgar-1.16_1.recipe b/games-arcade/edgar/edgar-1.16_1.recipe index 07c0aa503..473ac9dd8 100644 --- a/games-arcade/edgar/edgar-1.16_1.recipe +++ b/games-arcade/edgar/edgar-1.16_1.recipe @@ -25,7 +25,7 @@ PROVIDES=" cmd:edgar = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libintl lib:libpng lib:libSDL @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libintl devel:libpng devel:libSDL diff --git a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe index 71acbfcda..3171e18bd 100644 --- a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe +++ b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe @@ -12,7 +12,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -35,8 +35,8 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/giddy3/giddy3-1.4.recipe b/games-arcade/giddy3/giddy3-1.4.recipe index 9b95f7b16..dcf634eb2 100644 --- a/games-arcade/giddy3/giddy3-1.4.recipe +++ b/games-arcade/giddy3/giddy3-1.4.recipe @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe index e0c0dcbf1..ff81c85db 100644 --- a/games-arcade/goonies/goonies-1.4.1528.recipe +++ b/games-arcade/goonies/goonies-1.4.1528.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libSDL_image$secondaryArchSuffix lib:libSDL_mixer$secondaryArchSuffix @@ -35,8 +35,8 @@ BUILD_REQUIRES=" devel:libGLU$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/mog/mog-0.63.1548.recipe b/games-arcade/mog/mog-0.63.1548.recipe index 238b0e768..9aade712d 100644 --- a/games-arcade/mog/mog-0.63.1548.recipe +++ b/games-arcade/mog/mog-0.63.1548.recipe @@ -12,7 +12,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libSDL_image$secondaryArchSuffix lib:libSDL_mixer$secondaryArchSuffix @@ -25,8 +25,8 @@ BUILD_REQUIRES=" devel:libSDL_sound$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/moleinvasion/moleinvasion-0.4.recipe b/games-arcade/moleinvasion/moleinvasion-0.4.recipe index 2219c3b25..7dfc886e8 100644 --- a/games-arcade/moleinvasion/moleinvasion-0.4.recipe +++ b/games-arcade/moleinvasion/moleinvasion-0.4.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgl lib:libsdl lib:libsdl_mixer @@ -28,7 +28,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_mixer devel:libsdl_image diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe index 55d0e5075..a14612159 100644 --- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe +++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe @@ -34,7 +34,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libsdl2$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -68,7 +68,7 @@ BUILD_REQUIRES=" boost_devel${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe index d4e9fc9d9..5b8e8c46a 100644 --- a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe +++ b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe @@ -12,7 +12,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libSDL_image$secondaryArchSuffix lib:libSDL_mixer$secondaryArchSuffix @@ -27,8 +27,8 @@ BUILD_REQUIRES=" devel:libSDL_ttf$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe index 3e0835cdb..3a572b47c 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe +++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix @@ -36,7 +36,7 @@ BUILD_REQUIRES=" devel:libsmpeg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe index 463f07e10..ed3a4384c 100644 --- a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe +++ b/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe @@ -13,15 +13,15 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make 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 4ac282913..30c746670 100644 --- a/games-arcade/slime_volley/slime_volley-2.4.2.recipe +++ b/games-arcade/slime_volley/slime_volley-2.4.2.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libintl lib:libsdl lib:libsdl_image @@ -36,7 +36,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:cmake cmd:gcc cmd:make 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 70e4fd1c2..412840fa1 100644 --- a/games-arcade/super_transball/super_transball-2.1.5.recipe +++ b/games-arcade/super_transball/super_transball-2.1.5.recipe @@ -12,7 +12,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libSDL_image$secondaryArchSuffix lib:libSDL_mixer$secondaryArchSuffix @@ -27,8 +27,8 @@ BUILD_REQUIRES=" devel:libSGE$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-arcade/supertux/supertux-0.1.3.recipe b/games-arcade/supertux/supertux-0.1.3.recipe index 76367d8a0..7488cfd46 100644 --- a/games-arcade/supertux/supertux-0.1.3.recipe +++ b/games-arcade/supertux/supertux-0.1.3.recipe @@ -21,7 +21,7 @@ PROVIDES=" cmd:supertux$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libGLU$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix >= 0.11.4 @@ -30,7 +30,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix >= 1.2.8 " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libGL$secondaryArchSuffix devel:libGLU$secondaryArchSuffix devel:libSDL_1.2$secondaryArchSuffix >= 0.11.4 diff --git a/games-arcade/xrick/xrick-021212.recipe b/games-arcade/xrick/xrick-021212.recipe index 13061da70..797a10f58 100644 --- a/games-arcade/xrick/xrick-021212.recipe +++ b/games-arcade/xrick/xrick-021212.recipe @@ -12,7 +12,7 @@ PROVIDES=" app:xrick = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -21,8 +21,8 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index 0333fe419..4ba02ec2e 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -31,7 +31,7 @@ PROVIDES=" app:dosbox$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_net$secondaryArchSuffix lib:libsdl_sound$secondaryArchSuffix @@ -40,7 +40,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe index ffd5e7a50..1c5db8c7f 100644 --- a/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe +++ b/games-emulation/visualboyadvance/visualboyadvance-1.8.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix lib:libz$secondaryArchSuffix diff --git a/games-engines/gemrb/gemrb-0.8.1.recipe b/games-engines/gemrb/gemrb-0.8.1.recipe index a5def5e45..89cd5cc56 100644 --- a/games-engines/gemrb/gemrb-0.8.1.recipe +++ b/games-engines/gemrb/gemrb-0.8.1.recipe @@ -26,14 +26,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libutil$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl_1.2$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/games-engines/love/love-0.9.1.recipe b/games-engines/love/love-0.9.1.recipe index 7c19d3d9c..8cba9daba 100644 --- a/games-engines/love/love-0.9.1.recipe +++ b/games-engines/love/love-0.9.1.recipe @@ -26,7 +26,7 @@ PROVIDES=" lib:liblove$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libvorbisfile$secondaryArchSuffix @@ -50,7 +50,7 @@ REQUIRES=" lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL2$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix diff --git a/games-engines/ponscripter/ponscripter-20111009.recipe b/games-engines/ponscripter/ponscripter-20111009.recipe index 121e9a436..b1a983db7 100644 --- a/games-engines/ponscripter/ponscripter-20111009.recipe +++ b/games-engines/ponscripter/ponscripter-20111009.recipe @@ -25,7 +25,7 @@ PROVIDES=" cmd:ponscr " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libsdl${secondaryArchSuffix} >= 1.2.14 sdl_image${secondaryArchSuffix} >= 1.2.10 sdl_ttf${secondaryArchSuffix} >= 1.2 @@ -40,7 +40,7 @@ REQUIRES=" zlib${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_REQUIRES=" diff --git a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe index 3a2f07149..c6f9191ed 100644 --- a/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe +++ b/games-engines/scummvm-tools/scummvm_tools-1.7.0.recipe @@ -30,7 +30,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libvorbis lib:libogg lib:libFLAC @@ -43,7 +43,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libvorbis devel:libogg devel:libFLAC diff --git a/games-engines/scummvm/scummvm-1.6.0.recipe b/games-engines/scummvm/scummvm-1.6.0.recipe index c4f465e0e..d44c183f4 100644 --- a/games-engines/scummvm/scummvm-1.6.0.recipe +++ b/games-engines/scummvm/scummvm-1.6.0.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libFLAC++$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -43,7 +43,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libFLAC++$secondaryArchSuffix diff --git a/games-engines/scummvm/scummvm-1.7.0.recipe b/games-engines/scummvm/scummvm-1.7.0.recipe index 57ddbaab3..07f3ab873 100644 --- a/games-engines/scummvm/scummvm-1.7.0.recipe +++ b/games-engines/scummvm/scummvm-1.7.0.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfaad$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -44,7 +44,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libFLAC$secondaryArchSuffix diff --git a/games-engines/solarus/solarus-1.1.1.recipe b/games-engines/solarus/solarus-1.1.1.recipe index 4597efaf0..aa8999287 100644 --- a/games-engines/solarus/solarus-1.1.1.recipe +++ b/games-engines/solarus/solarus-1.1.1.recipe @@ -17,7 +17,7 @@ PROVIDES=" cmd:solarus = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libSDL$secondaryArchSuffix lib:libsdl_ttf$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix @@ -29,7 +29,7 @@ REQUIRES=" lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix devel:libsdl_ttf$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix diff --git a/games-kids/dragonmemory/dragonmemory-1.recipe b/games-kids/dragonmemory/dragonmemory-1.recipe index 9073df1cb..b5f29ced8 100644 --- a/games-kids/dragonmemory/dragonmemory-1.recipe +++ b/games-kids/dragonmemory/dragonmemory-1.recipe @@ -18,13 +18,13 @@ PROVIDES=" app:dragonmemory = $portVersion" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:mkdepend" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_image devel:libsdl_mixer diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe index 4434a25b4..7c194a6f4 100644 --- a/games-kids/pipepanic/pipepanic-0.1.3.recipe +++ b/games-kids/pipepanic/pipepanic-0.1.3.recipe @@ -16,11 +16,11 @@ PROVIDES=" app:pipepanic = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix cmd:xres " diff --git a/games-puzzle/abrick/abrick-1.12.recipe b/games-puzzle/abrick/abrick-1.12.recipe index 19591c682..a7da7e9e3 100644 --- a/games-puzzle/abrick/abrick-1.12.recipe +++ b/games-puzzle/abrick/abrick-1.12.recipe @@ -23,14 +23,14 @@ PROVIDES=" app:abrick = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libSDL_mixer lib:libSDL_image " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libSDL devel:libSDL_mixer devel:libSDL_image diff --git a/games-puzzle/blobwars/blobwars-1.19.recipe b/games-puzzle/blobwars/blobwars-1.19.recipe index 93350ab89..a7ed66d70 100644 --- a/games-puzzle/blobwars/blobwars-1.19.recipe +++ b/games-puzzle/blobwars/blobwars-1.19.recipe @@ -21,7 +21,7 @@ PROVIDES=" app:blobwars = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libSDL_mixer lib:libSDL_image @@ -31,7 +31,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libSDL devel:libSDL_mixer devel:libSDL_image diff --git a/games-puzzle/gemdropx/gemdropx-0.9.recipe b/games-puzzle/gemdropx/gemdropx-0.9.recipe index a23d6f2bf..e4c5d835b 100644 --- a/games-puzzle/gemdropx/gemdropx-0.9.recipe +++ b/games-puzzle/gemdropx/gemdropx-0.9.recipe @@ -27,13 +27,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl lib:libsdl_mixer " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl devel:libsdl_mixer " diff --git a/games-puzzle/gemz/gemz-0.97.0.recipe b/games-puzzle/gemz/gemz-0.97.0.recipe index d0891a46f..ab2f97c18 100644 --- a/games-puzzle/gemz/gemz-0.97.0.recipe +++ b/games-puzzle/gemz/gemz-0.97.0.recipe @@ -22,13 +22,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix " diff --git a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe index 28c7bc5cc..513d176bd 100644 --- a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe +++ b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libsdl_mixer lib:libsdl_net @@ -33,7 +33,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:sdl_mixer devel:sdl_net diff --git a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe index e985dde37..a60248823 100644 --- a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe +++ b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe @@ -26,14 +26,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libsdl_mixer lib:libsdl_net " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_mixer devel:libsdl_net diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe index bb7b0b790..a5b6c1eaf 100644 --- a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe +++ b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe @@ -23,13 +23,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libsdl_mixer " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_mixer " diff --git a/games-puzzle/lpairs/lpairs-1.0.4.recipe b/games-puzzle/lpairs/lpairs-1.0.4.recipe index 04b9e9ba2..137eeec41 100644 --- a/games-puzzle/lpairs/lpairs-1.0.4.recipe +++ b/games-puzzle/lpairs/lpairs-1.0.4.recipe @@ -18,12 +18,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl " diff --git a/games-puzzle/ltris/ltris-1.0.19.recipe b/games-puzzle/ltris/ltris-1.0.19.recipe index ab48509b1..487bcf18c 100644 --- a/games-puzzle/ltris/ltris-1.0.19.recipe +++ b/games-puzzle/ltris/ltris-1.0.19.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libsdl_mixer lib:libintl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsdl devel:libsdl_mixer devel:libintl diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe index 5da7e81e1..7801bdb0a 100644 --- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe +++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe @@ -13,7 +13,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix @@ -24,8 +24,8 @@ BUILD_REQUIRES=" devel:libsdl_mixer$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe index 3d8e2d59c..47857930c 100644 --- a/games-puzzle/neverball/neverball-1.5.4.recipe +++ b/games-puzzle/neverball/neverball-1.5.4.recipe @@ -26,7 +26,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libphysfs$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix @@ -39,7 +39,7 @@ REQUIRES=" lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libphysfs$secondaryArchSuffix devel:libsdl$secondaryArchSuffix devel:libsdl_mixer$secondaryArchSuffix diff --git a/games-puzzle/neverball/neverball-1.6.0.recipe b/games-puzzle/neverball/neverball-1.6.0.recipe index f7423ddec..fe4885355 100644 --- a/games-puzzle/neverball/neverball-1.6.0.recipe +++ b/games-puzzle/neverball/neverball-1.6.0.recipe @@ -26,7 +26,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libphysfs$secondaryArchSuffix lib:libsdl2$secondaryArchSuffix lib:libsdl2_mixer$secondaryArchSuffix @@ -39,7 +39,7 @@ REQUIRES=" lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libphysfs$secondaryArchSuffix devel:libsdl2$secondaryArchSuffix devel:libsdl2_mixer$secondaryArchSuffix diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe index decd12bc8..2bcd6ab84 100644 --- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe +++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe @@ -23,13 +23,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libsdl_mixer$secondaryArchSuffix " diff --git a/games-puzzle/sdllopan/sdllopan-10.recipe b/games-puzzle/sdllopan/sdllopan-10.recipe index f6d6a1ec9..70987f6b1 100644 --- a/games-puzzle/sdllopan/sdllopan-10.recipe +++ b/games-puzzle/sdllopan/sdllopan-10.recipe @@ -24,15 +24,15 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/games-puzzle/wizznic/wizznic-0.9.9.recipe b/games-puzzle/wizznic/wizznic-0.9.9.recipe index 8966f4185..e8e597d18 100644 --- a/games-puzzle/wizznic/wizznic-0.9.9.recipe +++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix @@ -43,7 +43,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:sdl_config$secondaryArchSuffix diff --git a/games-roguelike/angband/angband-3.5.0.recipe b/games-roguelike/angband/angband-3.5.0.recipe index f24e7985c..284f26501 100644 --- a/games-roguelike/angband/angband-3.5.0.recipe +++ b/games-roguelike/angband/angband-3.5.0.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libSDL_1.2 lib:libSDL_image_1.2 lib:libSDL_mixer_1.2 @@ -94,7 +94,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:awk cmd:find diff --git a/games-rpg/fheroes2/fheroes2-r3182.recipe b/games-rpg/fheroes2/fheroes2-r3182.recipe index 23807aaac..76698e112 100644 --- a/games-rpg/fheroes2/fheroes2-r3182.recipe +++ b/games-rpg/fheroes2/fheroes2-r3182.recipe @@ -31,7 +31,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix @@ -45,7 +45,7 @@ REQUIRES=" lib:libfreetype$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe index fcfebb1ab..675ec591b 100644 --- a/games-rpg/flare/flare-0.19.recipe +++ b/games-rpg/flare/flare-0.19.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix @@ -31,7 +31,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:sdl_mixer$secondaryArchSuffix devel:sdl_image$secondaryArchSuffix diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe index 9dcffc232..d4c231e1c 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe @@ -41,7 +41,7 @@ PROVIDES=" cmd:make_atlas$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix freedroidrpg_data == $portVersion lib:libsdl$secondaryArchSuffix #lib:libsdl_mixer$secondaryArchSuffix @@ -56,7 +56,7 @@ REQUIRES=" lib:libgl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix #devel:libsdl_mixer$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix @@ -119,7 +119,7 @@ PROVIDES_data=" freedroidrpg_data = $portVersion " REQUIRES_data=" - haiku >= $haikuVersion + haiku " SUMMARY_data="FreedroidRPG data files" ARCHITECTURES_data="any" diff --git a/games-simulation/corsix_th/corsix_th-0.30.recipe b/games-simulation/corsix_th/corsix_th-0.30.recipe index 42ac22e3d..7e2a4552f 100644 --- a/games-simulation/corsix_th/corsix_th-0.30.recipe +++ b/games-simulation/corsix_th/corsix_th-0.30.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix lib:libavcodec$secondaryArchSuffix @@ -34,7 +34,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libsdl_mixer$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix diff --git a/games-simulation/openttd/openttd-1.4.3.recipe b/games-simulation/openttd/openttd-1.4.3.recipe index 0bcd0ac7f..4638e6f3f 100644 --- a/games-simulation/openttd/openttd-1.4.3.recipe +++ b/games-simulation/openttd/openttd-1.4.3.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:liblzma$secondaryArchSuffix @@ -34,7 +34,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:liblzma$secondaryArchSuffix diff --git a/games-sports/xmoto/xmoto-0.5.11.recipe b/games-sports/xmoto/xmoto-0.5.11.recipe index 141fe5c52..d7d62c7d7 100644 --- a/games-sports/xmoto/xmoto-0.5.11.recipe +++ b/games-sports/xmoto/xmoto-0.5.11.recipe @@ -18,7 +18,7 @@ PROVIDES=" cmd:xmoto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgl$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libintl$secondaryArchSuffix @@ -57,7 +57,7 @@ BUILD_REQUIRES=" devel:libgl$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:sed diff --git a/games-strategy/freeciv/freeciv-2.4.3.recipe b/games-strategy/freeciv/freeciv-2.4.3.recipe index 989f7d15b..c41b3c8b0 100644 --- a/games-strategy/freeciv/freeciv-2.4.3.recipe +++ b/games-strategy/freeciv/freeciv-2.4.3.recipe @@ -34,7 +34,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -56,7 +56,7 @@ REQUIRES=" lib:libGL$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix diff --git a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe index 8b688b187..9094614eb 100644 --- a/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe +++ b/games-strategy/homeworld_sdl/homeworld_sdl-0.6.recipe @@ -22,14 +22,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix #lib:mesa_swrast " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libglu$secondaryArchSuffix " diff --git a/games-strategy/uqm/uqm-0.7.0.recipe b/games-strategy/uqm/uqm-0.7.0.recipe index cf3618a3a..cc5d91bff 100644 --- a/games-strategy/uqm/uqm-0.7.0.recipe +++ b/games-strategy/uqm/uqm-0.7.0.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/games-strategy/vcmi/vcmi-0.94.recipe b/games-strategy/vcmi/vcmi-0.94.recipe index b3e0bf244..dd0cbeed7 100644 --- a/games-strategy/vcmi/vcmi-0.94.recipe +++ b/games-strategy/vcmi/vcmi-0.94.recipe @@ -29,7 +29,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix lib:libsdl_mixer$secondaryArchSuffix lib:libsdl_image$secondaryArchSuffix @@ -45,7 +45,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix devel:libsdl_mixer$secondaryArchSuffix devel:libsdl_image$secondaryArchSuffix diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe index 8417b868d..92451dd63 100644 --- a/haiku-apps/a_book/a_book-1.1.recipe +++ b/haiku-apps/a_book/a_book-1.1.recipe @@ -15,11 +15,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe index 8c42cd51e..a83ab0175 100644 --- a/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe +++ b/haiku-apps/aalibtranslator/aalibtranslator-0.0.1.recipe @@ -15,12 +15,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libaa " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libaa " BUILD_PREREQUIRES=" diff --git a/haiku-apps/album/album-0.9.3.recipe b/haiku-apps/album/album-0.9.3.recipe index 252c6743f..bec201385 100644 --- a/haiku-apps/album/album-0.9.3.recipe +++ b/haiku-apps/album/album-0.9.3.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiptcdata$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + 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 25d855148..c656af22d 100644 --- a/haiku-apps/aplayer/aplayer-4.0_svn.recipe +++ b/haiku-apps/aplayer/aplayer-4.0_svn.recipe @@ -19,10 +19,10 @@ PROVIDES=" lib:APlayerKit = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:g++$secondaryArchSuffix diff --git a/haiku-apps/armyknife/armyknife-4.3.0.recipe b/haiku-apps/armyknife/armyknife-4.3.0.recipe index 07dc07ec6..15488698f 100644 --- a/haiku-apps/armyknife/armyknife-4.3.0.recipe +++ b/haiku-apps/armyknife/armyknife-4.3.0.recipe @@ -15,12 +15,12 @@ PROVIDES=" app:ArmyKnife = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libtag$secondaryArchSuffix lib:libsanta$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel taglib${secondaryArchSuffix}_devel libsanta${secondaryArchSuffix}_devel " diff --git a/haiku-apps/artpaint/artpaint-2.1.0git.recipe b/haiku-apps/artpaint/artpaint-2.1.0git.recipe index a461e1e22..4382e43d6 100644 --- a/haiku-apps/artpaint/artpaint-2.1.0git.recipe +++ b/haiku-apps/artpaint/artpaint-2.1.0git.recipe @@ -19,10 +19,10 @@ PROVIDES=" app:ArtPaint = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/backup/backup-0.0.1.recipe b/haiku-apps/backup/backup-0.0.1.recipe index c170b092c..1964bfbe5 100644 --- a/haiku-apps/backup/backup-0.0.1.recipe +++ b/haiku-apps/backup/backup-0.0.1.recipe @@ -16,7 +16,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index 187eae185..2070acb24 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -15,7 +15,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe index 3d2fab87a..22608bb64 100644 --- a/haiku-apps/bdhcalc/bdhcalc-1.1.recipe +++ b/haiku-apps/bdhcalc/bdhcalc-1.1.recipe @@ -19,11 +19,11 @@ PROVIDES=" app:bdhcalc = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index 056c99e25..83381bd5e 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -15,11 +15,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 3c3b7133c..86dc8d459 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -19,7 +19,7 @@ BUILD_REQUIRES=" devel:libssl " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:jam cmd:gcc cmd:bison diff --git a/haiku-apps/becasso/becasso-2.0.recipe b/haiku-apps/becasso/becasso-2.0.recipe index 8f588b59e..e1a1fef82 100644 --- a/haiku-apps/becasso/becasso-2.0.recipe +++ b/haiku-apps/becasso/becasso-2.0.recipe @@ -20,8 +20,8 @@ BUILD_PREREQUIRES=" cmd:jam" BUILD_REQUIRES=" - haiku >= $haikuVersion - haiku_devel >= $haikuVersion + haiku + haiku_devel devel:libz" USER_SETTINGS_FILES=" diff --git a/haiku-apps/beezer/beezer-0.99.hg.recipe b/haiku-apps/beezer/beezer-0.99.hg.recipe index 2ef33aedc..e9ccc0d9f 100644 --- a/haiku-apps/beezer/beezer-0.99.hg.recipe +++ b/haiku-apps/beezer/beezer-0.99.hg.recipe @@ -21,11 +21,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/beget/beget-1.2.3.recipe b/haiku-apps/beget/beget-1.2.3.recipe index 1aeee59c6..1318204ab 100644 --- a/haiku-apps/beget/beget-1.2.3.recipe +++ b/haiku-apps/beget/beget-1.2.3.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:wget$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe index b7157680b..66255f20b 100644 --- a/haiku-apps/behappy/behappy-1.06e_git.recipe +++ b/haiku-apps/behappy/behappy-1.06e_git.recipe @@ -17,11 +17,11 @@ PROVIDES=" app:BeHappy = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku # app:netsurf >= 2.6 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe index fe19629d4..a86db265f 100644 --- a/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe +++ b/haiku-apps/beindexed/beindexed-0.2.0_alpha.recipe @@ -22,7 +22,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsqlite3 lib:liblayout " @@ -37,7 +37,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" makefile_engine - haiku_devel >= $haikuVersion + haiku_devel devel:libsqlite3 devel:liblayout " diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe index 9cff00604..051ea8ed9 100644 --- a/haiku-apps/belife/belife-1.0.0.recipe +++ b/haiku-apps/belife/belife-1.0.0.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -32,7 +32,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/bemines/bemines-1.0b2.recipe b/haiku-apps/bemines/bemines-1.0b2.recipe index 7ce5ce14e..bf3092174 100644 --- a/haiku-apps/bemines/bemines-1.0b2.recipe +++ b/haiku-apps/bemines/bemines-1.0b2.recipe @@ -29,7 +29,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc " diff --git a/haiku-apps/bepdf/bepdf-1.2.0.recipe b/haiku-apps/bepdf/bepdf-1.2.0.recipe index 4a62b1e61..77090a8e7 100644 --- a/haiku-apps/bepdf/bepdf-1.2.0.recipe +++ b/haiku-apps/bepdf/bepdf-1.2.0.recipe @@ -31,7 +31,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:liblayout lib:libsanta lib:libfreetype @@ -41,7 +41,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:liblayout devel:libsanta devel:libfreetype diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe index 573b37ebc..e7a4eba2e 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe @@ -22,11 +22,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe index 67349650d..3811e4355 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.3.recipe @@ -24,11 +24,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe index 1a4052fa1..d60703c9a 100644 --- a/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe +++ b/haiku-apps/bescreencapture/bescreencapture-1.9.4.recipe @@ -24,11 +24,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/beshare/beshare-4.recipe b/haiku-apps/beshare/beshare-4.recipe index 2eed8a17b..662c62529 100644 --- a/haiku-apps/beshare/beshare-4.recipe +++ b/haiku-apps/beshare/beshare-4.recipe @@ -43,12 +43,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix #lib:libz " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel #devel:libz$secondaryArchSuffix #devel:muscle$secondaryArchSuffix " diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binary_clock/binary_clock-2.0.recipe index 7dac3c762..ef07650c9 100644 --- a/haiku-apps/binary_clock/binary_clock-2.0.recipe +++ b/haiku-apps/binary_clock/binary_clock-2.0.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe index 1c8f94142..f0f8c5c2c 100644 --- a/haiku-apps/blogpositive/blogpositive-0.1.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.1.0.recipe @@ -20,7 +20,7 @@ PROVIDES=" REQUIRES=" lib:libcurl lib:libz - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" devel:libcurl devel:libz - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe index bd923a629..a60fc3cf4 100644 --- a/haiku-apps/blogpositive/blogpositive-0.2.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.2.0.recipe @@ -20,7 +20,7 @@ PROVIDES=" REQUIRES=" lib:libcurl lib:libz - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" devel:libcurl devel:libz - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe index 43fb7e597..753b7c193 100644 --- a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe @@ -20,7 +20,7 @@ PROVIDES=" REQUIRES=" lib:libcurl lib:libz - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" devel:libcurl devel:libz - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe index 446b63a21..d9900164b 100644 --- a/haiku-apps/blogpositive/blogpositive-0.4.0.recipe +++ b/haiku-apps/blogpositive/blogpositive-0.4.0.recipe @@ -17,7 +17,7 @@ PROVIDES=" REQUIRES=" lib:libcurl lib:libz - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" devel:libcurl devel:libz - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe index ace579a61..63ae58aa0 100644 --- a/haiku-apps/burnitnow/burnitnow-0.1.0.recipe +++ b/haiku-apps/burnitnow/burnitnow-0.1.0.recipe @@ -26,13 +26,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:cdrecord cmd:mkisofs " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/butterfly/butterfly-1.6.2.recipe b/haiku-apps/butterfly/butterfly-1.6.2.recipe index b10f73e85..fe867787a 100644 --- a/haiku-apps/butterfly/butterfly-1.6.2.recipe +++ b/haiku-apps/butterfly/butterfly-1.6.2.recipe @@ -18,10 +18,10 @@ PROVIDES=" app:Butterfly = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/capitalbe/capitalbe-1.1.recipe b/haiku-apps/capitalbe/capitalbe-1.1.recipe index 2b3010364..f23636c4e 100644 --- a/haiku-apps/capitalbe/capitalbe-1.1.recipe +++ b/haiku-apps/capitalbe/capitalbe-1.1.recipe @@ -18,12 +18,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsqlite3 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsqlite3 " diff --git a/haiku-apps/caya/caya-2013.10.12.recipe b/haiku-apps/caya/caya-2013.10.12.recipe index 55c858ee2..30520ff1d 100644 --- a/haiku-apps/caya/caya-2013.10.12.recipe +++ b/haiku-apps/caya/caya-2013.10.12.recipe @@ -12,7 +12,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz lib:libexpat lib:libssl @@ -23,7 +23,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:jam diff --git a/haiku-apps/cdplayer/cdplayer-1.0.recipe b/haiku-apps/cdplayer/cdplayer-1.0.recipe index a71583d8b..bda8b5a89 100644 --- a/haiku-apps/cdplayer/cdplayer-1.0.recipe +++ b/haiku-apps/cdplayer/cdplayer-1.0.recipe @@ -26,11 +26,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe index 6ff520339..0643f3a94 100644 --- a/haiku-apps/chat/chat-20100903.recipe +++ b/haiku-apps/chat/chat-20100903.recipe @@ -19,13 +19,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libexpat$SecondaryArchSuffix " diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe index c79ed73c6..f2999945d 100644 --- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe +++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel taglib_devel " diff --git a/haiku-apps/clipup/clipup-2.0.3.recipe b/haiku-apps/clipup/clipup-2.0.3.recipe index dded03900..decbe35e2 100644 --- a/haiku-apps/clipup/clipup-2.0.3.recipe +++ b/haiku-apps/clipup/clipup-2.0.3.recipe @@ -19,7 +19,7 @@ PROVIDES=" app:ClipUp = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -29,7 +29,7 @@ BUILD_PREREQUIRES=" cmd:xres " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe index c1921e6ff..b80fab883 100644 --- a/haiku-apps/clockwerk/clockwerk-git.recipe +++ b/haiku-apps/clockwerk/clockwerk-git.recipe @@ -24,10 +24,10 @@ PROVIDES=" app:Clockwerk = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe index a0a6339d7..dbfb887cf 100644 --- a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe +++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe @@ -20,11 +20,11 @@ PROVIDES=" app:CmakeHaiku = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:cmake " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/haiku-apps/colors/colors-2.3.recipe b/haiku-apps/colors/colors-2.3.recipe index b88b0b3bb..1aa125576 100644 --- a/haiku-apps/colors/colors-2.3.recipe +++ b/haiku-apps/colors/colors-2.3.recipe @@ -30,7 +30,7 @@ REQUIRES="" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel makefile_engine cmd:gcc$secondaryArchSuffix cmd:make diff --git a/haiku-apps/converttolf/converttolf-0.0.0.recipe b/haiku-apps/converttolf/converttolf-0.0.0.recipe index d26ef8797..d70b2fbb4 100644 --- a/haiku-apps/converttolf/converttolf-0.0.0.recipe +++ b/haiku-apps/converttolf/converttolf-0.0.0.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() { diff --git a/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe b/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe index a07440498..25fade4b1 100644 --- a/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe +++ b/haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe @@ -20,7 +20,7 @@ PROVIDES=" app:CopyNameToClipboard = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -28,7 +28,7 @@ BUILD_PREREQUIRES=" cmd:gcc " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe index 0e9852022..848f3b38c 100644 --- a/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe +++ b/haiku-apps/coveredcalc/coveredcalc-1.10.0.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc cmd:xres diff --git a/haiku-apps/digiclock/digiclock-1.0.recipe b/haiku-apps/digiclock/digiclock-1.0.recipe index a4f72a619..95e433d68 100644 --- a/haiku-apps/digiclock/digiclock-1.0.recipe +++ b/haiku-apps/digiclock/digiclock-1.0.recipe @@ -19,10 +19,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion" + haiku" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion" + haiku_devel" BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index ced9f7eac..a90b59b49 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe index ac608767a..8834cff26 100644 --- a/haiku-apps/documentviewer/documentviewer-0.3_git.recipe +++ b/haiku-apps/documentviewer/documentviewer-0.3_git.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libdjvulibre$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -33,7 +33,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libdjvulibre$secondaryArchSuffix devel:libmupdf$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix diff --git a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe index fad7d6b60..27b762d59 100644 --- a/haiku-apps/ducksaver/ducksaver-1.1.0.recipe +++ b/haiku-apps/ducksaver/ducksaver-1.1.0.recipe @@ -11,7 +11,7 @@ PROVIDES=" addon:DuckSaver = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -20,7 +20,7 @@ BUILD_PREREQUIRES=" cmd:mkdepend " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/einsteinium/einsteinium-20141023.recipe b/haiku-apps/einsteinium/einsteinium-20141023.recipe index e6867d7f3..57f859cc3 100644 --- a/haiku-apps/einsteinium/einsteinium-20141023.recipe +++ b/haiku-apps/einsteinium/einsteinium-20141023.recipe @@ -21,13 +21,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsqlite3 lib:libxml2 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine devel:libsqlite3 devel:libxml2 diff --git a/haiku-apps/filecropper/filecropper-1.recipe b/haiku-apps/filecropper/filecropper-1.recipe index d402d789c..ecd397cda 100644 --- a/haiku-apps/filecropper/filecropper-1.recipe +++ b/haiku-apps/filecropper/filecropper-1.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/filer/filer-1.0.0beta3.recipe b/haiku-apps/filer/filer-1.0.0beta3.recipe index 74042b323..f7442f7b9 100644 --- a/haiku-apps/filer/filer-1.0.0beta3.recipe +++ b/haiku-apps/filer/filer-1.0.0beta3.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsqlite3 " @@ -35,7 +35,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsqlite3 " diff --git a/haiku-apps/filwip/filwip-1.0.0.recipe b/haiku-apps/filwip/filwip-1.0.0.recipe index 8680cb656..2e1b64d91 100644 --- a/haiku-apps/filwip/filwip-1.0.0.recipe +++ b/haiku-apps/filwip/filwip-1.0.0.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -29,7 +29,7 @@ BUILD_PREREQUIRES=" cmd:xres " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/finance/finance-1.0.0.recipe b/haiku-apps/finance/finance-1.0.0.recipe index ab80fa62c..d78636953 100644 --- a/haiku-apps/finance/finance-1.0.0.recipe +++ b/haiku-apps/finance/finance-1.0.0.recipe @@ -22,7 +22,7 @@ PROVIDES=" app:Finance = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" cmd:xres @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" cmd:awk " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" diff --git a/haiku-apps/foldershaper/foldershaper-1.0.recipe b/haiku-apps/foldershaper/foldershaper-1.0.recipe index 8335b90c5..02992996c 100644 --- a/haiku-apps/foldershaper/foldershaper-1.0.recipe +++ b/haiku-apps/foldershaper/foldershaper-1.0.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe index 366c7b2f4..77525b44d 100644 --- a/haiku-apps/fontboy/fontboy-0.9.7.recipe +++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe @@ -18,7 +18,7 @@ PROVIDES=" app:FontBoy = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -28,7 +28,7 @@ BUILD_PREREQUIRES=" cmd:make " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " USER_SETTINGS_FILES=" settings/Fontboy_prefs diff --git a/haiku-apps/fortuna/fortuna-1.0.0.recipe b/haiku-apps/fortuna/fortuna-1.0.0.recipe index fb54c05f9..c1be91b9a 100644 --- a/haiku-apps/fortuna/fortuna-1.0.0.recipe +++ b/haiku-apps/fortuna/fortuna-1.0.0.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -32,7 +32,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/friss/friss-0.8.0.recipe b/haiku-apps/friss/friss-0.8.0.recipe index 70e27e505..a68ce55d2 100644 --- a/haiku-apps/friss/friss-0.8.0.recipe +++ b/haiku-apps/friss/friss-0.8.0.recipe @@ -15,7 +15,7 @@ PROVIDES=" BUILD_REQUIRES=" cmd:jam cmd:gcc - haiku_devel >= $haikuVersion + haiku_devel " BUILD() { diff --git a/haiku-apps/ftppositive/ftppositive-1.0.recipe b/haiku-apps/ftppositive/ftppositive-1.0.recipe index eca43be0b..27d716bd3 100644 --- a/haiku-apps/ftppositive/ftppositive-1.0.recipe +++ b/haiku-apps/ftppositive/ftppositive-1.0.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/globe/globe-0.4.recipe b/haiku-apps/globe/globe-0.4.recipe index f2f168474..43fe364f3 100644 --- a/haiku-apps/globe/globe-0.4.recipe +++ b/haiku-apps/globe/globe-0.4.recipe @@ -12,11 +12,11 @@ REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:make diff --git a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe index 9fb01b977..b44264002 100644 --- a/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe +++ b/haiku-apps/haikutwitter/haikutwitter-1.0_git.recipe @@ -23,12 +23,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix " diff --git a/haiku-apps/hare/hare-1.1.1.recipe b/haiku-apps/hare/hare-1.1.1.recipe index 6a22b4e3d..fb5ff5e32 100644 --- a/haiku-apps/hare/hare-1.1.1.recipe +++ b/haiku-apps/hare/hare-1.1.1.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:lame cmd:oggenc$secondaryArchSuffix cmd:flac$secondaryArchSuffix @@ -30,7 +30,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libtag$secondaryArchSuffix " diff --git a/haiku-apps/hdialog/hdialog-0.1_git.recipe b/haiku-apps/hdialog/hdialog-0.1_git.recipe index 314909963..e4374286c 100644 --- a/haiku-apps/hdialog/hdialog-0.1_git.recipe +++ b/haiku-apps/hdialog/hdialog-0.1_git.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:make diff --git a/haiku-apps/jammin/jammin-0.1.0.recipe b/haiku-apps/jammin/jammin-0.1.0.recipe index 22ebdf6a8..79f1666a5 100644 --- a/haiku-apps/jammin/jammin-0.1.0.recipe +++ b/haiku-apps/jammin/jammin-0.1.0.recipe @@ -19,7 +19,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe index 03e09df07..2e01a0130 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.10.recipe @@ -15,12 +15,12 @@ PROVIDES=" keymapswitcher = $portVersion compat >= 1.2.7 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:ld diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe index 867262f5e..9d327c79b 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe @@ -17,12 +17,12 @@ PROVIDES=" app:KeymapSwitcher = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel makefile_engine cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe index e94097d48..991ae6cda 100644 --- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe +++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe @@ -15,12 +15,12 @@ PROVIDES=" keymapswitcher = $portVersion compat >= 1.2.7 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:ld diff --git a/haiku-apps/konfetti/konfetti-1.0.0.recipe b/haiku-apps/konfetti/konfetti-1.0.0.recipe index 18a706ed8..2e42a6dd6 100644 --- a/haiku-apps/konfetti/konfetti-1.0.0.recipe +++ b/haiku-apps/konfetti/konfetti-1.0.0.recipe @@ -16,7 +16,7 @@ PROVIDES=" app:Konfetti = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -24,7 +24,7 @@ BUILD_PREREQUIRES=" cmd:mkdepend " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/launchpad/launchpad-1.3.recipe b/haiku-apps/launchpad/launchpad-1.3.recipe index fc66e8d47..2b52392cd 100644 --- a/haiku-apps/launchpad/launchpad-1.3.recipe +++ b/haiku-apps/launchpad/launchpad-1.3.recipe @@ -20,17 +20,17 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libprefs " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel lib:libprefs " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:libtool cmd:aclocal diff --git a/haiku-apps/lava/lava-1.0.recipe b/haiku-apps/lava/lava-1.0.recipe index c10365b3f..551898d8c 100644 --- a/haiku-apps/lava/lava-1.0.recipe +++ b/haiku-apps/lava/lava-1.0.recipe @@ -15,12 +15,12 @@ PROVIDES=" add_on:Lava = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libburndevice " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libburndevice " BUILD_PREREQUIRES=" diff --git a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe index cfdb8959e..54c535e35 100644 --- a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe +++ b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe @@ -26,7 +26,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:jam cmd:unzip diff --git a/haiku-apps/masterpiece/masterpiece-r742.recipe b/haiku-apps/masterpiece/masterpiece-r742.recipe index eee731325..cb38cae71 100644 --- a/haiku-apps/masterpiece/masterpiece-r742.recipe +++ b/haiku-apps/masterpiece/masterpiece-r742.recipe @@ -24,13 +24,13 @@ PROVIDES=" app:MasterPiece = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix lib:liblayout lib:libpython2.7 " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsqlite3$secondaryArchSuffix devel:libpython2.7 " diff --git a/haiku-apps/microbe/microbe-20130728.recipe b/haiku-apps/microbe/microbe-20130728.recipe index 9fb4073d4..76456ea1d 100644 --- a/haiku-apps/microbe/microbe-20130728.recipe +++ b/haiku-apps/microbe/microbe-20130728.recipe @@ -16,11 +16,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:mkdepend cmd:make diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe index 18afdbe34..d36c1f15f 100644 --- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe +++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -34,7 +34,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " PATCHES="minimizeall-1.0.0.patch" diff --git a/haiku-apps/mkdepend/mkdepend-1.7.recipe b/haiku-apps/mkdepend/mkdepend-1.7.recipe index 7fa822c5f..200b038d1 100644 --- a/haiku-apps/mkdepend/mkdepend-1.7.recipe +++ b/haiku-apps/mkdepend/mkdepend-1.7.recipe @@ -17,12 +17,12 @@ PROVIDES=" cmd:mkdepend = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld " diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe index db50806ae..902d6de8c 100644 --- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe +++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe @@ -14,10 +14,10 @@ PROVIDES=" app:MrPeeps = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe index 11c2822aa..806787a5b 100644 --- a/haiku-apps/netpulse/netpulse-0.2.3.recipe +++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe @@ -20,7 +20,7 @@ REQUIRES="" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel makefile_engine cmd:gcc$secondaryArchSuffix cmd:make diff --git a/haiku-apps/nightandday/nightsandday-0.1.2.recipe b/haiku-apps/nightandday/nightsandday-0.1.2.recipe index fc18a58bf..dedfc5069 100644 --- a/haiku-apps/nightandday/nightsandday-0.1.2.recipe +++ b/haiku-apps/nightandday/nightsandday-0.1.2.recipe @@ -21,7 +21,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD() diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe index 77b67d99c..cded4d3d9 100644 --- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe +++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe @@ -21,12 +21,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:optipng$optipngSuffix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:as diff --git a/haiku-apps/organizer/organizer-0.1.recipe b/haiku-apps/organizer/organizer-0.1.recipe index d5f850172..60cf19651 100644 --- a/haiku-apps/organizer/organizer-0.1.recipe +++ b/haiku-apps/organizer/organizer-0.1.recipe @@ -17,11 +17,11 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libGL makefile_engine cmd:gcc @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " USER_SETTINGS_FILES=" diff --git a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe index 3b49e9f17..3c062ec13 100644 --- a/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe +++ b/haiku-apps/orphilia_dropbox/orphilia_dropbox-1.recipe @@ -22,7 +22,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:python cmd:sed @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel python_setuptools " diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe index fa1e4077f..9bdec1b6d 100644 --- a/haiku-apps/paladin/paladin-1.3.recipe +++ b/haiku-apps/paladin/paladin-1.3.recipe @@ -26,7 +26,7 @@ PROVIDES=" cmd:rez = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpcre cmd:fastdep cmd:ccache @@ -35,7 +35,7 @@ BUILD_REQUIRES=" devel:libpcre " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/haiku-apps/paladin/paladin-20141022.recipe b/haiku-apps/paladin/paladin-20141022.recipe index 1295b54d9..ecac0b523 100644 --- a/haiku-apps/paladin/paladin-20141022.recipe +++ b/haiku-apps/paladin/paladin-20141022.recipe @@ -19,13 +19,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpcre lib:libz " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libpcre devel:libz " diff --git a/haiku-apps/pecorename/pecorename-1.5.recipe b/haiku-apps/pecorename/pecorename-1.5.recipe index a8ee966af..edda66da8 100644 --- a/haiku-apps/pecorename/pecorename-1.5.recipe +++ b/haiku-apps/pecorename/pecorename-1.5.recipe @@ -33,10 +33,10 @@ PROVIDES=" app:PecoRename = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/peek/peek-20140206.recipe b/haiku-apps/peek/peek-20140206.recipe index 40d499dfc..1964886cd 100644 --- a/haiku-apps/peek/peek-20140206.recipe +++ b/haiku-apps/peek/peek-20140206.recipe @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -29,7 +29,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe index 3e018b8d1..f2cefbbbe 100644 --- a/haiku-apps/phantomlimb/phantomlimb-1.recipe +++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe @@ -26,7 +26,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" @@ -35,7 +35,7 @@ BUILD_PREREQUIRES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD() diff --git a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe index d2cb3e7c2..dda261d54 100644 --- a/haiku-apps/ppviewer/ppviewer-1.0.0.recipe +++ b/haiku-apps/ppviewer/ppviewer-1.0.0.recipe @@ -15,10 +15,10 @@ PROVIDES=" app:PPViewer = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:g++ diff --git a/haiku-apps/querywatcher/querywatcher-1.4.recipe b/haiku-apps/querywatcher/querywatcher-1.4.recipe index 754692d93..d965a62e6 100644 --- a/haiku-apps/querywatcher/querywatcher-1.4.recipe +++ b/haiku-apps/querywatcher/querywatcher-1.4.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe index b2b4a080e..9e6fbd518 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.6.recipe @@ -18,10 +18,10 @@ PROVIDES=" app:quicklaunch = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe index da8537ee2..d22691790 100644 --- a/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe @@ -18,10 +18,10 @@ PROVIDES=" app:QuickLaunch = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe index 1cbcbc3f4..672daa2d7 100644 --- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe index a5a229142..8e0ef8774 100644 --- a/haiku-apps/recibe/recibe-1.0b1.recipe +++ b/haiku-apps/recibe/recibe-1.0b1.recipe @@ -22,12 +22,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsqlite3 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libsqlite3 " diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe index 7a78c17ee..dde1f6f49 100644 --- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe +++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe @@ -22,7 +22,7 @@ PROVIDES=" addon:rcinputdevice = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" makefile_engine @@ -32,7 +32,7 @@ BUILD_PREREQUIRES=" cmd:mkdepend " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/rename/rename-3.9.0.recipe b/haiku-apps/rename/rename-3.9.0.recipe index 0ad131b77..ad2b26ea2 100644 --- a/haiku-apps/rename/rename-3.9.0.recipe +++ b/haiku-apps/rename/rename-3.9.0.recipe @@ -22,7 +22,7 @@ PROVIDES=" app:rename = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" cmd:gcc @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" makefile_engine " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe index d1b8a0cc2..6860697a9 100644 --- a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe +++ b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/resourcer/resourcer-1.0.recipe b/haiku-apps/resourcer/resourcer-1.0.recipe index ce693f781..7e92e36d7 100644 --- a/haiku-apps/resourcer/resourcer-1.0.recipe +++ b/haiku-apps/resourcer/resourcer-1.0.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -28,7 +28,7 @@ BUILD_PREREQUIRES=" cmd:mkdepend" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/rez/rez-108.recipe b/haiku-apps/rez/rez-108.recipe index 259c972a5..135d7ce4b 100644 --- a/haiku-apps/rez/rez-108.recipe +++ b/haiku-apps/rez/rez-108.recipe @@ -14,12 +14,12 @@ SOURCE_DIR="Rez-1.0" REVISION="1" BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku " BUILD_PREREQUIRES=" - haiku >= $haikuVersion + haiku cmd:make cmd:flex cmd:bison diff --git a/haiku-apps/runprogram/runprogram-1.0rc1.recipe b/haiku-apps/runprogram/runprogram-1.0rc1.recipe index 7ff5210aa..3e3daa8c0 100644 --- a/haiku-apps/runprogram/runprogram-1.0rc1.recipe +++ b/haiku-apps/runprogram/runprogram-1.0rc1.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe index c059d28ec..6dd8e6c45 100644 --- a/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe +++ b/haiku-apps/scriptureguide/scriptureguide-0.9.0.recipe @@ -26,7 +26,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:awk cmd:wget cmd:unzip @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsword$secondaryArchSuffix devel:libz$secondaryArchSuffix icu${secondaryArchSuffix}_devel diff --git a/haiku-apps/seeker/seeker-1.0.recipe b/haiku-apps/seeker/seeker-1.0.recipe index 7b0dd91fa..268b3b29e 100644 --- a/haiku-apps/seeker/seeker-1.0.recipe +++ b/haiku-apps/seeker/seeker-1.0.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsanta " @@ -27,7 +27,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:ld diff --git a/haiku-apps/shredder/shredder-1.0.0.recipe b/haiku-apps/shredder/shredder-1.0.0.recipe index b9e07f76a..578553f0b 100644 --- a/haiku-apps/shredder/shredder-1.0.0.recipe +++ b/haiku-apps/shredder/shredder-1.0.0.recipe @@ -17,11 +17,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:make cmd:gcc diff --git a/haiku-apps/slayer/slayer-0.9.recipe b/haiku-apps/slayer/slayer-0.9.recipe index 62c04e8d6..f1fb5e84a 100644 --- a/haiku-apps/slayer/slayer-0.9.recipe +++ b/haiku-apps/slayer/slayer-0.9.recipe @@ -16,7 +16,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine " diff --git a/haiku-apps/sortsave/sortsave-1.0.recipe b/haiku-apps/sortsave/sortsave-1.0.recipe index 68fa57e09..4d8f59731 100644 --- a/haiku-apps/sortsave/sortsave-1.0.recipe +++ b/haiku-apps/sortsave/sortsave-1.0.recipe @@ -20,10 +20,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion" + haiku" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion" + haiku_devel" BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-apps/substrate/substrate-1.0.recipe b/haiku-apps/substrate/substrate-1.0.recipe index 932eb950a..0fef123bd 100644 --- a/haiku-apps/substrate/substrate-1.0.recipe +++ b/haiku-apps/substrate/substrate-1.0.recipe @@ -16,7 +16,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -27,7 +27,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/sum_it/sum_it-0.2beta.recipe b/haiku-apps/sum_it/sum_it-0.2beta.recipe index bd7f8307e..3ac3683f3 100644 --- a/haiku-apps/sum_it/sum_it-0.2beta.recipe +++ b/haiku-apps/sum_it/sum_it-0.2beta.recipe @@ -19,7 +19,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/systeminfo/systeminfo-2.recipe b/haiku-apps/systeminfo/systeminfo-2.recipe index 0158096eb..eceee8761 100644 --- a/haiku-apps/systeminfo/systeminfo-2.recipe +++ b/haiku-apps/systeminfo/systeminfo-2.recipe @@ -25,11 +25,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index 277c5efaa..c00265afc 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -22,11 +22,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/taskmanager/taskmanager-0.1.7.recipe b/haiku-apps/taskmanager/taskmanager-0.1.7.recipe index b62f9d3fc..13a213ac5 100644 --- a/haiku-apps/taskmanager/taskmanager-0.1.7.recipe +++ b/haiku-apps/taskmanager/taskmanager-0.1.7.recipe @@ -25,10 +25,10 @@ PROVIDES=" " REQUIRES="" -BUILD_REQUIRES="haiku >= $haikuVersion" +BUILD_REQUIRES="haiku" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel makefile_engine cmd:gcc$secondaryArchSuffix cmd:make diff --git a/haiku-apps/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe index f02a03927..4da81207d 100644 --- a/haiku-apps/textsaver/textsaver-1.0.recipe +++ b/haiku-apps/textsaver/textsaver-1.0.recipe @@ -20,10 +20,10 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion" + haiku" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion" + haiku_devel" BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-apps/thememanager/thememanager-1.0_git.recipe b/haiku-apps/thememanager/thememanager-1.0_git.recipe index e8ad70e53..29013cdf3 100644 --- a/haiku-apps/thememanager/thememanager-1.0_git.recipe +++ b/haiku-apps/thememanager/thememanager-1.0_git.recipe @@ -17,10 +17,10 @@ PROVIDES=" app:ThemeManager = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe index a292964a7..c779ba02e 100644 --- a/haiku-apps/timecop/timecop-0.61.recipe +++ b/haiku-apps/timecop/timecop-0.61.recipe @@ -14,7 +14,7 @@ ARCHITECTURES="x86_gcc2 x86 !ppc" CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a94" REQUIRES=" - haiku >= $haikuVersion + haiku " PROVIDES=" @@ -23,7 +23,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index 4d0e3c9ce..ef253b700 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -19,7 +19,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe index b398df881..fae73c6d6 100644 --- a/haiku-apps/torrentor/torrentor-0.0.5.recipe +++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe @@ -26,7 +26,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libssl${secondaryArchSuffix} lib:libcurl${secondaryArchSuffix} lib:libevent${secondaryArchSuffix} @@ -34,7 +34,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libevent${secondaryArchSuffix} devel:libssl${secondaryArchSuffix} devel:libcurl${secondaryArchSuffix} diff --git a/haiku-apps/trackergrep/trackergrep-5.1.recipe b/haiku-apps/trackergrep/trackergrep-5.1.recipe index 68df9c5ff..f026386dd 100644 --- a/haiku-apps/trackergrep/trackergrep-5.1.recipe +++ b/haiku-apps/trackergrep/trackergrep-5.1.recipe @@ -22,11 +22,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/ubertuber/ubertuber-0.9.10.recipe b/haiku-apps/ubertuber/ubertuber-0.9.10.recipe index 67a4d0d25..c554a6c41 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.10.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.10.recipe @@ -30,11 +30,11 @@ PROVIDES=" app:UberTuber = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:youtube_dl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe index b536dc221..c5ddd0c96 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.7.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.7.recipe @@ -24,12 +24,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine " diff --git a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe index be0677f1b..2d8e9c716 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.8.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.8.recipe @@ -23,11 +23,11 @@ PROVIDES=" app:ubertuber = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:youtube_dl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/ubertuber/ubertuber-0.9.9.recipe b/haiku-apps/ubertuber/ubertuber-0.9.9.recipe index 89ed1584b..e610c3862 100644 --- a/haiku-apps/ubertuber/ubertuber-0.9.9.recipe +++ b/haiku-apps/ubertuber/ubertuber-0.9.9.recipe @@ -30,12 +30,12 @@ PROVIDES=" app:ubertuber = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python cmd:youtube_dl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe index 485ac883d..872fd49f8 100644 --- a/haiku-apps/virtualbelive/virtualbelive-20140718.recipe +++ b/haiku-apps/virtualbelive/virtualbelive-20140718.recipe @@ -17,7 +17,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" @@ -30,7 +30,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/haiku-apps/vision/vision-0.9.7.r949.recipe b/haiku-apps/vision/vision-0.9.7.r949.recipe index 940c2f892..705606842 100644 --- a/haiku-apps/vision/vision-0.9.7.r949.recipe +++ b/haiku-apps/vision/vision-0.9.7.r949.recipe @@ -22,12 +22,12 @@ PROVIDES=" app:Vision = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:find cmd:gcc cmd:ld diff --git a/haiku-apps/waveview/waveview-1.0.recipe b/haiku-apps/waveview/waveview-1.0.recipe index a173ee062..2acdae34e 100644 --- a/haiku-apps/waveview/waveview-1.0.recipe +++ b/haiku-apps/waveview/waveview-1.0.recipe @@ -15,13 +15,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpcre lib:libpcreposix " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libpcre devel:libpcreposix " @@ -38,7 +38,7 @@ BUILD_PREREQUIRES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD() diff --git a/haiku-apps/whisper/whisper-1.2.recipe b/haiku-apps/whisper/whisper-1.2.recipe index 23b06c5fe..da59332b4 100644 --- a/haiku-apps/whisper/whisper-1.2.recipe +++ b/haiku-apps/whisper/whisper-1.2.recipe @@ -21,7 +21,7 @@ PROVIDES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-apps/yab_ide/yab_ide-2.2.2.recipe b/haiku-apps/yab_ide/yab_ide-2.2.2.recipe index 98bd9090f..6295aa0e1 100644 --- a/haiku-apps/yab_ide/yab_ide-2.2.2.recipe +++ b/haiku-apps/yab_ide/yab_ide-2.2.2.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix yab$secondaryArchSuffix >= 1.7.02 devel:libncurses$secondaryArchSuffix @@ -31,7 +31,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe index da89bf515..076e83268 100644 --- a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe +++ b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix yab$secondaryArchSuffix >= 1.7.02 devel:libncurses$secondaryArchSuffix @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe index b1479ef31..45db64af4 100644 --- a/haiku-games/becheckers/becheckers-1.0.1.recipe +++ b/haiku-games/becheckers/becheckers-1.0.1.recipe @@ -16,11 +16,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-games/bespider/bespider-0.1.0.recipe b/haiku-games/bespider/bespider-0.1.0.recipe index 002a1a37c..707f7ccd9 100644 --- a/haiku-games/bespider/bespider-0.1.0.recipe +++ b/haiku-games/bespider/bespider-0.1.0.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-games/bevexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-1.1.recipe index 25ab71ea5..2dae91d2c 100644 --- a/haiku-games/bevexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-1.1.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/haiku-games/guitarmaster/guitarmaster-r21.recipe b/haiku-games/guitarmaster/guitarmaster-r21.recipe index ceaf4fdfa..c266f96c8 100644 --- a/haiku-games/guitarmaster/guitarmaster-r21.recipe +++ b/haiku-games/guitarmaster/guitarmaster-r21.recipe @@ -17,12 +17,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc " diff --git a/haiku-games/puri/puri-0.3.9.1.recipe b/haiku-games/puri/puri-0.3.9.1.recipe index f8f554ed6..2bbb541d7 100644 --- a/haiku-games/puri/puri-0.3.9.1.recipe +++ b/haiku-games/puri/puri-0.3.9.1.recipe @@ -24,13 +24,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libglu$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix " diff --git a/haiku-games/w6/w6-1.7.recipe b/haiku-games/w6/w6-1.7.recipe index 6130be20d..f61d3dc9e 100644 --- a/haiku-games/w6/w6-1.7.recipe +++ b/haiku-games/w6/w6-1.7.recipe @@ -22,10 +22,10 @@ PROVIDES=" app:w6 = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-libs/ale/ale-0.9.1.recipe b/haiku-libs/ale/ale-0.9.1.recipe index e24665865..4d1d32e71 100644 --- a/haiku-libs/ale/ale-0.9.1.recipe +++ b/haiku-libs/ale/ale-0.9.1.recipe @@ -30,10 +30,10 @@ PROVIDES=" app:ALEditor = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe index b54bb4539..53cb21cd2 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe @@ -38,7 +38,7 @@ PROVIDES=" lib:libwtf$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix icu$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -48,7 +48,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel icu${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe index 247dc8f8b..6184aed68 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_10_11.recipe @@ -31,7 +31,7 @@ PROVIDES=" lib:libwtf$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix icu$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -41,8 +41,8 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel icu${secondaryArchSuffix}_devel cmd:pkg_config devel:libjpeg$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe index 4d3551f9d..1ace490fb 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe @@ -28,7 +28,7 @@ PROVIDES=" lib:libWebKit$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix icu$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -39,8 +39,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel icu${secondaryArchSuffix}_devel cmd:pkg_config devel:libruby$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe index 5c0452b39..608e296bf 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.1.recipe @@ -28,7 +28,7 @@ PROVIDES=" lib:libWebKit$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -39,8 +39,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe index 07d7b7124..a3b865868 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe @@ -30,7 +30,7 @@ PROVIDES=" lib:libWebKit$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -41,8 +41,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe index 0113d6281..95291bc0c 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.3.recipe @@ -29,7 +29,7 @@ PROVIDES=" lib:libWebKit$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -40,8 +40,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe index 3a5237b48..ae50d63f5 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.4.recipe @@ -29,7 +29,7 @@ PROVIDES=" lib:libWebKit$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -40,8 +40,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe index 6d992ca9a..6b9dc620e 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.2.5.recipe @@ -32,7 +32,7 @@ PROVIDES=" lib:libWebKit$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -43,8 +43,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe index 39d1fb7ff..7e57895ab 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe @@ -35,7 +35,7 @@ PROVIDES=" cmd:jsc$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -47,8 +47,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe index aa53e9a76..fd7921b39 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe @@ -35,7 +35,7 @@ PROVIDES=" cmd:jsc$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -49,8 +49,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe index a726061eb..9fe2da312 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe @@ -35,7 +35,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -50,8 +50,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe index f9bebf71b..881181196 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.0.recipe @@ -35,7 +35,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -50,8 +50,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe index c556d5fd5..a0cfc4905 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.1.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -49,8 +49,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe index e1e0c4382..b204d735e 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.2.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -49,8 +49,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe index 5c35fae3e..bf4d5e17a 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.3.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -49,8 +49,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe index 17413af27..d509a894f 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.4.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -48,8 +48,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe index b78b014af..ac71b09d1 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.5.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -48,8 +48,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe index 4ac4143e3..166e779df 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.6.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -49,8 +49,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe index 0889d09b5..d10000ba9 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.7.recipe @@ -35,7 +35,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -50,8 +50,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe index 8b9d5c32b..828a83f7f 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.4.8.recipe @@ -35,7 +35,7 @@ PROVIDES=" cmd:jsc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -50,8 +50,8 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel + haiku_devel devel:libicuuc$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/haiku-libs/libburndevice/libburndevice-1.0.recipe b/haiku-libs/libburndevice/libburndevice-1.0.recipe index f4377bbf7..da9aec72b 100644 --- a/haiku-libs/libburndevice/libburndevice-1.0.recipe +++ b/haiku-libs/libburndevice/libburndevice-1.0.recipe @@ -16,7 +16,7 @@ PROVIDES=" lib:libburndevice$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:cdrecord " @@ -29,7 +29,7 @@ REQUIRES_devel=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe index caca21844..974fe9dae 100644 --- a/haiku-libs/libprefs/libprefs-1.2.5.recipe +++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe @@ -17,15 +17,15 @@ PROVIDES=" lib:libprefs$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku$secondaryArchSuffix + haiku${secondaryArchSuffix}_devel cmd:gcc " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/haiku-libs/libsanta/libsanta-3.0.1.recipe b/haiku-libs/libsanta/libsanta-3.0.1.recipe index cce9fbd2a..12b1ec4d9 100644 --- a/haiku-libs/libsanta/libsanta-3.0.1.recipe +++ b/haiku-libs/libsanta/libsanta-3.0.1.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/haiku-libs/libwalter/libwalter-97.recipe b/haiku-libs/libwalter/libwalter-97.recipe index 3fcaa7f10..da836ff93 100644 --- a/haiku-libs/libwalter/libwalter-97.recipe +++ b/haiku-libs/libwalter/libwalter-97.recipe @@ -23,7 +23,7 @@ PROVIDES=" lib:libwalter$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" cmd:gcc$secondaryArchSuffix @@ -33,7 +33,7 @@ BUILD_REQUIRES=" cmd:jam " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " SOURCE_DIR="LibWalter-59fdad559ee3dbcc58675cb27502ececce795bbc" diff --git a/haiku-misc/rssavers/rssavers-0.2.recipe b/haiku-misc/rssavers/rssavers-0.2.recipe index 747af004f..7f60c9eaa 100644 --- a/haiku-misc/rssavers/rssavers-0.2.recipe +++ b/haiku-misc/rssavers/rssavers-0.2.recipe @@ -20,7 +20,7 @@ PROVIDES=" addon:Plasma = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgl lib:libglu " @@ -31,7 +31,7 @@ BUILD_PREREQUIRES=" devel:libglu " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD() diff --git a/kde-misc/kdiff3/kdiff3-0.9.97.recipe b/kde-misc/kdiff3/kdiff3-0.9.97.recipe index 3e0ac1ec4..0f42ec5ad 100644 --- a/kde-misc/kdiff3/kdiff3-0.9.97.recipe +++ b/kde-misc/kdiff3/kdiff3-0.9.97.recipe @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libQtGui$secondaryArchSuffix lib:libQtCore$secondaryArchSuffix " diff --git a/media-gfx/exiv2/exiv2-0.24.recipe b/media-gfx/exiv2/exiv2-0.24.recipe index c3a556817..b19e8ba33 100644 --- a/media-gfx/exiv2/exiv2-0.24.recipe +++ b/media-gfx/exiv2/exiv2-0.24.recipe @@ -27,7 +27,7 @@ PROVIDES=" lib:libexiv2$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -36,7 +36,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:autoconf cmd:make diff --git a/media-gfx/fontforge/fontforge-20141126.recipe b/media-gfx/fontforge/fontforge-20141126.recipe index 7aa04eebc..729a75e09 100644 --- a/media-gfx/fontforge/fontforge-20141126.recipe +++ b/media-gfx/fontforge/fontforge-20141126.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libgioftp$secondaryArchSuffix = 2.0.0 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -50,7 +50,7 @@ REQUIRES=" lib:libltdl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix @@ -109,5 +109,5 @@ PROVIDES_devel=" " REQUIRES_devel=" fontforge$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " diff --git a/media-gfx/graphite2/graphite2-1.2.4.recipe b/media-gfx/graphite2/graphite2-1.2.4.recipe index a851ab29a..f02d01e43 100644 --- a/media-gfx/graphite2/graphite2-1.2.4.recipe +++ b/media-gfx/graphite2/graphite2-1.2.4.recipe @@ -27,11 +27,11 @@ PROVIDES=" lib:libgraphite2$secondaryArchSuffix = 3.0.1 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix @@ -68,6 +68,6 @@ PROVIDES_devel=" " REQUIRES_devel=" graphite2$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " diff --git a/media-gfx/graphviz/graphviz-2.26.3.recipe b/media-gfx/graphviz/graphviz-2.26.3.recipe index 60915fb14..8ea406e70 100644 --- a/media-gfx/graphviz/graphviz-2.26.3.recipe +++ b/media-gfx/graphviz/graphviz-2.26.3.recipe @@ -79,7 +79,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -89,7 +89,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe b/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe index 8275ba090..030d22c6a 100644 --- a/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe +++ b/media-gfx/imagemagick/imagemagick-6.8.9_8.recipe @@ -41,7 +41,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libbz2 lib:libfreetype lib:libjpeg @@ -67,7 +67,7 @@ BUILD_REQUIRES=" # devel:libcms BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe index 3edbfe0c4..ea3dedab1 100644 --- a/media-gfx/optipng/optipng-0.7.4.recipe +++ b/media-gfx/optipng/optipng-0.7.4.recipe @@ -18,13 +18,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng lib:libz " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libpng devel:libz " diff --git a/media-gfx/pngcrush/pngcrush-1.7.81.recipe b/media-gfx/pngcrush/pngcrush-1.7.81.recipe index 3354448b3..275a63889 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.81.recipe +++ b/media-gfx/pngcrush/pngcrush-1.7.81.recipe @@ -26,7 +26,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpng16 lib:libz " @@ -37,7 +37,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc " diff --git a/media-gfx/qrencode/qrencode-3.3.0.recipe b/media-gfx/qrencode/qrencode-3.3.0.recipe index 2a3ab01f0..065a8adf8 100644 --- a/media-gfx/qrencode/qrencode-3.3.0.recipe +++ b/media-gfx/qrencode/qrencode-3.3.0.recipe @@ -27,7 +27,7 @@ PROVIDES=" lib:libqrencode$secondaryArchSuffix = 3.3.0 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng16$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -36,7 +36,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe b/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe index 4efd7b376..49b525b33 100644 --- a/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe +++ b/media-gfx/qrencode/qrencode_kdl-3.3.0.recipe @@ -25,7 +25,7 @@ PROVIDES=" qrencode_kdl = $portVersion " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld " @@ -61,5 +61,5 @@ PROVIDES_devel=" devel:libqrencode_kdl = 3.3.0 compat >= 3 " REQUIRES_devel=" - haiku >= $haikuVersion + haiku " diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe index b849bfbb6..6271e1be4 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe +++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe @@ -22,7 +22,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libfribidi lib:libiconv lib:libintl @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libfribidi devel:libiconv devel:libintl diff --git a/media-libs/a52dec/a52dec-0.7.4.recipe b/media-libs/a52dec/a52dec-0.7.4.recipe index 831ae872d..bdf844721 100644 --- a/media-libs/a52dec/a52dec-0.7.4.recipe +++ b/media-libs/a52dec/a52dec-0.7.4.recipe @@ -25,14 +25,14 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index f47de0ca0..64a0cea6c 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/media-libs/allegro/allegro-4.4.1.1.recipe b/media-libs/allegro/allegro-4.4.1.1.recipe index fe45935fd..2f420db9b 100644 --- a/media-libs/allegro/allegro-4.4.1.1.recipe +++ b/media-libs/allegro/allegro-4.4.1.1.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng lib:libz lib:libogg @@ -34,7 +34,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:cmake @@ -79,7 +79,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix allegro$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/allegro/allegro-4.4.2.recipe b/media-libs/allegro/allegro-4.4.2.recipe index 0b19c96ae..54fc9b085 100644 --- a/media-libs/allegro/allegro-4.4.2.recipe +++ b/media-libs/allegro/allegro-4.4.2.recipe @@ -29,7 +29,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libogg$secondaryArchSuffix @@ -43,7 +43,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libogg$secondaryArchSuffix @@ -96,6 +96,6 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix allegro$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/devil/devil-1.7.8.recipe b/media-libs/devil/devil-1.7.8.recipe index 9722b388c..fd23e4774 100644 --- a/media-libs/devil/devil-1.7.8.recipe +++ b/media-libs/devil/devil-1.7.8.recipe @@ -12,7 +12,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" @@ -26,7 +26,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -65,7 +65,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix devil$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/djvulibre/djvulibre-3.5.25.recipe b/media-libs/djvulibre/djvulibre-3.5.25.recipe index 45f784f93..d70ea50b0 100644 --- a/media-libs/djvulibre/djvulibre-3.5.25.recipe +++ b/media-libs/djvulibre/djvulibre-3.5.25.recipe @@ -46,7 +46,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix @@ -62,7 +62,7 @@ BUILD_REQUIRES=" #needs devel:libtiff too but that isn't provided by anything BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix cmd:aclocal diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe index 6f8c5676e..2ed315a18 100644 --- a/media-libs/faac/faac-1.28.recipe +++ b/media-libs/faac/faac-1.28.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtool cmd:aclocal cmd:autoconf diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe index ef79da56f..45ebeb10b 100644 --- a/media-libs/faad2/faad2-2.7.recipe +++ b/media-libs/faad2/faad2-2.7.recipe @@ -21,11 +21,11 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtool cmd:aclocal cmd:autoconf diff --git a/media-libs/flac/flac-1.3.1.recipe b/media-libs/flac/flac-1.3.1.recipe index a7310c6bd..fb139c55a 100644 --- a/media-libs/flac/flac-1.3.1.recipe +++ b/media-libs/flac/flac-1.3.1.recipe @@ -37,14 +37,14 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libogg$secondaryArchSuffix " diff --git a/media-libs/flickcurl/flickcurl-1.26.recipe b/media-libs/flickcurl/flickcurl-1.26.recipe index 9313814d0..3cb7caab8 100644 --- a/media-libs/flickcurl/flickcurl-1.26.recipe +++ b/media-libs/flickcurl/flickcurl-1.26.recipe @@ -34,7 +34,7 @@ PROVIDES=" cmd:flickrdf$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libxml2$secondaryArchSuffix # required by libcurl and libxml2 @@ -44,7 +44,7 @@ REQUIRES=" lib:libcrypto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcurl$secondaryArchSuffix devel:libxml2$secondaryArchSuffix " diff --git a/media-libs/fontconfig/fontconfig-2.11.0.recipe b/media-libs/fontconfig/fontconfig-2.11.0.recipe index 4808b7513..35b8c01a8 100644 --- a/media-libs/fontconfig/fontconfig-2.11.0.recipe +++ b/media-libs/fontconfig/fontconfig-2.11.0.recipe @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -49,7 +49,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtool cmd:aclocal cmd:autoconf diff --git a/media-libs/fontconfig/fontconfig-2.11.1.recipe b/media-libs/fontconfig/fontconfig-2.11.1.recipe index 76867e639..f91baaab0 100644 --- a/media-libs/fontconfig/fontconfig-2.11.1.recipe +++ b/media-libs/fontconfig/fontconfig-2.11.1.recipe @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -49,7 +49,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtool cmd:aclocal cmd:autoconf diff --git a/media-libs/freetype/freetype-2.5.3.recipe b/media-libs/freetype/freetype-2.5.3.recipe index ae7780a1c..23113d9d4 100644 --- a/media-libs/freetype/freetype-2.5.3.recipe +++ b/media-libs/freetype/freetype-2.5.3.recipe @@ -21,13 +21,13 @@ PROVIDES=" lib:libfreetype$secondaryArchSuffix = 6.11.2 compat >= 6 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1 lib:libpng16$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libpng16$secondaryArchSuffix diff --git a/media-libs/gd/gd-2.1.recipe b/media-libs/gd/gd-2.1.recipe index 3094fafc9..5bb77a769 100644 --- a/media-libs/gd/gd-2.1.recipe +++ b/media-libs/gd/gd-2.1.recipe @@ -15,14 +15,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpng lib:libjpeg lib:libgif " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib-5.0.5.recipe index b4a66d6d0..cdcf9f9df 100644 --- a/media-libs/giflib/giflib-5.0.5.recipe +++ b/media-libs/giflib/giflib-5.0.5.recipe @@ -40,11 +40,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/media-libs/giflib/giflib-5.1.0.recipe b/media-libs/giflib/giflib-5.1.0.recipe index eacfa0641..111d9f31a 100644 --- a/media-libs/giflib/giflib-5.1.0.recipe +++ b/media-libs/giflib/giflib-5.1.0.recipe @@ -40,11 +40,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/media-libs/glew/glew-1.10.0.recipe b/media-libs/glew/glew-1.10.0.recipe index 4d5082cfc..19f9ca382 100644 --- a/media-libs/glew/glew-1.10.0.recipe +++ b/media-libs/glew/glew-1.10.0.recipe @@ -26,14 +26,14 @@ PROVIDES=" lib:libGLEW$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix " BUILD_REQUIRES=" devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -76,7 +76,7 @@ PROVIDES_util=" REQUIRES_util=" glew$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libGLEW$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix diff --git a/media-libs/glew/glew-1.11.0.recipe b/media-libs/glew/glew-1.11.0.recipe index 8240f9859..0c7db2597 100644 --- a/media-libs/glew/glew-1.11.0.recipe +++ b/media-libs/glew/glew-1.11.0.recipe @@ -26,14 +26,14 @@ PROVIDES=" lib:libGLEW$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix " BUILD_REQUIRES=" devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -78,7 +78,7 @@ PROVIDES_util=" REQUIRES_util=" glew$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libGLEW$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix diff --git a/media-libs/guilib/guilib-1.2.1.recipe b/media-libs/guilib/guilib-1.2.1.recipe index 3533dac45..40bdcb2af 100644 --- a/media-libs/guilib/guilib-1.2.1.recipe +++ b/media-libs/guilib/guilib-1.2.1.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix " diff --git a/media-libs/harfbuzz/harfbuzz-0.9.29.recipe b/media-libs/harfbuzz/harfbuzz-0.9.29.recipe index 3614601c9..de2c0d39a 100644 --- a/media-libs/harfbuzz/harfbuzz-0.9.29.recipe +++ b/media-libs/harfbuzz/harfbuzz-0.9.29.recipe @@ -19,7 +19,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:automake cmd:gcc cmd:gtkdocize diff --git a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe b/media-libs/harfbuzz/harfbuzz-0.9.36.recipe index f9f9c661b..f596c98b4 100644 --- a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe +++ b/media-libs/harfbuzz/harfbuzz-0.9.36.recipe @@ -38,7 +38,7 @@ PROVIDES=" cmd:hb_shape$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -60,7 +60,7 @@ BUILD_REQUIRES=" devel:libgraphite2$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/media-libs/ilmbase/ilmbase-2.1.0.recipe b/media-libs/ilmbase/ilmbase-2.1.0.recipe index 8a84ba709..b574ef42f 100644 --- a/media-libs/ilmbase/ilmbase-2.1.0.recipe +++ b/media-libs/ilmbase/ilmbase-2.1.0.recipe @@ -37,10 +37,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/media-libs/ilmbase/ilmbase-2.2.0.recipe b/media-libs/ilmbase/ilmbase-2.2.0.recipe index eadf7f232..bd9209d1f 100644 --- a/media-libs/ilmbase/ilmbase-2.2.0.recipe +++ b/media-libs/ilmbase/ilmbase-2.2.0.recipe @@ -34,11 +34,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/media-libs/im/im-3.8.recipe b/media-libs/im/im-3.8.recipe index c0de5b612..2d5a1e4b8 100644 --- a/media-libs/im/im-3.8.recipe +++ b/media-libs/im/im-3.8.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -37,7 +37,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:as$secondaryArchSuffix cmd:make diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index c1233dd90..84b608274 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -24,11 +24,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" @@ -101,6 +101,6 @@ if [ -z "$secondaryArchSuffix" ]; then " REQUIRES_tools=" jasper$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " fi diff --git a/media-libs/jbig2dec/jbig2dec-0.11.recipe b/media-libs/jbig2dec/jbig2dec-0.11.recipe index df2951fee..12547a688 100644 --- a/media-libs/jbig2dec/jbig2dec-0.11.recipe +++ b/media-libs/jbig2dec/jbig2dec-0.11.recipe @@ -29,11 +29,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtoolize cmd:aclocal cmd:autoconf diff --git a/media-libs/jgmod/jgmod-0.99.recipe b/media-libs/jgmod/jgmod-0.99.recipe index 7907ab95d..8d5e49dc1 100644 --- a/media-libs/jgmod/jgmod-0.99.recipe +++ b/media-libs/jgmod/jgmod-0.99.recipe @@ -23,7 +23,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:liballeg " BUILD_PREREQUIRES=" diff --git a/media-libs/jpeg/jpeg-8d.recipe b/media-libs/jpeg/jpeg-8d.recipe index d2cbbe6f0..6809d7fe4 100644 --- a/media-libs/jpeg/jpeg-8d.recipe +++ b/media-libs/jpeg/jpeg-8d.recipe @@ -25,12 +25,12 @@ PROVIDES=" lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 8 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake @@ -101,7 +101,7 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:wrjpgcom = $portVersion compat >= 8 " REQUIRES_tools=" - haiku >= $haikuVersion + haiku jpeg == $portVersion base " fi diff --git a/media-libs/jpeg/jpeg-9.recipe b/media-libs/jpeg/jpeg-9.recipe index 0ee9396a2..dc65e6f27 100644 --- a/media-libs/jpeg/jpeg-9.recipe +++ b/media-libs/jpeg/jpeg-9.recipe @@ -25,12 +25,12 @@ PROVIDES=" lib:libjpeg$secondaryArchSuffix = $portVersion compat >= 9 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake @@ -99,7 +99,7 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:wrjpgcom = $portVersion compat >= 9 " REQUIRES_tools=" - haiku >= $haikuVersion + haiku jpeg == $portVersion base " fi diff --git a/media-libs/jpeg/jpeg-9a.recipe b/media-libs/jpeg/jpeg-9a.recipe index 2a4761230..d35e169a1 100644 --- a/media-libs/jpeg/jpeg-9a.recipe +++ b/media-libs/jpeg/jpeg-9a.recipe @@ -25,12 +25,12 @@ PROVIDES=" lib:libjpeg$secondaryArchSuffix = 9.1.0 compat >= 9 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake @@ -96,7 +96,7 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:wrjpgcom = $portVersion compat >= 9 " REQUIRES_tools=" - haiku >= $haikuVersion + haiku jpeg == $portVersion base " fi diff --git a/media-libs/lcms/lcms-2.6.recipe b/media-libs/lcms/lcms-2.6.recipe index 0d22644ff..54f17e369 100644 --- a/media-libs/lcms/lcms-2.6.recipe +++ b/media-libs/lcms/lcms-2.6.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libtiff$secondaryArchSuffix diff --git a/media-libs/leptonica/leptonica-1.69.recipe b/media-libs/leptonica/leptonica-1.69.recipe index 9e26cdd58..7caaf2fc9 100644 --- a/media-libs/leptonica/leptonica-1.69.recipe +++ b/media-libs/leptonica/leptonica-1.69.recipe @@ -28,7 +28,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgif$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -37,7 +37,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgif$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix @@ -91,7 +91,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix leptonica$secondaryArchSuffix == $portVersion base " @@ -311,6 +311,6 @@ PROVIDES_tools=" cmd:yuvtest$secondaryArchSuffix = $portVersion " REQUIRES_tools=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix leptonica$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/leptonica/leptonica-1.71.recipe b/media-libs/leptonica/leptonica-1.71.recipe index 7a24e2c72..db1bbeff4 100644 --- a/media-libs/leptonica/leptonica-1.71.recipe +++ b/media-libs/leptonica/leptonica-1.71.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgif$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -36,7 +36,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgif$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix @@ -86,7 +86,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix leptonica$secondaryArchSuffix == $portVersion base " @@ -307,6 +307,6 @@ PROVIDES_tools=" cmd:yuvtest$secondaryArchSuffix = $portVersion " REQUIRES_tools=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix leptonica$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/libaacs/libaacs-0.7.1.recipe b/media-libs/libaacs/libaacs-0.7.1.recipe index 1be72437c..e6511a764 100644 --- a/media-libs/libaacs/libaacs-0.7.1.recipe +++ b/media-libs/libaacs/libaacs-0.7.1.recipe @@ -31,12 +31,12 @@ PROVIDES=" lib:libaacs$secondaryArchSuffix = 0.4.1 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgcrypt$secondaryArchSuffix devel:libgpg_error$secondaryArchSuffix " diff --git a/media-libs/libao/libao-1.2.0.recipe b/media-libs/libao/libao-1.2.0.recipe index 5379b6394..e537ad163 100644 --- a/media-libs/libao/libao-1.2.0.recipe +++ b/media-libs/libao/libao-1.2.0.recipe @@ -33,10 +33,10 @@ PROVIDES=" lib:libao$secondaryArchSuffix = 4.1.0 compat >= 4 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index 478cc305f..2fcdffd06 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -25,11 +25,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/media-libs/libass/libass-0.11.2.recipe b/media-libs/libass/libass-0.11.2.recipe index 657db363d..f0db69802 100644 --- a/media-libs/libass/libass-0.11.2.recipe +++ b/media-libs/libass/libass-0.11.2.recipe @@ -22,7 +22,7 @@ PROVIDES=" lib:libass$secondaryArchSuffix = 5.0.0 compat >= 5 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libenca$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -41,7 +41,7 @@ REQUIRES=" lib:libgraphite2$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libenca$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix diff --git a/media-libs/libass/libass-0.12.0.recipe b/media-libs/libass/libass-0.12.0.recipe index bb88df8ae..4a9650e50 100644 --- a/media-libs/libass/libass-0.12.0.recipe +++ b/media-libs/libass/libass-0.12.0.recipe @@ -22,7 +22,7 @@ PROVIDES=" lib:libass$secondaryArchSuffix = 5.1.0 compat >= 5 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libenca$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix @@ -41,7 +41,7 @@ REQUIRES=" lib:libgraphite2$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libenca$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix diff --git a/media-libs/libaubio/libaubio-0.4.1.recipe b/media-libs/libaubio/libaubio-0.4.1.recipe index ad9801676..1f05a3130 100644 --- a/media-libs/libaubio/libaubio-0.4.1.recipe +++ b/media-libs/libaubio/libaubio-0.4.1.recipe @@ -39,11 +39,11 @@ PROVIDES="$PROVIDES fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix # lib:libsamplerate$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel # devel:libsamplerate$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/media-libs/libbdplus/libbdplus-0.1.1.recipe b/media-libs/libbdplus/libbdplus-0.1.1.recipe index 23ed03db6..2c017a206 100644 --- a/media-libs/libbdplus/libbdplus-0.1.1.recipe +++ b/media-libs/libbdplus/libbdplus-0.1.1.recipe @@ -24,12 +24,12 @@ PROVIDES=" lib:libbdplus$secondaryArchSuffix = 0.0.1 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgcrypt$secondaryArchSuffix devel:libgpg_error$secondaryArchSuffix " diff --git a/media-libs/libbluray/libbluray-0.6.1.recipe b/media-libs/libbluray/libbluray-0.6.1.recipe index 1301e5edc..6eaabfb61 100644 --- a/media-libs/libbluray/libbluray-0.6.1.recipe +++ b/media-libs/libbluray/libbluray-0.6.1.recipe @@ -27,7 +27,7 @@ PROVIDES=" cmd:bd_info$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libxml2$secondaryArchSuffix # required by freetype @@ -36,7 +36,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libxml2$secondaryArchSuffix # required by freetype diff --git a/media-libs/libbluray/libbluray-0.6.2.recipe b/media-libs/libbluray/libbluray-0.6.2.recipe index bb70295c0..e48bf03e1 100644 --- a/media-libs/libbluray/libbluray-0.6.2.recipe +++ b/media-libs/libbluray/libbluray-0.6.2.recipe @@ -27,7 +27,7 @@ PROVIDES=" cmd:bd_info$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libxml2$secondaryArchSuffix # required by freetype @@ -36,7 +36,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libxml2$secondaryArchSuffix # required by freetype diff --git a/media-libs/libcddb/libcddb-1.3.2.recipe b/media-libs/libcddb/libcddb-1.3.2.recipe index 13d81ed26..74d4dfc4c 100644 --- a/media-libs/libcddb/libcddb-1.3.2.recipe +++ b/media-libs/libcddb/libcddb-1.3.2.recipe @@ -14,7 +14,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libintl$secondaryArchSuffix lib:libiconv$secondaryArchSuffix " @@ -24,7 +24,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/libcdr/libcdr-0.1.1.recipe b/media-libs/libcdr/libcdr-0.1.1.recipe index 634cf31c8..3b75ececc 100644 --- a/media-libs/libcdr/libcdr-0.1.1.recipe +++ b/media-libs/libcdr/libcdr-0.1.1.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libcdr_0.1$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libicudata$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix @@ -59,7 +59,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/media-libs/libcoverart/libcoverart-1.0.0.recipe b/media-libs/libcoverart/libcoverart-1.0.0.recipe index b0b6ce05e..e9d98474e 100644 --- a/media-libs/libcoverart/libcoverart-1.0.0.recipe +++ b/media-libs/libcoverart/libcoverart-1.0.0.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjansson$secondaryArchSuffix lib:libneon$secondaryArchSuffix " @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make diff --git a/media-libs/libcuefile/libcuefile-r475.recipe b/media-libs/libcuefile/libcuefile-r475.recipe index 861de42dd..e1851b0d1 100644 --- a/media-libs/libcuefile/libcuefile-r475.recipe +++ b/media-libs/libcuefile/libcuefile-r475.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make diff --git a/media-libs/libdca/libdca-0.0.5.recipe b/media-libs/libdca/libdca-0.0.5.recipe index 527e54ab8..b79a7a5f0 100644 --- a/media-libs/libdca/libdca-0.0.5.recipe +++ b/media-libs/libdca/libdca-0.0.5.recipe @@ -22,11 +22,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:gcc cmd:libtoolize diff --git a/media-libs/libdv/libdv-1.0.0.recipe b/media-libs/libdv/libdv-1.0.0.recipe index 6dc72151a..175580126 100644 --- a/media-libs/libdv/libdv-1.0.0.recipe +++ b/media-libs/libdv/libdv-1.0.0.recipe @@ -22,12 +22,12 @@ PROVIDES=" lib:libdv$secondaryArchSuffix = 4.0.3 compat >= 4 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl_1.2$secondaryArchSuffix lib:libpopt$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl_1.2$secondaryArchSuffix devel:libpopt${secondaryArchSuffix} " diff --git a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe index e12f6e97d..888aa3ba9 100644 --- a/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe +++ b/media-libs/libdvbpsi/libdvbpsi-1.2.0.recipe @@ -31,10 +31,10 @@ PROVIDES=" lib:libdvbpsi$secondaryArchSuffix = 9.0.0 compat >= 9 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe index 79dfba430..756d52e3d 100644 --- a/media-libs/libdvdcss/libdvdcss-1.2.12.recipe +++ b/media-libs/libdvdcss/libdvdcss-1.2.12.recipe @@ -21,14 +21,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe index b4ccf681a..686955787 100644 --- a/media-libs/libdvdcss/libdvdcss-1.3.0.recipe +++ b/media-libs/libdvdcss/libdvdcss-1.3.0.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe index 86105c68c..c53d87497 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.0.recipe +++ b/media-libs/libdvdnav/libdvdnav-4.2.0.recipe @@ -23,17 +23,17 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libdvdread${secondaryArchSuffix} libdvdcss${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libdvdread${secondaryArchSuffix}_devel libdvdcss${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe index d7d9d59d0..6659f456c 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe +++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libdvdread$secondaryArchSuffix libdvdcss$secondaryArchSuffix " @@ -34,7 +34,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libdvdnav/libdvdnav-5.0.1.recipe b/media-libs/libdvdnav/libdvdnav-5.0.1.recipe index e12eff88d..71263d1d5 100644 --- a/media-libs/libdvdnav/libdvdnav-5.0.1.recipe +++ b/media-libs/libdvdnav/libdvdnav-5.0.1.recipe @@ -22,7 +22,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libdvdread$secondaryArchSuffix # required by libdvdread libdvdcss$secondaryArchSuffix @@ -35,7 +35,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libdvdread/libdvdread-4.2.0.recipe b/media-libs/libdvdread/libdvdread-4.2.0.recipe index 131107030..dc4a4274d 100644 --- a/media-libs/libdvdread/libdvdread-4.2.0.recipe +++ b/media-libs/libdvdread/libdvdread-4.2.0.recipe @@ -26,15 +26,15 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/media-libs/libdvdread/libdvdread-4.2.1.recipe b/media-libs/libdvdread/libdvdread-4.2.1.recipe index db0db7896..ed19a0088 100644 --- a/media-libs/libdvdread/libdvdread-4.2.1.recipe +++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe @@ -26,14 +26,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libdvdread/libdvdread-5.0.0.recipe b/media-libs/libdvdread/libdvdread-5.0.0.recipe index 5786717f1..aaccc6653 100644 --- a/media-libs/libdvdread/libdvdread-5.0.0.recipe +++ b/media-libs/libdvdread/libdvdread-5.0.0.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libdvdcss$secondaryArchSuffix " @@ -34,7 +34,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libebur128/libebur128-1.0.1.recipe b/media-libs/libebur128/libebur128-1.0.1.recipe index 822cf1c4a..c820ecd37 100644 --- a/media-libs/libebur128/libebur128-1.0.1.recipe +++ b/media-libs/libebur128/libebur128-1.0.1.recipe @@ -18,7 +18,7 @@ PROVIDES=" lib:libebur128$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " # lib:libspeexdsp$secondaryArchSuffix @@ -26,7 +26,7 @@ BUILD_REQUIRES=" " # devel:libspeexdsp$secondaryArchSuffix BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:cmake diff --git a/media-libs/libfreehand/libfreehand-0.1.0.recipe b/media-libs/libfreehand/libfreehand-0.1.0.recipe index 114bda284..a068dd982 100644 --- a/media-libs/libfreehand/libfreehand-0.1.0.recipe +++ b/media-libs/libfreehand/libfreehand-0.1.0.recipe @@ -30,7 +30,7 @@ PROVIDES=" lib:libfreehand_0.1$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:librevenge_0.0$secondaryArchSuffix lib:librevenge_generators_0.0$secondaryArchSuffix @@ -45,7 +45,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/media-libs/libharu/libharu-2.3.0.recipe b/media-libs/libharu/libharu-2.3.0.recipe index a52130444..4c8258a92 100644 --- a/media-libs/libharu/libharu-2.3.0.recipe +++ b/media-libs/libharu/libharu-2.3.0.recipe @@ -31,12 +31,12 @@ PROVIDES=" lib:libhpdf$secondaryArchSuffix = 2.3.0 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/media-libs/libicns/libicns-0.8.1.recipe b/media-libs/libicns/libicns-0.8.1.recipe index ee4e5eca6..776263440 100644 --- a/media-libs/libicns/libicns-0.8.1.recipe +++ b/media-libs/libicns/libicns-0.8.1.recipe @@ -30,13 +30,13 @@ if [ -z "$secondaryArchSuffix" ]; then " fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjasper$secondaryArchSuffix lib:libpng15$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libjasper$secondaryArchSuffix devel:libpng15$secondaryArchSuffix devel:libz$secondaryArchSuffix >= 1.0.4 diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.recipe b/media-libs/libid3tag/libid3tag-0.15.1b.recipe index 3b022fab1..29ab77a1e 100644 --- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe +++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe @@ -13,12 +13,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe index 579d1f6a2..49fa2f8d0 100644 --- a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe +++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe @@ -23,12 +23,12 @@ PROVIDES=" lib:libiptcdata = 0.3.3 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv lib:libintl " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libiconv " BUILD_PREREQUIRES=" diff --git a/media-libs/liblo/liblo-0.28.recipe b/media-libs/liblo/liblo-0.28.recipe index 0dd1acaa2..532ce3904 100644 --- a/media-libs/liblo/liblo-0.28.recipe +++ b/media-libs/liblo/liblo-0.28.recipe @@ -26,10 +26,10 @@ PROVIDES=" lib:liblo$secondaryArchSuffix = 7.2.0 compat >= 7 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.1.recipe index 6a1ea69d7..ed79ef7aa 100644 --- a/media-libs/libmatroska/libmatroska-1.4.1.recipe +++ b/media-libs/libmatroska/libmatroska-1.4.1.recipe @@ -17,14 +17,14 @@ PROVIDES=" lib:libmatroska$secondaryArchSuffix = 6 " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libebml$secondaryArchSuffix " BUILD_REQUIRES=" devel:libebml$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libmetalink/libmetalink-0.1.2.recipe b/media-libs/libmetalink/libmetalink-0.1.2.recipe index b16f25d0b..8ee6a419d 100644 --- a/media-libs/libmetalink/libmetalink-0.1.2.recipe +++ b/media-libs/libmetalink/libmetalink-0.1.2.recipe @@ -22,11 +22,11 @@ PROVIDES=" lib:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix devel:libxml2$secondaryArchSuffix " diff --git a/media-libs/libmkv/libmkv-0.6.5.1.recipe b/media-libs/libmkv/libmkv-0.6.5.1.recipe index 7f669ea73..9e978eaec 100644 --- a/media-libs/libmkv/libmkv-0.6.5.1.recipe +++ b/media-libs/libmkv/libmkv-0.6.5.1.recipe @@ -19,14 +19,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libmng/libmng-1.0.10.recipe b/media-libs/libmng/libmng-1.0.10.recipe index 17a189b25..50a61ff9c 100644 --- a/media-libs/libmng/libmng-1.0.10.recipe +++ b/media-libs/libmng/libmng-1.0.10.recipe @@ -20,7 +20,7 @@ PROVIDES=" lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 1.0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -28,7 +28,7 @@ BUILD_REQUIRES=" libpng >= 1.5 " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake == 1.12 diff --git a/media-libs/libmng/libmng-2.0.2.recipe b/media-libs/libmng/libmng-2.0.2.recipe index 7867a0553..67640f4a9 100644 --- a/media-libs/libmng/libmng-2.0.2.recipe +++ b/media-libs/libmng/libmng-2.0.2.recipe @@ -20,12 +20,12 @@ PROVIDES=" lib:libmng$secondaryArchSuffix = 2.0.2 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix devel:libz$secondaryArchSuffix " diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe index 4f2cc88d4..d18675619 100644 --- a/media-libs/libmodplug/libmodplug-0.8.8.5.recipe +++ b/media-libs/libmodplug/libmodplug-0.8.8.5.recipe @@ -20,7 +20,7 @@ PROVIDES=" lib:libmodplug$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -32,7 +32,7 @@ fi BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe index 353c73252..39d214ed5 100644 --- a/media-libs/libmp4v2/libmp4v2-2.0.0.recipe +++ b/media-libs/libmp4v2/libmp4v2-2.0.0.recipe @@ -33,7 +33,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -41,7 +41,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-libs/libmpdclient/libmpdclient-2.10_git.recipe b/media-libs/libmpdclient/libmpdclient-2.10_git.recipe index 1db509681..acac3501d 100644 --- a/media-libs/libmpdclient/libmpdclient-2.10_git.recipe +++ b/media-libs/libmpdclient/libmpdclient-2.10_git.recipe @@ -25,12 +25,12 @@ PROVIDES=" lib:libmpdclient$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix glib2$secondaryArchSuffix >= 2 lib:libexpat$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libglib_2.0$secondaryArchSuffix devel:libexpat$secondaryArchSuffix " diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe index 61e2b73d4..2cae0d9ae 100644 --- a/media-libs/libmpeg2/libmpeg2-0.5.1.recipe +++ b/media-libs/libmpeg2/libmpeg2-0.5.1.recipe @@ -28,14 +28,14 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/media-libs/libmtp/libmtp-1.1.6.recipe b/media-libs/libmtp/libmtp-1.1.6.recipe index 28a6c8c70..dc99af2c9 100644 --- a/media-libs/libmtp/libmtp-1.1.6.recipe +++ b/media-libs/libmtp/libmtp-1.1.6.recipe @@ -28,13 +28,13 @@ PROVIDES=" " # add cmd provides REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgcrypt$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libusb_1.0$secondaryArchSuffix diff --git a/media-libs/libmtp/libmtp-1.1.8.recipe b/media-libs/libmtp/libmtp-1.1.8.recipe index a93576981..8f1fdc2ac 100644 --- a/media-libs/libmtp/libmtp-1.1.8.recipe +++ b/media-libs/libmtp/libmtp-1.1.8.recipe @@ -48,7 +48,7 @@ PROVIDES=" cmd:mtp_trexist$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcrypt$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix @@ -57,7 +57,7 @@ REQUIRES=" lib:libgpg_error$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgcrypt$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libusb_1.0$secondaryArchSuffix diff --git a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe index 8f36aeef5..65f3587d4 100644 --- a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe +++ b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe @@ -14,12 +14,12 @@ PROVIDES=" libnsbmp = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel netsurf_buildsystem cmd:gcc cmd:make diff --git a/media-libs/libnsgif/libnsgif-0.1.1.recipe b/media-libs/libnsgif/libnsgif-0.1.1.recipe index 13e2f7c05..93d482163 100644 --- a/media-libs/libnsgif/libnsgif-0.1.1.recipe +++ b/media-libs/libnsgif/libnsgif-0.1.1.recipe @@ -14,12 +14,12 @@ PROVIDES=" libnsgif = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel netsurf_buildsystem cmd:gcc cmd:make diff --git a/media-libs/libogg/libogg-1.3.2.recipe b/media-libs/libogg/libogg-1.3.2.recipe index f6d0c9877..314109df4 100644 --- a/media-libs/libogg/libogg-1.3.2.recipe +++ b/media-libs/libogg/libogg-1.3.2.recipe @@ -29,12 +29,12 @@ PROVIDES=" lib:libogg$secondaryArchSuffix = 0.8.2 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/libopus/libopus-1.1.recipe b/media-libs/libopus/libopus-1.1.recipe index b7f6fb3d3..b240db603 100644 --- a/media-libs/libopus/libopus-1.1.recipe +++ b/media-libs/libopus/libopus-1.1.recipe @@ -19,10 +19,10 @@ PROVIDES=" lib:libopus$secondaryArchSuffix = 0.5.0 compat >= 0.5 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/media-libs/libpng/libpng-1.5.20.recipe b/media-libs/libpng/libpng-1.5.20.recipe index 89f61613c..a47415858 100644 --- a/media-libs/libpng/libpng-1.5.20.recipe +++ b/media-libs/libpng/libpng-1.5.20.recipe @@ -22,11 +22,11 @@ PROVIDES=" lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" diff --git a/media-libs/libpng/libpng12-1.2.51.recipe b/media-libs/libpng/libpng12-1.2.51.recipe index 2c43ec138..8406b6ca9 100644 --- a/media-libs/libpng/libpng12-1.2.51.recipe +++ b/media-libs/libpng/libpng12-1.2.51.recipe @@ -26,11 +26,11 @@ PROVIDES=" lib:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" diff --git a/media-libs/libpng/libpng16-1.6.15.recipe b/media-libs/libpng/libpng16-1.6.15.recipe index 64a3139b0..39fde2cdc 100644 --- a/media-libs/libpng/libpng16-1.6.15.recipe +++ b/media-libs/libpng/libpng16-1.6.15.recipe @@ -23,11 +23,11 @@ PROVIDES=" lib:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" @@ -74,7 +74,7 @@ PROVIDES_devel=" " REQUIRES_devel=" libpng16$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " CONFLICTS_devel=" diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe index 8d2bfed39..d73b6b78b 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4.recipe +++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe @@ -56,7 +56,7 @@ if [ -z "$secondaryArchSuffix" ]; then " fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng15$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix @@ -69,7 +69,7 @@ REQUIRES=" lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libpng15$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix diff --git a/media-libs/libreplaygain/libreplaygain-r475.recipe b/media-libs/libreplaygain/libreplaygain-r475.recipe index b29283c78..10302f278 100644 --- a/media-libs/libreplaygain/libreplaygain-r475.recipe +++ b/media-libs/libreplaygain/libreplaygain-r475.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make diff --git a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe index 43fae6d02..e79484741 100644 --- a/media-libs/libsamplerate/libsamplerate-0.1.8.recipe +++ b/media-libs/libsamplerate/libsamplerate-0.1.8.recipe @@ -23,10 +23,10 @@ PROVIDES=" lib:libsamplerate$secondaryArchSuffix = 15.12.0 compat >= 15 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe index 8e553d167..77706ab02 100644 --- a/media-libs/libsdl/libsdl-1.2.15.recipe +++ b/media-libs/libsdl/libsdl-1.2.15.recipe @@ -22,7 +22,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix " @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:libtool cmd:aclocal diff --git a/media-libs/libsdl2/libsdl2-2.0.0.recipe b/media-libs/libsdl2/libsdl2-2.0.0.recipe index e7ec94f24..8c279af4b 100644 --- a/media-libs/libsdl2/libsdl2-2.0.0.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.0.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix # lib:libGL lib:libglu lib:libpng @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:libtool cmd:aclocal diff --git a/media-libs/libsdl2/libsdl2-2.0.1.recipe b/media-libs/libsdl2/libsdl2-2.0.1.recipe index 7cdfd7bca..ec87a917e 100644 --- a/media-libs/libsdl2/libsdl2-2.0.1.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.1.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -34,7 +34,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libGL$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/media-libs/libsdl2/libsdl2-2.0.3.recipe b/media-libs/libsdl2/libsdl2-2.0.3.recipe index 0fd176b99..5c92df11f 100644 --- a/media-libs/libsdl2/libsdl2-2.0.3.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.3.recipe @@ -22,14 +22,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libGL$secondaryArchSuffix devel:libglu$secondaryArchSuffix " diff --git a/media-libs/libsndfile/libsndfile-1.0.25.recipe b/media-libs/libsndfile/libsndfile-1.0.25.recipe index d0ef6a4ac..ecf62070c 100644 --- a/media-libs/libsndfile/libsndfile-1.0.25.recipe +++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe @@ -32,13 +32,13 @@ PROVIDES=" lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libflac$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libflac$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe index 92a2e4ae9..a15bff467 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe @@ -18,14 +18,14 @@ PROVIDES=" libsvgtiny = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" devel:libwapcaplet devel:libdom " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel netsurf_buildsystem cmd:gcc cmd:gperf diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe index 7cd2469e4..eb4c4b373 100644 --- a/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe +++ b/media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe @@ -18,7 +18,7 @@ PROVIDES=" libsvgtiny = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" devel:libwapcaplet @@ -27,7 +27,7 @@ BUILD_REQUIRES=" devel:libparserutils " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel netsurf_buildsystem cmd:gcc cmd:gperf diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe index 093bd94bd..b1eb65293 100644 --- a/media-libs/libtheora/libtheora-1.1.1.recipe +++ b/media-libs/libtheora/libtheora-1.1.1.recipe @@ -30,7 +30,7 @@ PROVIDES=" lib:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" @@ -39,7 +39,7 @@ BUILD_REQUIRES=" # Note: The build system also looks for libvorbis and SDL, but that seems # to be needed only for building the sample player, which we don't need. BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/media-libs/libvisio/libvisio-0.0.31.recipe b/media-libs/libvisio/libvisio-0.0.31.recipe index 0bfcad5f6..52ad0a0df 100644 --- a/media-libs/libvisio/libvisio-0.0.31.recipe +++ b/media-libs/libvisio/libvisio-0.0.31.recipe @@ -37,7 +37,7 @@ PROVIDES=" lib:libvisio_0.0$secondaryArchSuffix = $portVersion compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix lib:libicuuc$secondaryArchSuffix lib:libicudata$secondaryArchSuffix @@ -57,7 +57,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel pkgconfig$secondaryArchSuffix >= 0.27 cmd:aclocal cmd:libtoolize diff --git a/media-libs/libvisio/libvisio-0.1.0.recipe b/media-libs/libvisio/libvisio-0.1.0.recipe index bae669e64..cf0c0a270 100644 --- a/media-libs/libvisio/libvisio-0.1.0.recipe +++ b/media-libs/libvisio/libvisio-0.1.0.recipe @@ -35,7 +35,7 @@ PROVIDES=" lib:libvisio_0.1$secondaryArchSuffix = 1.0.0 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libboost_system$secondaryArchSuffix lib:libicudata$secondaryArchSuffix lib:libicui18n$secondaryArchSuffix @@ -60,7 +60,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:libtoolize cmd:autoconf diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe index c72404a47..5539fc299 100644 --- a/media-libs/libvorbis/libvorbis-1.3.2.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe @@ -28,14 +28,14 @@ PROVIDES=" lib:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/libvorbis/libvorbis-1.3.4.recipe b/media-libs/libvorbis/libvorbis-1.3.4.recipe index 46d8c4083..8eb8a30e4 100644 --- a/media-libs/libvorbis/libvorbis-1.3.4.recipe +++ b/media-libs/libvorbis/libvorbis-1.3.4.recipe @@ -28,14 +28,14 @@ PROVIDES=" lib:libvorbisfile$secondaryArchSuffix = 3.3.6 compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe index 6752a37dc..5b871e6dc 100644 --- a/media-libs/libvpx/libvpx-1.0.0.recipe +++ b/media-libs/libvpx/libvpx-1.0.0.recipe @@ -33,14 +33,14 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " # Note: The build system also looks for libvorbis and SDL, but that seems # to be needed only for building the sample player, which we don't need. BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-libs/libwebp/libwebp-0.3.1.recipe b/media-libs/libwebp/libwebp-0.3.1.recipe index 3c4af73b3..6507483c8 100644 --- a/media-libs/libwebp/libwebp-0.3.1.recipe +++ b/media-libs/libwebp/libwebp-0.3.1.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libgif$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -35,7 +35,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:autoconf diff --git a/media-libs/libwebp/libwebp-0.4.1.recipe b/media-libs/libwebp/libwebp-0.4.1.recipe index b6e87187b..8c199f7da 100644 --- a/media-libs/libwebp/libwebp-0.4.1.recipe +++ b/media-libs/libwebp/libwebp-0.4.1.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libgif$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -35,7 +35,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:autoconf diff --git a/media-libs/libxcm/libxcm-0.5.3.recipe b/media-libs/libxcm/libxcm-0.5.3.recipe index 887507cbf..dcffab8d9 100644 --- a/media-libs/libxcm/libxcm-0.5.3.recipe +++ b/media-libs/libxcm/libxcm-0.5.3.recipe @@ -25,10 +25,10 @@ PROVIDES=" lib:libXcmX11$secondaryArchSuffix = 0.0.5 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index e615bc967..70d7c0724 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" @@ -69,6 +69,6 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libopenal$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe index e021bb54c..4cd513825 100644 --- a/media-libs/openexr/openexr-2.1.0.recipe +++ b/media-libs/openexr/openexr-2.1.0.recipe @@ -41,7 +41,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libilmbase$secondaryArchSuffix == $portVersion lib:libHalf$secondaryArchSuffix == $portVersion lib:libIex_2_1$secondaryArchSuffix == $portVersion @@ -51,7 +51,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel ilmbase${secondaryArchSuffix}_devel == $portVersion devel:libilmbase$secondaryArchSuffix == $portVersion devel:libHalf$secondaryArchSuffix == $portVersion diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe index 4a91bf9e2..277edbfce 100644 --- a/media-libs/openexr/openexr-2.2.0.recipe +++ b/media-libs/openexr/openexr-2.2.0.recipe @@ -41,7 +41,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libhalf$secondaryArchSuffix == 12.0.0 lib:libiex_2_2$secondaryArchSuffix == 12.0.0 lib:libiexmath_2_2$secondaryArchSuffix == 12.0.0 @@ -51,7 +51,7 @@ REQUIRES=" lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel ilmbase${secondaryArchSuffix}_devel == $portVersion devel:libhalf$secondaryArchSuffix == 12.0.0 devel:libiex$secondaryArchSuffix == 12.0.0 diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe index d3df26e96..4a4357e49 100644 --- a/media-libs/openjpeg/openjpeg-1.5.0.recipe +++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe @@ -51,7 +51,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -64,7 +64,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:aclocal cmd:autoreconf diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe index 6b0a86547..da1512036 100644 --- a/media-libs/openjpeg/openjpeg-2.1.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe @@ -39,7 +39,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -53,7 +53,7 @@ BUILD_REQUIRES=" #needs devel:libtiff too but that isn't provided by anything BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix diff --git a/media-libs/pnglite/pnglite-0.1.17.recipe b/media-libs/pnglite/pnglite-0.1.17.recipe index 1955c8a03..530604b5a 100644 --- a/media-libs/pnglite/pnglite-0.1.17.recipe +++ b/media-libs/pnglite/pnglite-0.1.17.recipe @@ -20,11 +20,11 @@ PROVIDES=" lib:libpnglite$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix >= 1.0.4 " BUILD_PREREQUIRES=" diff --git a/media-libs/portaudio/portaudio-19.recipe b/media-libs/portaudio/portaudio-19.recipe index 29a4c7f80..15d71ef7c 100644 --- a/media-libs/portaudio/portaudio-19.recipe +++ b/media-libs/portaudio/portaudio-19.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} diff --git a/media-libs/schroedinger/schroedinger-1.0.11.recipe b/media-libs/schroedinger/schroedinger-1.0.11.recipe index 43303b290..89c2972c4 100644 --- a/media-libs/schroedinger/schroedinger-1.0.11.recipe +++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe @@ -29,11 +29,11 @@ PROVIDES=" lib:libschroedinger_1.0$secondaryArchSuffix = 0.11.0 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:liborc_0.4$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:liborc_0.4$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe index 121cd0fdd..d22c2f7ce 100644 --- a/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe +++ b/media-libs/sdl2_gfx/sdl2_gfx-2.0.x_svn.recipe @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc${secondaryArchSuffix} diff --git a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe index c089e4877..44f5c7105 100644 --- a/media-libs/sdl2_image/sdl2_image-2.0.0.recipe +++ b/media-libs/sdl2_image/sdl2_image-2.0.0.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libSDL2_2.0${secondaryArchSuffix} lib:libGL$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -41,7 +41,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libGL${secondaryArchSuffix} devel:libSDL2${secondaryArchSuffix} devel:libjpeg$secondaryArchSuffix diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe index 30f2436d1..f9956a6bc 100644 --- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -26,7 +26,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix # No clue, it wants it lib:libSDL2_2.0$secondaryArchSuffix lib:libogg$secondaryArchSuffix @@ -51,7 +51,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe index 6018c30f8..6983b652b 100644 --- a/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe +++ b/media-libs/sdl2_ttf/sdl2_ttf-2.0.12.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libfreetype${secondaryArchSuffix} lib:libSDL2_2.0${secondaryArchSuffix} lib:libz${secondaryArchSuffix} @@ -35,7 +35,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfreetype${secondaryArchSuffix} devel:libSDL2${secondaryArchSuffix} devel:libz${secondaryArchSuffix} diff --git a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe index ddb4cc2d4..32247eeef 100644 --- a/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe +++ b/media-libs/sdl_gfx/sdl_gfx-2.0.24.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libsdl$secondaryArchSuffix " @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/media-libs/sdl_image/sdl_image-1.2.12.recipe b/media-libs/sdl_image/sdl_image-1.2.12.recipe index b76b2aaa9..6ba8927b4 100644 --- a/media-libs/sdl_image/sdl_image-1.2.12.recipe +++ b/media-libs/sdl_image/sdl_image-1.2.12.recipe @@ -38,7 +38,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libpng$secondaryArchSuffix diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 3558b0326..a07e06751 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libSDL$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix @@ -50,7 +50,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe index 6b3163549..ef629f2c2 100644 --- a/media-libs/sdl_net/sdl_net-1.2.8.recipe +++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libGL$secondaryArchSuffix " diff --git a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe index 0b448df44..6cc3a450c 100644 --- a/media-libs/sdl_sound/sdl_sound-1.0.3.recipe +++ b/media-libs/sdl_sound/sdl_sound-1.0.3.recipe @@ -38,7 +38,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix diff --git a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index 7477afec8..5b596da0c 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -25,7 +25,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -35,7 +35,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 99d97aa54..9a9829527 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -33,7 +33,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix devel:libglu$secondaryArchSuffix " diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc1.recipe index 7e17dc1ba..b89de4ea4 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc1.recipe @@ -39,14 +39,14 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libogg$secondaryArchSuffix " BUILD_REQUIRES=" devel:libogg$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/media-libs/taglib/taglib-1.7.2.recipe b/media-libs/taglib/taglib-1.7.2.recipe index 932a6a1f0..80757e938 100644 --- a/media-libs/taglib/taglib-1.7.2.recipe +++ b/media-libs/taglib/taglib-1.7.2.recipe @@ -25,12 +25,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix " diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe index af6dfa0bf..5e3cc64fc 100644 --- a/media-libs/taglib/taglib-1.9.1.recipe +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -37,7 +37,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:cmake cmd:make diff --git a/media-libs/tiff/tiff-3.9.6.recipe b/media-libs/tiff/tiff-3.9.6.recipe index e684bb993..040cf1326 100644 --- a/media-libs/tiff/tiff-3.9.6.recipe +++ b/media-libs/tiff/tiff-3.9.6.recipe @@ -24,7 +24,7 @@ PROVIDES=" lib:libtiffxx$secondaryArchSuffix = $portVersion compat >= 3 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libz$secondaryArchSuffix " @@ -33,7 +33,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake @@ -120,7 +120,7 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:tiffsplit = $portVersion compat >= 3 " REQUIRES_tools=" - haiku >= $haikuVersion + haiku lib:libjpeg lib:libz tiff == $portVersion base diff --git a/media-libs/tiff/tiff4-4.0.3.recipe b/media-libs/tiff/tiff4-4.0.3.recipe index 6cbf258cb..b404da91c 100644 --- a/media-libs/tiff/tiff4-4.0.3.recipe +++ b/media-libs/tiff/tiff4-4.0.3.recipe @@ -20,7 +20,7 @@ PROVIDES=" lib:libtiffxx$secondaryArchSuffix = 5.2.0 compat >= 5 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -32,7 +32,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake @@ -133,7 +133,7 @@ if [ -z "$secondaryArchSuffix" ]; then cmd:tiffsplit " REQUIRES_tools=" - haiku >= $haikuVersion + haiku tiff4 == $portVersion base lib:libjpeg lib:libz diff --git a/media-libs/vigra/vigra-1.10.0.recipe b/media-libs/vigra/vigra-1.10.0.recipe index e977acd7c..4ea12d7ec 100644 --- a/media-libs/vigra/vigra-1.10.0.recipe +++ b/media-libs/vigra/vigra-1.10.0.recipe @@ -21,7 +21,7 @@ PROVIDES=" lib:libvigraimpex$secondaryArchSuffix = 5.1.10.0 compat >= 5 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -46,7 +46,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:g++$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe index 051854bc3..86034e6c5 100644 --- a/media-libs/x264/x264-20140308.recipe +++ b/media-libs/x264/x264-20140308.recipe @@ -26,10 +26,10 @@ PROVIDES=" lib:libx264$secondaryArchSuffix = 142 compat >= 142 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/media-sound/bladeenc/bladeenc-0.94.2.recipe b/media-sound/bladeenc/bladeenc-0.94.2.recipe index 026d861a4..3b1ba907b 100644 --- a/media-sound/bladeenc/bladeenc-0.94.2.recipe +++ b/media-sound/bladeenc/bladeenc-0.94.2.recipe @@ -19,11 +19,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index 0a590c85c..d80f09ce4 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -22,7 +22,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libFLAC$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -35,7 +35,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libFLAC$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix devel:libiconv$secondaryArchSuffix diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe index e5bc65ec6..b2548625f 100644 --- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe +++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe @@ -21,11 +21,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/media-sound/hivelytracker/hivelytracker-1.8.recipe b/media-sound/hivelytracker/hivelytracker-1.8.recipe index 205a0af79..276b38395 100644 --- a/media-sound/hivelytracker/hivelytracker-1.8.recipe +++ b/media-sound/hivelytracker/hivelytracker-1.8.recipe @@ -22,13 +22,13 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libsdl lib:libfreetype " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libfreetype devel:sdl_image devel:sdl_ttf diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 2c9ece8bb..b582deb68 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -27,12 +27,12 @@ if [ -z "$secondaryArchSuffix" ]; then " fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix " diff --git a/media-sound/milkytracker/milkytracker-0.90.86.recipe b/media-sound/milkytracker/milkytracker-0.90.86.recipe index 69d74cf63..f29a68835 100644 --- a/media-sound/milkytracker/milkytracker-0.90.86.recipe +++ b/media-sound/milkytracker/milkytracker-0.90.86.recipe @@ -37,14 +37,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix >= 1.2.3 " BUILD_REQUIRES=" devel:libz$secondaryArchSuffix >= 1.2.3 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:jam diff --git a/media-sound/mpc/musicpc-0.26.recipe b/media-sound/mpc/musicpc-0.26.recipe index b423bbf0e..b72fd1386 100644 --- a/media-sound/mpc/musicpc-0.26.recipe +++ b/media-sound/mpc/musicpc-0.26.recipe @@ -26,14 +26,14 @@ PROVIDES=" cmd:mpc$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libmpdclient$secondaryArchSuffix glib2_x86 >= 2 lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel boost${secondaryArchSuffix}_devel devel:libmpdclient$secondaryArchSuffix glib2${secondaryArchSuffix}_devel diff --git a/media-sound/mpd/mpd-0.18.12_git.recipe b/media-sound/mpd/mpd-0.18.12_git.recipe index affa8062b..5bef61f25 100644 --- a/media-sound/mpd/mpd-0.18.12_git.recipe +++ b/media-sound/mpd/mpd-0.18.12_git.recipe @@ -26,7 +26,7 @@ PROVIDES=" " #FIXME: expat not detected (missing .pc ?) REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix boost$secondaryArchSuffix lib:libmpdclient$secondaryArchSuffix @@ -53,7 +53,7 @@ REQUIRES=" lib:libvorbis$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel boost${secondaryArchSuffix}_devel devel:libmpdclient$secondaryArchSuffix icu${secondaryArchSuffix}_devel diff --git a/media-sound/mpg123/mpg123-1.12.1.recipe b/media-sound/mpg123/mpg123-1.12.1.recipe index a6bbe04c5..df56242fd 100644 --- a/media-sound/mpg123/mpg123-1.12.1.recipe +++ b/media-sound/mpg123/mpg123-1.12.1.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make @@ -58,7 +58,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix mpg123$secondaryArchSuffix == $portVersion base " diff --git a/media-sound/musepack_tools/musepack_tools-r475.recipe b/media-sound/musepack_tools/musepack_tools-r475.recipe index 8c0f81414..a9785bd14 100644 --- a/media-sound/musepack_tools/musepack_tools-r475.recipe +++ b/media-sound/musepack_tools/musepack_tools-r475.recipe @@ -33,7 +33,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcuefile$secondaryArchSuffix lib:libreplaygain$secondaryArchSuffix " @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:make diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index a41d54291..e3cea0b52 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -40,7 +40,7 @@ REQUIRES=" lib:libmad$secondaryArchSuffix >= 0.2.1 " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libSDL_1.2$secondaryArchSuffix >= 0.11.4 devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix diff --git a/media-sound/opensound/opensound-4.2_git.recipe b/media-sound/opensound/opensound-4.2_git.recipe index 9ecc34225..a309bd716 100644 --- a/media-sound/opensound/opensound-4.2_git.recipe +++ b/media-sound/opensound/opensound-4.2_git.recipe @@ -21,11 +21,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-sound/protrekkr/protrekkr-2.5.4.recipe b/media-sound/protrekkr/protrekkr-2.5.4.recipe index 134b90153..add794a96 100644 --- a/media-sound/protrekkr/protrekkr-2.5.4.recipe +++ b/media-sound/protrekkr/protrekkr-2.5.4.recipe @@ -27,14 +27,14 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libSDL$secondaryArchSuffix " BUILD_REQUIRES=" devel:libSDL$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} cmd:make diff --git a/media-sound/redoflacs/redoflacs-0.30.recipe b/media-sound/redoflacs/redoflacs-0.30.recipe index 1ee4eff5c..60ad190e7 100644 --- a/media-sound/redoflacs/redoflacs-0.30.recipe +++ b/media-sound/redoflacs/redoflacs-0.30.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:bash$secondaryArchSuffix cmd:flac$secondaryArchSuffix " diff --git a/media-sound/twolame/twolame-0.3.13.recipe b/media-sound/twolame/twolame-0.3.13.recipe index 51cd56052..8bc76293d 100644 --- a/media-sound/twolame/twolame-0.3.13.recipe +++ b/media-sound/twolame/twolame-0.3.13.recipe @@ -22,7 +22,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix lib:libogg$secondaryArchSuffix @@ -37,7 +37,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix diff --git a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe index 99b77058b..071d2a48f 100644 --- a/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe +++ b/media-sound/vorbis_tools/vorbis_tools-1.4.0.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix lib:libspeex$secondaryArchSuffix @@ -38,7 +38,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libvorbis$secondaryArchSuffix devel:libFLAC$secondaryArchSuffix devel:libspeex$secondaryArchSuffix diff --git a/media-video/ffmpeg/ffmpeg-0.10.14.recipe b/media-video/ffmpeg/ffmpeg-0.10.14.recipe index 751c9a4df..cbd3d0b4c 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.14.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.14.recipe @@ -42,7 +42,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libspeex$secondaryArchSuffix @@ -63,7 +63,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-video/ffmpeg/ffmpeg-0.11.5.recipe b/media-video/ffmpeg/ffmpeg-0.11.5.recipe index 3ec3efc02..b0bec726f 100644 --- a/media-video/ffmpeg/ffmpeg-0.11.5.recipe +++ b/media-video/ffmpeg/ffmpeg-0.11.5.recipe @@ -50,7 +50,7 @@ if [ -z "$secondaryArchSuffix" ] && [ "$effectiveTargetArchitecture" != "x86_gcc fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libspeex$secondaryArchSuffix @@ -73,7 +73,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-video/ffmpeg/ffmpeg-2.3.recipe b/media-video/ffmpeg/ffmpeg-2.3.recipe index a95ece19a..dbf9fd671 100644 --- a/media-video/ffmpeg/ffmpeg-2.3.recipe +++ b/media-video/ffmpeg/ffmpeg-2.3.recipe @@ -43,7 +43,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libspeex$secondaryArchSuffix @@ -66,7 +66,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-video/ffmpeg/ffmpeg-2.4.2.recipe b/media-video/ffmpeg/ffmpeg-2.4.2.recipe index 8e6ae98a9..ed3ffb081 100644 --- a/media-video/ffmpeg/ffmpeg-2.4.2.recipe +++ b/media-video/ffmpeg/ffmpeg-2.4.2.recipe @@ -43,7 +43,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libspeex$secondaryArchSuffix @@ -66,7 +66,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index 35f50e2f7..e283ac04b 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -20,7 +20,7 @@ PROVIDES=" app:Gnash = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix @@ -47,7 +47,7 @@ REQUIRES=" lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libbz2$secondaryArchSuffix diff --git a/media-video/handbrake/handbrake-0.9.9.recipe b/media-video/handbrake/handbrake-0.9.9.recipe index 02719dbde..6991624a1 100644 --- a/media-video/handbrake/handbrake-0.9.9.recipe +++ b/media-video/handbrake/handbrake-0.9.9.recipe @@ -21,7 +21,7 @@ PROVIDES=" cmd:HandBrakeCLI$secondaryArchSuffix " REQUIRES=" - haiku >= $haikuVersion + haiku lib:liba52$secondaryArchSuffix lib:libavcodec$secondaryArchSuffix lib:libmpeg2$secondaryArchSuffix @@ -47,7 +47,7 @@ REQUIRES=" lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:liba52$secondaryArchSuffix devel:libavcodec$secondaryArchSuffix devel:libmpeg2$secondaryArchSuffix diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.recipe b/media-video/mjpegtools/mjpegtools-2.1.0.recipe index 0393f5096..271586063 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0.recipe +++ b/media-video/mjpegtools/mjpegtools-2.1.0.recipe @@ -85,7 +85,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libpng15$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -96,7 +96,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/media-video/rtmpdump/rtmpdump-2.4_git.recipe b/media-video/rtmpdump/rtmpdump-2.4_git.recipe index 33b55287a..493bba47d 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_git.recipe +++ b/media-video/rtmpdump/rtmpdump-2.4_git.recipe @@ -39,7 +39,7 @@ PROVIDES=" # commands are provided in /bin regardless REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libssl$secondaryArchSuffix " @@ -50,7 +50,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/media-video/vcdimager/vcdimager-0.7.24.recipe b/media-video/vcdimager/vcdimager-0.7.24.recipe index 246ae1771..8f175ce36 100644 --- a/media-video/vcdimager/vcdimager-0.7.24.recipe +++ b/media-video/vcdimager/vcdimager-0.7.24.recipe @@ -42,7 +42,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcdio$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libpopt$secondaryArchSuffix @@ -59,7 +59,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:libtool cmd:aclocal cmd:autoconf diff --git a/media-video/vlc/vlc-0.8.6i.recipe b/media-video/vlc/vlc-0.8.6i.recipe index 14bea855e..652b44e6d 100644 --- a/media-video/vlc/vlc-0.8.6i.recipe +++ b/media-video/vlc/vlc-0.8.6i.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libintl lib:libiconv " @@ -88,7 +88,7 @@ BUILD_REQUIRES=" # devel:libx264$secondaryArchSuffix BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:bison cmd:gcc$secondaryArchSuffix diff --git a/net-analyzer/mtr/mtr-0.73.recipe b/net-analyzer/mtr/mtr-0.73.recipe index 25ffd3181..f5912783a 100644 --- a/net-analyzer/mtr/mtr-0.73.recipe +++ b/net-analyzer/mtr/mtr-0.73.recipe @@ -27,17 +27,17 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku >= $haikuVersion + haiku devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/net-analyzer/netcat/netcat-1.10.recipe b/net-analyzer/netcat/netcat-1.10.recipe index ab08dbdc3..21c57f886 100644 --- a/net-analyzer/netcat/netcat-1.10.recipe +++ b/net-analyzer/netcat/netcat-1.10.recipe @@ -17,10 +17,10 @@ PROVIDES=" cmd:nc = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/net-analyzer/netperf/netperf-2.6.0.recipe b/net-analyzer/netperf/netperf-2.6.0.recipe index 5e2a2d20d..a9143a79f 100644 --- a/net-analyzer/netperf/netperf-2.6.0.recipe +++ b/net-analyzer/netperf/netperf-2.6.0.recipe @@ -24,10 +24,10 @@ PROVIDES=" cmd:netserver " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:awk diff --git a/net-dialup/minicom/minicom-2.6.2.recipe b/net-dialup/minicom/minicom-2.6.2.recipe index 2874f1726..da5f2e183 100644 --- a/net-dialup/minicom/minicom-2.6.2.recipe +++ b/net-dialup/minicom/minicom-2.6.2.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix diff --git a/net-dns/c_ares/c_ares-1.10.0.recipe b/net-dns/c_ares/c_ares-1.10.0.recipe index 59540d256..7988cee12 100644 --- a/net-dns/c_ares/c_ares-1.10.0.recipe +++ b/net-dns/c_ares/c_ares-1.10.0.recipe @@ -38,13 +38,13 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES="" BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix diff --git a/net-dns/libidn/libidn-1.29.recipe b/net-dns/libidn/libidn-1.29.recipe index a7fe10a85..4fb8dc81b 100644 --- a/net-dns/libidn/libidn-1.29.recipe +++ b/net-dns/libidn/libidn-1.29.recipe @@ -20,12 +20,12 @@ PROVIDES=" cmd:idn$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/net-fs/samba/samba-3.6.24.recipe b/net-fs/samba/samba-3.6.24.recipe index 2d68e9e72..1113473cb 100644 --- a/net-fs/samba/samba-3.6.24.recipe +++ b/net-fs/samba/samba-3.6.24.recipe @@ -67,7 +67,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -84,7 +84,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:libtoolize cmd:perl diff --git a/net-ftp/lftp/lftp-4.4.16.recipe b/net-ftp/lftp/lftp-4.4.16.recipe index ad2406a01..fcd759c5f 100644 --- a/net-ftp/lftp/lftp-4.4.16.recipe +++ b/net-ftp/lftp/lftp-4.4.16.recipe @@ -27,14 +27,14 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix ca_root_certificates lib:libreadline$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libreadline$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe index a10980f85..c2443c98b 100644 --- a/net-irc/quassel/quassel-0.10.0.recipe +++ b/net-irc/quassel/quassel-0.10.0.recipe @@ -36,7 +36,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 lib:libz${secondaryArchSuffix} " @@ -53,7 +53,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 devel:libz${secondaryArchSuffix} " diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe index ebc34f5c9..2f5077e6d 100644 --- a/net-irc/quassel/quassel-0.9.2.recipe +++ b/net-irc/quassel/quassel-0.9.2.recipe @@ -36,7 +36,7 @@ PROVIDES=" " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libQtCore$secondaryArchSuffix >= 4.8 lib:libQtGui$secondaryArchSuffix >= 4.8 " @@ -51,7 +51,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libQtCore$secondaryArchSuffix >= 4.8 devel:libQtGui$secondaryArchSuffix >= 4.8 " diff --git a/net-libs/enet/enet-1.3.0.recipe b/net-libs/enet/enet-1.3.0.recipe index f6240277b..720a42bf1 100644 --- a/net-libs/enet/enet-1.3.0.recipe +++ b/net-libs/enet/enet-1.3.0.recipe @@ -23,11 +23,11 @@ PROVIDES=" lib:libenet$secondaryArchSuffix = $portVersion compat >= 1.0.0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/net-libs/gloox/gloox-1.0.12.recipe b/net-libs/gloox/gloox-1.0.12.recipe index 597a27927..206fbad56 100644 --- a/net-libs/gloox/gloox-1.0.12.recipe +++ b/net-libs/gloox/gloox-1.0.12.recipe @@ -25,12 +25,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix " diff --git a/net-libs/gloox/gloox-1.0.9.recipe b/net-libs/gloox/gloox-1.0.9.recipe index 161170ba2..cf866aa40 100644 --- a/net-libs/gloox/gloox-1.0.9.recipe +++ b/net-libs/gloox/gloox-1.0.9.recipe @@ -25,12 +25,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix " diff --git a/net-libs/gnutls/gnutls-2.8.6.recipe b/net-libs/gnutls/gnutls-2.8.6.recipe index c467c8860..e516514d0 100644 --- a/net-libs/gnutls/gnutls-2.8.6.recipe +++ b/net-libs/gnutls/gnutls-2.8.6.recipe @@ -27,7 +27,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgcrypt lib:libgpg_error " @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf cmd:automake cmd:gcc diff --git a/net-libs/hubbub/hubbub-0.3.0.recipe b/net-libs/hubbub/hubbub-0.3.0.recipe index e11267e74..53b93ef26 100644 --- a/net-libs/hubbub/hubbub-0.3.0.recipe +++ b/net-libs/hubbub/hubbub-0.3.0.recipe @@ -22,7 +22,7 @@ PROVIDES=" lib:libhubbub = $portVersion compat >= 0 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" devel:libparserutils @@ -30,7 +30,7 @@ BUILD_REQUIRES=" devel:libiconv " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel netsurf_buildsystem >= 0.3.0 cmd:gcc cmd:make diff --git a/net-libs/libdom/libdom-0.1.0.recipe b/net-libs/libdom/libdom-0.1.0.recipe index e9de20b52..b21ca6732 100644 --- a/net-libs/libdom/libdom-0.1.0.recipe +++ b/net-libs/libdom/libdom-0.1.0.recipe @@ -15,7 +15,7 @@ PROVIDES=" lib:libdom = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" devel:libexpat @@ -27,7 +27,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:perl diff --git a/net-libs/libdom/libdom-0.1.1.recipe b/net-libs/libdom/libdom-0.1.1.recipe index 4b41e4ea0..39f7549a1 100644 --- a/net-libs/libdom/libdom-0.1.1.recipe +++ b/net-libs/libdom/libdom-0.1.1.recipe @@ -16,7 +16,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" @@ -29,7 +29,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:perl diff --git a/net-libs/libnatpmp/libnatpmp-20140401.recipe b/net-libs/libnatpmp/libnatpmp-20140401.recipe index fc091fec2..79a3e5c0d 100644 --- a/net-libs/libnatpmp/libnatpmp-20140401.recipe +++ b/net-libs/libnatpmp/libnatpmp-20140401.recipe @@ -23,10 +23,10 @@ PROVIDES=" cmd:natpmpc " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.4.3.recipe index d0a9ab37b..08cf1e30f 100644 --- a/net-libs/libssh2/libssh2-1.4.3.recipe +++ b/net-libs/libssh2/libssh2-1.4.3.recipe @@ -26,13 +26,13 @@ PROVIDES=" lib:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-libs/neon/neon-0.29.6.recipe b/net-libs/neon/neon-0.29.6.recipe index 39bd445f8..f2f4a46e5 100644 --- a/net-libs/neon/neon-0.29.6.recipe +++ b/net-libs/neon/neon-0.29.6.recipe @@ -34,7 +34,7 @@ PROVIDES=" lib:libneon$secondaryArchSuffix = 27.2.6 compat >= 27.2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libssl$secondaryArchSuffix @@ -49,7 +49,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:libtoolize diff --git a/net-libs/neon/neon-0.30.1.recipe b/net-libs/neon/neon-0.30.1.recipe index d2c0a5642..5e575414c 100644 --- a/net-libs/neon/neon-0.30.1.recipe +++ b/net-libs/neon/neon-0.30.1.recipe @@ -32,7 +32,7 @@ PROVIDES=" lib:libneon$secondaryArchSuffix = 27.3.1 compat >= 27.2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libssl$secondaryArchSuffix @@ -47,7 +47,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:libtoolize diff --git a/net-libs/serf/serf-1.3.8.recipe b/net-libs/serf/serf-1.3.8.recipe index ac8eab22b..e811e015d 100644 --- a/net-libs/serf/serf-1.3.8.recipe +++ b/net-libs/serf/serf-1.3.8.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -32,7 +32,7 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-misc/axel/axel-2.4.recipe b/net-misc/axel/axel-2.4.recipe index 51f909eed..6f13d7890 100644 --- a/net-misc/axel/axel-2.4.recipe +++ b/net-misc/axel/axel-2.4.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/net-misc/berdp/berdp-1.recipe b/net-misc/berdp/berdp-1.recipe index 22d6203a1..36e8af97a 100644 --- a/net-misc/berdp/berdp-1.recipe +++ b/net-misc/berdp/berdp-1.recipe @@ -26,11 +26,11 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:rdesktop " diff --git a/net-misc/curl/curl-7.38.0.recipe b/net-misc/curl/curl-7.38.0.recipe index dcc944aab..f0f6e0d3d 100644 --- a/net-misc/curl/curl-7.38.0.recipe +++ b/net-misc/curl/curl-7.38.0.recipe @@ -21,7 +21,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix ca_root_certificates lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -31,7 +31,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/net-misc/curl/curl-7.39.0.recipe b/net-misc/curl/curl-7.39.0.recipe index fa4f2f675..9062c8385 100644 --- a/net-misc/curl/curl-7.39.0.recipe +++ b/net-misc/curl/curl-7.39.0.recipe @@ -21,7 +21,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix ca_root_certificates lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -31,7 +31,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/net-misc/gophernicus/gophernicus-1.5.recipe b/net-misc/gophernicus/gophernicus-1.5.recipe index 1bddd97aa..f701fa55e 100644 --- a/net-misc/gophernicus/gophernicus-1.5.recipe +++ b/net-misc/gophernicus/gophernicus-1.5.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/net-misc/mosh/mosh-1.2.4.recipe b/net-misc/mosh/mosh-1.2.4.recipe index 0b0d5800f..86ba7d6fc 100644 --- a/net-misc/mosh/mosh-1.2.4.recipe +++ b/net-misc/mosh/mosh-1.2.4.recipe @@ -33,7 +33,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix @@ -51,7 +51,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:automake cmd:awk diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe index 186d420be..ec2615541 100644 --- a/net-misc/muscle/muscle-6.00.recipe +++ b/net-misc/muscle/muscle-6.00.recipe @@ -35,11 +35,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix " diff --git a/net-misc/openssh/openssh-5.8p2.recipe b/net-misc/openssh/openssh-5.8p2.recipe index 546a3b3dd..cbbb1a59c 100644 --- a/net-misc/openssh/openssh-5.8p2.recipe +++ b/net-misc/openssh/openssh-5.8p2.recipe @@ -30,7 +30,7 @@ PROVIDES=" cmd:sshd = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libcrypto lib:libedit lib:libssl @@ -40,7 +40,7 @@ BUILD_REQUIRES=" openssl " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/net-misc/openssh/openssh-6.0p1.recipe b/net-misc/openssh/openssh-6.0p1.recipe index 01ee39429..0ef2c35a6 100644 --- a/net-misc/openssh/openssh-6.0p1.recipe +++ b/net-misc/openssh/openssh-6.0p1.recipe @@ -27,7 +27,7 @@ PROVIDES=" cmd:sshd = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:login cmd:passwd lib:libcrypto @@ -44,7 +44,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/net-misc/openssh/openssh-6.5p1.recipe b/net-misc/openssh/openssh-6.5p1.recipe index dfcdd1f0f..522f8922f 100644 --- a/net-misc/openssh/openssh-6.5p1.recipe +++ b/net-misc/openssh/openssh-6.5p1.recipe @@ -44,7 +44,7 @@ PROVIDES=" cmd:sshd = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:login cmd:passwd lib:libcrypto @@ -61,7 +61,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/net-misc/openssh/openssh-6.6p1.recipe b/net-misc/openssh/openssh-6.6p1.recipe index 240605a58..83cfca413 100644 --- a/net-misc/openssh/openssh-6.6p1.recipe +++ b/net-misc/openssh/openssh-6.6p1.recipe @@ -42,7 +42,7 @@ PROVIDES=" cmd:sshd = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:login cmd:passwd lib:libcrypto @@ -59,7 +59,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/net-misc/openssh/openssh-6.7p1.recipe b/net-misc/openssh/openssh-6.7p1.recipe index 700c1ee3b..31e27ecf1 100644 --- a/net-misc/openssh/openssh-6.7p1.recipe +++ b/net-misc/openssh/openssh-6.7p1.recipe @@ -43,7 +43,7 @@ PROVIDES=" cmd:sshd = $portVersion compat >= 5 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:login cmd:passwd lib:libcrypto @@ -60,7 +60,7 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/net-misc/rdesktop/rdesktop-1.8.0.recipe b/net-misc/rdesktop/rdesktop-1.8.0.recipe index 05077774b..ee9df7f70 100644 --- a/net-misc/rdesktop/rdesktop-1.8.0.recipe +++ b/net-misc/rdesktop/rdesktop-1.8.0.recipe @@ -25,12 +25,12 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libssl " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libcrypto lib:libssl " diff --git a/net-misc/rsync/rsync-3.1.1.recipe b/net-misc/rsync/rsync-3.1.1.recipe index e0c7dfd14..01ec0291f 100644 --- a/net-misc/rsync/rsync-3.1.1.recipe +++ b/net-misc/rsync/rsync-3.1.1.recipe @@ -21,7 +21,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " @@ -30,7 +30,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:find diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe index 65e3224be..c7626f4c3 100644 --- a/net-misc/tor/tor-0.2.4.20.recipe +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -52,14 +52,14 @@ PROVIDES=" cmd:torify$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libevent$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libevent$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-misc/vncviewer/vncviewer-3.3.1r6.recipe b/net-misc/vncviewer/vncviewer-3.3.1r6.recipe index ddbdeaea5..5d7667c30 100644 --- a/net-misc/vncviewer/vncviewer-3.3.1r6.recipe +++ b/net-misc/vncviewer/vncviewer-3.3.1r6.recipe @@ -26,7 +26,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine cmd:gcc cmd:make diff --git a/net-misc/wget/wget-1.16.1.recipe b/net-misc/wget/wget-1.16.1.recipe index 3dd4d2231..f6c5b10a4 100644 --- a/net-misc/wget/wget-1.16.1.recipe +++ b/net-misc/wget/wget-1.16.1.recipe @@ -19,7 +19,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix @@ -27,7 +27,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix >= 1.2.3 diff --git a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe index 0ae2bd54d..2ded6ff56 100644 --- a/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe +++ b/net-misc/youtube_dl/youtube_dl-2013.12.20.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:youtube_dl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:make diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe index ab2f3a393..d4c7d8b35 100644 --- a/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe +++ b/net-misc/youtube_dl/youtube_dl-2014.01.08.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:youtube_dl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:zip diff --git a/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe b/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe index f53022f16..a2eb648e1 100644 --- a/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe +++ b/net-misc/youtube_dl/youtube_dl-2014.01.23.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:youtube_dl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:zip diff --git a/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe b/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe index be59ab6bf..bd556fc90 100644 --- a/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe +++ b/net-misc/youtube_dl/youtube_dl-2014.02.08.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:youtube_dl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:zip diff --git a/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe b/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe index a93a193a0..f2648df62 100644 --- a/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe +++ b/net-misc/youtube_dl/youtube_dl-2014.06.19.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:youtube_dl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:zip diff --git a/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe b/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe index d81280293..afa330e8b 100644 --- a/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe +++ b/net-misc/youtube_dl/youtube_dl-2014.10.15.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:youtube_dl = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:python " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:python " BUILD_PREREQUIRES=" diff --git a/net-nds/openldap/openldap-2.4.40.recipe b/net-nds/openldap/openldap-2.4.40.recipe index 79d33b86f..1705e524d 100644 --- a/net-nds/openldap/openldap-2.4.40.recipe +++ b/net-nds/openldap/openldap-2.4.40.recipe @@ -51,13 +51,13 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix devel:libssl$secondaryArchSuffix " diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe index b6e83958e..8afebbe2e 100644 --- a/net-p2p/transmission/transmission-2.82.recipe +++ b/net-p2p/transmission/transmission-2.82.recipe @@ -57,7 +57,7 @@ PROVIDES=" cmd:transmission_show$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix @@ -67,7 +67,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-p2p/transmission/transmission-2.84.recipe b/net-p2p/transmission/transmission-2.84.recipe index d1f1f9953..47e7cbdaa 100644 --- a/net-p2p/transmission/transmission-2.84.recipe +++ b/net-p2p/transmission/transmission-2.84.recipe @@ -37,7 +37,7 @@ PROVIDES=" cmd:transmission_show$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libcurl$secondaryArchSuffix lib:libevent$secondaryArchSuffix @@ -48,7 +48,7 @@ REQUIRES=" lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libcurl$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/net-print/gutenprint/gutenprint-5.2.10.recipe b/net-print/gutenprint/gutenprint-5.2.10.recipe index 2787cf07d..c05b8c3b0 100644 --- a/net-print/gutenprint/gutenprint-5.2.10.recipe +++ b/net-print/gutenprint/gutenprint-5.2.10.recipe @@ -31,10 +31,10 @@ PROVIDES=" lib:libgutenprint$secondaryArchSuffix = 2.3.0 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/net-print/gutenprint/gutenprint-5.2.9.recipe b/net-print/gutenprint/gutenprint-5.2.9.recipe index 05359c2ff..ad1c1df51 100644 --- a/net-print/gutenprint/gutenprint-5.2.9.recipe +++ b/net-print/gutenprint/gutenprint-5.2.9.recipe @@ -31,10 +31,10 @@ PROVIDES=" lib:libgutenprint$secondaryArchSuffix = 2.1.0 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/net-proxy/privoxy/privoxy-3.0.21.recipe b/net-proxy/privoxy/privoxy-3.0.21.recipe index 9021345ae..180619276 100644 --- a/net-proxy/privoxy/privoxy-3.0.21.recipe +++ b/net-proxy/privoxy/privoxy-3.0.21.recipe @@ -16,11 +16,11 @@ ARCHITECTURES="x86_gcc2 x86 !ppc" CHECKSUM_SHA256="5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8" REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe index b9e421490..944b88d07 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe @@ -24,14 +24,14 @@ PROVIDES=" wpa_supplicant = $portVersion compat >= 0.7 " REQUIRES=" - haiku >= $haikuVersion + haiku openssl >= 1.0.0 " BUILD_REQUIRES=" openssl >= 1.0.0 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe index bab3e1cdf..4f9c868ff 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe +++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe @@ -25,14 +25,14 @@ PROVIDES=" cmd:wpa_supplicant = $portVersion compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libssl " BUILD_REQUIRES=" devel:libssl >= 1.0.0 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/sci-astronomy/celestia/celestia-1.6.1.recipe b/sci-astronomy/celestia/celestia-1.6.1.recipe index f73e260c6..2451fcf61 100644 --- a/sci-astronomy/celestia/celestia-1.6.1.recipe +++ b/sci-astronomy/celestia/celestia-1.6.1.recipe @@ -35,7 +35,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lua$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -46,7 +46,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel lua${secondaryArchSuffix}_devel devel:libintl$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/sci-electronics/verilator/verilator-3.864.recipe b/sci-electronics/verilator/verilator-3.864.recipe index fb27aa5cc..817e4a019 100644 --- a/sci-electronics/verilator/verilator-3.864.recipe +++ b/sci-electronics/verilator/verilator-3.864.recipe @@ -20,11 +20,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:perl cmd:bison diff --git a/sci-libs/fftw/fftw-3.2.2.recipe b/sci-libs/fftw/fftw-3.2.2.recipe index 9212d62b2..cec241f85 100644 --- a/sci-libs/fftw/fftw-3.2.2.recipe +++ b/sci-libs/fftw/fftw-3.2.2.recipe @@ -32,11 +32,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/sci-libs/fftw/fftw-3.3.3.recipe b/sci-libs/fftw/fftw-3.3.3.recipe index 3b267ebdf..fd50e065d 100644 --- a/sci-libs/fftw/fftw-3.3.3.recipe +++ b/sci-libs/fftw/fftw-3.3.3.recipe @@ -33,14 +33,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/sci-libs/fftw/fftw-3.3.4.recipe b/sci-libs/fftw/fftw-3.3.4.recipe index dcefbe609..edaf89675 100644 --- a/sci-libs/fftw/fftw-3.3.4.recipe +++ b/sci-libs/fftw/fftw-3.3.4.recipe @@ -33,14 +33,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/sci-libs/gdal/gdal-1.11.0.recipe b/sci-libs/gdal/gdal-1.11.0.recipe index 5559659aa..8eb349edf 100644 --- a/sci-libs/gdal/gdal-1.11.0.recipe +++ b/sci-libs/gdal/gdal-1.11.0.recipe @@ -74,7 +74,7 @@ PROVIDES=" cmd:testepsg " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libgeotiff$secondaryArchSuffix lib:libgif$secondaryArchSuffix >= 7.0.0 @@ -87,7 +87,7 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libexpat$secondaryArchSuffix devel:libgeotiff$secondaryArchSuffix devel:libgif$secondaryArchSuffix >= 7.0.0 diff --git a/sci-libs/geos/geos-3.4.2.recipe b/sci-libs/geos/geos-3.4.2.recipe index f7c03790f..071cc14b9 100644 --- a/sci-libs/geos/geos-3.4.2.recipe +++ b/sci-libs/geos/geos-3.4.2.recipe @@ -29,11 +29,11 @@ PROVIDES=" lib:libgeos_c$secondaryArchSuffix = 1.8.2 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:aclocal diff --git a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe index 36afd34c6..ffd79d8b8 100644 --- a/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe +++ b/sci-libs/libgeotiff/libgeotiff-1.4.0.recipe @@ -33,14 +33,14 @@ PROVIDES=" cmd:makegeo " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libproj$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix diff --git a/sci-libs/libsvm/libsvm-v320.recipe b/sci-libs/libsvm/libsvm-v320.recipe index 8fa9e9b65..a0dc93b28 100644 --- a/sci-libs/libsvm/libsvm-v320.recipe +++ b/sci-libs/libsvm/libsvm-v320.recipe @@ -19,12 +19,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libstdc++ " BUILD_PREREQUIRES=" - haiku >= $haikuVersion + haiku cmd:make cmd:gcc cmd:g++ @@ -91,7 +91,7 @@ PROVIDES_tools=" " REQUIRES_tools=" - haiku >= $haikuVersion + haiku lib:libstdc++ cmd:python " diff --git a/sci-libs/proj/proj-4.8.0.recipe b/sci-libs/proj/proj-4.8.0.recipe index 09203369b..df5114683 100644 --- a/sci-libs/proj/proj-4.8.0.recipe +++ b/sci-libs/proj/proj-4.8.0.recipe @@ -33,10 +33,10 @@ PROVIDES=" cmd:proj " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/sci-mathematics/pari/pari-2.7.0.recipe b/sci-mathematics/pari/pari-2.7.0.recipe index abf2ceeb3..0bd08231e 100644 --- a/sci-mathematics/pari/pari-2.7.0.recipe +++ b/sci-mathematics/pari/pari-2.7.0.recipe @@ -34,13 +34,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libgmp$secondaryArchSuffix devel:libncurses$secondaryArchSuffix " diff --git a/sci-visualization/gri/gri-2.12.23.recipe b/sci-visualization/gri/gri-2.12.23.recipe index 6a6f41ee1..c289ca744 100644 --- a/sci-visualization/gri/gri-2.12.23.recipe +++ b/sci-visualization/gri/gri-2.12.23.recipe @@ -16,10 +16,10 @@ PROVIDES=" gri = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:gcc diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index feadf31d6..ed3431192 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -132,11 +132,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:grep cmd:ld diff --git a/sys-apps/dbus/dbus-1.8.6.recipe b/sys-apps/dbus/dbus-1.8.6.recipe index f6dc1f836..e3be51801 100644 --- a/sys-apps/dbus/dbus-1.8.6.recipe +++ b/sys-apps/dbus/dbus-1.8.6.recipe @@ -45,7 +45,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix glib2$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix @@ -64,7 +64,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:pkg_config$secondaryArchSuffix cmd:find @@ -80,7 +80,7 @@ PROVIDES_devel=" REQUIRES_devel=" dbus$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD() diff --git a/sys-apps/dialog/dialog-1.2.recipe b/sys-apps/dialog/dialog-1.2.recipe index 2ba53b43e..53dbdc67d 100644 --- a/sys-apps/dialog/dialog-1.2.recipe +++ b/sys-apps/dialog/dialog-1.2.recipe @@ -18,11 +18,11 @@ PROVIDES=" cmd:dialog = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libncurses " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libncurses " BUILD_PREREQUIRES=" diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.3.recipe index 3bf416a26..1451faf38 100644 --- a/sys-apps/diffutils/diffutils-3.3.recipe +++ b/sys-apps/diffutils/diffutils-3.3.recipe @@ -31,11 +31,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc cmd:awk diff --git a/sys-apps/dmidecode/dmidecode-2.12.recipe b/sys-apps/dmidecode/dmidecode-2.12.recipe index e9de9980f..fc965ade7 100644 --- a/sys-apps/dmidecode/dmidecode-2.12.recipe +++ b/sys-apps/dmidecode/dmidecode-2.12.recipe @@ -20,7 +20,7 @@ REQUIRES=" haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" cmd:make diff --git a/sys-apps/dtc/dtc-1.4.0.recipe b/sys-apps/dtc/dtc-1.4.0.recipe index 86834097a..fbeb22145 100644 --- a/sys-apps/dtc/dtc-1.4.0.recipe +++ b/sys-apps/dtc/dtc-1.4.0.recipe @@ -30,11 +30,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:bison$secondaryArchSuffix >= 2.5 cmd:flex cmd:gcc$secondaryArchSuffix diff --git a/sys-apps/ed/ed-1.7.recipe b/sys-apps/ed/ed-1.7.recipe index 9facb3434..7ab636909 100644 --- a/sys-apps/ed/ed-1.7.recipe +++ b/sys-apps/ed/ed-1.7.recipe @@ -16,10 +16,10 @@ PROVIDES=" cmd:red = $portVersion compat >= 1 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/sys-apps/file/file-5.15.recipe b/sys-apps/file/file-5.15.recipe index 5445ad120..c77e6e2d9 100644 --- a/sys-apps/file/file-5.15.recipe +++ b/sys-apps/file/file-5.15.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libz " @@ -33,7 +33,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoreconf cmd:aclocal cmd:libtoolize diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe index 129b86948..b8c77f540 100644 --- a/sys-apps/findutils/findutils-4.4.2.recipe +++ b/sys-apps/findutils/findutils-4.4.2.recipe @@ -25,10 +25,10 @@ PROVIDES=" cmd:xargs = $portVersion compat >= 4 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/sys-apps/fxload/fxload-20120810.recipe b/sys-apps/fxload/fxload-20120810.recipe index ebb5a60ce..449041d98 100644 --- a/sys-apps/fxload/fxload-20120810.recipe +++ b/sys-apps/fxload/fxload-20120810.recipe @@ -35,11 +35,11 @@ PROVIDES=" " REQUIRES=" lib:libusb_1.0$secondaryArchSuffix - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" devel:libusb_1.0${secondaryArchSuffix} - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:make diff --git a/sys-apps/gawk/gawk-3.1.8.recipe b/sys-apps/gawk/gawk-3.1.8.recipe index 1e2211fd4..0882f59d6 100644 --- a/sys-apps/gawk/gawk-3.1.8.recipe +++ b/sys-apps/gawk/gawk-3.1.8.recipe @@ -23,12 +23,12 @@ PROVIDES=" cmd:gawk = $portVersion compat >= 3 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:libtoolize diff --git a/sys-apps/gawk/gawk-4.1.0.recipe b/sys-apps/gawk/gawk-4.1.0.recipe index 5fe68e1fb..2f871b4a1 100644 --- a/sys-apps/gawk/gawk-4.1.0.recipe +++ b/sys-apps/gawk/gawk-4.1.0.recipe @@ -25,12 +25,12 @@ PROVIDES=" cmd:igawk = $portVersion compat >= 4 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-apps/getconf/getconf-r260000.recipe b/sys-apps/getconf/getconf-r260000.recipe index 8afb44bbe..595b4057a 100644 --- a/sys-apps/getconf/getconf-r260000.recipe +++ b/sys-apps/getconf/getconf-r260000.recipe @@ -20,10 +20,10 @@ PROVIDES=" cmd:getconf = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" makefile_engine diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe b/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe index c2b8b7cb5..3313de1e3 100644 --- a/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe +++ b/sys-apps/gptfdisk/gptfdisk-0.8.10.recipe @@ -21,7 +21,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make " diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe index d6dc8d915..9322b5dd3 100644 --- a/sys-apps/grep/grep-2.14.recipe +++ b/sys-apps/grep/grep-2.14.recipe @@ -23,7 +23,7 @@ PROVIDES=" cmd:grep = $portVersion compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv lib:libintl " @@ -32,7 +32,7 @@ BUILD_REQUIRES=" devel:libintl " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-apps/grep/grep-2.20.recipe b/sys-apps/grep/grep-2.20.recipe index ab6fd3593..030d84011 100644 --- a/sys-apps/grep/grep-2.20.recipe +++ b/sys-apps/grep/grep-2.20.recipe @@ -20,7 +20,7 @@ PROVIDES=" cmd:grep = $portVersion compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv lib:libintl " @@ -29,7 +29,7 @@ BUILD_REQUIRES=" devel:libintl " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-apps/grep/grep-2.21.recipe b/sys-apps/grep/grep-2.21.recipe index 170d6b942..b288b1ee3 100644 --- a/sys-apps/grep/grep-2.21.recipe +++ b/sys-apps/grep/grep-2.21.recipe @@ -20,7 +20,7 @@ PROVIDES=" cmd:grep = $portVersion compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libiconv lib:libintl " @@ -29,7 +29,7 @@ BUILD_REQUIRES=" devel:libintl " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-apps/groff/groff-1.20.1.recipe b/sys-apps/groff/groff-1.20.1.recipe index e56eace55..cff405646 100644 --- a/sys-apps/groff/groff-1.20.1.recipe +++ b/sys-apps/groff/groff-1.20.1.recipe @@ -56,12 +56,12 @@ PROVIDES=" cmd:troff = $portVersion compat >= 1.20 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:gcc diff --git a/sys-apps/help2man/help2man-1.43.3.recipe b/sys-apps/help2man/help2man-1.43.3.recipe index 99131ff3a..90deb5c49 100644 --- a/sys-apps/help2man/help2man-1.43.3.recipe +++ b/sys-apps/help2man/help2man-1.43.3.recipe @@ -27,11 +27,11 @@ PROVIDES=" cmd:help2man$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:perl " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/sys-apps/help2man/help2man-1.44.1.recipe b/sys-apps/help2man/help2man-1.44.1.recipe index 2e0ffc432..5e2214891 100644 --- a/sys-apps/help2man/help2man-1.44.1.recipe +++ b/sys-apps/help2man/help2man-1.44.1.recipe @@ -27,11 +27,11 @@ PROVIDES=" cmd:help2man$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:perl " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/sys-apps/help2man/help2man-1.46.3.recipe b/sys-apps/help2man/help2man-1.46.3.recipe index 81022f554..c54a6e8e7 100644 --- a/sys-apps/help2man/help2man-1.46.3.recipe +++ b/sys-apps/help2man/help2man-1.46.3.recipe @@ -25,11 +25,11 @@ PROVIDES=" cmd:help2man$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:perl " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix diff --git a/sys-apps/less/less-451.recipe b/sys-apps/less/less-451.recipe index ca0233aa8..4007f440f 100644 --- a/sys-apps/less/less-451.recipe +++ b/sys-apps/less/less-451.recipe @@ -22,12 +22,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " diff --git a/sys-apps/less/less-458.recipe b/sys-apps/less/less-458.recipe index 23b558fed..33d51cd23 100644 --- a/sys-apps/less/less-458.recipe +++ b/sys-apps/less/less-458.recipe @@ -24,12 +24,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " diff --git a/sys-apps/less/less-466.recipe b/sys-apps/less/less-466.recipe index e3553701c..f3e69e87f 100644 --- a/sys-apps/less/less-466.recipe +++ b/sys-apps/less/less-466.recipe @@ -24,12 +24,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " diff --git a/sys-apps/man/man-1.6g.recipe b/sys-apps/man/man-1.6g.recipe index a1da4b5ef..fd2dfeca9 100644 --- a/sys-apps/man/man-1.6g.recipe +++ b/sys-apps/man/man-1.6g.recipe @@ -23,7 +23,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk cmd:bzip2 cmd:cat @@ -53,7 +53,7 @@ BUILD_REQUIRES=" cmd:zcat " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/sys-apps/pciutils/pciutils-3.2.1.recipe b/sys-apps/pciutils/pciutils-3.2.1.recipe index 596d423ce..db915dced 100644 --- a/sys-apps/pciutils/pciutils-3.2.1.recipe +++ b/sys-apps/pciutils/pciutils-3.2.1.recipe @@ -16,11 +16,11 @@ PROVIDES=" cmd:setpci${secondaryArchSuffix} = $portVersion " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz${secondaryArchSuffix} " BUILD_PREREQUIRES=" diff --git a/sys-apps/pciutils/pciutils-3.2.1_git.recipe b/sys-apps/pciutils/pciutils-3.2.1_git.recipe index d0161f4b6..6ed0e315c 100644 --- a/sys-apps/pciutils/pciutils-3.2.1_git.recipe +++ b/sys-apps/pciutils/pciutils-3.2.1_git.recipe @@ -19,11 +19,11 @@ PROVIDES=" # devel:pciutils${secondaryArchSuffix} " REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libz${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libz${secondaryArchSuffix} " BUILD_PREREQUIRES=" diff --git a/sys-apps/sed/sed-4.2.1.recipe b/sys-apps/sed/sed-4.2.1.recipe index b8e8c58d7..698fcbf09 100644 --- a/sys-apps/sed/sed-4.2.1.recipe +++ b/sys-apps/sed/sed-4.2.1.recipe @@ -22,10 +22,10 @@ PROVIDES=" cmd:sed = $portVersion compat >= 4 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:make diff --git a/sys-apps/spiff/spiff-1.recipe b/sys-apps/spiff/spiff-1.recipe index d92af0e89..7678ae5a4 100644 --- a/sys-apps/spiff/spiff-1.recipe +++ b/sys-apps/spiff/spiff-1.recipe @@ -19,13 +19,13 @@ PROVIDES=" cmd:spiff" REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel lib:libncurses lib:libroot " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel makefile_engine devel:libncurses cmd:gcc @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" cmd:mkdepend" BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libncurses " diff --git a/sys-apps/texinfo/texinfo-4.13a.recipe b/sys-apps/texinfo/texinfo-4.13a.recipe index bed916683..4b18d17b5 100644 --- a/sys-apps/texinfo/texinfo-4.13a.recipe +++ b/sys-apps/texinfo/texinfo-4.13a.recipe @@ -23,14 +23,14 @@ PROVIDES=" cmd:infokey = $portVersion compat >= 4.13 cmd:pdftexi2dvi = $portVersion compat >= 4.13" REQUIRES=" - haiku >= $haikuVersion + haiku lib:libncurses " BUILD_REQUIRES=" devel:libncurses " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:libtoolize diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe index 7800ea8b2..e65a4a26d 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe +++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.18.1.recipe @@ -37,7 +37,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:liblzma${secondaryArchSuffix} lib:libpcre${secondaryArchSuffix} lib:libz${secondaryArchSuffix} @@ -50,7 +50,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe index df3d08357..fed252254 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe +++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.26.recipe @@ -37,7 +37,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:liblzma${secondaryArchSuffix} lib:libpcre${secondaryArchSuffix} lib:libz${secondaryArchSuffix} @@ -50,7 +50,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:autoheader diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe index ec6bf8492..3f22ca0ef 100644 --- a/sys-apps/which/which-2.20.recipe +++ b/sys-apps/which/which-2.20.recipe @@ -14,12 +14,12 @@ PROVIDES=" cmd:which = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:sed diff --git a/sys-block/parted/parted-3.1.53_git.recipe b/sys-block/parted/parted-3.1.53_git.recipe index 6e06f6227..d80444c37 100644 --- a/sys-block/parted/parted-3.1.53_git.recipe +++ b/sys-block/parted/parted-3.1.53_git.recipe @@ -17,14 +17,14 @@ PROVIDES=" cmd:parted$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:git cmd:autoconf cmd:libtool diff --git a/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe b/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe index 648500ca5..5dce04490 100644 --- a/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe +++ b/sys-devel/arm_none_eabi_binutils/arm_none_eabi_binutils-2.24_2014_03_19.recipe @@ -47,14 +47,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" cmd:find cmd:xargs " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find diff --git a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe index bee70d846..305889cf2 100644 --- a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe +++ b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe @@ -39,7 +39,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:${targetU}_as$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -51,7 +51,7 @@ BUILD_REQUIRES=" devel:libmpc$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:bison diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe index 6d61d526e..0150c1f1c 100644 --- a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe +++ b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe @@ -39,7 +39,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:${targetU}_as$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgmp$secondaryArchSuffix @@ -53,7 +53,7 @@ BUILD_REQUIRES=" devel:libmpc$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:bison diff --git a/sys-devel/autoconf/autoconf-2.68.recipe b/sys-devel/autoconf/autoconf-2.68.recipe index 218fbb37e..41a7f258c 100644 --- a/sys-devel/autoconf/autoconf-2.68.recipe +++ b/sys-devel/autoconf/autoconf-2.68.recipe @@ -26,7 +26,7 @@ PROVIDES=" cmd:ifnames = $portVersion compat >= 2.60 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk coreutils diffutils @@ -37,7 +37,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:automake >= 1.11 cmd:autoreconf >= 2.60 cmd:make diff --git a/sys-devel/autoconf/autoconf-2.69.recipe b/sys-devel/autoconf/autoconf-2.69.recipe index 3dc015cb1..ffa4015fa 100644 --- a/sys-devel/autoconf/autoconf-2.69.recipe +++ b/sys-devel/autoconf/autoconf-2.69.recipe @@ -29,7 +29,7 @@ PROVIDES=" cmd:ifnames = $portVersion compat >= 2.60 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk coreutils diffutils @@ -40,7 +40,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:m4 cmd:make diff --git a/sys-devel/autoconf213/autoconf213-2.13.recipe b/sys-devel/autoconf213/autoconf213-2.13.recipe index 1d2598027..6b33dac1c 100644 --- a/sys-devel/autoconf213/autoconf213-2.13.recipe +++ b/sys-devel/autoconf213/autoconf213-2.13.recipe @@ -27,11 +27,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/sys-devel/automake/automake-1.11.1.recipe b/sys-devel/automake/automake-1.11.1.recipe index e45e5928f..a3059fdbc 100644 --- a/sys-devel/automake/automake-1.11.1.recipe +++ b/sys-devel/automake/automake-1.11.1.recipe @@ -21,7 +21,7 @@ PROVIDES=" cmd:aclocal_1.11 = $portVersion compat >= 1.11 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk coreutils diffutils @@ -32,7 +32,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf >= 2.60 cmd:make cmd:perl >= 5.8 diff --git a/sys-devel/automake/automake-1.12.2.recipe b/sys-devel/automake/automake-1.12.2.recipe index 862b64139..b540cdf6d 100644 --- a/sys-devel/automake/automake-1.12.2.recipe +++ b/sys-devel/automake/automake-1.12.2.recipe @@ -21,7 +21,7 @@ PROVIDES=" cmd:aclocal_1.12 = $portVersion compat >= 1.12 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk coreutils diffutils @@ -32,7 +32,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf >= 2.60 cmd:gcc cmd:ld diff --git a/sys-devel/automake/automake-1.13.1.recipe b/sys-devel/automake/automake-1.13.1.recipe index 9ee7a526d..773a46cc7 100644 --- a/sys-devel/automake/automake-1.13.1.recipe +++ b/sys-devel/automake/automake-1.13.1.recipe @@ -21,7 +21,7 @@ PROVIDES=" cmd:aclocal_1.13 = $portVersion compat >= 1.13 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:awk coreutils diffutils @@ -32,7 +32,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:autoconf >= 2.60 cmd:find cmd:gcc diff --git a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe index d0c11395c..6eb4076f5 100644 --- a/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe +++ b/sys-devel/avr_binutils/avr_binutils-2.24_2014_03_19.recipe @@ -44,14 +44,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" cmd:find cmd:xargs " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find diff --git a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe index 351b97fdd..96075b1f4 100644 --- a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe +++ b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe @@ -37,7 +37,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:avr_as$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -45,7 +45,7 @@ BUILD_REQUIRES=" cmd:avr_as$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:bison diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index f2a5fb1bb..5369c64a0 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -21,12 +21,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libfl >= 2 " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/sys-devel/bin86/bin86-0.16.21.recipe b/sys-devel/bin86/bin86-0.16.21.recipe index a040f116b..b6ebdae7d 100644 --- a/sys-devel/bin86/bin86-0.16.21.recipe +++ b/sys-devel/bin86/bin86-0.16.21.recipe @@ -31,11 +31,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe index 301bf5b90..414c72517 100644 --- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe +++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe @@ -34,12 +34,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:find cmd:flex diff --git a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe index 4ff223f07..fe6b398d3 100644 --- a/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe +++ b/sys-devel/binutils/binutils-2.23.2_2013_04_09.recipe @@ -41,12 +41,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find diff --git a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe index 4bfbc0938..ccc1ad641 100644 --- a/sys-devel/binutils/binutils-2.24_2014_03_19.recipe +++ b/sys-devel/binutils/binutils-2.24_2014_03_19.recipe @@ -44,14 +44,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" cmd:find cmd:xargs " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find diff --git a/sys-devel/bison/bison-2.4.3.recipe b/sys-devel/bison/bison-2.4.3.recipe index cade05d19..e8df83f06 100644 --- a/sys-devel/bison/bison-2.4.3.recipe +++ b/sys-devel/bison/bison-2.4.3.recipe @@ -27,13 +27,13 @@ PROVIDES=" devel:liby = $portVersion compat >= 2.4 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:m4 " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:m4 diff --git a/sys-devel/bison/bison-2.6.5.recipe b/sys-devel/bison/bison-2.6.5.recipe index 6de2a61f6..94d67871a 100644 --- a/sys-devel/bison/bison-2.6.5.recipe +++ b/sys-devel/bison/bison-2.6.5.recipe @@ -30,7 +30,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:m4 " @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk diff --git a/sys-devel/bmake/bmake-20140214.recipe b/sys-devel/bmake/bmake-20140214.recipe index 2cced260c..c6aebcd66 100644 --- a/sys-devel/bmake/bmake-20140214.recipe +++ b/sys-devel/bmake/bmake-20140214.recipe @@ -21,12 +21,12 @@ PROVIDES=" cmd:bmake = $portVersion compat >= 3.82 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:make diff --git a/sys-devel/clang/clang-3.2.recipe b/sys-devel/clang/clang-3.2.recipe index 0bd0233b5..a46465dc4 100644 --- a/sys-devel/clang/clang-3.2.recipe +++ b/sys-devel/clang/clang-3.2.recipe @@ -33,14 +33,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/clang/clang-3.4.recipe b/sys-devel/clang/clang-3.4.recipe index ddeac702e..d5b084dd3 100644 --- a/sys-devel/clang/clang-3.4.recipe +++ b/sys-devel/clang/clang-3.4.recipe @@ -36,7 +36,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -44,7 +44,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/distcc/distcc-3.1.recipe b/sys-devel/distcc/distcc-3.1.recipe index fab104290..a93636a43 100644 --- a/sys-devel/distcc/distcc-3.1.recipe +++ b/sys-devel/distcc/distcc-3.1.recipe @@ -24,7 +24,7 @@ GLOBAL_WRITABLE_FILES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libpython2.7 " @@ -32,7 +32,7 @@ BUILD_REQUIRES=" devel:libpython2.7 " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:libtoolize cmd:which cmd:aclocal diff --git a/sys-devel/flex/flex-2.5.35.recipe b/sys-devel/flex/flex-2.5.35.recipe index 87048cbc6..a41803dac 100644 --- a/sys-devel/flex/flex-2.5.35.recipe +++ b/sys-devel/flex/flex-2.5.35.recipe @@ -20,13 +20,13 @@ PROVIDES=" devel:libfl_pic = $portVersion compat >= 2.5 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:m4 " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe index 8c9734004..73d03a084 100644 --- a/sys-devel/flex/flex-2.5.39.recipe +++ b/sys-devel/flex/flex-2.5.39.recipe @@ -23,13 +23,13 @@ PROVIDES=" devel:libfl_pic = 2.0.0 compat >= 2 " REQUIRES=" - haiku >= $haikuVersion + haiku cmd:m4 " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe index 5086755e8..c8ec9dc47 100644 --- a/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2014_07_26.recipe @@ -34,13 +34,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix binutils$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf gcc$secondaryArchSuffix cmd:find diff --git a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe index 0d873ad8e..6a8f39b94 100644 --- a/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe +++ b/sys-devel/gcc/gcc-2.95.3_2014_10_14.recipe @@ -35,13 +35,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix binutils$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf gcc$secondaryArchSuffix cmd:find diff --git a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe index e31eabc3f..bea9b287d 100644 --- a/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe +++ b/sys-devel/gcc/gcc-4.8.3_2014_05_28.recipe @@ -37,13 +37,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:as$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find diff --git a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe index e27d45852..99edf9aff 100644 --- a/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe +++ b/sys-devel/gcc/gcc-4.8.3_2014_07_26.recipe @@ -45,7 +45,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix cmd:as$secondaryArchSuffix " @@ -53,7 +53,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:awk cmd:find @@ -315,7 +315,7 @@ PROVIDES_syslibs=" " REQUIRES_syslibs=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " # ----- syslibs_devel package ----------------------------------------------- diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index a85790b9a..8698c8f77 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -62,7 +62,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix gettext${secondaryArchSuffix}_libintl == $portVersion base lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -72,7 +72,7 @@ BUILD_REQUIRES=" devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake @@ -122,6 +122,6 @@ PROVIDES_libintl=" lib:libintl${secondaryArchSuffix} = 8.1.1 compat >= 8 " REQUIRES_libintl=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libiconv${secondaryArchSuffix} " diff --git a/sys-devel/gettext/gettext-0.19.2.recipe b/sys-devel/gettext/gettext-0.19.2.recipe index f8f29dcf5..af3e58bdd 100644 --- a/sys-devel/gettext/gettext-0.19.2.recipe +++ b/sys-devel/gettext/gettext-0.19.2.recipe @@ -62,7 +62,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix gettext${secondaryArchSuffix}_libintl == $portVersion base lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -73,7 +73,7 @@ BUILD_REQUIRES=" devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:find cmd:gcc$secondaryArchSuffix cmd:groff @@ -118,6 +118,6 @@ PROVIDES_libintl=" lib:libintl${secondaryArchSuffix} = 8.1.2 compat >= 8 " REQUIRES_libintl=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} lib:libiconv${secondaryArchSuffix} " diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe index 6dd2edf80..a4ffd9fe0 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -27,12 +27,12 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:make cmd:ld diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe index 859ede706..14e9d96b7 100644 --- a/sys-devel/libtool/libtool-2.4.2.recipe +++ b/sys-devel/libtool/libtool-2.4.2.recipe @@ -24,7 +24,7 @@ PROVIDES=" devel:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix libtool_libltdl$secondaryArchSuffix == $portVersion base cmd:aclocal cmd:automake @@ -36,7 +36,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf >= 2.62 cmd:autoheader >= 2.62 @@ -97,5 +97,5 @@ PROVIDES_libltdl=" lib:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7 " REQUIRES_libltdl=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index 4d809f5c4..e1b49aae1 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -23,7 +23,7 @@ PROVIDES=" devel:libltdl = 7.3.0 compat >= 7 " REQUIRES=" - haiku >= $haikuVersion + haiku libtool_libltdl == $portVersion base cmd:aclocal cmd:automake @@ -33,7 +33,7 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autoconf >= 2.62 cmd:autoheader >= 2.62 @@ -92,5 +92,5 @@ PROVIDES_libltdl=" lib:libltdl = 7.3.0 compat >= 7 " REQUIRES_libltdl=" - haiku >= $haikuVersion + haiku " diff --git a/sys-devel/libuuid/libuuid-1.0.3.recipe b/sys-devel/libuuid/libuuid-1.0.3.recipe index 3aa2e5fd3..7fe017659 100644 --- a/sys-devel/libuuid/libuuid-1.0.3.recipe +++ b/sys-devel/libuuid/libuuid-1.0.3.recipe @@ -25,11 +25,11 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:make diff --git a/sys-devel/llvm/llvm-3.0.recipe b/sys-devel/llvm/llvm-3.0.recipe index e4c113ae4..f96adf539 100644 --- a/sys-devel/llvm/llvm-3.0.recipe +++ b/sys-devel/llvm/llvm-3.0.recipe @@ -18,12 +18,12 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel # cmd:autoconf # cmd:flex cmd:groff diff --git a/sys-devel/llvm/llvm-3.2.recipe b/sys-devel/llvm/llvm-3.2.recipe index 7e2004dad..3850c7f81 100644 --- a/sys-devel/llvm/llvm-3.2.recipe +++ b/sys-devel/llvm/llvm-3.2.recipe @@ -47,14 +47,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/llvm/llvm-3.3.recipe b/sys-devel/llvm/llvm-3.3.recipe index 3c3146f10..886a1a044 100644 --- a/sys-devel/llvm/llvm-3.3.recipe +++ b/sys-devel/llvm/llvm-3.3.recipe @@ -20,14 +20,14 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe index e1ddd5a1c..fb8b440b8 100644 --- a/sys-devel/llvm/llvm-3.4.1.recipe +++ b/sys-devel/llvm/llvm-3.4.1.recipe @@ -148,7 +148,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -156,7 +156,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/llvm/llvm-3.4.2.recipe b/sys-devel/llvm/llvm-3.4.2.recipe index 32ae92aa8..87fe84ff0 100644 --- a/sys-devel/llvm/llvm-3.4.2.recipe +++ b/sys-devel/llvm/llvm-3.4.2.recipe @@ -148,7 +148,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " @@ -157,7 +157,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/llvm/llvm-3.4.recipe b/sys-devel/llvm/llvm-3.4.recipe index e2eb42455..bb80a0e96 100644 --- a/sys-devel/llvm/llvm-3.4.recipe +++ b/sys-devel/llvm/llvm-3.4.recipe @@ -47,7 +47,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " @@ -55,7 +55,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:automake diff --git a/sys-devel/m4/m4-1.4.16.recipe b/sys-devel/m4/m4-1.4.16.recipe index fc3888bd4..cb76f179a 100644 --- a/sys-devel/m4/m4-1.4.16.recipe +++ b/sys-devel/m4/m4-1.4.16.recipe @@ -26,12 +26,12 @@ PROVIDES=" cmd:m4 = $portVersion compat >= 1.4 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:ld diff --git a/sys-devel/make/make-3.82.recipe b/sys-devel/make/make-3.82.recipe index d6a66d9a6..3cb28cad1 100644 --- a/sys-devel/make/make-3.82.recipe +++ b/sys-devel/make/make-3.82.recipe @@ -22,12 +22,12 @@ PROVIDES=" cmd:make = $portVersion compat >= 3.82 " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:gcc cmd:ld cmd:libtoolize diff --git a/sys-devel/openwatcom/openwatcom-1.9.0.recipe b/sys-devel/openwatcom/openwatcom-1.9.0.recipe index c9705af9e..784ab4f95 100644 --- a/sys-devel/openwatcom/openwatcom-1.9.0.recipe +++ b/sys-devel/openwatcom/openwatcom-1.9.0.recipe @@ -27,7 +27,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:cc$secondaryArchSuffix cmd:make diff --git a/sys-devel/patch/patch-2.7.1.recipe b/sys-devel/patch/patch-2.7.1.recipe index eebe7efb6..76e653566 100644 --- a/sys-devel/patch/patch-2.7.1.recipe +++ b/sys-devel/patch/patch-2.7.1.recipe @@ -18,11 +18,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:make cmd:gcc diff --git a/sys-fs/ddrescue/ddrescue-1.19.recipe b/sys-fs/ddrescue/ddrescue-1.19.recipe index 37b17e30d..91aab6e6f 100644 --- a/sys-fs/ddrescue/ddrescue-1.19.recipe +++ b/sys-fs/ddrescue/ddrescue-1.19.recipe @@ -36,13 +36,13 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/sys-fs/mtools/mtools-4.0.18.recipe b/sys-fs/mtools/mtools-4.0.18.recipe index 754e0363e..7779dd085 100644 --- a/sys-fs/mtools/mtools-4.0.18.recipe +++ b/sys-fs/mtools/mtools-4.0.18.recipe @@ -53,11 +53,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:awk cmd:gcc cmd:make diff --git a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe index f8258b92b..6aaf9203b 100644 --- a/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe +++ b/sys-fs/ssh-fuse/sshfs_fuse-2.5.recipe @@ -32,7 +32,7 @@ REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:make diff --git a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe index ba683bc56..6ecb7340e 100644 --- a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe +++ b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe @@ -57,7 +57,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:awk cmd:gcc$secondaryArchSuffix cmd:make diff --git a/sys-libs/glu/glu-9.0.0.recipe b/sys-libs/glu/glu-9.0.0.recipe index 6465ef5cb..c6ea01cee 100644 --- a/sys-libs/glu/glu-9.0.0.recipe +++ b/sys-libs/glu/glu-9.0.0.recipe @@ -16,11 +16,11 @@ PROVIDES=" lib:libGLU$secondaryArchSuffix = 1.3.1 compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL${secondaryArchSuffix} " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libGL$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/sys-libs/libexecinfo/libexecinfo-1.1.recipe b/sys-libs/libexecinfo/libexecinfo-1.1.recipe index fbb1239d3..44e18a571 100644 --- a/sys-libs/libexecinfo/libexecinfo-1.1.recipe +++ b/sys-libs/libexecinfo/libexecinfo-1.1.recipe @@ -19,12 +19,12 @@ PROVIDES=" lib:libexecinfo$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make diff --git a/sys-libs/mesa/mesa-10.0.1.recipe b/sys-libs/mesa/mesa-10.0.1.recipe index fccdf54e8..752e6b24e 100644 --- a/sys-libs/mesa/mesa-10.0.1.recipe +++ b/sys-libs/mesa/mesa-10.0.1.recipe @@ -24,10 +24,10 @@ PROVIDES=" lib:libGL$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " PATCHES="mesa-10.0.1.patchset" diff --git a/sys-libs/mesa/mesa-10.0.2.recipe b/sys-libs/mesa/mesa-10.0.2.recipe index 8ab5a0d06..cca5b2aae 100644 --- a/sys-libs/mesa/mesa-10.0.2.recipe +++ b/sys-libs/mesa/mesa-10.0.2.recipe @@ -24,10 +24,10 @@ PROVIDES=" lib:libGL$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " PATCHES="mesa-10.0.2.patchset" diff --git a/sys-libs/mesa/mesa-10.1.0.recipe b/sys-libs/mesa/mesa-10.1.0.recipe index 18327f821..922dcb994 100644 --- a/sys-libs/mesa/mesa-10.1.0.recipe +++ b/sys-libs/mesa/mesa-10.1.0.recipe @@ -24,10 +24,10 @@ PROVIDES=" lib:libGL$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" libxml2_python diff --git a/sys-libs/mesa/mesa-10.1.1.recipe b/sys-libs/mesa/mesa-10.1.1.recipe index f53f5865d..8a2f7018c 100644 --- a/sys-libs/mesa/mesa-10.1.1.recipe +++ b/sys-libs/mesa/mesa-10.1.1.recipe @@ -24,12 +24,12 @@ PROVIDES=" lib:libGL$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" libxml2_python diff --git a/sys-libs/mesa/mesa-10.2.9.recipe b/sys-libs/mesa/mesa-10.2.9.recipe index 943384a4e..d9c049955 100644 --- a/sys-libs/mesa/mesa-10.2.9.recipe +++ b/sys-libs/mesa/mesa-10.2.9.recipe @@ -24,12 +24,12 @@ PROVIDES=" lib:libGL$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" libxml2_python diff --git a/sys-libs/mesa/mesa-7.9.2.recipe b/sys-libs/mesa/mesa-7.9.2.recipe index eb6139a1f..1a24dfa61 100644 --- a/sys-libs/mesa/mesa-7.9.2.recipe +++ b/sys-libs/mesa/mesa-7.9.2.recipe @@ -30,10 +30,10 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/sys-libs/mesa/mesa-9.1.1.recipe b/sys-libs/mesa/mesa-9.1.1.recipe index 0b1cf8d1e..13b9259eb 100644 --- a/sys-libs/mesa/mesa-9.1.1.recipe +++ b/sys-libs/mesa/mesa-9.1.1.recipe @@ -35,12 +35,12 @@ PROVIDES=" mesa$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel libxml2_python cmd:bison cmd:find diff --git a/sys-libs/ncurses/ncurses-5.9.recipe b/sys-libs/ncurses/ncurses-5.9.recipe index faaeb02e4..86cda2e56 100644 --- a/sys-libs/ncurses/ncurses-5.9.recipe +++ b/sys-libs/ncurses/ncurses-5.9.recipe @@ -39,7 +39,7 @@ if [ -z "$secondaryArchSuffix" ]; then fi REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " if [ -n "$secondaryArchSuffix" ]; then REQUIRES="$REQUIRES @@ -50,7 +50,7 @@ fi BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:grep cmd:ld$secondaryArchSuffix diff --git a/sys-libs/readline/readline-6.2.recipe b/sys-libs/readline/readline-6.2.recipe index 5201d1697..5b5da5687 100644 --- a/sys-libs/readline/readline-6.2.recipe +++ b/sys-libs/readline/readline-6.2.recipe @@ -27,11 +27,11 @@ PROVIDES=" lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/sys-libs/readline/readline-6.3.recipe b/sys-libs/readline/readline-6.3.recipe index 876829e16..4212c4e2c 100644 --- a/sys-libs/readline/readline-6.3.recipe +++ b/sys-libs/readline/readline-6.3.recipe @@ -27,11 +27,11 @@ PROVIDES=" lib:libreadline$secondaryArchSuffix = $portVersion compat >= 6 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index ce893c72e..448d813fc 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -23,12 +23,12 @@ PROVIDES=" lib:libz$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:cmake cmd:gcc$secondaryArchSuffix cmd:grep diff --git a/sys-process/dcron/dcron-4.5.recipe b/sys-process/dcron/dcron-4.5.recipe index ddb83a586..dd14ff683 100644 --- a/sys-process/dcron/dcron-4.5.recipe +++ b/sys-process/dcron/dcron-4.5.recipe @@ -30,11 +30,11 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel " BUILD_PREREQUIRES=" diff --git a/www-client/bezilla/bezilla-git.recipe b/www-client/bezilla/bezilla-git.recipe index 924ef3d18..3d8e1893a 100644 --- a/www-client/bezilla/bezilla-git.recipe +++ b/www-client/bezilla/bezilla-git.recipe @@ -18,7 +18,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" @@ -27,7 +27,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:m4 diff --git a/www-client/links/links-2.3pre2.recipe b/www-client/links/links-2.3pre2.recipe index d73d9ff21..15ce8c848 100644 --- a/www-client/links/links-2.3pre2.recipe +++ b/www-client/links/links-2.3pre2.recipe @@ -18,7 +18,7 @@ PROVIDES=" cmd:links$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix # lib:libtiff$secondaryArchSuffix @@ -37,7 +37,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:libtool cmd:aclocal diff --git a/www-client/links/links-2.8.recipe b/www-client/links/links-2.8.recipe index cce2a6aae..21c73119a 100644 --- a/www-client/links/links-2.8.recipe +++ b/www-client/links/links-2.8.recipe @@ -19,7 +19,7 @@ PROVIDES=" cmd:links$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix # lib:libtiff$secondaryArchSuffix @@ -38,7 +38,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:libtool cmd:aclocal diff --git a/www-client/lynx/lynx-2.8.9dev.1.recipe b/www-client/lynx/lynx-2.8.9dev.1.recipe index 8669b7136..172c9c418 100644 --- a/www-client/lynx/lynx-2.8.9dev.1.recipe +++ b/www-client/lynx/lynx-2.8.9dev.1.recipe @@ -19,7 +19,7 @@ PROVIDES=" cmd:lynx$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -34,7 +34,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel #cmd:autoconf cmd:ar cmd:bison diff --git a/www-client/netsurf/netsurf-3.1.recipe b/www-client/netsurf/netsurf-3.1.recipe index 31cf4a0fd..915d41b20 100644 --- a/www-client/netsurf/netsurf-3.1.recipe +++ b/www-client/netsurf/netsurf-3.1.recipe @@ -23,7 +23,7 @@ PROVIDES=" app:NetSurf = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libcurl lib:libexpat lib:libiconv @@ -33,7 +33,7 @@ REQUIRES=" lib:libz " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libcurl devel:libexpat devel:libiconv diff --git a/www-client/netsurf/netsurf-3.2.recipe b/www-client/netsurf/netsurf-3.2.recipe index 43ed98c94..556ff1b51 100644 --- a/www-client/netsurf/netsurf-3.2.recipe +++ b/www-client/netsurf/netsurf-3.2.recipe @@ -16,7 +16,7 @@ SRC_URI="git://git.netsurf-browser.org/netsurf.git#9b62f1ec53b089e6697131a3653c7 REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" REQUIRES=" - haiku >= $haikuVersion + haiku lib:libcurl lib:libexpat lib:libiconv @@ -28,7 +28,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel devel:libcurl devel:libexpat devel:libiconv diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe index dd80ab1e2..62b021fa1 100644 --- a/www-client/qupzilla/qupzilla-1.4.x.recipe +++ b/www-client/qupzilla/qupzilla-1.4.x.recipe @@ -30,7 +30,7 @@ PROVIDES=" # TODO: update requirements to be more specific about which Qt # libraries are required. REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} qtcore${secondaryArchSuffix} >= 4.8.0 " @@ -41,7 +41,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel openssl${secondaryArchSuffix}_devel qtcore${secondaryArchSuffix} >= 4.8.0 qtcore${secondaryArchSuffix}_devel >= 4.8.0 diff --git a/www-client/qupzilla/qupzilla-1.7.x.recipe b/www-client/qupzilla/qupzilla-1.7.x.recipe index 408f6bbfa..4d619f595 100644 --- a/www-client/qupzilla/qupzilla-1.7.x.recipe +++ b/www-client/qupzilla/qupzilla-1.7.x.recipe @@ -29,7 +29,7 @@ PROVIDES=" # TODO: update requirements to be more specific about which Qt # libraries are required. REQUIRES=" - haiku${secondaryArchSuffix} >= $haikuVersion + haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8.0 lib:libexecinfo${secondaryArchSuffix} " @@ -42,7 +42,7 @@ BUILD_PREREQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel == $haikuVersion + haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8.0 devel:libssl${secondaryArchSuffix} devel:libcrypto${secondaryArchSuffix} diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe index a403eeda1..c4b9354bf 100644 --- a/www-client/w3m/w3m-0.5.3.recipe +++ b/www-client/w3m/w3m-0.5.3.recipe @@ -24,7 +24,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libgc lib:libssl lib:libcrypto @@ -41,7 +41,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:libtoolize cmd:autoconf cmd:make diff --git a/www-servers/haproxy/haproxy-1.4.22.recipe b/www-servers/haproxy/haproxy-1.4.22.recipe index c498e4038..a9a4e71b5 100644 --- a/www-servers/haproxy/haproxy-1.4.22.recipe +++ b/www-servers/haproxy/haproxy-1.4.22.recipe @@ -20,11 +20,11 @@ PROVIDES=" cmd:haproxy = $portVersion " REQUIRES=" - haiku >= $haikuVersion + haiku " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:make cmd:gcc " diff --git a/www-servers/lighttpd/lighttpd-1.4.35.recipe b/www-servers/lighttpd/lighttpd-1.4.35.recipe index 11053f558..0b22c962c 100644 --- a/www-servers/lighttpd/lighttpd-1.4.35.recipe +++ b/www-servers/lighttpd/lighttpd-1.4.35.recipe @@ -56,7 +56,7 @@ PROVIDES=" " REQUIRES=" - haiku >= $haikuVersion + haiku lib:libbz2 lib:libcrypto lib:libpcre @@ -72,7 +72,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:aclocal cmd:autom4te cmd:automake diff --git a/www-servers/nginx/nginx-1.7.4_hg.recipe b/www-servers/nginx/nginx-1.7.4_hg.recipe index fae8b9331..ccb6e281a 100644 --- a/www-servers/nginx/nginx-1.7.4_hg.recipe +++ b/www-servers/nginx/nginx-1.7.4_hg.recipe @@ -22,13 +22,13 @@ PROVIDES=" cmd:nginx$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libpcre$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/x11-libs/agg/agg-2.5.recipe b/x11-libs/agg/agg-2.5.recipe index 980c729a8..348c74f1f 100644 --- a/x11-libs/agg/agg-2.5.recipe +++ b/x11-libs/agg/agg-2.5.recipe @@ -21,14 +21,14 @@ PROVIDES=" lib:libaggplatformHaiku$secondaryArchSuffix = 2.0.4 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libsdl_1.2$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libbz2$secondaryArchSuffix @@ -99,7 +99,7 @@ PROVIDES_sdl=" " REQUIRES_sdl=" agg$secondaryArchSuffix == $portVersion base - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libsdl_1.2$secondaryArchSuffix lib:libGL$secondaryArchSuffix " diff --git a/x11-libs/cairo/cairo-1.12.16.recipe b/x11-libs/cairo/cairo-1.12.16.recipe index 6f1c87c93..23f608b9a 100644 --- a/x11-libs/cairo/cairo-1.12.16.recipe +++ b/x11-libs/cairo/cairo-1.12.16.recipe @@ -44,7 +44,7 @@ PROVIDES=" lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.16 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libpixman_1$secondaryArchSuffix @@ -56,7 +56,7 @@ REQUIRES=" lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libpixman_1$secondaryArchSuffix diff --git a/x11-libs/cairo/cairo-1.12.18.recipe b/x11-libs/cairo/cairo-1.12.18.recipe index 7a716da4e..e10730e49 100644 --- a/x11-libs/cairo/cairo-1.12.18.recipe +++ b/x11-libs/cairo/cairo-1.12.18.recipe @@ -44,7 +44,7 @@ PROVIDES=" lib:libcairo_script_interpreter$secondaryArchSuffix = 2.11200.18 compat >= 2 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libpixman_1$secondaryArchSuffix @@ -56,7 +56,7 @@ REQUIRES=" lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libpixman_1$secondaryArchSuffix diff --git a/x11-libs/cd/cd-5.8.recipe b/x11-libs/cd/cd-5.8.recipe index 0710ea8a0..d25bee772 100644 --- a/x11-libs/cd/cd-5.8.recipe +++ b/x11-libs/cd/cd-5.8.recipe @@ -30,7 +30,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libGLU$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -53,7 +53,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:make cmd:gcc$secondaryArchSuffix cmd:as$secondaryArchSuffix diff --git a/x11-libs/iup/iup-3.8.recipe b/x11-libs/iup/iup-3.8.recipe index 454bccf42..60ff7064e 100644 --- a/x11-libs/iup/iup-3.8.recipe +++ b/x11-libs/iup/iup-3.8.recipe @@ -37,7 +37,7 @@ PROVIDES=" lib:libiupweb$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:liblua$secondaryArchSuffix lib:libcd$secondaryArchSuffix >= 5.6 lib:libim$secondaryArchSuffix >= 3.8 @@ -58,7 +58,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:as$secondaryArchSuffix cmd:make diff --git a/x11-libs/libxau/libxau-1.0.5.recipe b/x11-libs/libxau/libxau-1.0.5.recipe index 401df5e10..9a955a037 100644 --- a/x11-libs/libxau/libxau-1.0.5.recipe +++ b/x11-libs/libxau/libxau-1.0.5.recipe @@ -19,17 +19,17 @@ PROVIDES=" devel:libxau$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix xproto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix devel:xproto$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/x11-libs/libxau/libxau-1.0.8.recipe b/x11-libs/libxau/libxau-1.0.8.recipe index 44976333c..aff1b8c9d 100644 --- a/x11-libs/libxau/libxau-1.0.8.recipe +++ b/x11-libs/libxau/libxau-1.0.8.recipe @@ -21,17 +21,17 @@ PROVIDES=" devel:libXau$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix xproto$secondaryArchSuffix " BUILD_REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix devel:xproto$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/x11-libs/libxcb/libxcb-1.6.recipe b/x11-libs/libxcb/libxcb-1.6.recipe index 260f14c9c..77caeb1e7 100644 --- a/x11-libs/libxcb/libxcb-1.6.recipe +++ b/x11-libs/libxcb/libxcb-1.6.recipe @@ -61,7 +61,7 @@ PROVIDES=" devel:libxcb_xvmc$secondaryArchSuffix " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libxslt >= 1.1.26 lib:libxau$secondaryArchSuffix >= 1.0.5 " @@ -74,7 +74,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:doxygen diff --git a/x11-libs/pango/pango-1.36.8.recipe b/x11-libs/pango/pango-1.36.8.recipe index 7a10f51fe..2f31fcc9a 100644 --- a/x11-libs/pango/pango-1.36.8.recipe +++ b/x11-libs/pango/pango-1.36.8.recipe @@ -41,7 +41,7 @@ PROVIDES=" lib:libpangoft2_1.0$secondaryArchSuffix = 0.3600.8 compat >= 0 " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libcairo$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix @@ -62,7 +62,7 @@ REQUIRES=" lib:libbz2$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:libcairo$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe index 59e7a731c..a3d79fbbd 100644 --- a/x11-libs/pixman/pixman-0.20.0.recipe +++ b/x11-libs/pixman/pixman-0.20.0.recipe @@ -29,7 +29,7 @@ PROVIDES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " REQUIRES_devel=" @@ -40,7 +40,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/x11-libs/pixman/pixman-0.32.4.recipe b/x11-libs/pixman/pixman-0.32.4.recipe index 248a4096c..e868fab43 100644 --- a/x11-libs/pixman/pixman-0.32.4.recipe +++ b/x11-libs/pixman/pixman-0.32.4.recipe @@ -29,7 +29,7 @@ PROVIDES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " REQUIRES_devel=" @@ -40,7 +40,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/x11-libs/pixman/pixman-0.32.6.recipe b/x11-libs/pixman/pixman-0.32.6.recipe index e60adb9ca..3be9c6a8e 100644 --- a/x11-libs/pixman/pixman-0.32.6.recipe +++ b/x11-libs/pixman/pixman-0.32.6.recipe @@ -29,7 +29,7 @@ PROVIDES_devel=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " REQUIRES_devel=" @@ -40,7 +40,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:aclocal cmd:autoconf cmd:gcc$secondaryArchSuffix diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe index c2f5e6efa..1864a6f7c 100644 --- a/x11-libs/xtrans/xtrans-1.2.5.recipe +++ b/x11-libs/xtrans/xtrans-1.2.5.recipe @@ -21,14 +21,14 @@ PROVIDES=" devel:xtrans$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe b/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe index be26c3cfb..64887d5b8 100644 --- a/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe +++ b/x11-misc/shared_mime_info/shared_mime_info-1.3.recipe @@ -20,7 +20,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix glib2$secondaryArchSuffix >= 2 lib:libxml2$secondaryArchSuffix lib:libintl$secondaryArchSuffix @@ -33,7 +33,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:pkg_config$secondaryArchSuffix cmd:xmllint diff --git a/x11-misc/synergy/synergy-1.5.0.recipe b/x11-misc/synergy/synergy-1.5.0.recipe index 793ad3127..79b203911 100644 --- a/x11-misc/synergy/synergy-1.5.0.recipe +++ b/x11-misc/synergy/synergy-1.5.0.recipe @@ -29,7 +29,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku_devel cmd:cmake cmd:gcc cmd:make diff --git a/x11-misc/util_macros/util_macros-1.17.0_git.recipe b/x11-misc/util_macros/util_macros-1.17.0_git.recipe index a79f453fe..2fdd88e87 100644 --- a/x11-misc/util_macros/util_macros-1.17.0_git.recipe +++ b/x11-misc/util_macros/util_macros-1.17.0_git.recipe @@ -19,14 +19,14 @@ PROVIDES=" devel:util_macros$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:autoconf cmd:aclocal cmd:make diff --git a/x11-misc/util_macros/util_macros-1.19.0.recipe b/x11-misc/util_macros/util_macros-1.19.0.recipe index 1f056d70a..e4a56b711 100644 --- a/x11-misc/util_macros/util_macros-1.19.0.recipe +++ b/x11-misc/util_macros/util_macros-1.19.0.recipe @@ -19,11 +19,11 @@ PROVIDES=" devel:util_macros$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" diff --git a/x11-proto/inputproto/inputproto-2.0.recipe b/x11-proto/inputproto/inputproto-2.0.recipe index 41aa9bf03..96af8a5c9 100644 --- a/x11-proto/inputproto/inputproto-2.0.recipe +++ b/x11-proto/inputproto/inputproto-2.0.recipe @@ -20,14 +20,14 @@ PROVIDES=" devel:inputproto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/x11-proto/kbproto/kbproto-1.0.4.recipe b/x11-proto/kbproto/kbproto-1.0.4.recipe index 4bae0ebbc..9ddce1933 100644 --- a/x11-proto/kbproto/kbproto-1.0.4.recipe +++ b/x11-proto/kbproto/kbproto-1.0.4.recipe @@ -17,14 +17,14 @@ PROVIDES=" devel:kbproto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe index f9a8cf473..9364a56cc 100644 --- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe +++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe @@ -17,11 +17,11 @@ PROVIDES=" devel:xcb_proto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix " diff --git a/x11-proto/xextproto/xextproto-7.1.1.recipe b/x11-proto/xextproto/xextproto-7.1.1.recipe index da6336db8..08c394397 100644 --- a/x11-proto/xextproto/xextproto-7.1.1.recipe +++ b/x11-proto/xextproto/xextproto-7.1.1.recipe @@ -25,14 +25,14 @@ PROVIDES=" devel:xextproto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix >= 1.7.0 cmd:autoconf cmd:libtool diff --git a/x11-proto/xproto/xproto-7.0.23_git.recipe b/x11-proto/xproto/xproto-7.0.23_git.recipe index 8578e0d16..db95e08a6 100644 --- a/x11-proto/xproto/xproto-7.0.23_git.recipe +++ b/x11-proto/xproto/xproto-7.0.23_git.recipe @@ -25,14 +25,14 @@ PROVIDES=" devel:xproto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool diff --git a/x11-proto/xproto/xproto-7.0.26.recipe b/x11-proto/xproto/xproto-7.0.26.recipe index 3491bd29a..1bb11178f 100644 --- a/x11-proto/xproto/xproto-7.0.26.recipe +++ b/x11-proto/xproto/xproto-7.0.26.recipe @@ -25,14 +25,14 @@ PROVIDES=" devel:xproto$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix " BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel devel:util_macros$secondaryArchSuffix cmd:autoconf cmd:libtool From 196342800a9638bdc0254b1de7dc6b3e8c3a2f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 15 Dec 2014 00:20:59 +0100 Subject: [PATCH 054/326] doctranslator: drop $haikuVersion --- haiku-apps/doctranslator/doctranslator-0.1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe index 0b8cf224f..b1bd340a0 100644 --- a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe +++ b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe @@ -17,7 +17,7 @@ REQUIRES="antiword >= 0.37" PROVIDES="doctranslator = $portVersion" -BUILD_REQUIRES="haiku_devel >= $haikuVersion +BUILD_REQUIRES="haiku_devel makefile_engine" BUILD_PREREQUIRES="cmd:make From 0a0ba88491d284bf5302d5a7f45da25670020106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 15 Dec 2014 00:21:52 +0100 Subject: [PATCH 055/326] doctranslator: add haiku in REQUIRES Also reformat the lists. --- .../doctranslator/doctranslator-0.1.0.recipe | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe index b1bd340a0..e437a87f0 100644 --- a/haiku-apps/doctranslator/doctranslator-0.1.0.recipe +++ b/haiku-apps/doctranslator/doctranslator-0.1.0.recipe @@ -13,14 +13,22 @@ COPYRIGHT="Copyright (c) 2014 Markus Himmel" ARCHITECTURES="x86 x86_gcc2" -REQUIRES="antiword >= 0.37" +PROVIDES=" + doctranslator = $portVersion + " -PROVIDES="doctranslator = $portVersion" +REQUIRES=" + haiku + antiword >= 0.37 + " -BUILD_REQUIRES="haiku_devel - makefile_engine" +BUILD_REQUIRES=" + haiku_devel + makefile_engine + " -BUILD_PREREQUIRES="cmd:make +BUILD_PREREQUIRES=" + cmd:make cmd:gcc" BUILD() From 66e24ed8020d6d2e860e1c53a7ef497befe45745 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Mon, 15 Dec 2014 03:36:14 +0000 Subject: [PATCH 056/326] llvm: Create 3.5.0 recipe --- sys-devel/llvm/llvm-3.5.0.recipe | 234 +++++ sys-devel/llvm/patches/llvm-3.5.0.patchset | 1040 ++++++++++++++++++++ 2 files changed, 1274 insertions(+) create mode 100644 sys-devel/llvm/llvm-3.5.0.recipe create mode 100644 sys-devel/llvm/patches/llvm-3.5.0.patchset diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe new file mode 100644 index 000000000..84e25e69c --- /dev/null +++ b/sys-devel/llvm/llvm-3.5.0.recipe @@ -0,0 +1,234 @@ +SUMMARY="Modular and reuseable compiler and toolchain technologies." +DESCRIPTION=" +LLVM is a collection of modular and reuseable compiler and and toolchain \ +technologies. +" +HOMEPAGE="http://www.llvm.org/" +LICENSE="UIUC" +COPYRIGHT="2003-2014 University of Illinois at Urbana-Champaign" +SRC_URI="http://llvm.org/releases/${portVersion}/llvm-${portVersion}.src.tar.xz" +CHECKSUM_SHA256="28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03" +REVISION="1" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + llvm$secondaryArchSuffix = $portVersion + cmd:bugpoint + cmd:llc + cmd:lli + cmd:lli_child_target + cmd:llvm_ar + cmd:llvm_as + cmd:llvm_bcanalyzer + cmd:llvm_config + cmd:llvm_cov + cmd:llvm_diff + cmd:llvm_dis + cmd:llvm_dwarfdump + cmd:llvm_extract + cmd:llvm_link + cmd:llvm_mc + cmd:llvm_mcmarkup + cmd:llvm_nm + cmd:llvm_objdump + cmd:llvm_profdata + cmd:llvm_ranlib + cmd:llvm_readobj + cmd:llvm_rtdyld + cmd:llvm_size + cmd:llvm_stress + cmd:llvm_symbolizer + cmd:llvm_tblgen + cmd:macho_dump + cmd:opt + lib:BugpointPasses$secondaryArchSuffix + lib:LLVMHello$secondaryArchSuffix + lib:libLTO$secondaryArchSuffix + + devel:libLLVMAArch64AsmParser$secondaryArchSuffix + devel:libLLVMAArch64AsmPrinter$secondaryArchSuffix + devel:libLLVMAArch64CodeGen$secondaryArchSuffix + devel:libLLVMAArch64Desc$secondaryArchSuffix + devel:libLLVMAArch64Disassembler$secondaryArchSuffix + devel:libLLVMAArch64Info$secondaryArchSuffix + devel:libLLVMAArch64Utils$secondaryArchSuffix + devel:libLLVMARMAsmParser$secondaryArchSuffix + devel:libLLVMARMAsmPrinter$secondaryArchSuffix + devel:libLLVMARMCodeGen$secondaryArchSuffix + devel:libLLVMARMDesc$secondaryArchSuffix + devel:libLLVMARMDisassembler$secondaryArchSuffix + devel:libLLVMARMInfo$secondaryArchSuffix + devel:libLLVMAnalysis$secondaryArchSuffix + devel:libLLVMAsmParser$secondaryArchSuffix + devel:libLLVMAsmPrinter$secondaryArchSuffix + devel:libLLVMBitReader$secondaryArchSuffix + devel:libLLVMBitWriter$secondaryArchSuffix + devel:libLLVMCodeGen$secondaryArchSuffix + devel:libLLVMCore$secondaryArchSuffix + devel:libLLVMCppBackendCodeGen$secondaryArchSuffix + devel:libLLVMCppBackendInfo$secondaryArchSuffix + devel:libLLVMDebugInfo$secondaryArchSuffix + devel:libLLVMExecutionEngine$secondaryArchSuffix + devel:libLLVMHexagonAsmPrinter$secondaryArchSuffix + devel:libLLVMHexagonCodeGen$secondaryArchSuffix + devel:libLLVMHexagonDesc$secondaryArchSuffix + devel:libLLVMHexagonInfo$secondaryArchSuffix + devel:libLLVMIRReader$secondaryArchSuffix + devel:libLLVMInstCombine$secondaryArchSuffix + devel:libLLVMInstrumentation$secondaryArchSuffix + devel:libLLVMInterpreter$secondaryArchSuffix + devel:libLLVMJIT$secondaryArchSuffix + devel:libLLVMLineEditor$secondaryArchSuffix + devel:libLLVMLTO$secondaryArchSuffix + devel:libLLVMLinker$secondaryArchSuffix + devel:libLLVMMC$secondaryArchSuffix + devel:libLLVMMCAnalysis$secondaryArchSuffix + devel:libLLVMMCDisassembler$secondaryArchSuffix + devel:libLLVMMCJIT$secondaryArchSuffix + devel:libLLVMMCParser$secondaryArchSuffix + devel:libLLVMMSP430AsmPrinter$secondaryArchSuffix + devel:libLLVMMSP430CodeGen$secondaryArchSuffix + devel:libLLVMMSP430Desc$secondaryArchSuffix + devel:libLLVMMSP430Info$secondaryArchSuffix + devel:libLLVMMipsAsmParser$secondaryArchSuffix + devel:libLLVMMipsAsmPrinter$secondaryArchSuffix + devel:libLLVMMipsCodeGen$secondaryArchSuffix + devel:libLLVMMipsDesc$secondaryArchSuffix + devel:libLLVMMipsDisassembler$secondaryArchSuffix + devel:libLLVMMipsInfo$secondaryArchSuffix + devel:libLLVMNVPTXAsmPrinter$secondaryArchSuffix + devel:libLLVMNVPTXCodeGen$secondaryArchSuffix + devel:libLLVMNVPTXDesc$secondaryArchSuffix + devel:libLLVMNVPTXInfo$secondaryArchSuffix + devel:libLLVMObjCARCOpts$secondaryArchSuffix + devel:libLLVMObject$secondaryArchSuffix + devel:libLLVMOption$secondaryArchSuffix + devel:libLLVMPowerPCAsmParser$secondaryArchSuffix + devel:libLLVMPowerPCAsmPrinter$secondaryArchSuffix + devel:libLLVMPowerPCCodeGen$secondaryArchSuffix + devel:libLLVMPowerPCDesc$secondaryArchSuffix + devel:libLLVMPowerPCDisassembler$secondaryArchSuffix + devel:libLLVMPowerPCInfo$secondaryArchSuffix + devel:libLLVMProfileData$secondaryArchSuffix + devel:libLLVMR600AsmPrinter$secondaryArchSuffix + devel:libLLVMR600CodeGen$secondaryArchSuffix + devel:libLLVMR600Desc$secondaryArchSuffix + devel:libLLVMR600Info$secondaryArchSuffix + devel:libLLVMRuntimeDyld$secondaryArchSuffix + devel:libLLVMScalarOpts$secondaryArchSuffix + devel:libLLVMSelectionDAG$secondaryArchSuffix + devel:libLLVMSparcAsmParser$secondaryArchSuffix + devel:libLLVMSparcAsmPrinter$secondaryArchSuffix + devel:libLLVMSparcCodeGen$secondaryArchSuffix + devel:libLLVMSparcDesc$secondaryArchSuffix + devel:libLLVMSparcDisassembler$secondaryArchSuffix + devel:libLLVMSparcInfo$secondaryArchSuffix + devel:libLLVMSupport$secondaryArchSuffix + devel:libLLVMSystemZAsmParser$secondaryArchSuffix + devel:libLLVMSystemZAsmPrinter$secondaryArchSuffix + devel:libLLVMSystemZCodeGen$secondaryArchSuffix + devel:libLLVMSystemZDesc$secondaryArchSuffix + devel:libLLVMSystemZDisassembler$secondaryArchSuffix + devel:libLLVMSystemZInfo$secondaryArchSuffix + devel:libLLVMTableGen$secondaryArchSuffix + devel:libLLVMTarget$secondaryArchSuffix + devel:libLLVMTransformUtils$secondaryArchSuffix + devel:libLLVMVectorize$secondaryArchSuffix + devel:libLLVMX86AsmParser$secondaryArchSuffix + devel:libLLVMX86AsmPrinter$secondaryArchSuffix + devel:libLLVMX86CodeGen$secondaryArchSuffix + devel:libLLVMX86Desc$secondaryArchSuffix + devel:libLLVMX86Disassembler$secondaryArchSuffix + devel:libLLVMX86Info$secondaryArchSuffix + devel:libLLVMX86Utils$secondaryArchSuffix + devel:libLLVMXCoreAsmPrinter$secondaryArchSuffix + devel:libLLVMXCoreCodeGen$secondaryArchSuffix + devel:libLLVMXCoreDesc$secondaryArchSuffix + devel:libLLVMXCoreDisassembler$secondaryArchSuffix + devel:libLLVMXCoreInfo$secondaryArchSuffix + devel:libLLVMipa$secondaryArchSuffix + devel:libLLVMipo$secondaryArchSuffix + devel:libLTO$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:python + cmd:sed + cmd:find + cmd:grep + " + +PATCHES="llvm-${portVersion}.patchset" + +SOURCE_DIR="llvm-$portVersion.src" + +BUILD() +{ + # Haiku C++ requires rtti in a lot of central system components + # such as Mesa + export REQUIRES_RTTI=1 + runConfigure ./configure --enable-optimized + make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ + PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir +} + +INSTALL() +{ + make install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ + PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir + + prepareInstalledDevelLibs libLLVMAArch64AsmParser libLLVMAArch64Disassembler \ + libLLVMAArch64Utils + prepareInstalledDevelLibs libLLVMARMAsmParser libLLVMARMDisassembler + prepareInstalledDevelLibs libLLVMMipsAsmParser libLLVMMipsDisassembler + prepareInstalledDevelLibs libLLVMPowerPCAsmParser libLLVMPowerPCDisassembler + prepareInstalledDevelLibs libLLVMSystemZAsmParser libLLVMSystemZDisassembler + prepareInstalledDevelLibs libLLVMX86AsmParser libLLVMX86Disassembler libLLVMX86Utils + prepareInstalledDevelLibs libLLVMXCoreDisassembler + prepareInstalledDevelLibs libLLVMSparcAsmParser libLLVMSparcDisassembler + + for arch in AArch64 ARM Hexagon Mips MSP430 NVPTX PowerPC R600 SystemZ Sparc X86 XCore + do + prepareInstalledDevelLibs libLLVM${arch}AsmPrinter \ + libLLVM${arch}CodeGen libLLVM${arch}Desc libLLVM${arch}Info + done + + prepareInstalledDevelLibs libLLVMAnalysis libLLVMAsmParser \ + libLLVMAsmPrinter libLLVMBitReader libLLVMBitWriter libLLVMCodeGen \ + libLLVMCore libLLVMCppBackendCodeGen libLLVMCppBackendInfo \ + libLLVMDebugInfo libLLVMExecutionEngine libLLVMIRReader \ + libLLVMInstCombine libLLVMInstrumentation libLLVMInterpreter libLLVMJIT \ + libLLVMLTO libLLVMLinker libLLVMLineEditor libLLVMMC libLLVMMCAnalysis \ + libLLVMMCDisassembler libLLVMMCJIT libLLVMMCParser libLLVMObjCARCOpts \ + libLLVMObject libLLVMOption libLLVMProfileData libLLVMRuntimeDyld \ + libLLVMScalarOpts libLLVMSelectionDAG libLLVMSupport libLLVMTableGen \ + libLLVMTarget libLLVMTransformUtils libLLVMVectorize libLLVMipa \ + libLLVMipo libLTO +} + +TEST() +{ + make check +} diff --git a/sys-devel/llvm/patches/llvm-3.5.0.patchset b/sys-devel/llvm/patches/llvm-3.5.0.patchset new file mode 100644 index 000000000..b73c6ab55 --- /dev/null +++ b/sys-devel/llvm/patches/llvm-3.5.0.patchset @@ -0,0 +1,1040 @@ +From ea9fabb4c279b2d94e54e6a416d8c1d971cc2383 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 22 Jan 2014 05:04:31 +0000 +Subject: [PATCH 1/2] haiku: fix Host.h for endian.h + +--- + include/llvm/Support/Host.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h +index 8f4bf3c..8114f9b 100644 +--- a/include/llvm/Support/Host.h ++++ b/include/llvm/Support/Host.h +@@ -16,7 +16,7 @@ + + #include "llvm/ADT/StringMap.h" + +-#if defined(__linux__) || defined(__GNU__) ++#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) + #include + #else + #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32) +-- +1.8.3.4 + +From 568aa3d732e8482db2797470235f363077ab2900 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Tue, 9 Dec 2014 01:20:26 +0000 +Subject: [PATCH 2/2] LLVM: Update autoconf for Haiku x86_64 support + +--- + autoconf/config.guess | 371 ++++++++++++++++++-------------------------------- + autoconf/config.sub | 165 +++++++++++++--------- + 2 files changed, 235 insertions(+), 301 deletions(-) + mode change 100755 => 100644 autoconf/config.guess + mode change 100755 => 100644 autoconf/config.sub + +diff --git a/autoconf/config.guess b/autoconf/config.guess +old mode 100755 +new mode 100644 +index 73d671b..6c32c86 +--- a/autoconf/config.guess ++++ b/autoconf/config.guess +@@ -1,14 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +-# 2011 Free Software Foundation, Inc. ++# Copyright 1992-2014 Free Software Foundation, Inc. + +-timestamp='2011-08-20' ++timestamp='2014-11-04' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -17,26 +15,22 @@ timestamp='2011-08-20' + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +- +-# Originally written by Per Bothner. Please send patches (context +-# diff format) to and include a ChangeLog +-# entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # + # You can get the latest version of this script from: + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# ++# Please send patches to . ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,9 +50,7 @@ version="\ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +-Software Foundation, Inc. ++Copyright 1992-2014 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "${UNAME_SYSTEM}" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ eval $set_cc_for_build ++ cat <<-EOF > $dummy.c ++ #include ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -202,14 +215,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; +- *:OpenBSD:*:*) +- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` +- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +- exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; +@@ -308,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -566,8 +579,9 @@ EOF + else + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi +@@ -807,9 +821,15 @@ EOF + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ *:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 +@@ -855,17 +875,21 @@ EOF + exit ;; + *:GNU:*:*) + # the GNU system +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland +- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; +- aarch64*:Linux:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +@@ -878,56 +902,54 @@ EOF + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) +- LIBC=gnu +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build +@@ -946,57 +968,63 @@ EOF + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; +- or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-${LIBC} ++ exit ;; ++ or32:Linux:*:* | or1k*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) +- echo sparc-unknown-linux-gnu ++ echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; ++ *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu ++ echo powerpc64-unknown-linux-${LIBC} ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) +- echo powerpc64le-unknown-linux-gnu ++ echo powerpc64le-unknown-linux-${LIBC} + exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux ++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) +- echo ${UNAME_MACHINE}-dec-linux-gnu ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -1200,6 +1228,9 @@ EOF + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1226,19 +1257,31 @@ EOF + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown +- case $UNAME_PROCESSOR in +- i386) +- eval $set_cc_for_build +- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then +- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ +- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ +- grep IS_64BIT_ARCH >/dev/null +- then +- UNAME_PROCESSOR="x86_64" +- fi +- fi ;; +- unknown) UNAME_PROCESSOR=powerpc ;; +- esac ++ eval $set_cc_for_build ++ if test "$UNAME_PROCESSOR" = unknown ; then ++ UNAME_PROCESSOR=powerpc ++ fi ++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # Avoid executing cc on OS X 10.9, as it ships with a stub ++ # that puts up a graphical alert prompting to install ++ # developer tools. Any system running Mac OS X 10.7 or ++ # later (Darwin 11 and later) is required to have a 64-bit ++ # processor. This is not true of the ARM version of Darwin ++ # that Apple uses in portable devices. ++ UNAME_PROCESSOR=x86_64 ++ fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) +@@ -1255,7 +1298,7 @@ EOF + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1324,158 +1367,10 @@ EOF + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; +-esac +- +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-eval $set_cc_for_build +-cat >$dummy.c < +-# include +-#endif +-main () +-{ +-#if defined (sony) +-#if defined (MIPSEB) +- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +- I don't know.... */ +- printf ("mips-sony-bsd\n"); exit (0); +-#else +-#include +- printf ("m68k-sony-newsos%s\n", +-#ifdef NEWSOS4 +- "4" +-#else +- "" +-#endif +- ); exit (0); +-#endif +-#endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix\n"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); +-#endif +- +-#if defined (NeXT) +-#if !defined (__ARCHITECTURE__) +-#define __ARCHITECTURE__ "m68k" +-#endif +- int version; +- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- if (version < 4) +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); +- else +- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); +- exit (0); +-#endif +- +-#if defined (MULTIMAX) || defined (n16) +-#if defined (UMAXV) +- printf ("ns32k-encore-sysv\n"); exit (0); +-#else +-#if defined (CMU) +- printf ("ns32k-encore-mach\n"); exit (0); +-#else +- printf ("ns32k-encore-bsd\n"); exit (0); +-#endif +-#endif +-#endif +- +-#if defined (__386BSD__) +- printf ("i386-pc-bsd\n"); exit (0); +-#endif +- +-#if defined (sequent) +-#if defined (i386) +- printf ("i386-sequent-dynix\n"); exit (0); +-#endif +-#if defined (ns32000) +- printf ("ns32k-sequent-dynix\n"); exit (0); +-#endif +-#endif +- +-#if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); +- +-#endif +- +-#if defined (vax) +-# if !defined (ultrix) +-# include +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif +-#endif +- +-#if defined (alliant) && defined (i860) +- printf ("i860-alliant-bsd\n"); exit (0); +-#endif +- +- exit (1); +-} +-EOF +- +-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && +- { echo "$SYSTEM_NAME"; exit; } +- +-# Apollos put the system type in the environment. +- +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +- +-# Convex versions that predate uname can use getsysinfo(1) +- +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit ;; +- c34*) +- echo c34-convex-bsd ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx + exit ;; +- c38*) +- echo c38-convex-bsd +- exit ;; +- c4*) +- echo c4-convex-bsd +- exit ;; +- esac +-fi ++esac + + cat >&2 <. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). + + +-# Please send patches to . Submit a context +-# diff and a properly formatted GNU ChangeLog entry. ++# Please send patches to . + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. +@@ -75,9 +68,7 @@ Report bugs and patches to ." + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free +-Software Foundation, Inc. ++Copyright 1992-2014 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -125,13 +116,17 @@ esac + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ +- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -154,7 +149,7 @@ case $os in + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +@@ -223,6 +218,12 @@ case $os in + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -247,24 +248,28 @@ case $basic_machine in + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ +- | aarch64 \ +- | be32 | be64 \ ++ | arc | arceb \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ +- | c4x | clipper \ ++ | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ +- | hexagon \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -278,24 +283,27 @@ case $basic_machine in + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ +- | nios | nios2 \ ++ | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ +- | open8 \ +- | or32 \ ++ | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | riscv32 | riscv64 \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +@@ -305,6 +313,7 @@ case $basic_machine in + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ ++ | visium \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) +@@ -319,8 +328,10 @@ case $basic_machine in + c6x) + basic_machine=tic6x-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ leon|leon[3-9]) ++ basic_machine=sparc-$basic_machine ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -333,7 +344,10 @@ case $basic_machine in + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; +- ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; + xscaleeb) + basic_machine=armeb-unknown + ;; +@@ -356,29 +370,31 @@ case $basic_machine in + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ +- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | aarch64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ +- | clipper-* | craynv-* | cydra-* \ ++ | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ +- | hexagon-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -392,23 +408,27 @@ case $basic_machine in + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ +- | nios-* | nios2-* \ ++ | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ ++ | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ +@@ -421,6 +441,7 @@ case $basic_machine in + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ ++ | visium-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ +@@ -720,7 +741,6 @@ case $basic_machine in + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -759,6 +779,9 @@ case $basic_machine in + basic_machine=m68k-isi + os=-sysv + ;; ++ leon-*|leon[3-9]-*) ++ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` ++ ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux +@@ -778,11 +801,15 @@ case $basic_machine in + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) +- basic_machine=i386-pc ++ basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) +@@ -810,6 +837,10 @@ case $basic_machine in + basic_machine=powerpc-unknown + os=-morphos + ;; ++ moxiebox) ++ basic_machine=moxie-unknown ++ os=-moxiebox ++ ;; + msdos) + basic_machine=i386-pc + os=-msdos +@@ -817,6 +848,10 @@ case $basic_machine in + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i686-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs +@@ -1005,7 +1040,11 @@ case $basic_machine in + basic_machine=i586-unknown + os=-pw32 + ;; +- rdos) ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ os=-rdos ++ ;; ++ rdos32) + basic_machine=i386-pc + os=-rdos + ;; +@@ -1332,29 +1371,29 @@ case $os in + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ +- | -sym* | -kopensolaris* \ ++ | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-android* \ +- | -linux-newlib* | -linux-uclibc* \ +- | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1478,9 +1517,6 @@ case $os in + -aros*) + os=-aros + ;; +- -kaos*) +- os=-kaos +- ;; + -zvmoe) + os=-zvmoe + ;; +@@ -1529,6 +1565,12 @@ case $basic_machine in + c4x-* | tic4x-*) + os=-coff + ;; ++ c8051-*) ++ os=-elf ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; + tic54x-*) + os=-coff + ;; +@@ -1556,9 +1598,6 @@ case $basic_machine in + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout +-- +1.8.3.4 + From a3f4595296b151fe6a695af583af9aa4897a9bea Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 14 Dec 2014 19:07:16 +0200 Subject: [PATCH 057/326] Update paladin recipe and patch --- ...din-20141022.recipe => paladin-git.recipe} | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) rename haiku-apps/paladin/{paladin-20141022.recipe => paladin-git.recipe} (56%) diff --git a/haiku-apps/paladin/paladin-20141022.recipe b/haiku-apps/paladin/paladin-git.recipe similarity index 56% rename from haiku-apps/paladin/paladin-20141022.recipe rename to haiku-apps/paladin/paladin-git.recipe index ecac0b523..d6475b1f5 100644 --- a/haiku-apps/paladin/paladin-20141022.recipe +++ b/haiku-apps/paladin/paladin-git.recipe @@ -1,21 +1,20 @@ -SUMMARY="Paladin is a open source integrated development environment (IDE)" -DESCRIPTION=" -Paladin is an open source integrated development environment (IDE) modeled \ -after BeOS' BeIDE. -" +SUMMARY="Paladin is an open source integrated development environment (IDE)" +DESCRIPTION="Paladin is an open source integrated development environment (IDE) \ +modeled after BeOS' BeIDE." HOMEPAGE="http://paladin.sourceforge.net" -SRC_URI="git://github.com/HaikuArchives/Paladin#cec6b2dac93f495c5e472ce8a17862296d3c1d14" -REVISION="1" +SRC_URI="git://github.com/HaikuArchives/Paladin#8929011" +REVISION="3" LICENSE="MIT" -COPYRIGHT="2008-2010 DarkWyrm" +COPYRIGHT="2001-2010 DarkWyrm \ + 2014 John Scipione " ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" paladin = $portVersion app:Paladin = $portVersion app:SymbolFinder = $portVersion - lib:libhekkel = $portVersion " REQUIRES=" @@ -31,16 +30,13 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - cmd:bison - cmd:find - cmd:flex - cmd:gcc - cmd:jam + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix cmd:ld - cmd:make + cmd:find " -USER_SETTINGS_FILE="settings/Paladin_settings" +USER_SETTINGS_FILES="settings/Paladin_settings" SOURCE_DIR="Paladin" @@ -54,10 +50,10 @@ INSTALL() mkdir -p $appsDir/Paladin mkdir -p $libDir mkdir -p $binDir - + cp -r Paladin/Paladin Paladin/Templates $appsDir/Paladin/ cp SymbolFinder/SymbolFinder $appsDir/Paladin/ - + addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder SymbolFinder } From 37601bf0e32d234ebfa9ace57811caff5296c3f2 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:48:43 +0200 Subject: [PATCH 058/326] Fixed Apache 2.4.3 --- ...ache-2.4.3.patch => apache-2.4.3.patchset} | 113 ++++++++++++------ 1 file changed, 74 insertions(+), 39 deletions(-) rename www-servers/apache/patches/{apache-2.4.3.patch => apache-2.4.3.patchset} (67%) diff --git a/www-servers/apache/patches/apache-2.4.3.patch b/www-servers/apache/patches/apache-2.4.3.patchset similarity index 67% rename from www-servers/apache/patches/apache-2.4.3.patch rename to www-servers/apache/patches/apache-2.4.3.patchset index 714cf4479..e3906b955 100644 --- a/www-servers/apache/patches/apache-2.4.3.patch +++ b/www-servers/apache/patches/apache-2.4.3.patchset @@ -1,31 +1,14 @@ -diff -urN httpd-2.4.3/modules/proxy/mod_proxy_connect.c httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c ---- httpd-2.4.3/modules/proxy/mod_proxy_connect.c 2012-07-28 14:40:23.041680896 +0000 -+++ httpd-2.4.3-haiku/modules/proxy/mod_proxy_connect.c 2012-12-02 06:58:17.131072000 +0000 -@@ -254,7 +254,7 @@ - rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC, - connectport, 0, p); - if (rv != APR_SUCCESS) { -- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() -+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, - "failed to resolve hostname '%s'", connectname); - return ap_proxyerror(r, HTTP_BAD_GATEWAY, - apr_pstrcat(p, "DNS lookup failure for: ", -diff -urN httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c ---- httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c 2012-04-03 13:36:55.037224448 +0000 -+++ httpd-2.4.3-haiku/modules/slotmem/mod_slotmem_shm.c 2012-12-02 06:58:40.734265344 +0000 -@@ -33,7 +33,7 @@ - #include /* for getpid() */ - #endif - --#if HAVE_SYS_SEM_H -+#if HAVE_SYS_SHM_H - #include - #if !defined(SHM_R) - #define SHM_R 0400 -diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 ---- httpd-2.4.3/acinclude.m4 2012-07-23 15:20:48.061341696 +0000 -+++ httpd-2.4.3-haiku/acinclude.m4 2012-12-02 15:18:03.000000000 +0000 -@@ -4,25 +4,25 @@ +From 0410108ac91734ad764c0c1a64e3e429ab86b0e6 Mon Sep 17 00:00:00 2001 +From: Nav +Date: Tue, 9 Dec 2014 19:29:31 +0000 +Subject: Fixing patch + + +diff --git a/httpd-2.4.3/acinclude.m4 b/httpd-2.4.3/acinclude.m4 +index 54defc2..b59b688 100644 +--- a/httpd-2.4.3/acinclude.m4 ++++ b/httpd-2.4.3/acinclude.m4 +@@ -4,25 +4,25 @@ dnl Autoconf 2.50 can not handle substr correctly. It does have dnl AC_HELP_STRING, so let's try to call it if we can. dnl Note: this define must be on one line so that it can be properly returned dnl as the help string. @@ -55,7 +38,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 APACHE_SUBST(abs_srcdir) APACHE_SUBST(bindir) APACHE_SUBST(sbindir) -@@ -112,14 +112,14 @@ +@@ -112,14 +112,14 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ dnl APACHE_GEN_MAKEFILES dnl Creates Makefiles @@ -72,7 +55,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 APACHE_OUTPUT_FILES="$APACHE_OUTPUT_FILES $1" ]) -@@ -128,7 +128,7 @@ +@@ -128,7 +128,7 @@ dnl APACHE_TYPE_RLIM_T dnl dnl If rlim_t is not defined, define it to int dnl @@ -81,7 +64,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [ AC_TRY_COMPILE([ #include -@@ -146,7 +146,7 @@ +@@ -146,7 +146,7 @@ AC_DEFUN(APACHE_TYPE_RLIM_T, [ ]) dnl APACHE_MODPATH_INIT(modpath) @@ -90,7 +73,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 current_dir=$1 modpath_current=modules/$1 modpath_static= -@@ -155,7 +155,7 @@ +@@ -155,7 +155,7 @@ AC_DEFUN(APACHE_MODPATH_INIT,[ > $modpath_current/modules.mk ])dnl dnl @@ -99,7 +82,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk echo "static = $modpath_static" >> $modpath_current/modules.mk echo "shared = $modpath_shared" >> $modpath_current/modules.mk -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ AC_DEFUN(APACHE_MODPATH_FINISH,[ ])dnl dnl dnl APACHE_MODPATH_ADD(name[, shared[, objects [, ldflags[, libs]]]]) @@ -108,7 +91,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 if test -z "$3"; then objects="mod_$1.lo" else -@@ -214,7 +214,7 @@ +@@ -214,7 +214,7 @@ dnl config -- configuration logic to run if the MPM is enabled dnl path -- relative path to MPM (default: server/mpm/mpmname) dnl libs -- libs needed by this MPM dnl @@ -117,7 +100,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 if ap_mpm_is_enabled $1; then if test -z "$3"; then objects="$1.lo" -@@ -291,7 +291,7 @@ +@@ -291,7 +291,7 @@ dnl current module. dnl prereq_module's APACHE_MODULE() statement must have been processed dnl before the current APACHE_MODULE() statement. dnl @@ -126,7 +109,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 AC_MSG_CHECKING(whether to enable mod_$1) define([optname],[--]ifelse($5,yes,disable,enable)[-]translit($1,_,-))dnl AC_ARG_ENABLE(translit($1,_,-),APACHE_HELP_STRING(optname(),$2),force_$1=$enableval,enable_$1=ifelse($5,,maybe-all,$5)) -@@ -392,7 +392,7 @@ +@@ -392,7 +392,7 @@ AC_DEFUN(APACHE_MODULE,[ dnl dnl APACHE_ENABLE_MODULES dnl @@ -135,7 +118,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 module_selection=most module_default=shared -@@ -452,7 +452,7 @@ +@@ -452,7 +452,7 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[ ]) ]) @@ -144,7 +127,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 if test -z "$apache_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP -@@ -466,7 +466,7 @@ +@@ -466,7 +466,7 @@ dnl dnl Configure for OpenSSL, giving preference to dnl "--with-ssl=" if it was specified. dnl @@ -153,7 +136,7 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 AC_CACHE_CHECK([for OpenSSL], [ac_cv_openssl], [ dnl initialise the variables we use ac_cv_openssl=no -@@ -576,14 +576,14 @@ +@@ -576,14 +576,14 @@ dnl Export (via APACHE_SUBST) the various path-related variables that dnl apache will use while generating scripts like autoconf and apxs and dnl the default config file. @@ -170,3 +153,55 @@ diff -urN httpd-2.4.3/acinclude.m4 httpd-2.4.3-haiku/acinclude.m4 APACHE_SUBST_EXPANDED_ARG(exec_prefix) APACHE_SUBST_EXPANDED_ARG(bindir) APACHE_SUBST_EXPANDED_ARG(sbindir) +diff --git a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c +index 0cf5693..f4e958c 100644 +--- a/httpd-2.4.3/modules/proxy/mod_proxy_connect.c ++++ b/httpd-2.4.3/modules/proxy/mod_proxy_connect.c +@@ -254,7 +254,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, + rv = apr_sockaddr_info_get(&nexthop, connectname, APR_UNSPEC, + connectport, 0, p); + if (rv != APR_SUCCESS) { +- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO() ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "failed to resolve hostname '%s'", connectname); + return ap_proxyerror(r, HTTP_BAD_GATEWAY, + apr_pstrcat(p, "DNS lookup failure for: ", +diff --git a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c +index a9b7ca2..178eea5 100644 +--- a/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c ++++ b/httpd-2.4.3/modules/slotmem/mod_slotmem_shm.c +@@ -33,7 +33,7 @@ + #include /* for getpid() */ + #endif + +-#if HAVE_SYS_SEM_H ++#if HAVE_SYS_SHM_H + #include + #if !defined(SHM_R) + #define SHM_R 0400 +-- +1.8.3.4 + + +From 9ed8aff5487da044a341bde882f1aa3132d5398f Mon Sep 17 00:00:00 2001 +From: Nav +Date: Mon, 15 Dec 2014 16:39:31 +0000 +Subject: Fixed redefinition error + + +diff --git a/httpd-2.4.3/server/Makefile.in b/httpd-2.4.3/server/Makefile.in +index 42d1fe5..9418843 100644 +--- a/httpd-2.4.3/server/Makefile.in ++++ b/httpd-2.4.3/server/Makefile.in +@@ -32,7 +32,7 @@ test_char.h: gen_test_char + util.lo: test_char.h + + EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) +-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) ++EXPORT_DIRS_APR = $(APR_INCLUDEDIR) + + # If export_files is a dependency here, but we remove it during this stage, + # when exports.c is generated, make will not detect that export_files is no +-- +1.8.3.4 + From 275daa9bf77fdbec22ff7e2c30e8d85b098fa1cc Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:52:02 +0200 Subject: [PATCH 059/326] Fixed Apache 2.4.3 - Added recipe --- www-servers/apache/apache-2.4.3.recipe | 49 ++++++++++++++++++++------ 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 58bceb591..ff3bac8d9 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,22 +1,51 @@ +SUMMARY="Apache 2.4.3" DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org" -SRC_URI="http://apache.osuosl.org//httpd/httpd-2.4.3.tar.gz" +SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" +CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4 2 - dev-libs/apr-util >= 1.3.9" -CHECKSUM_MD5="538dccd22dd18466fff3ec7948495417" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDRY_ARCHITECTURES="x86" +SOURCE_DIR= + +PROVIDES=" + apache2$secondaryArchSuffix = $portVersion + cmd:apache2$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + lib:libapr_1$secondaryArchSuffix + lib:aprutil_1$secondaryArchSuffix >= 1.4.1 +" + +PATCHES="apache-2.4.3.patchset" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:libtoolize + cmd:autom4te + cmd:gcc$secondaryArchSuffix + cmd:pcre_config + cmd:make + cmd:awk + " +BUILD_REQUIRES=" + devel:libapr_1$secondaryArchSuffix + devel:libaprutil_1$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libexpat$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + " + BUILD() { cd httpd-2.4.3 libtoolize --force --copy --install aclocal autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \ - --with-z=`finddir B_COMMON_LIB_DIRECTORY` + echo $relativeBinDir + echo $portPackageLinksDir/devel~libaprutil_1$secondaryArchSuffix + ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir make } From dc46df0a98ad280241bbeb659cf5e318bb4d4b41 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 16:54:45 +0200 Subject: [PATCH 060/326] Updated recipe --- www-servers/apache/apache-2.4.3.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index ff3bac8d9..502a822cf 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -43,8 +43,7 @@ BUILD() libtoolize --force --copy --install aclocal autoconf - echo $relativeBinDir - echo $portPackageLinksDir/devel~libaprutil_1$secondaryArchSuffix + ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir make } From ac66df4417dfe0813f1f866b49b2c70219c947d7 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Mon, 15 Dec 2014 17:01:19 +0100 Subject: [PATCH 061/326] Added an rdef for vector icon and app signature. --- games-rpg/flare/flare-0.19.recipe | 4 ++- games-rpg/flare/patches/flare-0.19.patch | 46 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe index fcfebb1ab..5306f6976 100644 --- a/games-rpg/flare/flare-0.19.recipe +++ b/games-rpg/flare/flare-0.19.recipe @@ -5,7 +5,7 @@ HOMEPAGE="http://flarerpg.org" SRC_URI="http://downloads.sourceforge.net/project/flare-game/Linux/flare.0.19.tar.gz" CHECKSUM_SHA256="c96995fff6b71d44ddeae611b1ae4cd35162655f73088000786d03478f0a924e" SOURCE_DIR="flare.0.19" -REVISION="1" +REVISION="2" LICENSE="GNU GPL v3" COPYRIGHT="2010-2013 Clint Bellanger" @@ -54,6 +54,8 @@ BUILD() { cmake . make $jobArgs + addResourcesToBinaries distribution/flare.rdef flare + } INSTALL() diff --git a/games-rpg/flare/patches/flare-0.19.patch b/games-rpg/flare/patches/flare-0.19.patch index d40cbc0e8..f5aec0697 100644 --- a/games-rpg/flare/patches/flare-0.19.patch +++ b/games-rpg/flare/patches/flare-0.19.patch @@ -56,3 +56,49 @@ index 8beaeed..c22cc09 100644 #else void setPaths() { + +From d54ff21849b9d0d9d98a0388efe95aadd00e4e3a Mon Sep 17 00:00:00 2001 +From: Humdinger +Date: Mon, 15 Dec 2014 16:35:51 +0100 +Subject: Adding flare.rdef for a vector icon and an app signature. + + +diff --git a/distribution/flare.rdef b/distribution/flare.rdef +new file mode 100644 +index 0000000..2f804f0 +--- /dev/null ++++ b/distribution/flare.rdef +@@ -0,0 +1,30 @@ ++resource app_signature "application/x-vnd.flare"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 0, ++ middle = 1, ++ minor = 9, ++ ++ /* 0 = development 1 = alpha 2 = beta ++ 3 = gamma 4 = golden master 5 = final */ ++ variety = 1, ++ ++ internal = 0, ++ ++ short_info = "Single-player 2D action RPG", ++ long_info = "Single-player 2D RPG with fast-paced action and a dark fantasy style." ++}; ++ ++resource vector_icon { ++ $"6E63696603020106023E30000000000000003E10004840004AF00000FFD965FF" ++ $"DE7B060500040167040614BFFBBBAAE63D553D55BD6CC88CB823C034B526C82E" ++ $"B7D5BC16B823BDAAB690BBD5B919BE1E324232BBE3BAEFBDEBB969B9DB322F37" ++ $"36BA14BAB1BE32BABF3B243F294126463646B9EAC3EBBC464B324D3CC5DFBC98" ++ $"C2E3BF2BC28DBFB24E4447473E4234483E4C4C3451BE7CC813BD37C750BE7CC8" ++ $"130604FA3F4C47484D4B47494C4E47514C4F424E02043C2AC3A82AB8A72A2343" ++ $"23BB7123C6723C5CB8A75CC3A85C554355C67255BB710A044228482A492E412C" ++ $"060A020102023FD67FBC41253A2A0F3DAF324619A04A8C580A00010210011785" ++ $"10040A010102000A020103000A0101001001178410040A0002000100" ++}; +-- +1.8.3.4 + From 7491065b73ec5de398504332f6403685458dad96 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 10 Dec 2014 07:34:01 +0000 Subject: [PATCH 062/326] Let boost use cmd:sed, to fix build --- dev-libs/boost/boost-1.55.0.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 4792a93d3..5d03a0301 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -65,6 +65,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:sed " BUILD() From 68c66e8e76051331056cbf94a396f3270463935d Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 10 Dec 2014 14:29:28 +0000 Subject: [PATCH 063/326] Bump boost revision for updated packages --- dev-libs/boost/boost-1.55.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe index 5d03a0301..d47798a9d 100644 --- a/dev-libs/boost/boost-1.55.0.recipe +++ b/dev-libs/boost/boost-1.55.0.recipe @@ -8,7 +8,7 @@ testing. It contains over eighty individual libraries. HOMEPAGE="http://www.boost.org/" SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2" CHECKSUM_SHA256="fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52" -REVISION="4" +REVISION="5" LICENSE="Boost v1.0" COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al." ARCHITECTURES="x86 ?x86_64" From daf27dd08992948ccb017e91658ec0cc1cebe239 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 10 Dec 2014 19:28:51 +0000 Subject: [PATCH 064/326] Let ffmpeg use cmd:grep and cmd:sed, to fix build --- media-video/ffmpeg/ffmpeg-2.4.2.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-2.4.2.recipe b/media-video/ffmpeg/ffmpeg-2.4.2.recipe index ed3ffb081..fc3546984 100644 --- a/media-video/ffmpeg/ffmpeg-2.4.2.recipe +++ b/media-video/ffmpeg/ffmpeg-2.4.2.recipe @@ -70,9 +70,11 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:awk + cmd:grep cmd:make cmd:perl cmd:pkg_config$secondaryArchSuffix + cmd:sed cmd:texi2html cmd:yasm " From c796fd0ee4c12ca100f8cd9e3bf408ec4ad145a1 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 9 Dec 2014 18:15:34 +0000 Subject: [PATCH 065/326] Fix python build * Let it use cmd:sed and cmd:grep --- dev-lang/python/python-2.7.8.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-lang/python/python-2.7.8.recipe b/dev-lang/python/python-2.7.8.recipe index 65ae16ac3..b0fe427ff 100644 --- a/dev-lang/python/python-2.7.8.recipe +++ b/dev-lang/python/python-2.7.8.recipe @@ -58,10 +58,12 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:find cmd:gcc + cmd:grep cmd:ld cmd:libtoolize cmd:make cmd:pkg_config + cmd:sed " SOURCE_DIR="Python-$portVersion" From 2656ad307eff546d06eafef6fe2fde474473f5b4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 10 Dec 2014 14:29:22 +0000 Subject: [PATCH 066/326] Rename giflib 5.0.5 to giflib6 * Needed by some packages --- media-libs/giflib/giflib-5.1.0.recipe | 1 + ...flib-5.0.5.recipe => giflib6-5.0.5.recipe} | 31 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) rename media-libs/giflib/{giflib-5.0.5.recipe => giflib6-5.0.5.recipe} (78%) diff --git a/media-libs/giflib/giflib-5.1.0.recipe b/media-libs/giflib/giflib-5.1.0.recipe index 111d9f31a..6907bd71c 100644 --- a/media-libs/giflib/giflib-5.1.0.recipe +++ b/media-libs/giflib/giflib-5.1.0.recipe @@ -54,6 +54,7 @@ BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:make + cmd:grep " PATCHES="giflib-5.1.0.patchset" diff --git a/media-libs/giflib/giflib-5.0.5.recipe b/media-libs/giflib/giflib6-5.0.5.recipe similarity index 78% rename from media-libs/giflib/giflib-5.0.5.recipe rename to media-libs/giflib/giflib6-5.0.5.recipe index cdcf9f9df..22b1f5903 100644 --- a/media-libs/giflib/giflib-5.0.5.recipe +++ b/media-libs/giflib/giflib6-5.0.5.recipe @@ -15,8 +15,9 @@ abysm of MS-DOS, but Unix hackers are encouraged to spell it \"giflib\" in deference to local conventions. :-) " SUMMARY="giflib - A library for processing GIFs" -HOMEPAGE="http://sourceforge.net/projects/giflib/" +HOMEPAGE="http://sourceforge.net/projects/giflib/" SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-5.x/giflib-5.0.5.tar.bz2/download" +SOURCE_DIR="giflib-$portVersion" CHECKSUM_SHA256="606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609" LICENSE="MIT" COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi" @@ -26,17 +27,8 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - giflib$secondaryArchSuffix = $portVersion + giflib6$secondaryArchSuffix = $portVersion lib:libgif$secondaryArchSuffix = 6.0.1 compat >= 6 - cmd:gif2raw$secondaryArchSuffix - cmd:gif2rgb$secondaryArchSuffix - cmd:gifbuild$secondaryArchSuffix - cmd:gifclrmp$secondaryArchSuffix - cmd:gifecho$secondaryArchSuffix - cmd:giffix$secondaryArchSuffix - cmd:gifinto$secondaryArchSuffix - cmd:giftext$secondaryArchSuffix - cmd:giftool$secondaryArchSuffix " REQUIRES=" @@ -54,6 +46,7 @@ BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:make + cmd:grep " PATCHES="giflib-5.0.5.patch" @@ -67,6 +60,10 @@ BUILD() INSTALL() { make install + + # We do not want the binaries so that this doesn't conflict + # with the 'giflib' package + rm -rf $binDir prepareInstalledDevelLibs libgif fixPkgconfig @@ -77,10 +74,14 @@ INSTALL() } PROVIDES_devel=" - giflib${secondaryArchSuffix}_devel = $portVersion compat >= 5 + giflib6${secondaryArchSuffix}_devel = $portVersion compat >= 5 devel:libgif$secondaryArchSuffix = 6.0.1 compat >= 6 - " +" REQUIRES_devel=" - giflib$secondaryArchSuffix == $portVersion base - " + giflib6$secondaryArchSuffix == $portVersion base +" + +CONFLICTS_devel=" + giflib${secondaryArchSuffix}_devel +" From 86bf66bba044ba5981af1a222ec0b345b86a5b15 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:49:34 +0200 Subject: [PATCH 067/326] Updated Apache recipe --- www-servers/apache/apache-2.4.3.recipe | 144 +++++++++++++++++++++++-- 1 file changed, 135 insertions(+), 9 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 502a822cf..0fdf60ea4 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -4,22 +4,150 @@ HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" REVISION="1" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SECONDRY_ARCHITECTURES="x86" -SOURCE_DIR= +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +SOURCE_DIR="httpd-2.4.3" PROVIDES=" apache2$secondaryArchSuffix = $portVersion - cmd:apache2$secondaryArchSuffix = $portVersion + cmd:ab$secondaryArchSuffix + cmd:apachectl$secondaryArchSuffix + cmd:apxs$secondaryArchSuffix + cmd:checkgid$secondaryArchSuffix + cmd:dbmmanage$secondaryArchSuffix + cmd:envvars$secondaryArchSuffix + cmd:envvars_std$secondaryArchSuffix + cmd:fcgistarter$secondaryArchSuffix + cmd:htcacheclean$secondaryArchSuffix + cmd:htdbm$secondaryArchSuffix + cmd:htdigest$secondaryArchSuffix + cmd:htpasswd$secondaryArchSuffix + cmd:httpd$secondaryArchSuffix + cmd:httxt2dbm$secondaryArchSuffix + cmd:logresolve$secondaryArchSuffix + cmd:rotatelogs$secondaryArchSuffix + lib:mod_access_compat$secondaryArchSuffix + lib:mod_actions$secondaryArchSuffix + lib:mod_alias$secondaryArchSuffix + lib:mod_allowmethods$secondaryArchSuffix + lib:mod_auth_basic$secondaryArchSuffix + lib:mod_auth_digest$secondaryArchSuffix + lib:mod_auth_form$secondaryArchSuffix + lib:mod_authn_anon$secondaryArchSuffix + lib:mod_authn_core$secondaryArchSuffix + lib:mod_authn_dbd$secondaryArchSuffix + lib:mod_authn_dbm$secondaryArchSuffix + lib:mod_authn_file$secondaryArchSuffix + lib:mod_authn_socache$secondaryArchSuffix + lib:mod_authz_core$secondaryArchSuffix + lib:mod_authz_dbd$secondaryArchSuffix + lib:mod_authz_dbm$secondaryArchSuffix + lib:mod_authz_groupfile$secondaryArchSuffix + lib:mod_authz_host$secondaryArchSuffix + lib:mod_authz_owner$secondaryArchSuffix + lib:mod_authz_user$secondaryArchSuffix + lib:mod_autoindex$secondaryArchSuffix + lib:mod_buffer$secondaryArchSuffix + lib:mod_cache$secondaryArchSuffix + lib:mod_cache_disk$secondaryArchSuffix + lib:mod_cgid$secondaryArchSuffix + lib:mod_dav$secondaryArchSuffix + lib:mod_dav_fs$secondaryArchSuffix + lib:mod_dbd$secondaryArchSuffix + lib:mod_dir$secondaryArchSuffix + lib:mod_dumpio$secondaryArchSuffix + lib:mod_env$secondaryArchSuffix + lib:mod_expires$secondaryArchSuffix + lib:mod_ext_filter$secondaryArchSuffix + lib:mod_file_cache$secondaryArchSuffix + lib:mod_filter$secondaryArchSuffix + lib:mod_headers$secondaryArchSuffix + lib:mod_include$secondaryArchSuffix + lib:mod_info$secondaryArchSuffix + lib:mod_lbmethod_bybusyness$secondaryArchSuffix + lib:mod_lbmethod_byrequests$secondaryArchSuffix + lib:mod_lbmethod_bytraffic$secondaryArchSuffix + lib:mod_lbmethod_heartbeat$secondaryArchSuffix + lib:mod_log_config$secondaryArchSuffix + lib:mod_log_debug$secondaryArchSuffix + lib:mod_logio$secondaryArchSuffix + lib:mod_mime$secondaryArchSuffix + lib:mod_negotiation$secondaryArchSuffix + lib:mod_proxy$secondaryArchSuffix + lib:mod_proxy_ajp$secondaryArchSuffix + lib:mod_proxy_balancer$secondaryArchSuffix + lib:mod_proxy_connect$secondaryArchSuffix + lib:mod_proxy_express$secondaryArchSuffix + lib:mod_proxy_fcgi$secondaryArchSuffix + lib:mod_proxy_ftp$secondaryArchSuffix + lib:mod_proxy_http$secondaryArchSuffix + lib:mod_proxy_scgi$secondaryArchSuffix + lib:mod_ratelimit$secondaryArchSuffix + lib:mod_remoteip$secondaryArchSuffix + lib:mod_reqtimeout$secondaryArchSuffix + lib:mod_request$secondaryArchSuffix + lib:mod_rewrite$secondaryArchSuffix + lib:mod_sed$secondaryArchSuffix + lib:mod_session$secondaryArchSuffix + lib:mod_session_cookie$secondaryArchSuffix + lib:mod_session_dbd$secondaryArchSuffix + lib:mod_setenvif$secondaryArchSuffix + lib:mod_slotmem_shm$secondaryArchSuffix + lib:mod_socache_dbm$secondaryArchSuffix + lib:mod_socache_memcache$secondaryArchSuffix + lib:mod_socache_shmcb$secondaryArchSuffix + lib:mod_speling$secondaryArchSuffix + lib:mod_status$secondaryArchSuffix + lib:mod_substitute$secondaryArchSuffix + lib:mod_unique_id$secondaryArchSuffix + lib:mod_unixd$secondaryArchSuffix + lib:mod_userdir$secondaryArchSuffix + lib:mod_version$secondaryArchSuffix + lib:mod_vhost_alias$secondaryArchSuffix " REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion lib:libapr_1$secondaryArchSuffix - lib:aprutil_1$secondaryArchSuffix >= 1.4.1 + lib:libaprutil_1$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libpcre$secondaryArchSuffix " PATCHES="apache-2.4.3.patchset" +GLOBAL_WRITABLE_FILES=" + settings/extra/httpd-autoindex.conf keep-old + settings/extra/httpd-dav.conf keep-old + settings/extra/httpd-default.conf keep-old + settings/extra/httpd-info.conf keep-old + settings/extra/httpd-languages.conf keep-old + settings/extra/httpd-manual.conf keep-old + settings/extra/httpd-mpm.conf keep-old + settings/extra/httpd-multilang-errordoc.conf keep-old + settings/extra/httpd-ssl.conf keep-old + settings/extra/httpd-userdir.conf keep-old + settings/extra/httpd-vhosts.conf keep-old + settings/extra/proxy-html.conf keep-old + settings/httpd.conf keep-old + settings/magic keep-old + settings/mime.types keep-old + settings/original/extra/httpd-autoindex.conf keep-old + settings/original/extra/httpd-dav.conf keep-old + settings/original/extra/httpd-default.conf keep-old + settings/original/extra/httpd-info.conf keep-old + settings/original/extra/httpd-languages.conf keep-old + settings/original/extra/httpd-manual.conf keep-old + settings/original/extra/httpd-mpm.conf keep-old + settings/original/extra/httpd-multilang-errordoc.conf keep-old + settings/original/extra/httpd-ssl.conf keep-old + settings/original/extra/httpd-userdir.conf keep-old + settings/original/extra/httpd-vhosts.conf keep-old + settings/original/extra/proxy-html.conf keep-old + settings/original/httpd.conf keep-old +" + BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize @@ -30,6 +158,7 @@ BUILD_PREREQUIRES=" cmd:awk " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libapr_1$secondaryArchSuffix devel:libaprutil_1$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -39,24 +168,21 @@ BUILD_REQUIRES=" BUILD() { - cd httpd-2.4.3 libtoolize --force --copy --install aclocal autoconf - ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir + runConfigure ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir make } INSTALL() { - cd httpd-2.4.3 make install } TEST() { - cd httpd-2.4.3 make test } From 8bbc2101f9587fd71058c71c605350b641eb1e17 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:53:31 +0200 Subject: [PATCH 068/326] Updated Apache 2.4.3 recipe --- www-servers/apache/apache-2.4.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 0fdf60ea4..741666b88 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -151,7 +151,7 @@ GLOBAL_WRITABLE_FILES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:libtoolize - cmd:autom4te + cmd:autoconf cmd:gcc$secondaryArchSuffix cmd:pcre_config cmd:make From dba95e89acb2f0f37cb8348bbf0abeddb32e2ea4 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 21:56:29 +0200 Subject: [PATCH 069/326] Updated Apache 2.4.3 recipe, updated revision --- www-servers/apache/apache-2.4.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 741666b88..9190e0dd5 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -3,7 +3,7 @@ DESCRIPTION="The Apache Web Server." HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="httpd-2.4.3" From ec82f204f9b3d1e3ac2ac9b9b0cd5e719a2849ed Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 23:13:04 +0200 Subject: [PATCH 070/326] Updated summary and description --- www-servers/apache/apache-2.4.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 9190e0dd5..102912f25 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,5 +1,5 @@ -SUMMARY="Apache 2.4.3" -DESCRIPTION="The Apache Web Server." +SUMMARY="Apache HTTP Server 2.4.3" +DESCRIPTION="The Apache HTTP Server Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" From b261842052beb06498affb71a7d74a76e6a8f048 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 15 Dec 2014 16:11:37 -0500 Subject: [PATCH 071/326] TrackerGrep: v5.2. --- .../patches/trackergrep-5.1.patchset | 49 ----------------- haiku-apps/trackergrep/trackergrep-5.1.recipe | 55 ------------------- haiku-apps/trackergrep/trackergrep-5.2.recipe | 50 +++++++++++++++++ 3 files changed, 50 insertions(+), 104 deletions(-) delete mode 100644 haiku-apps/trackergrep/patches/trackergrep-5.1.patchset delete mode 100644 haiku-apps/trackergrep/trackergrep-5.1.recipe create mode 100644 haiku-apps/trackergrep/trackergrep-5.2.recipe diff --git a/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset b/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset deleted file mode 100644 index 01fd9988e..000000000 --- a/haiku-apps/trackergrep/patches/trackergrep-5.1.patchset +++ /dev/null @@ -1,49 +0,0 @@ -From c02a072f11683914ce9dbe77adf0b478f613885e Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 20:22:01 -0700 -Subject: Fix directory and include issues - - -diff --git a/source/Grepper.cpp b/source/Grepper.cpp -index d2e5c58..71befc8 100644 ---- a/source/Grepper.cpp -+++ b/source/Grepper.cpp -@@ -139,8 +139,10 @@ int32 Grepper::GrepperThread() - char command[B_PATH_NAME_LENGTH + 32]; - - BPath tempFile; -- sprintf(fileName, "/boot/var/tmp/TrackerGrep%ld", fThreadId); -- tempFile.SetTo(fileName); -+ if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &tempFile, true) != B_OK) -+ return -1; -+ sprintf(fileName, "TrackerGrep%ld", fThreadId); -+ tempFile.Append(fileName); - - while (!fMustQuit && GetNextName(fileName)) { - message.MakeEmpty(); -@@ -159,8 +161,9 @@ int32 Grepper::GrepperThread() - - EscapeSpecialChars(fileName); - -+ //assume that grep is already in $PATH - sprintf( -- command, "/boot/beos/bin/grep -hn %s %s \"%s\" > \"%s\"", -+ command, "grep -hn %s %s \"%s\" > \"%s\"", - fModel->fCaseSensitive ? "" : "-i", fPattern, fileName, - tempFile.Path()); - -diff --git a/source/Model.h b/source/Model.h -index a73d801..8ec1d24 100644 ---- a/source/Model.h -+++ b/source/Model.h -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #define PREFS_FILE "TrackerGrepSettings" --- -1.8.3.4 - diff --git a/haiku-apps/trackergrep/trackergrep-5.1.recipe b/haiku-apps/trackergrep/trackergrep-5.1.recipe deleted file mode 100644 index f026386dd..000000000 --- a/haiku-apps/trackergrep/trackergrep-5.1.recipe +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY="A simple Tracker add-on that lets you search through text files." -DESCRIPTION=" -Tracker Grep is a simple Tracker add-on that lets you search through text \ -files. Haiku already comes with a tool that lets you do that, grep, but you \ -need to use it from a Terminal window. Gone are those days of command-line \ -trouble, because from now on Tracker Grep lets you run grep directly from the \ -Tracker. -" -HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep/" -SRC_URI="git://github.com/HaikuArchives/TrackerGrep.git#001a0b68be" -REVISION="2" -COPYRIGHT=" - 1998-2006 Matthijs Hollemans - 2007 Jonas Sundström." -LICENSE="MIT" - -ARCHITECTURES="x86_gcc2 x86 ?x86_64" - -PROVIDES=" - trackergrep = $portVersion - app:TrackerGrep = $portVersion - " - -REQUIRES=" - haiku - " - -BUILD_REQUIRES=" - haiku_devel - " - -BUILD_PREREQUIRES=" - cmd:gcc - cmd:xres - " - -PATCHES="trackergrep-5.1.patchset" - -BUILD() -{ - cd source - g++ -o TrackerGrep GrepApp.cpp GrepWindow.cpp Model.cpp \ - TrackerGrep.cpp Grepper.cpp GrepListView.cpp -fpermissive \ - -lbe -ltracker -ltextencoding - xres -o TrackerGrep TrackerGrep.rsrc - mimeset -f TrackerGrep -} - -INSTALL() -{ - cd source - mkdir -p $addOnsDir/Tracker - cp TrackerGrep $addOnsDir/Tracker - addAppDeskbarSymlink $appsDir/TrackerGrep -} diff --git a/haiku-apps/trackergrep/trackergrep-5.2.recipe b/haiku-apps/trackergrep/trackergrep-5.2.recipe new file mode 100644 index 000000000..9dfa4334c --- /dev/null +++ b/haiku-apps/trackergrep/trackergrep-5.2.recipe @@ -0,0 +1,50 @@ +SUMMARY="A simple Tracker add-on that lets you search through text files." +DESCRIPTION="TrackerGrep is a simple Tracker add-on that lets you search \ +through text files. Haiku already comes with a tool that lets you do that \ +(grep) but you need to use it from a Terminal window. Gone are those days \ +of command-line trouble, because from now on TrackerGrep lets you run grep \ +directly from Tracker." +HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep" +SRC_URI="https://github.com/HaikuArchives/TrackerGrep/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="7b19601d48ae26bc54345c26914892ea6a8e54f131c5049ee5bb52523a950d81" +SOURCE_DIR="TrackerGrep-$portVersion" +LICENSE="MIT" +COPYRIGHT=" + 1998-2006 Matthijs Hollemans + 2007 Jonas Sundström." +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + trackergrep = $portVersion + add_on:TrackerGrep = $portVersion + " +REQUIRES=" + haiku + cmd:grep + " + +BUILD_REQUIRES=" + haiku_devel + " +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 $addOnsDir/Tracker/ + + cp objects/TrackerGrep-G $addOnsDir/Tracker/ +} From 50097924a868b47a961e9596c9fff5e1b112a5fe Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 15 Dec 2014 23:30:51 +0200 Subject: [PATCH 072/326] Removed TEST block --- www-servers/apache/apache-2.4.3.recipe | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index 102912f25..d0a7c4bf3 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="Apache HTTP Server 2.4.3" +SUMMARY="The Number One HTTP Server On The Internet" DESCRIPTION="The Apache HTTP Server Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" @@ -181,10 +181,5 @@ INSTALL() make install } -TEST() -{ - make test -} - LICENSE="Apache v2" COPYRIGHT="2012 The Apache Software Foundation." From df3f6c0aaf4a57d05f8c8412bdecefb79aeef070 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 15 Dec 2014 18:17:16 -0500 Subject: [PATCH 073/326] Add dejavu port Signed-off-by: Timothy Gu --- media-fonts/dejavu/dejavu-2.34.recipe | 37 +++++++++++++++++ media-fonts/dejavu/licenses/Arev Fonts | 47 ++++++++++++++++++++++ media-fonts/dejavu/licenses/Bitstream Vera | 46 +++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 media-fonts/dejavu/dejavu-2.34.recipe create mode 100644 media-fonts/dejavu/licenses/Arev Fonts create mode 100644 media-fonts/dejavu/licenses/Bitstream Vera diff --git a/media-fonts/dejavu/dejavu-2.34.recipe b/media-fonts/dejavu/dejavu-2.34.recipe new file mode 100644 index 000000000..19607436d --- /dev/null +++ b/media-fonts/dejavu/dejavu-2.34.recipe @@ -0,0 +1,37 @@ +SUMMARY="DejaVu font family with improved Vera fonts" +DESCRIPTION="This package includes the DejaVu Serif, Sans (proportional), and \ +DejaVu Sans Mono (monospaced) fonts. +The fonts are based on the Vera fonts open-sourced by Bitstream, and the Arev \ +fonts." +HOMEPAGE="http://dejavu-fonts.org/" +SRC_URI="http://sourceforge.net/projects/dejavu/files/dejavu/$portVersion/dejavu-fonts-ttf-$portVersion.tar.bz2" +CHECKSUM_SHA256="d0a72c3ae99f5b8d7470daf091ec43f78dc942795aed5c996ab1aa678702eb5d" +LICENSE="Bitstream Vera + Arev Fonts +" +COPYRIGHT="2003 Bitstream, Inc. +2006 Tavmjong Bah . +" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="dejavu = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="dejavu-fonts-ttf-$portVersion/ttf" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/DejaVu + mkdir -p ${FONTDIR} + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/dejavu/licenses/Arev Fonts b/media-fonts/dejavu/licenses/Arev Fonts new file mode 100644 index 000000000..c52d29ed4 --- /dev/null +++ b/media-fonts/dejavu/licenses/Arev Fonts @@ -0,0 +1,47 @@ +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. diff --git a/media-fonts/dejavu/licenses/Bitstream Vera b/media-fonts/dejavu/licenses/Bitstream Vera new file mode 100644 index 000000000..f77fe4fcf --- /dev/null +++ b/media-fonts/dejavu/licenses/Bitstream Vera @@ -0,0 +1,46 @@ +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. From 211ab4a487c0641fa9a54ddd2a5a2f46155b98a2 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 16 Dec 2014 03:04:22 +0000 Subject: [PATCH 074/326] Add yasm 1.3.0 Signed-off-by: Timothy Gu --- dev-lang/yasm/yasm-1.3.0.recipe | 63 +++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 dev-lang/yasm/yasm-1.3.0.recipe diff --git a/dev-lang/yasm/yasm-1.3.0.recipe b/dev-lang/yasm/yasm-1.3.0.recipe new file mode 100644 index 000000000..4f9c5d7e0 --- /dev/null +++ b/dev-lang/yasm/yasm-1.3.0.recipe @@ -0,0 +1,63 @@ +SUMMARY="The Yasm modular assembler" +HOMEPAGE="http://www.tortall.net/projects/yasm/" +SRC_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" +CHECKSUM_SHA256="3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f" +LICENSE=" + Artistic + BSD (2-clause) + BSD (3-clause) + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="2001-2014 Peter Johnson and other Yasm developers." +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + yasm = $portVersion compat >= 1 + cmd:vsyasm = $portVersion compat >= 1 + cmd:yasm = $portVersion compat >= 1 + cmd:ytasm = $portVersion compat >= 1 + devel:libyasm = $portVersion compat >= 1.2 + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + + +BUILD() +{ + libtoolize --force --copy --install + runConfigure ./configure \ + --disable-nls + make $jobArgs + +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libyasm +} + + +DESCRIPTION=" +Yasm is a complete rewrite of the NASM assembler under the “new” BSD License \ +(some portions are under other licenses, see COPYING for details). +Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM and \ +GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit Mach-O, \ +RDOFF2, COFF, Win32, and Win64 object formats, and generates source debugging \ +information in STABS, DWARF 2, and CodeView 8 formats. +Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \ +assembly of NASM or GAS syntax code into Win32 or Win64 object files. +" From 727f9b4abb9069d9c67e0b270fb17243f9bb5358 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Dec 2014 09:22:43 +0100 Subject: [PATCH 075/326] Apache2: Rewrap description and add missing $jobArgs. --- www-servers/apache/apache-2.4.3.recipe | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www-servers/apache/apache-2.4.3.recipe b/www-servers/apache/apache-2.4.3.recipe index d0a7c4bf3..8485e0664 100644 --- a/www-servers/apache/apache-2.4.3.recipe +++ b/www-servers/apache/apache-2.4.3.recipe @@ -1,5 +1,7 @@ SUMMARY="The Number One HTTP Server On The Internet" -DESCRIPTION="The Apache HTTP Server Project is a collaborative software development effort aimed at creating a robust, commercial-grade, featureful, and freely-available source code implementation of an HTTP (Web) server" +DESCRIPTION="The Apache HTTP Server Project is a collaborative software \ +development effort aimed at creating a robust, commercial-grade, featureful, \ +and freely-available source code implementation of an HTTP (Web) server" HOMEPAGE="http://httpd.apache.org" SRC_URI="http://archive.apache.org/dist/httpd/httpd-2.4.3.tar.gz" CHECKSUM_SHA256="7650e82554cd0b81160beb74e9a28e464bff8e2cb76cd7c95217fd50a5306716" @@ -173,7 +175,7 @@ BUILD() autoconf runConfigure ./configure --with-apr=/$relativeBinDir --with-apr-util=/$relativeBinDir - make + make $jobArgs } INSTALL() From fc9572ae05e5d8b4cf2833bec2fae559f25ca743 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 16 Dec 2014 14:14:35 +0100 Subject: [PATCH 076/326] gcal: add dependency on gettext/libintl * If not using it, gcal will always show dates in english. * Also link it as "cal" so it can replace the built-in one. --- app-misc/gcal/gcal-3.6.3.recipe | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app-misc/gcal/gcal-3.6.3.recipe b/app-misc/gcal/gcal-3.6.3.recipe index 95b07b0d8..8ed10aa86 100644 --- a/app-misc/gcal/gcal-3.6.3.recipe +++ b/app-misc/gcal/gcal-3.6.3.recipe @@ -18,6 +18,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" gcal = $portVersion cmd:gcal + cmd:cal cmd:gcal2txt cmd:tcal cmd:txt2gcal @@ -25,6 +26,7 @@ PROVIDES=" REQUIRES=" haiku + lib:libintl " BUILD_PREREQUIRES=" @@ -37,6 +39,7 @@ BUILD_PREREQUIRES=" BUILD_REQUIRES=" haiku_devel + devel:libintl " BUILD() @@ -48,6 +51,7 @@ BUILD() INSTALL() { make install + ln -s $binDir/gcal $binDir/cal } TEST() From 78ea8917807e8290b1a0f948a79e38dba7fe9a98 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 9 Dec 2014 18:21:15 +0000 Subject: [PATCH 077/326] Update gnash recipe and patches * Builds and installs, but doesn't work yet. --- media-video/gnash/gnash-0.8.10.recipe | 13 +- .../gnash/patches/gnash-0.8.10.patchset | 255 ++++++++++++++++++ 2 files changed, 263 insertions(+), 5 deletions(-) diff --git a/media-video/gnash/gnash-0.8.10.recipe b/media-video/gnash/gnash-0.8.10.recipe index e283ac04b..3e727fb68 100644 --- a/media-video/gnash/gnash-0.8.10.recipe +++ b/media-video/gnash/gnash-0.8.10.recipe @@ -9,11 +9,8 @@ COPYRIGHT="2005-2012 Free Software Foundation" LICENSE="GNU GPL v3" REVISION="2" -ARCHITECTURES="!x86 !x86_64" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="$ARCHITECTURES x86_gcc2" -fi -SECONDARY_ARCHITECTURES="!x86" +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" PROVIDES=" gnash$secondaryArchSuffix = $portVersion @@ -87,10 +84,16 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix cmd:sdl_config$secondaryArchSuffix cmd:xargs + cmd:grep " PATCHES="gnash-0.8.10.patchset" +GLOBAL_WRITABLE_FILES=" + settings/gnashpluginrc auto-merge + settings/gnashrc auto-merge +" + BUILD() { INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir diff --git a/media-video/gnash/patches/gnash-0.8.10.patchset b/media-video/gnash/patches/gnash-0.8.10.patchset index 01be8c9cd..3372a609a 100644 --- a/media-video/gnash/patches/gnash-0.8.10.patchset +++ b/media-video/gnash/patches/gnash-0.8.10.patchset @@ -47,3 +47,258 @@ index 845aaae..5788f57 100644 -- 1.8.3.4 +From 4b3dae970549d42723c2528c250a1f95248145c7 Mon Sep 17 00:00:00 2001 +From: Alexis Ballier +Date: Wed, 13 Feb 2013 17:38:44 +0000 +Subject: Fix build with latest FFmpeg (second attempt) + +Add ifdefery to be compatible with older versions. +See ticket #38122 + +Signed-off-by: Sandro Santilli +--- +(limited to 'libmedia/ffmpeg') + +diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +index 067e418..5c8e1ad 100644 +--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp ++++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +@@ -84,8 +84,10 @@ AudioDecoderFfmpeg::~AudioDecoderFfmpeg() + + void AudioDecoderFfmpeg::setup(SoundInfo& info) + { +- // Init the avdecoder-decoder ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,6,2) ++ // Starting from this version avcodec_register calls avcodec_init + avcodec_init(); ++#endif + avcodec_register_all();// change this to only register need codec? + + enum CodecID codec_id; +@@ -158,14 +160,14 @@ void AudioDecoderFfmpeg::setup(SoundInfo& info) + case CODEC_ID_PCM_U16LE: + _audioCodecCtx->channels = (info.isStereo() ? 2 : 1); + _audioCodecCtx->sample_rate = info.getSampleRate(); +- _audioCodecCtx->sample_fmt = SAMPLE_FMT_S16; // ?! arbitrary ? ++ _audioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16; // ?! arbitrary ? + _audioCodecCtx->frame_size = 1; + break; + + default: + _audioCodecCtx->channels = (info.isStereo() ? 2 : 1); + _audioCodecCtx->sample_rate = info.getSampleRate(); +- _audioCodecCtx->sample_fmt = SAMPLE_FMT_S16; // ?! arbitrary ? ++ _audioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16; // ?! arbitrary ? + break; + } + } +@@ -173,7 +175,10 @@ void AudioDecoderFfmpeg::setup(SoundInfo& info) + void AudioDecoderFfmpeg::setup(const AudioInfo& info) + { + // Init the avdecoder-decoder ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,6,2) ++ // Starting from this version avcodec_register calls avcodec_init + avcodec_init(); ++#endif + avcodec_register_all();// change this to only register need codec? + + enum CodecID codec_id = CODEC_ID_NONE; +@@ -297,7 +302,7 @@ void AudioDecoderFfmpeg::setup(const AudioInfo& info) + _audioCodecCtx->channels = (info.stereo ? 2 : 1); + _audioCodecCtx->sample_rate = info.sampleRate; + // was commented out (why?): +- _audioCodecCtx->sample_fmt = SAMPLE_FMT_S16; ++ _audioCodecCtx->sample_fmt = AV_SAMPLE_FMT_S16; + break; + } + +diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp +index d6e6902..136cc08 100644 +--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp ++++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp +@@ -344,8 +344,10 @@ MediaParserFfmpeg::initializeParser() + { + av_register_all(); // TODO: needs to be invoked only once ? + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0) + _byteIOCxt.buffer = NULL; +- ++#endif ++ + _inputFmt = probeStream(); + + #ifdef GNASH_ALLOW_VCODEC_ENV +@@ -366,7 +368,11 @@ MediaParserFfmpeg::initializeParser() + // which isn't needed. + _byteIOBuffer.reset(new unsigned char[byteIOBufferSize]); + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0) + init_put_byte(&_byteIOCxt, ++#else ++ _avIOCxt = avio_alloc_context( ++#endif + _byteIOBuffer.get(), // buffer + byteIOBufferSize, // buffer size + 0, // write flags +@@ -376,7 +382,11 @@ MediaParserFfmpeg::initializeParser() + MediaParserFfmpeg::seekMediaWrapper // seeker callback + ); + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0) + _byteIOCxt.is_streamed = 1; ++#else ++ _avIOCxt->seekable = 0; ++#endif + + #if !defined(LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 52 + // Needed for Lenny. +@@ -387,12 +397,19 @@ MediaParserFfmpeg::initializeParser() + + assert(_formatCtx); + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0) + // Otherwise av_open_input_stream will reallocate the context. + AVFormatParameters ap; + std::memset(&ap, 0, sizeof ap); + ap.prealloced_context = 1; + + if (av_open_input_stream(&_formatCtx, &_byteIOCxt, "", _inputFmt, &ap) < 0) ++#else ++ ++ _formatCtx->pb = _avIOCxt; ++ ++ if (avformat_open_input(&_formatCtx, "", _inputFmt, NULL) < 0) ++#endif + { + throw IOException("MediaParserFfmpeg couldn't open input stream"); + } +@@ -400,10 +417,17 @@ MediaParserFfmpeg::initializeParser() + #if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR >= 52 + // Note: in at least some versions of ffmpeg, av_open_input_stream does + // not parse metadata; not sure why. ++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,5,0) + AVMetadata* md = _formatCtx->metadata; + if (md) { + AVMetadataTag* tag = av_metadata_get(md, "album", 0, + AV_METADATA_MATCH_CASE); ++#else ++ AVDictionary* md = _formatCtx->metadata; ++ if (md) { ++ AVDictionaryEntry* tag = av_dict_get(md, "album", 0, ++ AV_DICT_MATCH_CASE); ++#endif + if (tag && tag->value) { + setId3Info(&Id3Info::album, std::string(tag->value), + _id3Object); +@@ -620,27 +644,27 @@ MediaParserFfmpeg::seekMedia(boost::int64_t offset, int whence) + } + + boost::uint16_t +-MediaParserFfmpeg::SampleFormatToSampleSize(SampleFormat fmt) ++MediaParserFfmpeg::SampleFormatToSampleSize(AVSampleFormat fmt) + { + switch (fmt) + { +- case SAMPLE_FMT_U8: // unsigned 8 bits ++ case AV_SAMPLE_FMT_U8: // unsigned 8 bits + return 1; + +- case SAMPLE_FMT_S16: // signed 16 bits +- case SAMPLE_FMT_FLT: // float ++ case AV_SAMPLE_FMT_S16: // signed 16 bits ++ case AV_SAMPLE_FMT_FLT: // float + return 2; + + #if !defined (LIBAVCODEC_VERSION_MAJOR) || LIBAVCODEC_VERSION_MAJOR < 52 + // Was dropped for version 52.0.0 +- case SAMPLE_FMT_S24: // signed 24 bits ++ case AV_SAMPLE_FMT_S24: // signed 24 bits + return 3; + #endif + +- case SAMPLE_FMT_S32: // signed 32 bits ++ case AV_SAMPLE_FMT_S32: // signed 32 bits + return 4; + +- case SAMPLE_FMT_NONE: ++ case AV_SAMPLE_FMT_NONE: + default: + return 8; // arbitrary value + } +diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.h b/libmedia/ffmpeg/MediaParserFfmpeg.h +index 4e410d8..a14cfb6 100644 +--- a/libmedia/ffmpeg/MediaParserFfmpeg.h ++++ b/libmedia/ffmpeg/MediaParserFfmpeg.h +@@ -154,7 +154,13 @@ private: + AVStream* _audioStream; + + /// ? +- ByteIOContext _byteIOCxt; ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52,107,0) ++// AVIOContext was introduced a bit earlier but without version bump, so let's ++// be safe ++ ByteIOContext _byteIOCxt; ++#else ++ AVIOContext* _avIOCxt; ++#endif + + /// Size of the ByteIO context buffer + // +@@ -172,7 +178,7 @@ private: + // + /// TODO: move somewhere in ffmpeg utils.. + /// +- boost::uint16_t SampleFormatToSampleSize(SampleFormat fmt); ++ boost::uint16_t SampleFormatToSampleSize(AVSampleFormat fmt); + + /// Make an EncodedVideoFrame from an AVPacket and push to buffer + // +diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +index 40a5c80..eeefafe 100644 +--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp ++++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +@@ -171,7 +171,10 @@ VideoDecoderFfmpeg::init(enum CodecID codecId, int /*width*/, int /*height*/, + boost::uint8_t* extradata, int extradataSize) + { + // Init the avdecoder-decoder ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,6,2) ++ // Starting from this version avcodec_register calls avcodec_init + avcodec_init(); ++#endif + avcodec_register_all();// change this to only register need codec? + + _videoCodec = avcodec_find_decoder(codecId); +@@ -529,7 +532,11 @@ get_buffer(AVCodecContext* avctx, AVFrame* pic) + + static unsigned int pic_num = 0; + pic->type = FF_BUFFER_TYPE_USER; ++#if LIBAVCODEC_VERSION_MAJOR < 54 ++ // This field has been unused for longer but has been removed with ++ // libavcodec 54. + pic->age = ++pic_num - surface->getPicNum(); ++#endif + surface->setPicNum(pic_num); + return 0; + #endif +diff --git a/libmedia/ffmpeg/ffmpegHeaders.h b/libmedia/ffmpeg/ffmpegHeaders.h +index 65a8d0c..7710121 100644 +--- a/libmedia/ffmpeg/ffmpegHeaders.h ++++ b/libmedia/ffmpeg/ffmpegHeaders.h +@@ -83,5 +83,15 @@ extern "C" { + #define HAVE_SWSCALE_H 1 + #endif + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,94,1) ++#define AV_SAMPLE_FMT_NONE SAMPLE_FMT_NONE ++#define AV_SAMPLE_FMT_U8 SAMPLE_FMT_U8 ++#define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16 ++#define AV_SAMPLE_FMT_S32 SAMPLE_FMT_S32 ++#define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT ++#define AV_SAMPLE_FMT_DBL SAMPLE_FMT_DBL ++ ++#define AVSampleFormat SampleFormat ++#endif + + #endif // GNASH_MEDIA_FFMPEG_HEADERS_H +-- +cgit v0.9.0.2 From cfeabc475c5851f4a71c265da0f3abcf2bfc472e Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 16 Dec 2014 19:24:26 +0100 Subject: [PATCH 078/326] Also copy the documentation. --- haiku-apps/paladin/paladin-git.recipe | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe index d6475b1f5..0fb7ac185 100644 --- a/haiku-apps/paladin/paladin-git.recipe +++ b/haiku-apps/paladin/paladin-git.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." HOMEPAGE="http://paladin.sourceforge.net" SRC_URI="git://github.com/HaikuArchives/Paladin#8929011" -REVISION="3" +REVISION="4" LICENSE="MIT" COPYRIGHT="2001-2010 DarkWyrm \ 2014 John Scipione " @@ -47,10 +47,12 @@ BUILD() INSTALL() { - mkdir -p $appsDir/Paladin + mkdir -p $appsDir/Paladin $appsDir/Paladin/Documentation mkdir -p $libDir mkdir -p $binDir + cp -r Documentation $appsDir/Paladin + rm $appsDir/Paladin/Documentation/KeltFont.zip cp -r Paladin/Paladin Paladin/Templates $appsDir/Paladin/ cp SymbolFinder/SymbolFinder $appsDir/Paladin/ From d29e7dc9edb7659250379e7efb2468b442891fcd Mon Sep 17 00:00:00 2001 From: Humdinger Date: Tue, 16 Dec 2014 19:40:14 +0100 Subject: [PATCH 079/326] Removed the email addresses from COPYRIGHT --- haiku-apps/paladin/paladin-git.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe index 0fb7ac185..4e16a8cf5 100644 --- a/haiku-apps/paladin/paladin-git.recipe +++ b/haiku-apps/paladin/paladin-git.recipe @@ -5,8 +5,9 @@ HOMEPAGE="http://paladin.sourceforge.net" SRC_URI="git://github.com/HaikuArchives/Paladin#8929011" REVISION="4" LICENSE="MIT" -COPYRIGHT="2001-2010 DarkWyrm \ - 2014 John Scipione " +COPYRIGHT="2001-2010 DarkWyrm + 2014 John Scipione + " ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" From 37c4d8f29dda453a1b4273a4efc0b4d28db8b627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Tue, 16 Dec 2014 20:56:49 +0000 Subject: [PATCH 080/326] Added mesa_swrast to xmoto REQUIRES --- games-sports/xmoto/xmoto-0.5.11.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/games-sports/xmoto/xmoto-0.5.11.recipe b/games-sports/xmoto/xmoto-0.5.11.recipe index 141fe5c52..cc4effce6 100644 --- a/games-sports/xmoto/xmoto-0.5.11.recipe +++ b/games-sports/xmoto/xmoto-0.5.11.recipe @@ -37,6 +37,7 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix + mesa_swrast " BUILD_REQUIRES=" devel:libsqlite3$secondaryArchSuffix From bb53cf1eded39125829d89069d57906c53e76a43 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 16 Dec 2014 22:13:52 +0000 Subject: [PATCH 081/326] gzip-1.6: Fix gzexe backup generation Signed-off-by: Timothy Gu --- app-arch/gzip/gzip-1.6.recipe | 4 +++- app-arch/gzip/patches/gzip-1.6.patchset | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 app-arch/gzip/patches/gzip-1.6.patchset diff --git a/app-arch/gzip/gzip-1.6.recipe b/app-arch/gzip/gzip-1.6.recipe index 4c4bfffab..16d7a5c17 100644 --- a/app-arch/gzip/gzip-1.6.recipe +++ b/app-arch/gzip/gzip-1.6.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://www.gzip.org/" SRC_URI="https://ftp.gnu.org/gnu/gzip/gzip-1.6.tar.xz" CHECKSUM_SHA256="37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847" SOURCE_DIR="$portVersionedName" -REVISION="1" +REVISION="2" LICENSE="GNU GPL v3" COPYRIGHT="1992-1993 Jean-loup Gailly 1999-2013 Free Software Foundation, Inc." @@ -45,6 +45,8 @@ BUILD_PREREQUIRES=" cmd:awk " +PATCHES="${portVersionedName}.patchset" + BUILD() { export CFLAGS="-Wno-error" diff --git a/app-arch/gzip/patches/gzip-1.6.patchset b/app-arch/gzip/patches/gzip-1.6.patchset new file mode 100644 index 000000000..449115031 --- /dev/null +++ b/app-arch/gzip/patches/gzip-1.6.patchset @@ -0,0 +1,25 @@ +From 39ee8c0d94879bde10822f2b95caedde3d6842fb Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 16 Dec 2014 21:50:24 +0000 +Subject: [PATCH] gzexe: Fallback on file copying for backup + +BFS doesn't support hard links. + +Signed-off-by: Timothy Gu + +diff --git a/gzexe.in b/gzexe.in +index e458563..45e1900 100644 +--- a/gzexe.in ++++ b/gzexe.in +@@ -218,7 +218,7 @@ EOF + echo >&2 "$0: $tmp: cannot chmod" + continue + } +- ln -f "$file" "$file~" || { ++ ln -f "$file" "$file~" || cp -f "$file" "${file}~" || { + res=$? + echo >&2 "$0: cannot backup $i as $i~" + continue +-- +1.8.3.4 + From 4b65ec5733f8e08f3c967a866c59f7ee1d672bc0 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 17 Dec 2014 00:23:53 +0000 Subject: [PATCH 082/326] faac: Support x86_64 Signed-off-by: Timothy Gu --- media-libs/faac/faac-1.28.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe index 2ed315a18..746fcee1d 100644 --- a/media-libs/faac/faac-1.28.recipe +++ b/media-libs/faac/faac-1.28.recipe @@ -10,7 +10,7 @@ REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="Copyright (C) 2003 Krzysztof Nikiel" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" PROVIDES=" @@ -47,8 +47,6 @@ PATCH() if [ "$targetArchitecture" = x86_gcc2 ]; then sed -i 's/-lstdc++/-lstdc++.r4/' configure.in frontend/Makefile.am - else - sed -i 's/-lstdc++//' configure.in frontend/Makefile.am fi } From 323a9e436f6a810a5fa47a6c1d79ab29032f7d62 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 18 Dec 2014 03:02:53 +0000 Subject: [PATCH 083/326] cabextract: Support x86_64 Also adds missing dependency. Signed-off-by: Timothy Gu --- app-arch/cabextract/cabextract-1.4.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe index 228ccb467..44e8aefec 100644 --- a/app-arch/cabextract/cabextract-1.4.recipe +++ b/app-arch/cabextract/cabextract-1.4.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2000-2011 Stuart Caie" SRC_URI="http://www.cabextract.org.uk/cabextract-1.4.tar.gz" CHECKSUM_SHA256="f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e" REVISION="1" -ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" +ARCHITECTURES="x86 ?x86_gcc2 x86_64" PROVIDES=" cabextract = $portVersion @@ -29,6 +29,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:make cmd:gcc + cmd:awk " BUILD() From 30817cc0490cacb2accc2494f169e5843a18515e Mon Sep 17 00:00:00 2001 From: Humdinger Date: Thu, 18 Dec 2014 08:33:39 +0100 Subject: [PATCH 084/326] Smallish changes in the Paladin recipe: * With changes in Paladin's source, we can now build for gcc4. * Added "lua" to REQUIREMENT and "luagrep" and "luare" to PROVIDES. This enables the feature to find and replace strings in a project. * Removed "SymbolFinder" from the Deskbar. It's normally started from Paladin's menu. * Improved summary. * Changed HOMEPAGE address to HaikuArchives. --- haiku-apps/paladin/paladin-git.recipe | 49 +++++++++++++++++++-------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe index 4e16a8cf5..0897e3235 100644 --- a/haiku-apps/paladin/paladin-git.recipe +++ b/haiku-apps/paladin/paladin-git.recipe @@ -1,9 +1,27 @@ -SUMMARY="Paladin is an open source integrated development environment (IDE)" +SUMMARY="An open source integrated development environment (IDE)" DESCRIPTION="Paladin is an open source integrated development environment (IDE) \ -modeled after BeOS' BeIDE." -HOMEPAGE="http://paladin.sourceforge.net" -SRC_URI="git://github.com/HaikuArchives/Paladin#8929011" -REVISION="4" +modeled after BeOS' BeIDE. + +Paladin's feature set includes: + +- Command-line build support +- Multithreaded builds +- Revision control-friendly project files +- More run options for projects +- Explicit support for debugging with gdb under Haiku +- Bundled helper tools +- Streamlined project settings +- Out-of-the-box support for Lex and Yacc +- Support for text and binary resource files +- Projects can include notes and other files that aren't source code +- Project templates +- Out-of-the-box makefile generation +- Integrated source code management +- 1-click project backups +" +HOMEPAGE="http://github.com/HaikuArchives/Paladin" +SRC_URI="git://github.com/HaikuArchives/Paladin#dd61cdf" +REVISION="5" LICENSE="MIT" COPYRIGHT="2001-2010 DarkWyrm 2014 John Scipione @@ -14,20 +32,22 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" paladin = $portVersion - app:Paladin = $portVersion - app:SymbolFinder = $portVersion + app:Paladin + app:SymbolFinder + cmd:luagrep + cmd:luare " REQUIRES=" - haiku - lib:libpcre - lib:libz + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpcre$secondaryArchSuffix + lib:libz$secondaryArchSuffix + cmd:lua " BUILD_REQUIRES=" - haiku_devel - devel:libpcre - devel:libz + devel:libpcre$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -49,14 +69,13 @@ BUILD() INSTALL() { mkdir -p $appsDir/Paladin $appsDir/Paladin/Documentation - mkdir -p $libDir mkdir -p $binDir cp -r Documentation $appsDir/Paladin rm $appsDir/Paladin/Documentation/KeltFont.zip cp -r Paladin/Paladin Paladin/Templates $appsDir/Paladin/ cp SymbolFinder/SymbolFinder $appsDir/Paladin/ + cp luagrep luare $binDir addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin - addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder SymbolFinder } From 08e9baff0249ccfad9dc180364e4a4929a01420f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 18 Dec 2014 12:46:57 -0500 Subject: [PATCH 085/326] Recipe for Atari++. --- games-emulation/atari++/atari++-1.73.recipe | 73 +++++++++++++++++++ .../atari++/patches/atari++-1.73.patch | 25 +++++++ 2 files changed, 98 insertions(+) create mode 100644 games-emulation/atari++/atari++-1.73.recipe create mode 100644 games-emulation/atari++/patches/atari++-1.73.patch diff --git a/games-emulation/atari++/atari++-1.73.recipe b/games-emulation/atari++/atari++-1.73.recipe new file mode 100644 index 000000000..1f494a0e3 --- /dev/null +++ b/games-emulation/atari++/atari++-1.73.recipe @@ -0,0 +1,73 @@ +SUMMARY="Emulator of Atari 8-bit system" +DESCRIPTION="The Atari++ Emulator is a Unix based emulator of the Atari eight \ +bit computers, namely the Atari 400 and 800, the Atari 400XL, 800XL and \ +130XE, and the Atari 5200 game console. The emulator is auto-configurable and \ +will compile on a variety of systems (Linux, Solaris, Irix). Its emulation \ +features are stunning: + * Cycle precise emulation; this includes correct emulation of horizontal \ +kernels and programs that modify chip registers within a horizontal line. \ +In a less technical language, software making use of advanced displaying \ +techniques will be emulated correctly. + * Emulation of an advanced 1050 disk drive including single, double and \ +enhanced density. The emulator not only understands .atr and .xfd files, \ +but comes with a mini-boot loader that allows you to boot from binary load \ +files (.exe and .com)." +HOMEPAGE="http://xl-project.com/" +COPYRIGHT="2004 Thomas Richter" +SRC_URI="http://www.xl-project.com/download/atari++_1.73.tar.gz" +CHECKSUM_SHA256="b41095eeb6362806ddcfa9c59ca319b873fb9eed3bf7a78ad2f2848300e4b3f8" +SOURCE_DIR="atari++" +PATCHES="atari++-$portVersion.patch" +REVISION="1" +LICENSE="GNU GPL v1" + +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=" + atari++$secondaryArchSuffix = $portVersion + cmd:atari++ = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl_1.2$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl_1.2$secondaryArchSuffix >= 0.11.4 + devel:libpng$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoreconf + cmd:autoheader + cmd:which + cmd:sdl_config$secondaryArchSuffix + cmd:awk + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + autoreconf + runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install + addAppDeskbarSymlink $prefix/bin/atari++ "Atari++" +} diff --git a/games-emulation/atari++/patches/atari++-1.73.patch b/games-emulation/atari++/patches/atari++-1.73.patch new file mode 100644 index 000000000..5621f6127 --- /dev/null +++ b/games-emulation/atari++/patches/atari++-1.73.patch @@ -0,0 +1,25 @@ +From 6c18d36b30e6eefe9a757ca9f6c3505d9218e5f3 Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Thu, 18 Dec 2014 12:35:36 -0500 +Subject: [PATCH] Fix autoconf script to include the proper header for timeval. + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 76e160d..56c731f 100644 +--- a/configure.in ++++ b/configure.in +@@ -159,7 +159,7 @@ AC_CHECK_FUNCS([gettimeofday isascii memchr memmove memset select strcasecmp str + AC_CHECK_FUNCS([time localtime snprintf vsnprintf usleep select getenv isatty chmod]) + AC_CHECK_FUNCS([tcsetattr tcgetattr tcflush tcdrain cfmakeraw cfsetospeed cfsetispeed]) + AC_CHECK_FUNCS([ioctl open creat close read write unlink fileno]) +-AC_CHECK_TYPE([struct timeval],[AC_DEFINE(HAS_STRUCT_TIMEVAL,[1],[Define to 1 if struct timeval is available])]) ++AC_CHECK_TYPE([struct timeval],[AC_DEFINE(HAS_STRUCT_TIMEVAL,[1],[Define to 1 if struct timeval is available])],[],[[#include ]]) + # + # + # Check for where X11 could be +-- +1.8.3.4 + From 5ae376e994cfe7509d0c0c1f4fc7c97b871bdde1 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 16 Dec 2014 00:48:17 +0200 Subject: [PATCH 086/326] Add Bam 0.4.0 recipe and patch --- dev-util/bam/bam-0.4.0.recipe | 42 ++++++++++++++++++++++++++++ dev-util/bam/patches/bam-0.4.0.patch | 26 +++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 dev-util/bam/bam-0.4.0.recipe create mode 100644 dev-util/bam/patches/bam-0.4.0.patch diff --git a/dev-util/bam/bam-0.4.0.recipe b/dev-util/bam/bam-0.4.0.recipe new file mode 100644 index 000000000..b8f341b36 --- /dev/null +++ b/dev-util/bam/bam-0.4.0.recipe @@ -0,0 +1,42 @@ +SUMMARY="Bam is a fast and flexible build system." +DESCRIPTION="Bam uses Lua to describe the build process. It's takes its \ +inspiration for the script files from scons. While scons focuses on being \ +100% correct when building, bam makes a few sacrifices to acquire fast. \ +full and incremental build times." +HOMEPAGE="http://matricks.github.io/bam/" +SRC_URI="http://github.com/downloads/matricks/bam/bam-0.4.0.tar.gz" +CHECKSUM_SHA256="5e4e4920b4d265da582f66774e9b1ec8ddfbe75ddc028fba86c12f686ea18db3" +REVISION="1" + +COPYRIGHT="2009 Magnus Auvinen" +LICENSE="Zlib" + +ARCHITECTURES="x86_gcc2 x86" + +PATCHES="bam-0.4.0.patch" + +PROVIDES=" + bam = $portVersion + cmd:bam$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + cmd:lua + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + sh make_beos.sh +} + +INSTALL() +{ + mkdir -p $binDir + cp bam $binDir +} diff --git a/dev-util/bam/patches/bam-0.4.0.patch b/dev-util/bam/patches/bam-0.4.0.patch new file mode 100644 index 000000000..8c5c48898 --- /dev/null +++ b/dev-util/bam/patches/bam-0.4.0.patch @@ -0,0 +1,26 @@ +Only in bam-0.4.0: bam +diff -ur bam-0.4.0-orig/make_beos.sh bam-0.4.0/make_beos.sh +--- bam-0.4.0-orig/make_beos.sh 2010-08-09 21:08:24.043778048 +0300 ++++ bam-0.4.0/make_beos.sh 2014-12-15 21:08:44.414187520 +0200 +@@ -1,4 +1,4 @@ + #!/bin/sh + gcc -Wall -ansi -pedantic src/tools/txt2c.c -o src/tools/txt2c + src/tools/txt2c src/base.lua src/tools.lua src/driver_gcc.lua src/driver_cl.lua > src/internal_base.h +-gcc -Wall -ansi -pedantic src/lua/*.c src/*.c -o bam -I src/lua -lpthread -O2 $* ++gcc -Wall -ansi -pedantic src/lua/*.c src/*.c -o bam -I src/lua -O2 $* +diff -ur bam-0.4.0-orig/src/support.c bam-0.4.0/src/support.c +--- bam-0.4.0-orig/src/support.c 2010-08-09 21:08:24.045875200 +0300 ++++ bam-0.4.0/src/support.c 2014-12-15 23:47:55.438042624 +0200 +@@ -140,7 +140,11 @@ + #include + #include + #include ++#ifdef BAM_FAMILY_BEOS ++ #include ++#else + #include ++#endif + #include + #include + #include +Binary files bam-0.4.0-orig/src/tools/txt2c and bam-0.4.0/src/tools/txt2c differ From 31ff93a759ac43cd98f53977c7e84ae60849b92d Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Thu, 18 Dec 2014 21:29:43 +0000 Subject: [PATCH 087/326] Add z26 recipe --- games-emulation/z26/z26-2.16.00s.recipe | 53 +++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 games-emulation/z26/z26-2.16.00s.recipe diff --git a/games-emulation/z26/z26-2.16.00s.recipe b/games-emulation/z26/z26-2.16.00s.recipe new file mode 100644 index 000000000..cb6669fff --- /dev/null +++ b/games-emulation/z26/z26-2.16.00s.recipe @@ -0,0 +1,53 @@ +SUMMARY="A fully-featured Atari 2600 emulator" +DESCRIPTION=" +z26 is an Atari 2600 emulator which supports a lot of carts and a \ +whole lot of peripherals, including mindlink, Trak-Ball, Light Gun and much more!\ +It also supports multiload files, and a whole lot of other features. +" +HOMEPAGE="http://whimsey.com/z26/" +SRC_URI="http://whimsey.com/z26/z26v2.16.00s.zip" +CHECKSUM_SHA256="fe285597543a9f562b25f11e57804c604d8226d9a6dc6dc1b9e2a4cfc5f38276" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1997-2004 John Saeger" + +ARCHITECTURES="x86" +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" +fi + +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + z26$secondaryArchSuffix = $portVersion + app:z26$secondaryArchSuffix = $portVersion +" +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix +" +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + libsdl${secondaryArchSuffix}_devel +" +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:nasm + cmd:ld$secondaryArchSuffix +" +SOURCE_DIR="src" + +BUILD() +{ + make beos +} + +INSTALL() +{ + mkdir -p $appsDir + cp z26 $appsDir/z26 + addAppDeskbarSymlink $appsDir/z26 "z26" +} From 5d23d62c0d3e135c07cb077cc72f9dc681fb5d4b Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 17 Dec 2014 18:56:04 +0200 Subject: [PATCH 088/326] Add broken teeworlds 0.6.3 recipe and patch --- .../teeworlds/patches/teeworlds-0.6.3.patch | 283 ++++++++++++++++++ games-action/teeworlds/teeworlds-0.6.3.recipe | 59 ++++ 2 files changed, 342 insertions(+) create mode 100644 games-action/teeworlds/patches/teeworlds-0.6.3.patch create mode 100644 games-action/teeworlds/teeworlds-0.6.3.recipe diff --git a/games-action/teeworlds/patches/teeworlds-0.6.3.patch b/games-action/teeworlds/patches/teeworlds-0.6.3.patch new file mode 100644 index 000000000..923557a4d --- /dev/null +++ b/games-action/teeworlds/patches/teeworlds-0.6.3.patch @@ -0,0 +1,283 @@ +diff -ur teeworlds-0.6.3-src-orig/bam.lua teeworlds-0.6.3-src/bam.lua +--- teeworlds-0.6.3-src-orig/bam.lua 2014-11-20 00:08:23.059768832 +0200 ++++ teeworlds-0.6.3-src/bam.lua 2014-12-17 00:47:27.678428672 +0200 +@@ -184,6 +184,12 @@ + settings.link.libs:Add("ws2_32") + settings.link.libs:Add("ole32") + settings.link.libs:Add("shell32") ++ elseif family == "beos" and platform == "haiku" then ++ settings.link.libs:Add("be") ++ settings.link.libs:Add("root") ++ settings.link.libs:Add("network") ++ settings.link.libs:Add("GL"); ++ settings.link.libs:Add("GLU"); + end + + -- compile zlib if needed +diff -ur teeworlds-0.6.3-src-orig/src/base/detect.h teeworlds-0.6.3-src/src/base/detect.h +--- teeworlds-0.6.3-src-orig/src/base/detect.h 2014-11-20 00:08:22.046137344 +0200 ++++ teeworlds-0.6.3-src/src/base/detect.h 2014-12-16 21:31:00.576192512 +0200 +@@ -68,7 +68,7 @@ + #endif + + /* beos family */ +-#if defined(__BeOS) || defined(__BEOS__) ++#if defined(__BeOS) || defined(__BEOS__) || defined(__HAIKU__) + #define CONF_FAMILY_BEOS 1 + #define CONF_FAMILY_STRING "beos" + #define CONF_PLATFORM_BEOS 1 +diff -ur teeworlds-0.6.3-src-orig/src/base/system.c teeworlds-0.6.3-src/src/base/system.c +--- teeworlds-0.6.3-src-orig/src/base/system.c 2014-11-20 00:08:22.047448064 +0200 ++++ teeworlds-0.6.3-src/src/base/system.c 2014-12-17 18:20:36.652738560 +0200 +@@ -9,7 +9,7 @@ + + #include "system.h" + +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + #include + #include + +@@ -372,7 +372,7 @@ + + void *thread_create(void (*threadfunc)(void *), void *u) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_t id; + pthread_create(&id, NULL, (void *(*)(void*))threadfunc, u); + return (void*)id; +@@ -385,7 +385,7 @@ + + void thread_wait(void *thread) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_join((pthread_t)thread, NULL); + #elif defined(CONF_FAMILY_WINDOWS) + WaitForSingleObject((HANDLE)thread, INFINITE); +@@ -396,7 +396,7 @@ + + void thread_destroy(void *thread) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + void *r = 0; + pthread_join((pthread_t)thread, &r); + #else +@@ -406,7 +406,7 @@ + + void thread_yield() + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + sched_yield(); + #elif defined(CONF_FAMILY_WINDOWS) + Sleep(0); +@@ -417,7 +417,7 @@ + + void thread_sleep(int milliseconds) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + usleep(milliseconds*1000); + #elif defined(CONF_FAMILY_WINDOWS) + Sleep(milliseconds); +@@ -428,7 +428,7 @@ + + void thread_detach(void *thread) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_detach((pthread_t)(thread)); + #elif defined(CONF_FAMILY_WINDOWS) + CloseHandle(thread); +@@ -440,7 +440,7 @@ + + + +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + typedef pthread_mutex_t LOCKINTERNAL; + #elif defined(CONF_FAMILY_WINDOWS) + typedef CRITICAL_SECTION LOCKINTERNAL; +@@ -452,7 +452,7 @@ + { + LOCKINTERNAL *lock = (LOCKINTERNAL*)mem_alloc(sizeof(LOCKINTERNAL), 4); + +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_mutex_init(lock, 0x0); + #elif defined(CONF_FAMILY_WINDOWS) + InitializeCriticalSection((LPCRITICAL_SECTION)lock); +@@ -464,7 +464,7 @@ + + void lock_destroy(LOCK lock) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_mutex_destroy((LOCKINTERNAL *)lock); + #elif defined(CONF_FAMILY_WINDOWS) + DeleteCriticalSection((LPCRITICAL_SECTION)lock); +@@ -476,7 +476,7 @@ + + int lock_try(LOCK lock) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + return pthread_mutex_trylock((LOCKINTERNAL *)lock); + #elif defined(CONF_FAMILY_WINDOWS) + return !TryEnterCriticalSection((LPCRITICAL_SECTION)lock); +@@ -487,7 +487,7 @@ + + void lock_wait(LOCK lock) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_mutex_lock((LOCKINTERNAL *)lock); + #elif defined(CONF_FAMILY_WINDOWS) + EnterCriticalSection((LPCRITICAL_SECTION)lock); +@@ -498,7 +498,7 @@ + + void lock_release(LOCK lock) + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + pthread_mutex_unlock((LOCKINTERNAL *)lock); + #elif defined(CONF_FAMILY_WINDOWS) + LeaveCriticalSection((LPCRITICAL_SECTION)lock); +@@ -508,7 +508,7 @@ + } + + #if !defined(CONF_PLATFORM_MACOSX) +- #if defined(CONF_FAMILY_UNIX) ++ #if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + void semaphore_init(SEMAPHORE *sem) { sem_init(sem, 0, 0); } + void semaphore_wait(SEMAPHORE *sem) { sem_wait(sem); } + void semaphore_signal(SEMAPHORE *sem) { sem_post(sem); } +@@ -527,7 +527,7 @@ + /* ----- time ----- */ + int64 time_get() + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + struct timeval val; + gettimeofday(&val, NULL); + return (int64)val.tv_sec*(int64)1000000+(int64)val.tv_usec; +@@ -546,7 +546,7 @@ + + int64 time_freq() + { +-#if defined(CONF_FAMILY_UNIX) ++#if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + return 1000000; + #elif defined(CONF_FAMILY_WINDOWS) + int64 t; +@@ -1354,6 +1354,16 @@ + return -1; + _snprintf(path, max, "%s/%s", home, appname); + return 0; ++#elif defined(CONF_FAMILY_BEOS) ++ #include ++ ++ dev_t device = (dev_t)-1; ++ char *datadir; ++ ++ status_t status = find_directory(B_USER_DATA_DIRECTORY, device, false, datadir, max); ++ if (status < B_OK) return -1; ++ snprintf(path, max, "%s/%s", datadir, appname); ++ return 0; + #else + char *home = getenv("HOME"); + #if !defined(CONF_PLATFORM_MACOSX) +@@ -1795,7 +1805,7 @@ + &theItem); + + RunStandardAlert(theItem, NULL, &itemIndex); +-#elif defined(CONF_FAMILY_UNIX) ++#elif defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + static char cmd[1024]; + int err; + /* use xmessage which is available on nearly every X11 system */ +diff -ur teeworlds-0.6.3-src-orig/src/base/system.h teeworlds-0.6.3-src/src/base/system.h +--- teeworlds-0.6.3-src-orig/src/base/system.h 2014-11-20 00:08:22.046137344 +0200 ++++ teeworlds-0.6.3-src/src/base/system.h 2014-12-16 21:31:00.580124672 +0200 +@@ -411,7 +411,7 @@ + /* Group: Semaphores */ + + #if !defined(CONF_PLATFORM_MACOSX) +- #if defined(CONF_FAMILY_UNIX) ++ #if defined(CONF_FAMILY_UNIX) || defined(CONF_FAMILY_BEOS) + #include + typedef sem_t SEMAPHORE; + #elif defined(CONF_FAMILY_WINDOWS) +diff -ur teeworlds-0.6.3-src-orig/src/engine/client/backend_sdl.cpp teeworlds-0.6.3-src/src/engine/client/backend_sdl.cpp +--- teeworlds-0.6.3-src-orig/src/engine/client/backend_sdl.cpp 2014-11-20 00:08:22.004980736 +0200 ++++ teeworlds-0.6.3-src/src/engine/client/backend_sdl.cpp 2014-12-16 23:45:27.095944704 +0200 +@@ -1,6 +1,6 @@ + +-#include "SDL.h" +-#include "SDL_opengl.h" ++#include ++#include + + #include + +diff -ur teeworlds-0.6.3-src-orig/src/engine/client/backend_sdl.h teeworlds-0.6.3-src/src/engine/client/backend_sdl.h +--- teeworlds-0.6.3-src-orig/src/engine/client/backend_sdl.h 2014-11-20 00:08:22.005767168 +0200 ++++ teeworlds-0.6.3-src/src/engine/client/backend_sdl.h 2014-12-17 18:21:15.679215104 +0200 +@@ -1,12 +1,12 @@ + +-#include "SDL.h" +-#include "SDL_opengl.h" ++#include ++#include + + #include "graphics_threaded.h" + + + +-// platform dependent implementations for transfering render context from the main thread to the graphics thread ++// platform dependent implementations for transfering render Context from the main thread to the graphics thread + // TODO: when SDL 1.3 comes, this can be removed + #if defined(CONF_FAMILY_WINDOWS) + struct SGLContext +@@ -49,7 +49,7 @@ + { + SGLContext Context; + Class NSOpenGLContextClass = (Class) objc_getClass("NSOpenGLContext"); +- SEL selector = sel_registerName("currentContext"); ++ SEL selector = sel_reg0isterName("currentContext"); + Context.m_Context = objc_msgSend((objc_object*) NSOpenGLContextClass, selector); + return Context; + } +@@ -117,6 +117,29 @@ + static void GL_MakeCurrent(const SGLContext &Context) { glXMakeCurrent(Context.m_pDisplay, Context.m_Drawable, Context.m_Context); } + static void GL_ReleaseContext(const SGLContext &Context) { glXMakeCurrent(Context.m_pDisplay, None, 0x0); } + static void GL_SwapBuffers(const SGLContext &Context) { glXSwapBuffers(Context.m_pDisplay, Context.m_Drawable); } ++#elif defined(CONF_FAMILY_BEOS) ++ ++ #include ++ #include ++ ++ struct SGLContext ++ { ++ BGLView* view; ++ }; ++ ++ static SGLContext GL_GetCurrentContext() ++ { ++ SGLContext Context; ++ ++ BApplication *be_app = new BApplication("application/x-vnd.tw-teeworlds"); ++ ++ Context.view = ((BGLView*) be_app->WindowAt(0)->ChildAt(0)); ++ return Context; ++ } ++ ++ static void GL_MakeCurrent(const SGLContext &Context) { Context.view->LockGL(); } ++ static void GL_ReleaseContext(const SGLContext &Context) { Context.view->UnlockGL(); } ++ static void GL_SwapBuffers(const SGLContext &Context) { Context.view->SwapBuffers(); } + #else + #error missing implementation + #endif diff --git a/games-action/teeworlds/teeworlds-0.6.3.recipe b/games-action/teeworlds/teeworlds-0.6.3.recipe new file mode 100644 index 000000000..a3713b30e --- /dev/null +++ b/games-action/teeworlds/teeworlds-0.6.3.recipe @@ -0,0 +1,59 @@ +SUMMARY="Teeworlds is a retro multiplayer shooter" +DESCRIPTION="Teeworlds is a free online multiplayer game, available for \ +all major operating systems. Battle with up to 16 players in a variety of \ +game modes, including Team Deathmatch and Capture The Flag. You can even \ +design your own maps!" + +LICENSE="Zlib" +COPYRIGHT="2007-2012 Magnus Auvinen" + +ARCHITECTURES="!x86" # Once it works, remove the bang +if [ $effectiveTargetArchitecture != "x86_gcc2" ]; then + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" # Once it works, remove the bang +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" +fi +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" # Once it works, remove the bang on x86 +REVISION="1" +HOMEPAGE="https://www.teeworlds.com" +SRC_URI="https://downloads.teeworlds.com/teeworlds-0.6.3-src.tar.gz" +CHECKSUM_SHA256="490ee7c372898761c609af8d7b0c6bd55942c6c6fcd7f361eefa00abfc70077b" +SOURCE_DIR="teeworlds-0.6.3-src" + +PROVIDES=" + teeworlds$secondaryArchSuffix = $portVersion + cmd:teeworlds$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libGL$secondaryArchSuffix + lib:libGLU$secondaryArchSuffix + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libz$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:bam$secondaryArchSuffix + cmd:python + " + +PATCHES="teeworlds-0.6.3.patch" + +BUILD() +{ + bam release +} + +INSTALL() +{ + mkdir -p $binDir + cp teeworlds $binDir +} From 952ccd6cc015fb2c839c05517546bc53712da12b Mon Sep 17 00:00:00 2001 From: puckipedia Date: Thu, 18 Dec 2014 23:03:35 +0000 Subject: [PATCH 089/326] z26: Style fixes --- games-emulation/z26/z26-2.16.00s.recipe | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/games-emulation/z26/z26-2.16.00s.recipe b/games-emulation/z26/z26-2.16.00s.recipe index cb6669fff..c2192d00f 100644 --- a/games-emulation/z26/z26-2.16.00s.recipe +++ b/games-emulation/z26/z26-2.16.00s.recipe @@ -1,9 +1,7 @@ SUMMARY="A fully-featured Atari 2600 emulator" -DESCRIPTION=" -z26 is an Atari 2600 emulator which supports a lot of carts and a \ +DESCRIPTION="z26 is an Atari 2600 emulator which supports a lot of carts and a \ whole lot of peripherals, including mindlink, Trak-Ball, Light Gun and much more!\ -It also supports multiload files, and a whole lot of other features. -" +It also supports multiload files, and a whole lot of other features." HOMEPAGE="http://whimsey.com/z26/" SRC_URI="http://whimsey.com/z26/z26v2.16.00s.zip" CHECKSUM_SHA256="fe285597543a9f562b25f11e57804c604d8226d9a6dc6dc1b9e2a4cfc5f38276" @@ -30,7 +28,7 @@ REQUIRES=" " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - libsdl${secondaryArchSuffix}_devel + devel:libsdl${secondaryArchSuffix} " BUILD_PREREQUIRES=" cmd:make From 8b27d3b8bc7b1f21432d0be9bd5286e772a56a88 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 19 Dec 2014 19:33:22 +0300 Subject: [PATCH 090/326] Slayer: use 32bit icons --- haiku-apps/slayer/slayer-0.9.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/slayer/slayer-0.9.recipe b/haiku-apps/slayer/slayer-0.9.recipe index f1fb5e84a..b61bb9d32 100644 --- a/haiku-apps/slayer/slayer-0.9.recipe +++ b/haiku-apps/slayer/slayer-0.9.recipe @@ -6,8 +6,8 @@ priorities or kill them. LICENSE="GNU GPL v3" COPYRIGHT="1998 Arto Jalkanen." HOMEPAGE="https://github.com/pulkomandy/Slayer" -SRC_URI="git+https://github.com/pulkomandy/Slayer.git#f36790b1fe9" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/Slayer.git#e04057b" +REVISION="2" ARCHITECTURES="?x86 x86_gcc2" PROVIDES=" From 9713404fb5fdde59aac66c2735c9991016229022 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Fri, 19 Dec 2014 03:37:46 +0000 Subject: [PATCH 091/326] Add libcaca port Signed-off-by: Timothy Gu --- media-libs/libcaca/libcaca-0.99.beta19.recipe | 124 +++++++++++++ media-libs/libcaca/licenses/WTFPL | 14 ++ .../patches/libcaca-0.99.beta19.patchset | 164 ++++++++++++++++++ 3 files changed, 302 insertions(+) create mode 100644 media-libs/libcaca/libcaca-0.99.beta19.recipe create mode 100644 media-libs/libcaca/licenses/WTFPL create mode 100644 media-libs/libcaca/patches/libcaca-0.99.beta19.patchset diff --git a/media-libs/libcaca/libcaca-0.99.beta19.recipe b/media-libs/libcaca/libcaca-0.99.beta19.recipe new file mode 100644 index 000000000..f8f42fae4 --- /dev/null +++ b/media-libs/libcaca/libcaca-0.99.beta19.recipe @@ -0,0 +1,124 @@ +SUMMARY="libcaca ASCII art rendering library" +DESCRIPTION=" +libcaca is a software library which allows applications to automatically \ +convert still and moving images into colored ASCII art. +" +HOMEPAGE="http://caca.zoy.org/wiki/libcaca" + +# FIXME: the offical website is down right now. Using mirror provided by the +# MXE project. +SRC_URI=" + http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-$portVersion.tar.gz + http://s3.amazonaws.com/mxe-pkg/libcaca-$portVersion.tar.gz + " +CHECKSUM_SHA256="128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4" +SOURCE_DIR="libcaca-$portVersion" +REVISION="1" +LICENSE=" + WTFPL + GNU GPL v2 + " +COPYRIGHT=" + 1998, 1999, 2001 Jan Hubicka + 2003-2008 Sam Hocevar + 2003-2008 Jean-Yves Lamoureux + 2004-2005 John Beppu + 2006-2007 Ben Wiley Sittler + 2007-2008 Pascal Terjan + " + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libcaca$secondaryArchSuffix = $portVersion compat >= 0 + lib:libcaca$secondaryArchSuffix = 0.99.19 compat >= 0 + lib:libcaca++$secondaryArchSuffix = 0.99.19 compat >= 0 + cmd:cacaclock$secondaryArchSuffix = $portVersion compat >= 0 + cmd:cacademo$secondaryArchSuffix = $portVersion compat >= 0 + cmd:cacafire$secondaryArchSuffix = $portVersion compat >= 0 + cmd:cacaserver$secondaryArchSuffix = $portVersion compat >= 0 + cmd:cacaview$secondaryArchSuffix = $portVersion compat >= 0 + cmd:cacaplay$secondaryArchSuffix = $portVersion compat >= 0 + cmd:img2txt$secondaryArchSuffix = $portVersion compat >= 0 + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libncursesw$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +if [ "$effectiveTargetArchitecture" != 'x86_gcc2' ]; then + REQUIRES=" + $REQUIRES + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " +fi + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libncursesw$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:doxygen + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config + cmd:ranlib + " + +PATCHES="libcaca-${portVersion}.patchset" + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac +} + +BUILD() +{ + autoreconf -fi + runConfigure ./configure \ + --enable-ncurses \ + --enable-cxx \ + --disable-python \ + --htmldir=${developDocDir} + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libcaca libcaca++ + fixPkgconfig + + # devel package + packageEntries devel \ + $binDir/caca-config \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libcaca${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libcaca$secondaryArchSuffix = $portVersion compat >= 0 + devel:libcaca++$secondaryArchSuffix = $portVersion compat >= 0 + cmd:caca_config$secondaryArchSuffix = $portVersion compat >= 0 + " + +REQUIRES_devel=" + haiku$secondaryArchSuffix + libcaca$secondaryArchSuffix == $portVersion base + lib:libncursesw$secondaryArchSuffix + devel:libncursesw$secondaryArchSuffix + " diff --git a/media-libs/libcaca/licenses/WTFPL b/media-libs/libcaca/licenses/WTFPL new file mode 100644 index 000000000..ee7d6a54e --- /dev/null +++ b/media-libs/libcaca/licenses/WTFPL @@ -0,0 +1,14 @@ + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. + diff --git a/media-libs/libcaca/patches/libcaca-0.99.beta19.patchset b/media-libs/libcaca/patches/libcaca-0.99.beta19.patchset new file mode 100644 index 000000000..543eda6e3 --- /dev/null +++ b/media-libs/libcaca/patches/libcaca-0.99.beta19.patchset @@ -0,0 +1,164 @@ +From fb47040266da2f0e74cc36cdf407afe2d8fa6ee8 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 18 Dec 2014 23:45:35 +0000 +Subject: [PATCH 1/3] Fix network detection + +Signed-off-by: Timothy Gu + +diff --git a/configure.ac b/configure.ac +index 641dd17..e06cb74 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -491,8 +491,12 @@ fi + + # Build cacaserver? + ac_cv_my_have_network="no" +-AC_CHECK_HEADERS(sys/socket.h, +- [ac_cv_my_have_network="yes"]) ++AC_CHECK_HEADERS(sys/socket.h, [ ++ # On Haiku the socket() function and friends are in libnetwork ++ AC_SEARCH_LIBS([socket], [network], [ ++ ac_cv_my_have_network="yes" ++ ]) ++]) + AM_CONDITIONAL(USE_NETWORK, test "${ac_cv_my_have_network}" = "yes") + + # Use Imlib2? +-- +1.8.3.4 + + +From b4a3afb4b37257e6f18aa31511df9615ea39418e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 19 Dec 2014 02:19:19 +0000 +Subject: [PATCH 2/3] doc: use standard PDF and HTML installation directories + +Signed-off-by: Timothy Gu + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 5598ce3..77720e7 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -7,11 +7,9 @@ doxygen_DOX = libcaca.dox user.dox migrating.dox tutorial.dox canvas.dox font.do + man_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2txt.1 cacaplay.1 + + if BUILD_DOCUMENTATION +-htmldoc_DATA = html/doxygen.css +-htmldocdir = $(datadir)/doc/libcaca-dev/html ++html_DATA = html/doxygen.css + if USE_LATEX +-pdfdoc_DATA = latex/libcaca.pdf +-pdfdocdir = $(datadir)/doc/libcaca-dev/pdf ++pdf_DATA = latex/libcaca.pdf + endif + endif + +@@ -42,10 +40,10 @@ clean-local: + + install-data-local: + if BUILD_DOCUMENTATION +- mkdir -p $(DESTDIR)$(datadir)/doc +- $(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html ++ mkdir -p $(DESTDIR)$(htmldir) ++ $(mkinstalldirs) $(DESTDIR)$(htmldir) + cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \ +- $(DESTDIR)$(datadir)/doc/libcaca-dev/html ++ $(DESTDIR)$(htmldir) + $(mkinstalldirs) $(DESTDIR)$(mandir)/man3 + for man in $$(find man -name '*.3caca'); do \ + sed -e 's/man3caca/man3/g' -e "s/fC'\([a-zA-Z0-9]*\)'/fC\"\1\"/g" \ +-- +1.8.3.4 + + +From 28016da0b3e6c2d001455bb49b0b24fde3e9edc5 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Thu, 18 Dec 2014 22:46:50 -0800 +Subject: [PATCH 3/3] Fix gcc2 issues in 3 files + +Signed-off-by: Timothy Gu + +diff --git a/caca/file.c b/caca/file.c +index 27e4e83..51e127b 100644 +--- a/caca/file.c ++++ b/caca/file.c +@@ -63,6 +63,10 @@ struct caca_file + */ + caca_file_t *caca_file_open(char const *path, const char *mode) + { ++# if defined HAVE_ZLIB_H ++ uint8_t buf[4]; ++ unsigned int skip_size = 0; ++#endif + #if defined __KERNEL__ + seterrno(ENOSYS); + return NULL; +@@ -72,8 +76,6 @@ caca_file_t *caca_file_open(char const *path, const char *mode) + fp->readonly = !!strchr(mode, 'r'); + + # if defined HAVE_ZLIB_H +- uint8_t buf[4]; +- unsigned int skip_size = 0; + + fp->gz = gzopen(path, fp->readonly ? "rb" : "wb"); + if(!fp->gz) +diff --git a/examples/trifiller.c b/examples/trifiller.c +index 5a06f23..fab3cd7 100644 +--- a/examples/trifiller.c ++++ b/examples/trifiller.c +@@ -45,6 +45,7 @@ int main(int argc, char *argv[]) + int quit = 0; + int update = 1; + int px, py; ++ int p; + float angle = 0; + + +@@ -198,7 +199,6 @@ int main(int argc, char *argv[]) + + + /* 2D Rotation around screen center */ +- int p; + for (p = 0; p < 4; p++) + { + rotated[p][0] = +diff --git a/src/cacaclock.c b/src/cacaclock.c +index 3a405ea..63b35af 100644 +--- a/src/cacaclock.c ++++ b/src/cacaclock.c +@@ -67,6 +67,10 @@ int main(int argc, char *argv[]) { + caca_canvas_t *figcv; + caca_display_t *dp; + uint32_t w, h, fw, fh; ++ char *d; ++ uint32_t o; ++ uint32_t x; ++ uint32_t y; + + char *format = "%R:%S"; + char *font = "/usr/share/figlet/mono12.tlf"; +@@ -143,8 +147,8 @@ int main(int argc, char *argv[]) { + if(caca_get_event_type(&ev)) + goto end; + } +- char *d = get_date(format); +- uint32_t o = 0; ++ d = get_date(format); ++ o = 0; + + // figfont API is not complete, and does not allow us to put a string + // at another position than 0,0 +@@ -164,8 +168,8 @@ int main(int argc, char *argv[]) { + fw = caca_get_canvas_width (figcv); + fh = caca_get_canvas_height(figcv); + +- uint32_t x = (w/2) - (fw/2); +- uint32_t y = (h/2) - (fh/2); ++ x = (w/2) - (fw/2); ++ y = (h/2) - (fh/2); + + caca_blit(cv, x, y, figcv, NULL); + caca_refresh_display(dp); +-- +1.8.3.4 + From 870c596f01258b3466f55739e253b0ff1e4bac5c Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 19 Dec 2014 14:27:58 -0500 Subject: [PATCH 092/326] MrPeeps: recipe for 1.2. --- haiku-apps/mrpeeps/mrpeeps-1.2.recipe | 53 +++++++++++++++++++ haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 43 --------------- .../mrpeeps/patches/MrPeeps-1.2_beta.patch | 50 ----------------- 3 files changed, 53 insertions(+), 93 deletions(-) create mode 100644 haiku-apps/mrpeeps/mrpeeps-1.2.recipe delete mode 100644 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe delete mode 100644 haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2.recipe new file mode 100644 index 000000000..6d487ca7d --- /dev/null +++ b/haiku-apps/mrpeeps/mrpeeps-1.2.recipe @@ -0,0 +1,53 @@ +SUMMARY="Simple, powerful contact manager for Haiku" +DESCRIPTION="Mr. Peeps! is an app for managing People files that has more \ +features than other contact managers. Highlights: + * Autosave: no more clicking File|Save or typing Alt-S. Edit it and it's \ +saved that way. + * Fast keyboard navigation: + * Use Tab and Shift-Tab to jump between data fields + * Alt-Up and Alt-Down go to the next/previous person, no matter what + * When using the People list, use the cursor keys or jump to a person \ +using a letter key + * Use the Alt key plus the 1-5 keys to change tabs, i.e. Alt+2 is the \ +Personal tab + * Multiple groups - separate group names with a comma + * Native Language support - Mr. Peeps! can now show itself in your own \ +language and you can change languages quickly, if you so choose. + * More Data: handles more types of data than even People v2 and \ +DeeperPeople, such as birthdays, anniversaries, and other personal data." +HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" +SRC_URI="https://github.com/HaikuArchives/MrPeeps/archive/v1.2.tar.gz" +CHECKSUM_SHA256="5c8bc6dd0677497292fbd41a79fb29a66fe196a6028879b3cd33ac54a1d968aa" +SOURCE_DIR="MrPeeps-$portVersion" +LICENSE="MIT" +COPYRIGHT="2003 Jon Yoder (DarkWyrm)" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + mrpeeps = $portVersion + app:MrPeeps = $portVersion" +REQUIRES=" + haiku" +BUILD_REQUIRES=" + haiku_devel" +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:mkdepend + cmd:g++ + " + +BUILD() +{ + cd src + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cd src + cp -f objects/MrPeeps $appsDir + addAppDeskbarSymlink $appsDir/MrPeeps "Mr. Peeps!" +} diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe deleted file mode 100644 index 902d6de8c..000000000 --- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY="Easy to use powerful contact manager for haiku" -DESCRIPTION=" -MrPeeps is an app for managing People files that has more features than other \ -contact managers. For more info read the README file. -" -HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" -SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65" -LICENSE="MIT" -COPYRIGHT="2003 DarkWyrm" -REVISION="1" -ARCHITECTURES="x86 x86_gcc2 x86_64" -PROVIDES=" - mrpeeps = $portVersion - app:MrPeeps = $portVersion - " -REQUIRES=" - haiku - " -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - cmd:gcc - " -PATCHES="MrPeeps-1.2_beta.patch" - -BUILD() -{ - cd src - cp Locale\ Support/* ./ - g++ -lbe -ltranslation -lroot AboutWindow.cpp BitmapDump.cpp \ - BitmapView.cpp BStringList.cpp DataView.cpp Formatting.cpp \ - IntroView.cpp ListData.cpp MrPeeps.cpp NewTextControl.cpp \ - PeepsItem.cpp PeepsWindow.cpp PeopleList.cpp LocaleRoster.cpp \ - Locale.cpp TextFile.cpp -o ../MrPeeps -} - -INSTALL() -{ - mkdir -p $appsDir - cp -f ./MrPeeps $appsDir - addAppDeskbarSymlink $appsDir/MrPeeps -} diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch deleted file mode 100644 index 069aa06a4..000000000 --- a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur -x .git /boot/home/MrPeeps/src/ListData.h ./src/ListData.h ---- /boot/home/MrPeeps/src/ListData.h 2013-12-01 19:17:49.441188352 +0400 -+++ ./src/ListData.h 2013-12-09 19:07:33.235667456 +0400 -@@ -3,10 +3,11 @@ - - #include - #include -+#include - #include --#include "BStringList.h" - #include - #include "BitmapDump.h" -+#include "BStringList.h" - - class PeepsListItem; - class GroupItem; -diff -Naur -x .git /boot/home/MrPeeps/src/PeepsWindow.h ./src/PeepsWindow.h ---- /boot/home/MrPeeps/src/PeepsWindow.h 2013-12-01 19:17:49.467927040 +0400 -+++ ./src/PeepsWindow.h 2013-12-09 19:07:59.108789760 +0400 -@@ -1,16 +1,18 @@ - #ifndef PEEPSWINDOW_H - #define PEEPSWINDOW_H - --#include --#include --#include --#include - #include -+#include -+#include - #include - #include --#include "NewTextControl.h" - #include -+#include -+#include -+#include -+#include - #include "LocaleRoster.h" -+#include "NewTextControl.h" - - class PeopleList; - class PeepsListItem; -@@ -117,4 +119,4 @@ - - #define TRANSLATE(x) gCurrentLocale->Translate(x).String() - --#endif -\ No newline at end of file -+#endif From c14485572ce6f25c45dca6a77d98c3275c2aa5c8 Mon Sep 17 00:00:00 2001 From: begasus Date: Sat, 20 Dec 2014 09:55:05 +0100 Subject: [PATCH 093/326] pachi, fixes in the recipe --- .../pachi/{pachi-03_29_04.recipe => pachi-1.0.recipe} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename games-arcade/pachi/{pachi-03_29_04.recipe => pachi-1.0.recipe} (81%) diff --git a/games-arcade/pachi/pachi-03_29_04.recipe b/games-arcade/pachi/pachi-1.0.recipe similarity index 81% rename from games-arcade/pachi/pachi-03_29_04.recipe rename to games-arcade/pachi/pachi-1.0.recipe index 8dbbfaad7..d8c9c4aed 100644 --- a/games-arcade/pachi/pachi-03_29_04.recipe +++ b/games-arcade/pachi/pachi-1.0.recipe @@ -1,15 +1,14 @@ SUMMARY="Pachi el marciano is a cool 2D platforms game" -DESCRIPTION="Pachi el marciano is a cool 2D platforms game inspired in games like\ +DESCRIPTION="Pachi el marciano is a cool 2D platforms game inspired in games like \ Manic Miner, Jet set Willy and more from the 80s." HOMEPAGE="http://dragontech.sourceforge.net/index.php?lang=en&main=about" LICENSE="GNU GPL v2" -COPYRIGHT="Santiago Radeff, Nicolas Radeff, Peter Hajba" -SRC_URI="http://prdownloads.sf.net/dragontech/pachi_source.tgz" +COPYRIGHT="(c) 2004 Santiago Radeff, Nicolas Radeff, Peter Hajba" +SRC_URI="http://sourceforge.net/projects/dragontech/files/Pachi%20el%20marciano/Pachi%20el%20marciano%201.0/pachi_source.tgz" CHECKSUM_SHA256="134a51773d5e441dc31aed4e57b3543afdefe2d8efedeaa05acb85cac0fa9c52" REVISION="1" -ARCHITECTURES="x86 ?x86_gcc2 ?x86_64" -SECONDARY_ARCHITECTURES="?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PATCHES="pachi-$portVersion.patch" From fec632facaf6e5dbc0c92fe73f037663a2afa5ad Mon Sep 17 00:00:00 2001 From: begasus Date: Sat, 20 Dec 2014 09:57:25 +0100 Subject: [PATCH 094/326] pachi, fixes in the recipe --- .../pachi/patches/{pachi-03_29_04.patch => pachi-1.0.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename games-arcade/pachi/patches/{pachi-03_29_04.patch => pachi-1.0.patch} (100%) diff --git a/games-arcade/pachi/patches/pachi-03_29_04.patch b/games-arcade/pachi/patches/pachi-1.0.patch similarity index 100% rename from games-arcade/pachi/patches/pachi-03_29_04.patch rename to games-arcade/pachi/patches/pachi-1.0.patch From ab2e7cf96cd847c6043814c665ce94751f57e7d5 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 20 Dec 2014 13:55:53 +0200 Subject: [PATCH 095/326] Change boost devel package name in libclaw recipe --- dev-libs/libclaw/libclaw-1.7.4.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libclaw/libclaw-1.7.4.recipe b/dev-libs/libclaw/libclaw-1.7.4.recipe index 990ce95e1..6ec615d62 100644 --- a/dev-libs/libclaw/libclaw-1.7.4.recipe +++ b/dev-libs/libclaw/libclaw-1.7.4.recipe @@ -57,7 +57,7 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libintl$secondaryArchSuffix - boost_devel${secondaryArchSuffix} + boost${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" From a0ba7cc5bd71330896b4cb0aebd5b655ebcc06fe Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 20 Dec 2014 14:11:47 +0200 Subject: [PATCH 096/326] Fix sdl_mixer recipe (covert various library names to lowercase) --- media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index a07e06751..cd88280be 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -38,9 +38,9 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libSDL$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix devel:libogg$secondaryArchSuffix - devel:libFLAC$secondaryArchSuffix + devel:libflac$secondaryArchSuffix # devel:libfluidsynth$secondaryArchSuffix devel:libmad$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix From 0759b0a45b3a822910d330e5bab35dd2d22f553d Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 18 Dec 2014 19:29:59 +0000 Subject: [PATCH 097/326] Add Noto Sans fonts for CJK languages This is done as part of thee GCI task "Create a Haiku build recipe for Noto CJK font family," GCI 2014. Signed-off-by: Timothy Gu --- .../noto_sans_cjk/noto_sans_cjk-1.001.recipe | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe new file mode 100644 index 000000000..fbcb049dd --- /dev/null +++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe @@ -0,0 +1,71 @@ +LANG_EN="CJK languages" +LANG_DL="CJK" +LANG_LC="cjk" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" + +# As of December 2014, four packaging formats are provided: +# 1. Super OTC (TTC) for all languages and weights +# 2. One OTC (OpenType TTC) per weight +# 3. One OTF with all glyphs per default language +# 4. One OTF per language per weight +# +# I am using #3 with Japanese here. Rationale: +# 1. Not supported by Haiku right now. +# 2. Only the name "Noto Sans CJK Japanese" is shown, even though all glyphs +# are included and render correctly, which is confusing compared to #3. +# 3. Although it's not optimal to discriminate against three languages for +# one default language, this is the best choice right now. All glyphs +# render correctly, is smaller than #2, and its name is a unconfusing +# "Noto Sans CJK." Plus in Haiku #2 has a default language anyway. +# 4. It's too big. + +# Using a specific Git commit for permanent linking. +SRC_URI="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-Regular.otf#noarchive" +SRC_URI_2="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-Thin.otf#noarchive" +SRC_URI_3="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-Bold.otf#noarchive" +SRC_URI_4="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-Light.otf#noarchive" +SRC_URI_5="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-DemiLight.otf#noarchive" +SRC_URI_6="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-Medium.otf#noarchive" +SRC_URI_7="https://noto.googlecode.com/git-history/da238c975c00/third_party/noto_${LANG_LC}/NotoSans${LANG_DL}-Black.otf#noarchive" + +CHECKSUM_SHA256="2b1304a1a2d6b811a38c2c90a2be503cbac0bfbf4d8b0e6a6a598146564a61ad" +CHECKSUM_SHA256_2="657417baad497ecb66709f4b9198f29bc1dda70b5ba559ef6375d3d0406b89f7" +CHECKSUM_SHA256_3="fd2fd3c84008b16fda09233e254ac0602e56b1f6f8b2a6e8b5049c5a19017946" +CHECKSUM_SHA256_4="639e8a8ab1fc7c5d63789df3f99b7e145d1bcc757ed2006a177eab535eafbc6c" +CHECKSUM_SHA256_5="3466d9a677be4fa754ca460ad7898c5a3bce6649ab1b09635a14bc1a96f5cd53" +CHECKSUM_SHA256_6="ecc27c09875de097570c6c3a88d6a359e4193b9c2acf2087a48b4ddee87bb9b7" +CHECKSUM_SHA256_7="e6e04ca22f7182eb87277d476564637b714a022cee51497737b0639e88c9f2a7" + +LICENSE="Apache v2" +COPYRIGHT="2014 Adobe Systems Incorporated" +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + cmd:find + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + cp `find ../sources* -type f -name \*.otf` ${FONTDIR} +} From 12fe312c993930516901657d2cc67e6abe0c032f Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 20 Dec 2014 00:31:36 +0000 Subject: [PATCH 098/326] Add Noto Sans fonts for South Asian languages This was done as a part of GCI 2014. Signed-off-by: Timothy Gu --- .../noto_sans_bengali-1.02.recipe | 39 +++++++++++++++++++ .../noto_sans_devanagari-1.05.recipe | 39 +++++++++++++++++++ .../noto_sans_gujarati-1.02.recipe | 39 +++++++++++++++++++ .../noto_sans_gurmukhi-1.01.recipe | 39 +++++++++++++++++++ .../noto_sans_sinhala-1.01.recipe | 39 +++++++++++++++++++ .../noto_sans_tamil-1.04.recipe | 39 +++++++++++++++++++ .../noto_sans_telugu-1.02.recipe | 39 +++++++++++++++++++ 7 files changed, 273 insertions(+) create mode 100644 media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe create mode 100644 media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe create mode 100644 media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe create mode 100644 media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe create mode 100644 media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe create mode 100644 media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe create mode 100644 media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe diff --git a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe new file mode 100644 index 000000000..815468b0b --- /dev/null +++ b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Bengali" +LANG_DL="${LANG_EN}" +LANG_LC="bengali" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="bc9422930cb09b0736ed3ebf60f747bb0078e451087b52926a4ae0d1d50db42c" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe new file mode 100644 index 000000000..a75967fef --- /dev/null +++ b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe @@ -0,0 +1,39 @@ +LANG_EN="Devanagari" +LANG_DL="${LANG_EN}" +LANG_LC="devanagari" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="8601d16cb04d740d2a2a27299ae59445971bbbed3d6b401c14e6fb1d461dd353" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe new file mode 100644 index 000000000..213e0fb14 --- /dev/null +++ b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Gujarati" +LANG_DL="${LANG_EN}" +LANG_LC="gujarati" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="44e6925fa81c7a59992415ffce24434e7b2609af7921d10e735879ebbc5a593f" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe new file mode 100644 index 000000000..7217207e1 --- /dev/null +++ b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Gurmukhi" +LANG_DL="${LANG_EN}" +LANG_LC="gurmukhi" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="c154bacc4998fa6e8eb380cf6823a07c2cf6bcafbad373446fbb7576f61d1e48" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe new file mode 100644 index 000000000..62e386d5e --- /dev/null +++ b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Sinhala" +LANG_DL="${LANG_EN}" +LANG_LC="sinhala" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="2cf8027b61f0657e64959e17eb16f4d84658a950c36ee483d4bf1ade8df9d683" +LICENSE="Apache v2" +COPYRIGHT="2014 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe new file mode 100644 index 000000000..12c1e2f14 --- /dev/null +++ b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tamil" +LANG_DL="${LANG_EN}" +LANG_LC="tamil" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="15d8f1e5310f4d2eecf2e46a9d74b52c5a30afae00b90d2fe92bc8f00a5c1ee8" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe new file mode 100644 index 000000000..13724e96a --- /dev/null +++ b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Telugu" +LANG_DL="${LANG_EN}" +LANG_LC="telugu" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="8d434121cb8e10b02f80a1a7ab87a9a70ef2eee96aababe4ec871e554578c460" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/NotoSans${LANG_DL} + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 58277e70db3aa61e7cfef59b3e2d7a73c2edb319 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 Dec 2014 11:08:43 +0000 Subject: [PATCH 099/326] tinyxml2: update to version 2.2.0 --- .../{tinyxml2-2.recipe => tinyxml2-2.2.0.recipe} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename dev-libs/tinyxml2/{tinyxml2-2.recipe => tinyxml2-2.2.0.recipe} (81%) diff --git a/dev-libs/tinyxml2/tinyxml2-2.recipe b/dev-libs/tinyxml2/tinyxml2-2.2.0.recipe similarity index 81% rename from dev-libs/tinyxml2/tinyxml2-2.recipe rename to dev-libs/tinyxml2/tinyxml2-2.2.0.recipe index b90243a4f..ca9ae1de8 100644 --- a/dev-libs/tinyxml2/tinyxml2-2.recipe +++ b/dev-libs/tinyxml2/tinyxml2-2.2.0.recipe @@ -6,12 +6,15 @@ easily integrated into other programs. HOMEPAGE="http://www.grinninglizard.com/tinyxml2/" LICENSE="Zlib" COPYRIGHT="2011-2013 Lee Thomason" -SRC_URI="git+https://github.com/leethomason/tinyxml2.git#343a5ff3bdd7336644db4080f001759e062c359e" +SRC_URI="https://github.com/leethomason/tinyxml2/archive/$portVersion.tar.gz" +CHECKSUM_SHA256="f891224f32e7a06bf279290619cec80cc8ddc335c13696872195ffb87f5bce67" REVISION="1" -ARCHITECTURES="!x86_gcc2 x86 x86_64" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +fi SECONDARY_ARCHITECTURES="x86" - PROVIDES=" tinyxml2$secondaryArchSuffix = $portVersion lib:libtinyxml2$secondaryArchSuffix = $portVersion From b931eaa7cc77be319818dce180c7ca160fdcc5a8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 Dec 2014 11:57:52 +0000 Subject: [PATCH 100/326] nss: add recipe for version 3.17.3 --- dev-libs/nss/nss-3.17.3.recipe | 179 +++++++++++++++++++++++ dev-libs/nss/patches/nss-3.17.3.patchset | 141 ++++++++++++++++++ 2 files changed, 320 insertions(+) create mode 100644 dev-libs/nss/nss-3.17.3.recipe create mode 100644 dev-libs/nss/patches/nss-3.17.3.patchset diff --git a/dev-libs/nss/nss-3.17.3.recipe b/dev-libs/nss/nss-3.17.3.recipe new file mode 100644 index 000000000..375aabd05 --- /dev/null +++ b/dev-libs/nss/nss-3.17.3.recipe @@ -0,0 +1,179 @@ +SUMMARY="Mozilla's Network Security Services library that implements PKI support" +DESCRIPTION=" +Network Security Services (NSS) is a set of libraries designed to support \ +cross-platform development of security-enabled client and server \ +applications. Applications built with NSS can support SSL v2 and v3, TLS, \ +PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and \ +other security standards. +" +LICENSE=" +GNU GPL v2 +GNU LGPL v2.1 +MPL v2.0 +" +COPYRIGHT="Mozilla Foundation" +HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" +NSS_VERSION=`echo $portVersion | sed 's/\./_/g'` +SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz" +CHECKSUM_SHA256="f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5" +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" +fi +SECONDARY_ARCHITECTURES="x86" +SOURCE_DIR="nss-$portVersion/nss" + +PROVIDES=" + nss$secondaryArchSuffix = $portVersion compat >= 3 + cmd:addbuiltin$secondaryArchSuffix = $portVersion compat >= 3 + cmd:atob$secondaryArchSuffix = $portVersion compat >= 3 + cmd:baddbdir$secondaryArchSuffix = $portVersion compat >= 3 + cmd:bltest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:btoa$secondaryArchSuffix = $portVersion compat >= 3 + cmd:certcgi$secondaryArchSuffix = $portVersion compat >= 3 + cmd:certutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:checkcert$secondaryArchSuffix = $portVersion compat >= 3 + cmd:chktest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:cmsutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:conflict$secondaryArchSuffix = $portVersion compat >= 3 + cmd:crlutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:crmftest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:dbtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:derdump$secondaryArchSuffix = $portVersion compat >= 3 + cmd:dertimetest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:digest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:encodeinttest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:fipstest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:httpserv$secondaryArchSuffix = $portVersion compat >= 3 + cmd:listsuites$secondaryArchSuffix = $portVersion compat >= 3 + cmd:makepqg$secondaryArchSuffix = $portVersion compat >= 3 + cmd:mangle$secondaryArchSuffix = $portVersion compat >= 3 + cmd:modutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:multinit$secondaryArchSuffix = $portVersion compat >= 3 + cmd:nonspr10$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ocspclnt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ocspresp$secondaryArchSuffix = $portVersion compat >= 3 + cmd:oidcalc$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7content$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7env$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7sign$secondaryArchSuffix = $portVersion compat >= 3 + cmd:p7verify$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk11gcmtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk11mode$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk12util$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pk1sign$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pkix_errcodes$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pp$secondaryArchSuffix = $portVersion compat >= 3 + cmd:pwdecrypt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:remtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:rsaperf$secondaryArchSuffix = $portVersion compat >= 3 + cmd:sdrtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:secmodtest$secondaryArchSuffix = $portVersion compat >= 3 + cmd:selfserv$secondaryArchSuffix = $portVersion compat >= 3 + cmd:shlibsign$secondaryArchSuffix = $portVersion compat >= 3 + cmd:signtool$secondaryArchSuffix = $portVersion compat >= 3 + cmd:signver$secondaryArchSuffix = $portVersion compat >= 3 + cmd:ssltap$secondaryArchSuffix = $portVersion compat >= 3 + cmd:strsclnt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:symkeyutil$secondaryArchSuffix = $portVersion compat >= 3 + cmd:tstclnt$secondaryArchSuffix = $portVersion compat >= 3 + cmd:vfychain$secondaryArchSuffix = $portVersion compat >= 3 + cmd:vfyserv$secondaryArchSuffix = $portVersion compat >= 3 + lib:libfreebl3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnss3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnssckbi${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnssdbm3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libnssutil3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libsmime3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libsoftokn3${secondaryArchSuffix} = $portVersion compat >= 3 + lib:libssl3${secondaryArchSuffix} = $portVersion compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libnspr4${secondaryArchSuffix} >= 4 + lib:libsqlite3$secondaryArchSuffix + lib:libz${secondaryArchSuffix} + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libnspr4${secondaryArchSuffix} >= 4 + devel:libsqlite3$secondaryArchSuffix + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:awk + cmd:pkg_config$secondaryArchSuffix + " + +PATCHES="nss-$portVersion.patchset" + +BUILD() +{ + # FIXME: $secondaryArchSuffix is wrong here (_arch). What should be used? + myCPPFLAGS="${CPPFLAGS} `pkg-config nspr --cflags`" + myLDFLAGS="${LDFLAGS} `pkg-config nspr --libs-only-L`" + + export BUILD_OPT=1 + export NSDISTMODE=copy + export FREEBL_NO_DEPEND=1 + export ASFLAGS="" + if [ $effectiveTargetArchitecture == 'x86_64' ]; then + export USE_64=1 + fi + for d in . lib/dbm ; do + CPPFLAGS="${myCPPFLAGS}" + LDFLAGS="${myLDFLAGS}" + make -j1 -C ${d} + done +} + +INSTALL() +{ + # files are in /sources/dist + mkdir -p $includeDir $binDir + mkdir -p $(dirname $libDir) + mv ../dist/*/bin/* $binDir + mv ../dist/*/lib $libDir + mv ../dist/public/nss $includeDir + + # set up the develop directory correctly + prepareInstalledDevelLibs libnss3 libfreebl3 libnssckbi libnssdbm3 \ + libnssutil3 libsmime3 libsoftokn3 libssl3 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + rm $libDir/*.a +} + +TEST() +{ + echo TODO + # TODO +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + nss${secondaryArchSuffix}_devel = $portVersion compat >= 3 + devel:libfreebl3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnss3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnssckbi${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnssdbm3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libnssutil3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libsmime3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libsoftokn3${secondaryArchSuffix} = $portVersion compat >= 3 + devel:libssl3${secondaryArchSuffix} = $portVersion compat >= 3 + " +REQUIRES_devel=" + nss${secondaryArchSuffix} == $portVersion base + " diff --git a/dev-libs/nss/patches/nss-3.17.3.patchset b/dev-libs/nss/patches/nss-3.17.3.patchset new file mode 100644 index 000000000..d99cd24fe --- /dev/null +++ b/dev-libs/nss/patches/nss-3.17.3.patchset @@ -0,0 +1,141 @@ +From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 +From: Kacper Kasper +Date: Sat, 5 Jul 2014 02:12:23 +0200 +Subject: Haiku support + + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index 750696d..b53cfea 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk + + XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) + +-USE_PTHREADS = ++USE_PTHREADS = 1 + + ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH +@@ -27,7 +27,7 @@ else + CPU_ARCH = x86 + endif + +-MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) ++MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) + ifdef BUILD_OPT + OPTIMIZER = -O2 + endif +diff --git a/coreconf/arch.mk b/coreconf/arch.mk +index 782e6c0..669e52a 100644 +--- a/coreconf/arch.mk ++++ b/coreconf/arch.mk +@@ -41,6 +41,14 @@ else + endif + + # ++# Force the Haiku machines to use BeOS. ++# ++ ++ifeq ($(OS_ARCH),Haiku) ++ OS_ARCH = BeOS ++endif ++ ++# + # Force the IRIX64 machines to use IRIX. + # + +diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h +index f204484..5cb10ee 100644 +--- a/lib/dbm/include/mcom_db.h ++++ b/lib/dbm/include/mcom_db.h +@@ -66,7 +66,7 @@ typedef PRUint32 uint32; + #include + #endif + +-#if defined(__linux) || defined(__BEOS__) ++#if defined(__linux) || defined(BEOS) + #include + #ifndef BYTE_ORDER + #define BYTE_ORDER __BYTE_ORDER +-- +1.8.3.4 + + +From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Sep 2014 13:09:35 +0000 +Subject: define RTLD_NOLOAD + + +diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c +index 1de9b49..08d7753 100644 +--- a/lib/freebl/stubs.c ++++ b/lib/freebl/stubs.c +@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) + return SECSuccess; + } + ++#ifndef RTLD_NOLOAD ++ #define RTLD_NOLOAD 0 ++#endif ++ + /* + * fetch the library if it's loaded. For NSS it should already be loaded + */ +-- +1.8.3.4 + + +From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Sep 2014 13:40:13 +0000 +Subject: skip optionally the signing part + + +diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile +index 83f90fa..8934439 100644 +--- a/cmd/shlibsign/Makefile ++++ b/cmd/shlibsign/Makefile +@@ -95,5 +95,7 @@ else + endif + endif + ++ifndef SKIP_SHLIBSIGN + libs install :: $(CHECKLOC) ++endif + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index b53cfea..51fe162 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -45,3 +45,5 @@ ARCH = beos + + DSO_CFLAGS = -fPIC + DSO_LDOPTS = ++ ++SKIP_SHLIBSIGN=1 +-- +1.8.3.4 + + +From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 25 Sep 2014 14:14:26 +0000 +Subject: use system libs + + +diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk +index 51fe162..fe54580 100644 +--- a/coreconf/BeOS.mk ++++ b/coreconf/BeOS.mk +@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC + DSO_LDOPTS = + + SKIP_SHLIBSIGN=1 ++USE_SYSTEM_ZLIB = 1 ++ZLIB_LIBS = -lz ++NSS_USE_SYSTEM_SQLITE=1 +-- +1.8.3.4 + From a5cf346660fa6c507a39894b4313c33363a981f6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 21 Dec 2014 10:19:11 +0000 Subject: [PATCH 101/326] python: added recipe for version 2.7.9 --- dev-lang/python/patches/python-2.7.9.patchset | 870 ++++++++++++++++++ dev-lang/python/python-2.7.9.recipe | 110 +++ 2 files changed, 980 insertions(+) create mode 100644 dev-lang/python/patches/python-2.7.9.patchset create mode 100644 dev-lang/python/python-2.7.9.recipe diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset new file mode 100644 index 000000000..fafb60a2f --- /dev/null +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -0,0 +1,870 @@ +From f7d6b2b6f44a8f9337c9103d298222747d547ebf Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 12 Mar 2014 21:17:06 +0000 +Subject: initial Haiku patch + + +diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py +index b9f1c6c..7be61d3 100644 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -83,6 +83,35 @@ INSTALL_SCHEMES = { + 'scripts': '$userbase/bin', + 'data' : '$userbase', + }, ++ 'haiku': { ++ 'purelib': '$base/non-packaged/lib/python$py_version_short/site-packages', ++ 'platlib': '$platbase/non-packaged/lib/python$py_version_short/site-packages', ++ 'headers': '$base/non-packaged/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$base/non-packaged/bin', ++ 'data' : '$base/non-packaged', ++ }, ++ 'haiku_vendor': { ++ 'purelib': '$base/lib/python$py_version_short/vendor-packages', ++ 'platlib': '$platbase/lib/python$py_version_short/vendor-packages', ++ 'headers': '$base/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, ++ 'haiku_home': { ++ 'purelib': '$base/lib/python', ++ 'platlib': '$base/lib/python', ++ 'headers': '$base/develop/headers/python/$dist_name', ++ 'scripts': '$base/bin', ++ 'data' : '$base', ++ }, ++ 'haiku_user': { ++ 'purelib': '$usersite', ++ 'platlib': '$usersite', ++ 'headers': '$userbase/develop/headers/python$py_version_short/$dist_name', ++ 'scripts': '$userbase/bin', ++ 'data' : '$userbase', ++ }, ++ + } + + # The keys to an installation scheme; if any new types of files are to be +@@ -416,10 +445,16 @@ class install (Command): + raise DistutilsPlatformError( + "User base directory is not specified") + self.install_base = self.install_platbase = self.install_userbase +- self.select_scheme("unix_user") ++ if sys.platform.startswith('haiku'): ++ self.select_scheme("haiku_user") ++ else: ++ self.select_scheme("unix_user") + elif self.home is not None: + self.install_base = self.install_platbase = self.home +- self.select_scheme("unix_home") ++ if sys.platform.startswith('haiku'): ++ self.select_scheme("haiku_home") ++ else: ++ self.select_scheme("unix_home") + else: + if self.prefix is None: + if self.exec_prefix is not None: +@@ -435,7 +470,13 @@ class install (Command): + + self.install_base = self.prefix + self.install_platbase = self.exec_prefix +- self.select_scheme("unix_prefix") ++ if sys.platform.startswith('haiku'): ++ if os.environ.get('HAIKU_USE_VENDOR_DIRECTORIES') == '1': ++ self.select_scheme("haiku_vendor") ++ else: ++ self.select_scheme("haiku") ++ else: ++ self.select_scheme("unix_prefix") + + # finalize_unix () + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 4aa9334..d06e5e8 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -90,7 +90,8 @@ def get_python_inc(plat_specific=0, prefix=None): + # Include is located in the srcdir + inc_dir = os.path.join(srcdir, "Include") + return inc_dir +- return os.path.join(prefix, "include", "python" + get_python_version()) ++ inc_dir = "include" if sys.platform != "haiku1" else "develop/headers" ++ return os.path.join(prefix, inc_dir, "python" + get_python_version()) + elif os.name == "nt": + return os.path.join(prefix, "include") + elif os.name == "os2": +@@ -119,12 +120,20 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): + prefix = plat_specific and EXEC_PREFIX or PREFIX + + if os.name == "posix": +- libpython = os.path.join(prefix, +- "lib", "python" + get_python_version()) +- if standard_lib: +- return libpython ++ if sys.platform.startswith('haiku'): ++ if standard_lib: ++ return os.path.join(prefix, ++ "lib", "python" + get_python_version()) ++ return os.path.join(prefix, "non-packaged", ++ "lib", "python" + get_python_version(), ++ "site-packages") + else: +- return os.path.join(libpython, "site-packages") ++ libpython = os.path.join(prefix, ++ "lib", "python" + get_python_version()) ++ if standard_lib: ++ return libpython ++ else: ++ return os.path.join(libpython, "site-packages") + + elif os.name == "nt": + if standard_lib: +diff --git a/Lib/plat-haiku1/IN.py b/Lib/plat-haiku1/IN.py +new file mode 100644 +index 0000000..362cb41 +--- /dev/null ++++ b/Lib/plat-haiku1/IN.py +@@ -0,0 +1,327 @@ ++# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h ++ ++# Included from socket.h ++ ++# Included from BeBuild.h ++B_BEOS_VERSION_4 = 0x0400 ++B_BEOS_VERSION_4_5 = 0x0450 ++B_BEOS_VERSION_5 = 0x0500 ++B_BEOS_VERSION = B_BEOS_VERSION_5 ++B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 ++_PR2_COMPATIBLE_ = 1 ++_PR3_COMPATIBLE_ = 1 ++_R4_COMPATIBLE_ = 1 ++_R4_5_COMPATIBLE_ = 1 ++_PR2_COMPATIBLE_ = 0 ++_PR3_COMPATIBLE_ = 0 ++_R4_COMPATIBLE_ = 1 ++_R4_5_COMPATIBLE_ = 1 ++def _UNUSED(x): return x ++ ++ ++# Included from sys/types.h ++ ++# Included from time.h ++ ++# Included from be_setup.h ++def __std(ref): return ref ++ ++__be_os = 2 ++__dest_os = __be_os ++__MSL__ = 0x4011 ++__GLIBC__ = -2 ++__GLIBC_MINOR__ = 1 ++ ++# Included from null.h ++NULL = (0) ++NULL = 0L ++ ++# Included from size_t.h ++ ++# Included from stddef.h ++ ++# Included from wchar_t.h ++CLOCKS_PER_SEC = 1000 ++CLK_TCK = CLOCKS_PER_SEC ++MAX_TIMESTR = 70 ++ ++# Included from sys/time.h ++ ++# Included from ByteOrder.h ++ ++# Included from endian.h ++__LITTLE_ENDIAN = 1234 ++LITTLE_ENDIAN = __LITTLE_ENDIAN ++__BYTE_ORDER = __LITTLE_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++__BIG_ENDIAN = 0 ++BIG_ENDIAN = 0 ++__BIG_ENDIAN = 4321 ++BIG_ENDIAN = __BIG_ENDIAN ++__BYTE_ORDER = __BIG_ENDIAN ++BYTE_ORDER = __BYTE_ORDER ++__LITTLE_ENDIAN = 0 ++LITTLE_ENDIAN = 0 ++__PDP_ENDIAN = 3412 ++PDP_ENDIAN = __PDP_ENDIAN ++ ++# Included from SupportDefs.h ++ ++# Included from Errors.h ++ ++# Included from limits.h ++ ++# Included from float.h ++FLT_ROUNDS = 1 ++FLT_RADIX = 2 ++FLT_MANT_DIG = 24 ++FLT_DIG = 6 ++FLT_MIN_EXP = (-125) ++FLT_MIN_10_EXP = (-37) ++FLT_MAX_EXP = 128 ++FLT_MAX_10_EXP = 38 ++DBL_MANT_DIG = 53 ++DBL_DIG = 15 ++DBL_MIN_EXP = (-1021) ++DBL_MIN_10_EXP = (-308) ++DBL_MAX_EXP = 1024 ++DBL_MAX_10_EXP = 308 ++LDBL_MANT_DIG = DBL_MANT_DIG ++LDBL_DIG = DBL_DIG ++LDBL_MIN_EXP = DBL_MIN_EXP ++LDBL_MIN_10_EXP = DBL_MIN_10_EXP ++LDBL_MAX_EXP = DBL_MAX_EXP ++LDBL_MAX_10_EXP = DBL_MAX_10_EXP ++CHAR_BIT = (8) ++SCHAR_MIN = (-127-1) ++SCHAR_MAX = (127) ++CHAR_MIN = SCHAR_MIN ++CHAR_MAX = SCHAR_MAX ++MB_LEN_MAX = (1) ++SHRT_MIN = (-32767-1) ++SHRT_MAX = (32767) ++LONG_MIN = (-2147483647L-1) ++LONG_MAX = (2147483647L) ++INT_MIN = LONG_MIN ++INT_MAX = LONG_MAX ++ARG_MAX = (32768) ++ATEXIT_MAX = (32) ++CHILD_MAX = (1024) ++IOV_MAX = (256) ++FILESIZEBITS = (64) ++LINK_MAX = (1) ++LOGIN_NAME_MAX = (32) ++MAX_CANON = (255) ++MAX_INPUT = (255) ++NAME_MAX = (256) ++NGROUPS_MAX = (32) ++OPEN_MAX = (128) ++PATH_MAX = (1024) ++PIPE_MAX = (512) ++SSIZE_MAX = (2147483647L) ++TTY_NAME_MAX = (256) ++TZNAME_MAX = (32) ++SYMLINKS_MAX = (16) ++_POSIX_ARG_MAX = (32768) ++_POSIX_CHILD_MAX = (1024) ++_POSIX_LINK_MAX = (1) ++_POSIX_LOGIN_NAME_MAX = (9) ++_POSIX_MAX_CANON = (255) ++_POSIX_MAX_INPUT = (255) ++_POSIX_NAME_MAX = (255) ++_POSIX_NGROUPS_MAX = (0) ++_POSIX_OPEN_MAX = (128) ++_POSIX_PATH_MAX = (1024) ++_POSIX_PIPE_BUF = (512) ++_POSIX_SSIZE_MAX = (2147483647L) ++_POSIX_STREAM_MAX = (8) ++_POSIX_TTY_NAME_MAX = (256) ++_POSIX_TZNAME_MAX = (3) ++B_GENERAL_ERROR_BASE = LONG_MIN ++B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 ++B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 ++B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 ++B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 ++B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 ++B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 ++B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 ++B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 ++B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 ++B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 ++B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 ++B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) ++E2BIG = (B_POSIX_ERROR_BASE + 1) ++ECHILD = (B_POSIX_ERROR_BASE + 2) ++EDEADLK = (B_POSIX_ERROR_BASE + 3) ++EFBIG = (B_POSIX_ERROR_BASE + 4) ++EMLINK = (B_POSIX_ERROR_BASE + 5) ++ENFILE = (B_POSIX_ERROR_BASE + 6) ++ENODEV = (B_POSIX_ERROR_BASE + 7) ++ENOLCK = (B_POSIX_ERROR_BASE + 8) ++ENOSYS = (B_POSIX_ERROR_BASE + 9) ++ENOTTY = (B_POSIX_ERROR_BASE + 10) ++ENXIO = (B_POSIX_ERROR_BASE + 11) ++ESPIPE = (B_POSIX_ERROR_BASE + 12) ++ESRCH = (B_POSIX_ERROR_BASE + 13) ++EFPOS = (B_POSIX_ERROR_BASE + 14) ++ESIGPARM = (B_POSIX_ERROR_BASE + 15) ++EDOM = (B_POSIX_ERROR_BASE + 16) ++ERANGE = (B_POSIX_ERROR_BASE + 17) ++EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) ++EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) ++EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) ++EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) ++EADDRINUSE = (B_POSIX_ERROR_BASE + 22) ++EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) ++ENETDOWN = (B_POSIX_ERROR_BASE + 24) ++ENETUNREACH = (B_POSIX_ERROR_BASE + 25) ++ENETRESET = (B_POSIX_ERROR_BASE + 26) ++ECONNABORTED = (B_POSIX_ERROR_BASE + 27) ++ECONNRESET = (B_POSIX_ERROR_BASE + 28) ++EISCONN = (B_POSIX_ERROR_BASE + 29) ++ENOTCONN = (B_POSIX_ERROR_BASE + 30) ++ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) ++ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) ++EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) ++ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) ++ENOBUFS = (B_POSIX_ERROR_BASE + 35) ++EINPROGRESS = (B_POSIX_ERROR_BASE + 36) ++EALREADY = (B_POSIX_ERROR_BASE + 37) ++EILSEQ = (B_POSIX_ERROR_BASE + 38) ++ENOMSG = (B_POSIX_ERROR_BASE + 39) ++ESTALE = (B_POSIX_ERROR_BASE + 40) ++EOVERFLOW = (B_POSIX_ERROR_BASE + 41) ++EMSGSIZE = (B_POSIX_ERROR_BASE + 42) ++EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) ++ENOTSOCK = (B_POSIX_ERROR_BASE + 44) ++false = 0 ++true = 1 ++NULL = (0) ++FALSE = 0 ++TRUE = 1 ++ ++# Included from TypeConstants.h ++B_HOST_IS_LENDIAN = 1 ++B_HOST_IS_BENDIAN = 0 ++def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) ++ ++def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) ++ ++def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) ++ ++def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) ++ ++def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) ++ ++def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) ++ ++def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) ++ ++def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) ++ ++def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) ++ ++def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) ++ ++def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) ++ ++def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) ++ ++def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) ++ ++def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) ++ ++def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) ++ ++def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) ++ ++def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) ++ ++def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) ++ ++def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) ++ ++def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) ++ ++B_HOST_IS_LENDIAN = 0 ++B_HOST_IS_BENDIAN = 1 ++def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) ++ ++def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) ++ ++def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) ++ ++def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) ++ ++def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) ++ ++def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) ++ ++def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) ++ ++def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) ++ ++def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) ++ ++def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) ++ ++def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) ++ ++def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) ++ ++def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) ++ ++def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) ++ ++def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) ++ ++def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) ++ ++def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) ++ ++def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) ++ ++def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) ++ ++def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) ++ ++def B_SWAP_DOUBLE(arg): return __swap_double(arg) ++ ++def B_SWAP_FLOAT(arg): return __swap_float(arg) ++ ++def B_SWAP_INT64(arg): return __swap_int64(arg) ++ ++def B_SWAP_INT32(arg): return __swap_int32(arg) ++ ++def B_SWAP_INT16(arg): return __swap_int16(arg) ++ ++def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) ++ ++def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) ++ ++def htons(x): return B_HOST_TO_BENDIAN_INT16(x) ++ ++def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) ++ ++AF_INET = 1 ++INADDR_ANY = 0x00000000 ++INADDR_BROADCAST = 0xffffffff ++INADDR_LOOPBACK = 0x7f000001 ++SOL_SOCKET = 1 ++SO_DEBUG = 1 ++SO_REUSEADDR = 2 ++SO_NONBLOCK = 3 ++SO_REUSEPORT = 4 ++MSG_OOB = 0x1 ++SOCK_DGRAM = 1 ++SOCK_STREAM = 2 ++IPPROTO_UDP = 1 ++IPPROTO_TCP = 2 ++IPPROTO_ICMP = 3 ++B_UDP_MAX_SIZE = (65536 - 1024) ++FD_SETSIZE = 256 ++FDSETSIZE = FD_SETSIZE ++NFDBITS = 32 ++def _FDMSKNO(fd): return ((fd) / NFDBITS) ++ ++def _FDBITNO(fd): return ((fd) % NFDBITS) +diff --git a/Lib/plat-haiku1/regen b/Lib/plat-haiku1/regen +new file mode 100644 +index 0000000..d9da80c +--- /dev/null ++++ b/Lib/plat-haiku1/regen +@@ -0,0 +1,7 @@ ++#! /bin/sh ++ ++H2PY=../../Tools/scripts/h2py.py ++HEADERS=/boot/develop/headers ++ ++set -v ++python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h +diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py +index b45d79b..d1f77f7 100644 +--- a/Lib/test/test_fileio.py ++++ b/Lib/test/test_fileio.py +@@ -299,6 +299,7 @@ class OtherFileTests(unittest.TestCase): + self.assertEqual(f.writable(), True) + if sys.platform != "darwin" and \ + 'bsd' not in sys.platform and \ ++ 'haiku' not in sys.platform and \ + not sys.platform.startswith('sunos'): + # Somehow /dev/tty appears seekable on some BSDs + self.assertEqual(f.seekable(), False) +diff --git a/Modules/resource.c b/Modules/resource.c +index 53a6c3e..6c5f52f 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -86,6 +86,7 @@ resource_getrusage(PyObject *self, PyObject *args) + PyFloat_FromDouble(doubletime(ru.ru_utime))); + PyStructSequence_SET_ITEM(result, 1, + PyFloat_FromDouble(doubletime(ru.ru_stime))); ++#ifndef __HAIKU__ + PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); + PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); + PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); +@@ -100,6 +101,7 @@ resource_getrusage(PyObject *self, PyObject *args) + PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); + PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); + PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); ++#endif + + if (PyErr_Occurred()) { + Py_DECREF(result); +diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c +index 880f311..54b66f7 100644 +--- a/Modules/socketmodule.c ++++ b/Modules/socketmodule.c +@@ -4868,7 +4868,9 @@ init_socket(void) + #ifndef __BEOS__ + /* We have incomplete socket support. */ + PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); ++#ifndef __HAIKU__ + PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); ++#endif + #if defined(SOCK_RDM) + PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); + #endif +diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h +index 8515499..4e33e4f 100644 +--- a/Modules/socketmodule.h ++++ b/Modules/socketmodule.h +@@ -47,6 +47,10 @@ typedef int socklen_t; + # undef AF_NETLINK + #endif + ++#if defined(__HAIKU__) ++#undef HAVE_BLUETOOTH_BLUETOOTH_H ++#endif ++ + #ifdef HAVE_BLUETOOTH_BLUETOOTH_H + #include + #include +diff --git a/Modules/spwdmodule.c b/Modules/spwdmodule.c +index 957de58..69be5bb 100644 +--- a/Modules/spwdmodule.c ++++ b/Modules/spwdmodule.c +@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p) + + SETS(setIndex++, p->sp_namp); + SETS(setIndex++, p->sp_pwdp); ++#ifndef __HAIKU__ + SETI(setIndex++, p->sp_lstchg); ++#endif + SETI(setIndex++, p->sp_min); + SETI(setIndex++, p->sp_max); + SETI(setIndex++, p->sp_warn); +diff --git a/Modules/timemodule.c b/Modules/timemodule.c +index 12c43b0..206b325 100644 +--- a/Modules/timemodule.c ++++ b/Modules/timemodule.c +@@ -1006,11 +1006,11 @@ floatsleep(double secs) + return -1; + } + Py_END_ALLOW_THREADS +-#elif defined(__BEOS__) ++#elif defined(__BEOS__) || defined(__HAIKU__) + /* This sleep *CAN BE* interrupted. */ + { + if( secs <= 0.0 ) { +- return; ++ return 0; + } + + Py_BEGIN_ALLOW_THREADS +diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c +index f052574..6a77f0d 100644 +--- a/Python/bltinmodule.c ++++ b/Python/bltinmodule.c +@@ -19,7 +19,7 @@ + */ + #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) + const char *Py_FileSystemDefaultEncoding = "mbcs"; +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__HAIKU__) + const char *Py_FileSystemDefaultEncoding = "utf-8"; + #else + const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ +diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py +index c64501e..7df3ad7 100755 +--- a/Tools/scripts/h2py.py ++++ b/Tools/scripts/h2py.py +@@ -50,7 +50,7 @@ except KeyError: + searchdirs=os.environ['INCLUDE'].split(';') + except KeyError: + try: +- if sys.platform.find("beos") == 0: ++ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: + searchdirs=os.environ['BEINCLUDES'].split(';') + elif sys.platform.startswith("atheos"): + searchdirs=os.environ['C_INCLUDE_PATH'].split(':') +diff --git a/configure.ac b/configure.ac +index 54f8c0f..1ea438a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -883,7 +883,7 @@ if test $enable_shared = "yes"; then + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) ++ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|Haiku*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} +@@ -891,6 +891,9 @@ if test $enable_shared = "yes"; then + FreeBSD*) + SOVERSION=`echo $SOVERSION|cut -d "." -f 1` + ;; ++ Haiku*) ++ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} ++ ;; + esac + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; +@@ -1006,7 +1009,7 @@ AC_PROG_MKDIR_P + AC_SUBST(LN) + if test -z "$LN" ; then + case $ac_sys_system in +- BeOS*) LN="ln -s";; ++ BeOS*|Haiku*) LN="ln -s";; + CYGWIN*) LN="ln -s";; + atheos*) LN="ln -s";; + *) LN=ln;; +@@ -2030,7 +2033,7 @@ then + BLDSHARED="$LDSHARED" + fi + ;; +- Linux*|GNU*|QNX*) ++ Linux*|GNU*|QNX*|Haiku*) + LDSHARED='$(CC) -shared' + LDCXXSHARED='$(CXX) -shared';; + BSD/OS*/4*) +@@ -2102,7 +2105,7 @@ then + then CCSHARED="-fPIC"; + else CCSHARED="+z"; + fi;; +- Linux*|GNU*) CCSHARED="-fPIC";; ++ Linux*|GNU*|Haiku*) CCSHARED="-fPIC";; + BSD/OS*/4*) CCSHARED="-fpic";; + FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; + OpenUNIX*|UnixWare*) +@@ -2134,7 +2137,7 @@ then + LINKFORSHARED="-Wl,-E -Wl,+s";; + # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; + BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; +- Linux*|GNU*) LINKFORSHARED="-Xlinker -export-dynamic";; ++ Linux*|GNU*|Haiku*) LINKFORSHARED="-Xlinker -export-dynamic";; + # -u libsys_s pulls in all symbols in libsys + Darwin/*) + # -u _PyMac_Error is needed to pull in the mac toolbox glue, +@@ -2249,14 +2252,16 @@ case "$ac_sys_system" in + esac + + # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. +-# BeOS' sockets are stashed in libnet. + AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4 + AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets + ++# BeOS' sockets are stashed in libnet. ++# Haiku's sockets are stashed in libnetwork. + case "$ac_sys_system" in +-BeOS*) +-AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS +-;; ++ BeOS*) ++ AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS);; ++ Haiku*) ++ AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS);; + esac + + AC_MSG_CHECKING(for --with-libs) +@@ -3592,7 +3597,7 @@ fi], + AC_SUBST(LIBM) + case $ac_sys_system in + Darwin) ;; +-BeOS) ;; ++BeOS|Haiku) ;; + *) LIBM=-lm + esac + AC_MSG_CHECKING(for --with-libm=STRING) +diff --git a/setup.py b/setup.py +index a46bf35..9fe247f 100644 +--- a/setup.py ++++ b/setup.py +@@ -523,6 +523,12 @@ class PyBuildExt(build_ext): + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) + inc_dirs += ['/system/include', '/atheos/autolnk/include'] + inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ++ ++ # Haiku-specific include and library locations ++ if host_platform == 'haiku1': ++ inc_dirs += ['/boot/develop/headers/posix', ++ '/boot/system/develop/headers'] ++ lib_dirs += ['/boot/system/develop/lib'] + + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) + if host_platform in ['osf1', 'unixware7', 'openunix8']: +@@ -551,7 +557,7 @@ class PyBuildExt(build_ext): + + # Check for MacOS X, which doesn't need libm.a at all + math_libs = ['m'] +- if host_platform in ['darwin', 'beos']: ++ if host_platform in ['darwin', 'beos', 'haiku1']: + math_libs = [] + + # XXX Omitted modules: gl, pure, dl, SGI-specific modules +@@ -790,15 +796,22 @@ class PyBuildExt(build_ext): + '/usr/local/ssl/include', + '/usr/contrib/ssl/include/' + ] +- ssl_incs = find_file('openssl/ssl.h', inc_dirs, ++ ssl_incs = find_file('openssl/ssl.h', [], ++ inc_dirs + search_for_ssl_incs_in ++ ) ++ ssl_incs_to_add = find_file('openssl/ssl.h', inc_dirs, + search_for_ssl_incs_in + ) + if ssl_incs is not None: + krb5_h = find_file('krb5.h', inc_dirs, + ['/usr/kerberos/include']) + if krb5_h: +- ssl_incs += krb5_h +- ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, ++ ssl_incs_to_add += krb5_h ++ ssl_libs = find_library_file(self.compiler, 'ssl', [], ++ lib_dirs + ['/usr/local/ssl/lib', ++ '/usr/contrib/ssl/lib/' ++ ] ) ++ ssl_libs_to_add = find_library_file(self.compiler, 'ssl', lib_dirs, + ['/usr/local/ssl/lib', + '/usr/contrib/ssl/lib/' + ] ) +@@ -806,8 +819,8 @@ class PyBuildExt(build_ext): + if (ssl_incs is not None and + ssl_libs is not None): + exts.append( Extension('_ssl', ['_ssl.c'], +- include_dirs = ssl_incs, +- library_dirs = ssl_libs, ++ include_dirs = ssl_incs_to_add, ++ library_dirs = ssl_libs_to_add, + libraries = ['ssl', 'crypto'], + depends = ['socketmodule.h']), ) + else: +@@ -845,8 +858,8 @@ class PyBuildExt(build_ext): + # The _hashlib module wraps optimized implementations + # of hash functions from the OpenSSL library. + exts.append( Extension('_hashlib', ['_hashopenssl.c'], +- include_dirs = ssl_incs, +- library_dirs = ssl_libs, ++ include_dirs = ssl_incs_to_add, ++ library_dirs = ssl_libs_to_add, + libraries = ['ssl', 'crypto']) ) + else: + print ("warning: openssl 0x%08x is too old for _hashlib" % +@@ -1325,7 +1338,7 @@ class PyBuildExt(build_ext): + missing.append('resource') + + # Sun yellow pages. Some systems have the functions in libc. +- if (host_platform not in ['cygwin', 'atheos', 'qnx6'] and ++ if (host_platform not in ['cygwin', 'atheos', 'qnx6', 'haiku1'] and + find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None): + if (self.compiler.find_library_file(lib_dirs, 'nsl')): + libs = ['nsl'] +-- +1.8.3.4 + + +From 571ed69e1ab40fd11c4a1fdcb6198ff787c5129b Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 5 Apr 2014 21:16:40 +0000 +Subject: fix pyconfig.h path + + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index bcd83bf..f93c10a 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -105,7 +105,7 @@ BINDIR= @bindir@ + LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ +-CONFINCLUDEDIR= $(exec_prefix)/include ++CONFINCLUDEDIR= $(INCLUDEDIR) + SCRIPTDIR= $(prefix)/lib + + # Detailed destination directories +-- +1.8.3.4 + + +From d49a8ee2494391b3a1c50bc652f0838ac036e046 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 18 Jun 2014 12:19:13 +0000 +Subject: Import missed change from the 2.6.9 patches + +This makes our site- and vendor- packages work properly again. +It's sill missing the changes to addusersitepackages. This method was apparently refactored, and I don't have enough Python knowledge to redo our changes in the new code. User packages will not workas +expected with +this version of Python. + +diff --git a/Lib/site.py b/Lib/site.py +index d2e18f1..34d5aee 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -287,6 +287,13 @@ def getsitepackages(): + + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) ++ elif sys.platform.startswith('haiku'): ++ sitepackages.append(os.path.join(prefix, "non-packaged", "lib", ++ "python" + sys.version[:3], ++ "site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "vendor-packages")) + elif os.sep == '/': + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +-- +1.8.3.4 + + +From a0b72ccfc2f385c3ec9148523d981c7d971e2636 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 21 Sep 2014 18:59:44 +0200 +Subject: gcc2 fix. + + +diff --git a/Modules/_ctypes/libffi/include/ffi_common.h b/Modules/_ctypes/libffi/include/ffi_common.h +index 650ca69..02a1913 100644 +--- a/Modules/_ctypes/libffi/include/ffi_common.h ++++ b/Modules/_ctypes/libffi/include/ffi_common.h +@@ -115,7 +115,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); + + typedef float FLOAT32; + +-#ifndef __GNUC__ ++#if !defined(__GNUC__) || __GNUC__ < 3 + #define __builtin_expect(x, expected_value) (x) + #endif + #define LIKELY(x) __builtin_expect(!!(x),1) +-- +1.8.3.4 + + +From d50a28e47cbd54263d065f47b2650333d917c2b9 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 28 Nov 2014 16:26:28 +0000 +Subject: tarfile: let link fail and catch exception. + + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index 57ea877..bc3f82c 100644 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -2242,7 +2242,7 @@ class TarFile(object): + (platform limitation), we try to make a copy of the referenced file + instead of a link. + """ +- if hasattr(os, "symlink") and hasattr(os, "link"): ++ try: + # For systems that support symbolic and hard links. + if tarinfo.issym(): + if os.path.lexists(targetpath): +@@ -2256,7 +2256,7 @@ class TarFile(object): + os.link(tarinfo._link_target, targetpath) + else: + self._extract_member(self._find_link_target(tarinfo), targetpath) +- else: ++ except (os.error, AttributeError): + try: + self._extract_member(self._find_link_target(tarinfo), targetpath) + except KeyError: +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe new file mode 100644 index 000000000..dc6e40078 --- /dev/null +++ b/dev-lang/python/python-2.7.9.recipe @@ -0,0 +1,110 @@ +SUMMARY="An interpreted, interactive, object-oriented programming language" +DESCRIPTION=" +Python is a programming language that lets you work more quickly and integrate \ +your systems more effectively. You can learn to use Python and see almost \ +immediate gains in productivity and lower maintenance costs. +Python runs on Windows, Linux/Unix, Mac OS X, and has been ported to the Java \ +and .NET virtual machines. +Python is free to use, even for commercial products, because of its \ +OSI-approved open source license. +" +HOMEPAGE="http://www.python.org" +LICENSE="Python" +COPYRIGHT="1990-2012, Python Software Foundation" +SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" +CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PATCHES="python-$portVersion.patchset" + +PROVIDES=" + python = $portVersion compat >= 2.7 + cmd:2to3 = $portVersion compat >= 2.7 + cmd:idle = $portVersion compat >= 2.7 + cmd:pydoc = $portVersion compat >= 2.7 + cmd:python = $portVersion compat >= 2.7 + cmd:python2 = $portVersion compat >= 2.7 + cmd:python2_config = $portVersion compat >= 2.7 + cmd:python2.7 = $portVersion compat >= 2.7 + cmd:python2.7_config = $portVersion compat >= 2.7 + cmd:python_config = $portVersion compat >= 2.7 + cmd:smtpd.py = $portVersion compat >= 2.7 + devel:libpython2.7 = 1.0 + lib:libpython2.7 = 1.0 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libbz2 + lib:libncurses + lib:libssl + lib:libreadline + lib:libsqlite3 + lib:libz + lib:libffi + " +BUILD_REQUIRES=" + devel:libbz2 + devel:libffi + devel:libncurses + devel:libssl + devel:libreadline + devel:libsqlite3 + devel:libz + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:find + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + cmd:pkg_config + " + +SOURCE_DIR="Python-$portVersion" + +GLOBAL_WRITABLE_FILES=" + non-packaged/lib/python2.7/site-packages directory keep-old + " + +BUILD() +{ + cd Modules/_ctypes/libffi + libtoolize --force --copy --install + cd ../../.. + + libtoolize --force --copy --install + aclocal + autoconf + runConfigure ./configure --with-system-ffi \ + --enable-shared \ + --enable-unicode=ucs4 + + # prevent make from rebuilding stuff that requires python + touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h + + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libpython2.7 + fixPkgconfig + + mkdir -p $prefix/lib/python2.7/vendor-packages + echo 'This directory contains packaged python modules.' \ + >$prefix/lib/python2.7/vendor-packages/README + + mkdir -p $prefix/non-packaged/lib/python2.7 + mv $prefix/lib/python2.7/site-packages $prefix/non-packaged/lib/python2.7/ +} + +TEST() +{ + make $jobArgs test +} From 7ccaa9bc0b4e1d1cf749d8cf3a547f56f5331c10 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Sun, 21 Dec 2014 11:37:44 +0100 Subject: [PATCH 102/326] Add recipe for BeTeX --- haiku-apps/betex/betex-20141221.recipe | 43 ++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 haiku-apps/betex/betex-20141221.recipe diff --git a/haiku-apps/betex/betex-20141221.recipe b/haiku-apps/betex/betex-20141221.recipe new file mode 100644 index 000000000..0ae775671 --- /dev/null +++ b/haiku-apps/betex/betex-20141221.recipe @@ -0,0 +1,43 @@ +SUMMARY="LaTeX editor for Haiku." +DESCRIPTION="BeTeX is the premier TeX/LaTeX editor for BeOS/Haiku. With it you \ +can create, compile and preview your latex documents all from within a single \ +user-friendly interface." +HOMEPAGE="https://github.com/HaikuArchives/BeTeX/" +SRC_URI="git+https://github.com/HaikuArchives/BeTeX#ee4907" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2005 Tim de Jong, Brent Miszalski" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + betex = $portVersion + app:BeTeX = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku_devel >= $haikuVersion + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:mkdepend + cmd:gcc + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp objects/BeTeX $appsDir/BeTeX + addAppDeskbarSymlink $appsDir/BeTeX +} From 2adb5d11d16c36dc4192ecf1567cdb34d1c44730 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Sun, 21 Dec 2014 15:36:40 +0000 Subject: [PATCH 103/326] Updated iozone recipe to pass lint test --- app-benchmarks/iozone/iozone-3.326.recipe | 66 ++++++++++++++++------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe index e95216033..cb9431bf7 100644 --- a/app-benchmarks/iozone/iozone-3.326.recipe +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -1,22 +1,50 @@ -DESCRIPTION="Filesystem benchmarking program" -HOMEPAGE="http://www.iozone.org/" -SRC_URI="http://www.iozone.org/src/current/iozone3_326.tar" -CHECKSUM_MD5="e80f06da89d314f7fc08fcef4046d367" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd iozone3_326/src/current/ - make haiku -} -INSTALL() -{ - cd iozone3_326/src/current/ - mkdir -p ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY` - cp iozone ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/iozone - cp fileop ${DESTDIR}/`finddir B_COMMON_BIN_DIRECTORY`/fileop -} +SUMMARY="Filesystem benchmarking program" +DESCRIPTION="Filesystem benchmarking program" + +#NOTE: The author retains the exclusive right to publish derivative works based on this work, including, but not limited to, revised versions of this work. + LICENSE="iozone" COPYRIGHT="1991-2001, William D. Norcott 2010, Don Capps" + +HOMEPAGE="http://www.iozone.org/" +SRC_URI="http://www.iozone.org/src/current/iozone3_326.tar" + +CHECKSUM_SHA256="bc0a40b2cc7f2e8c6dcfbbff82f1df82ad735f02c9a7db59f8364b76f43f7063" + +SOURCE_DIR="iozone3_326" + +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2" + +PATCHES="iozone-3.326.patch" + +PROVIDES=" + cmd:iozone = $portVersion + iozone = $portVersion + " +REQUIRES="" + +BUILD_REQUIRES=" + cmd:make + cmd:cc + " + +BUILD_PREREQUIRES=" + haiku_devel + " + +BUILD() +{ + cd src/current/ + make haiku +} + +INSTALL() +{ + cd src/current/ + mkdir -p $binDir/iozone + cp iozone $binDir/iozone + cp fileop $binDir +} \ No newline at end of file From 90c41b5c00f85a61ce9b936b76993d21338bf0ed Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Sun, 21 Dec 2014 16:11:21 +0000 Subject: [PATCH 104/326] iozone-3.326.recipe fixed provides and requires --- app-benchmarks/iozone/iozone-3.326.recipe | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe index cb9431bf7..398529eac 100644 --- a/app-benchmarks/iozone/iozone-3.326.recipe +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -22,9 +22,12 @@ PATCHES="iozone-3.326.patch" PROVIDES=" cmd:iozone = $portVersion + cmd:fileop = $portVersion iozone = $portVersion " -REQUIRES="" +REQUIRES=" + haiku + " BUILD_REQUIRES=" cmd:make From 6ae600d28932a62dd545516f287a20e60ce34702 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 21 Dec 2014 17:49:20 +0100 Subject: [PATCH 105/326] Adjusted install path to $fontsDir/ttfonts/ --- media-fonts/dejavu/dejavu-2.34.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-fonts/dejavu/dejavu-2.34.recipe b/media-fonts/dejavu/dejavu-2.34.recipe index 19607436d..cf69e667a 100644 --- a/media-fonts/dejavu/dejavu-2.34.recipe +++ b/media-fonts/dejavu/dejavu-2.34.recipe @@ -12,7 +12,7 @@ LICENSE="Bitstream Vera COPYRIGHT="2003 Bitstream, Inc. 2006 Tavmjong Bah . " -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -31,7 +31,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/DejaVu + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } From 4f02c88f147f785b3cbac5c8a595eb8f0188aab7 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 20 Dec 2014 06:26:59 +0000 Subject: [PATCH 106/326] Add soxr port Signed-off-by: Timothy Gu --- media-libs/soxr/patches/soxr-0.1.1.patchset | 99 +++++++++++++++++++++ media-libs/soxr/soxr-0.1.1.recipe | 75 ++++++++++++++++ 2 files changed, 174 insertions(+) create mode 100644 media-libs/soxr/patches/soxr-0.1.1.patchset create mode 100644 media-libs/soxr/soxr-0.1.1.recipe diff --git a/media-libs/soxr/patches/soxr-0.1.1.patchset b/media-libs/soxr/patches/soxr-0.1.1.patchset new file mode 100644 index 000000000..c76258eb1 --- /dev/null +++ b/media-libs/soxr/patches/soxr-0.1.1.patchset @@ -0,0 +1,99 @@ +From c592f1dd795750f36ade845fcd6dcea8d5eaf126 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 21 Dec 2014 17:28:56 +0000 +Subject: Use stdbool.h and stdint.h if they are present + +Fixes building on some exotic platforms like Haiku. Plus it's more +correct any way. + +Signed-off-by: Timothy Gu + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a24952..b638184 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,7 +106,9 @@ if (WITH_AVFFT) + endif () + + check_function_exists (lrint HAVE_LRINT) +-check_include_files (fenv.h HAVE_FENV_H) ++check_include_files (fenv.h HAVE_FENV_H) ++check_include_files (stdbool.h HAVE_STDBOOL_H) ++check_include_files (stdint.h HAVE_STDINT_H) + test_big_endian (WORDS_BIGENDIAN) + + macro (make_exist) +diff --git a/examples/examples-common.h b/examples/examples-common.h +index 585fac3..1474cb5 100644 +--- a/examples/examples-common.h ++++ b/examples/examples-common.h +@@ -12,6 +12,8 @@ + #include + #include + ++#include "../soxr-config.h" ++ + #ifdef _WIN32 + /* Work-around for broken file-I/O on MS-Windows: */ + #include +@@ -25,18 +27,6 @@ + #define USE_STD_STDIO + #endif + +-#undef int16_t +-#define int16_t short +- +-#undef int32_t +-#if LONG_MAX > 2147483647L +- #define int32_t int +-#elif LONG_MAX < 2147483647L +- #error this programme requires that 'long int' has at least 32-bits +-#else +- #define int32_t long +-#endif +- + #undef min + #undef max + #define min(x,y) ((x)<(y)?(x):(y)) +diff --git a/soxr-config.h.in b/soxr-config.h.in +index 227bcfd..d93987b 100644 +--- a/soxr-config.h.in ++++ b/soxr-config.h.in +@@ -10,17 +10,23 @@ + #define HAVE_SIMD @HAVE_SIMD@ + #define HAVE_FENV_H @HAVE_FENV_H@ + #define HAVE_LRINT @HAVE_LRINT@ ++#define HAVE_STDBOOL_H @HAVE_STDBOOL_H@ ++#define HAVE_STDINT_H @HAVE_STDINT_H@ + #define WORDS_BIGENDIAN @WORDS_BIGENDIAN@ + +-#include +- ++#if !HAVE_STDBOOL_H + #undef bool + #undef false + #undef true + #define bool int + #define false 0 + #define true 1 ++#else /* HAVE_STDBOOL_H */ ++#include ++#endif + ++#if !HAVE_STDINT_H ++#include + #undef int16_t + #undef int32_t + #undef int64_t +@@ -42,5 +48,7 @@ + #endif + #define uint32_t unsigned int32_t + #define uint64_t unsigned int64_t +- ++#else /* HAVE_STDINT_H */ ++#include ++#endif + #endif +-- +1.8.3.4 + diff --git a/media-libs/soxr/soxr-0.1.1.recipe b/media-libs/soxr/soxr-0.1.1.recipe new file mode 100644 index 000000000..e211c4fff --- /dev/null +++ b/media-libs/soxr/soxr-0.1.1.recipe @@ -0,0 +1,75 @@ +SUMMARY="SoX Resampler library" +DESCRIPTION="SoXR is a high-quality audio resampling library. It handles \ +the conversion of audio to different sample rates (most commonly 44100, \ +48000, and 96000 Hz). It is one-dimensional and high-quality. +" +HOMEPAGE="https://sourceforge.net/p/soxr/wiki/Home/" +SRC_URI="http://downloads.sourceforge.net/project/soxr/soxr-${portVersion}-Source.tar.xz" +CHECKSUM_SHA256="dcc16868d1a157079316f84233afcc2b52dd0bd541dd8439dc25bceb306faac2" +REVISION="1" + +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2007-2013 Rob Sykes " + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + soxr${secondaryArchSuffix} = $portVersion + lib:libsoxr$secondaryArchSuffix = 0.1.0 compat >= 0 + lib:libsoxr_lsr$secondaryArchSuffix = 0.1.9 compat >= 0 + " + +REQUIRES=" + haiku$secondaryArchSuffix + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +SOURCE_DIR="soxr-${portVersion}-Source" + +PATCHES="soxr-${portVersion}.patchset" + +BUILD() +{ + cmake . \ + -DCMAKE_INSTALL_PREFIX=$prefix \ + -DBUILD_TESTS=OFF \ + -DBIN_INSTALL_DIR=$binDir \ + -DLIB_INSTALL_DIR=$libDir \ + -DINCLUDE_INSTALL_DIR=$includeDir \ + -DDOC_INSTALL_DIR=$docDir + make $jobArgs +} + +INSTALL() +{ + make install + + # prepare develop/lib + prepareInstalledDevelLibs libsoxr libsoxr-lsr + fixPkgconfig + + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + soxr${secondaryArchSuffix}_devel = $portVersion + devel:libsoxr$secondaryArchSuffix = 0.1.0 compat >= 0 + devel:libsoxr_lsr$secondaryArchSuffix = 0.1.9 compat >= 0 + " +REQUIRES_devel=" + soxr$secondaryArchSuffix == $portVersion base + " From 0b7f4cc121f7a53bc354cd47645b9e21ccc7c22a Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 20 Dec 2014 14:14:43 +0200 Subject: [PATCH 107/326] Fix sdl2_mixer recipe * Mark sdl2_mixer as working on x86_gcc2, x86 and x86_64 secondary architectures * Convert various library names to lowercase --- media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe index f9956a6bc..d9b1deb77 100644 --- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -10,10 +10,10 @@ SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.g CHECKSUM_SHA256="a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b" LICENSE="Zlib" COPYRIGHT="1997-2012 Sam Lantinga" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="sdl2_mixer-${portVersion}.patch" @@ -39,10 +39,10 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libGL$secondaryArchSuffix - devel:libSDL2$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libsdl2$secondaryArchSuffix devel:libogg$secondaryArchSuffix - devel:libFLAC$secondaryArchSuffix + devel:libflac$secondaryArchSuffix devel:libfluidsynth$secondaryArchSuffix devel:libmad$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix From e355677fb15095d6a28fe3d0ebff43b5c2f02bc3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 21 Dec 2014 10:50:24 +0000 Subject: [PATCH 108/326] flare: fixed typo --- games-rpg/flare/flare-0.19.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe index c15a01a75..83572737f 100644 --- a/games-rpg/flare/flare-0.19.recipe +++ b/games-rpg/flare/flare-0.19.recipe @@ -1,5 +1,5 @@ SUMMARY="Single-player 2D action RPG." -DESCRIPTION="Flare is a a single-player 2D action RPG with fast-paced action \ +DESCRIPTION="Flare is a single-player 2D action RPG with fast-paced action \ and a dark fantasy style." HOMEPAGE="http://flarerpg.org" SRC_URI="http://downloads.sourceforge.net/project/flare-game/Linux/flare.0.19.tar.gz" @@ -12,8 +12,6 @@ COPYRIGHT="2010-2013 Clint Bellanger" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" -else - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" From c3f26dcb88d791058db2a4e702f81d33f044741d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 21 Dec 2014 21:29:14 +0000 Subject: [PATCH 109/326] gcc: added recipe for version 4.8.4 --- sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe | 334 ++++++++++++++++++++++ 1 file changed, 334 insertions(+) create mode 100644 sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe diff --git a/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe b/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe new file mode 100644 index 000000000..d88c61e08 --- /dev/null +++ b/sys-devel/gcc/gcc-4.8.4_2014_12_21.recipe @@ -0,0 +1,334 @@ +SUMMARY="C/C++ compiler for target ${effectiveTargetMachineTriple}" +DESCRIPTION=" +Standard compiler for non-legacy Haiku (i.e. for all architectures other than \ +x86_gcc2). +" +HOMEPAGE="http://gcc.gnu.org" + +srcGitRev="1a00a76b58ae57d24bd4d774f6323c4ea62dd1e7" +SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="822f5944c9866eebbe293edcc6ba524e5b1e409114350a681ec88e4d6b747dc2" +REVISION="1" +LICENSE=" + GNU GPL v2 + GNU LGPL v2 + " +COPYRIGHT="1988-2014 Free Software Foundation, Inc." + +if [ $effectiveTargetArchitecture = x86_64 ]; then + PATCHES="gcc-4.8.3_buildfixes_for_x86_64.patchset" +fi + +ARCHITECTURES="x86 x86_64 arm" +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" +fi +SECONDARY_ARCHITECTURES="x86" + +libstdcxxSoVersion="6" +libstdcxxLibVersion="6.0.19" + +libgccSoVersion="1" +libgccLibVersion="1" + +PROVIDES=" + gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:c++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:cpp$secondaryArchSuffix = $portVersion compat >= 4 + cmd:g++$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcc_4.8.4$secondaryArchSuffix = $portVersion compat >= 4 + cmd:gcov$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES=" + haiku$secondaryArchSuffix + cmd:as$secondaryArchSuffix + " + +BUILD_REQUIRES=" + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:autoconf + cmd:awk + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + cmd:xargs + " + +SOURCE_DIR="buildtools-$srcGitRev/gcc" + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj +gccVersion=$(echo $portVersion | cut -d_ -f1) + +BUILD() +{ + rm -rf $objectsDir + + # Touch some files generated by bison, so that bison won't run to update + # them. Fixes issues with newer bison versions. + # And while at it, touch gperf target, too (as gperf may not be installed). + (cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \ + cp/parse.h c-gperf.h) + + mkdir -p $objectsDir + cd $objectsDir + + local additionalConfigureFlags + if [ -n "$secondaryArchSuffix" ]; then + additionalConfigureFlags="\ + --with-hybrid-secondary=${effectiveTargetArchitecture}" + fi + local kernelCcFlags="-D_KERNEL_MODE" + if [ $effectiveTargetArchitecture == x86_64 ]; then + # disable multilib support, as x86_64 by default tries to build the + # 32-bit libraries, too, which fails as no 32-bit libroot is available + additionalConfigureFlags+=" --disable-multilib" + + # deactivate red zone for x86_64 + kernelCcFlags="$kernelCcFlags -mno-red-zone" + fi + + "$sourceDir/configure" \ + --build=$effectiveTargetMachineTriple \ + --prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \ + --docdir=$docDir --enable-threads=posix \ + --disable-nls --enable-shared --with-gnu-ld --with-gnu-as \ + --enable-version-specific-runtime-libs \ + --enable-languages=c,c++ --enable-lto --enable-frame-pointer \ + --with-pkgversion=$(echo $portVersion | cut -d_ -f2-) \ + --enable-__cxa-atexit \ + $additionalConfigureFlags + + make $jobArgs + + echo "######################## building special libraries ################" + + echo "### libgcc" + + # build kernel versions of libgcc.a and libgcc_eh.a (no threads or TLS) + cd $objectsDir/$effectiveTargetMachineTriple/libgcc + mkdir -p saved + mv libgcc.a libgcc_eh.a libgcc_s* libgcov* saved/ + make clean + ln -sfn "$sourceDir/libgcc/gthr-single.h" gthr-default.h + make CFLAGS="-O2 $kernelCcFlags" CXXFLAGS="-O2 $kernelCcFlags" + mv libgcc.a libgcc-kernel.a + mv libgcc_eh.a libgcc_eh-kernel.a + ln -sfn "$sourceDir/libgcc/gthr-posix.h" gthr-default.h + mv saved/* . + rmdir saved + + echo "### libsupc++" + + # Build a shared libsupc++ from libsupc++.a (hacking the gcc build system + # to build a shared libsupc++ yields pretty much the same result, so we + # use this simpler approach). + cd $objectsDir/$effectiveTargetMachineTriple/libstdc++-v3/libsupc++ + gcc -nodefaultlibs -shared -o .libs/libsupc++.so -Xlinker --whole-archive \ + .libs/libsupc++.a + # build kernel version of libsupc++.a (without threads or TLS) + mkdir -p saved + mv .libs/libsupc++* saved/ + cp "../include/$effectiveTargetMachineTriple/bits/gthr-default.h" \ + "../config.h" \ + "../include/$effectiveTargetMachineTriple/bits/c++config.h" \ + saved/ + make clean + cp "../include/$effectiveTargetMachineTriple/bits/gthr-single.h" \ + "../include/$effectiveTargetMachineTriple/bits/gthr-default.h" + sed -i -e 's,#define _GLIBCXX_HAS_GTHREADS 1,/* #undef _GLIBCXX_HAS_GTHREADS */,' \ + "../config.h" + sed -i -e 's,#define _GLIBCXX_HAVE_TLS 1,/* #undef _GLIBCXX_HAVE_TLS */,' \ + "../include/$effectiveTargetMachineTriple/bits/c++config.h" + make CFLAGS="-O2 $kernelCcFlags" CXXFLAGS="-O2 $kernelCcFlags" + mv .libs/libsupc++.a .libs/libsupc++-kernel.a + mv saved/libsupc++* .libs/ + mv saved/gthr-default.h "../include/$effectiveTargetMachineTriple/bits/" + mv saved/config.h .. + mv saved/c++config.h "../include/$effectiveTargetMachineTriple/bits/" + rmdir saved +} + +INSTALL() +{ + cd $objectsDir + + make install + make install-html + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + for dir in gmp libquadmath mpc mpfr; do + mv ${dir}.html $dir + ln -s $dir/index.html ${dir}.html + done + + ### Libraries ############################################# + + echo "Moving libraries around" + + # Move/copy libraries such that copies of the runtime (shared) libs exist + # in $libDir and copies of static libraries exist in $developLibDir. These + # are put into separate packages gcc_syslibs and gcc_syslibs_devel, which + # are both used by Haiku's build system. + mkdir -p $libDir + mkdir -p $developLibDir + cd $installDir + gccLibDir=lib/gcc/$effectiveTargetMachineTriple/$gccVersion + + # libstdc++ + strip --strip-debug $gccLibDir/libstdc++.so.$libstdcxxLibVersion + cp -d $gccLibDir/libstdc++.so \ + $gccLibDir/libstdc++.so.$libstdcxxSoVersion \ + $gccLibDir/libstdc++.so.$libstdcxxLibVersion \ + $libDir/ + cp $gccLibDir/libstdc++*.a $developLibDir/ + + # libsupc++ + libstdcxxDir=$objectsDir/$effectiveTargetMachineTriple/libstdc++-v3 + cp $libstdcxxDir/libsupc++/.libs/libsupc++-kernel.a \ + $libstdcxxDir/libsupc++/.libs/libsupc++.so \ + $gccLibDir/ + strip --strip-debug $gccLibDir/libsupc++.so + cp $gccLibDir/libsupc++.so $libDir/ + cp $gccLibDir/libsupc++*.a $developLibDir/ + + # libgcc + cp $objectsDir/$effectiveTargetMachineTriple/libgcc/libgcc-kernel.a \ + $objectsDir/$effectiveTargetMachineTriple/libgcc/libgcc_eh-kernel.a \ + $gccLibDir/ + strip --strip-debug $gccLibDir/libgcc_s.so.$libgccSoVersion + cp -d $gccLibDir/libgcc_s.so \ + $gccLibDir/libgcc_s.so.$libgccSoVersion \ + $libDir/ + cp $gccLibDir/libgcc*.a $developLibDir/ + + # gcc and c++ headers + mkdir -p $includeDir/gcc + cp -r $gccLibDir/include $includeDir/gcc/ + cp -r $gccLibDir/include-fixed $includeDir/gcc/ + mv $includeDir/gcc/include/c++ $includeDir/ + + ### Strip ################################################# + + echo "Strip" + + cd $installDir + strip bin/* + for f in cc1 cc1plus collect2 lto1 lto-wrapper; do + strip $gccLibDir/$f + done + + strip --strip-debug lib/*.a \ + $gccLibDir/*.a \ + $developLibDir/*.a + + ### Disable ASLR ########################################## + + echo "Add SYS:ENV attribute to disable ASLR" + + cd $installDir + for f in bin/*; do + if [ -r "$f" ]; then + addattr SYS:ENV DISABLE_ASLR=1 $f + fi + done + for f in cc1 cc1plus collect2 lto1; do + addattr SYS:ENV DISABLE_ASLR=1 \ + $gccLibDir/$f + done + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # create missing cc symlink + ln -sf gcc $installDir/bin/cc + + # make all tools available via default paths + mkdir -p $binDir + for f in c++ cc cpp g++ gcc gcov; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + ### Cleanup ############################################### + + echo "Cleanup" + rm -rf $installDir/info + rm -rf $installDir/share + + ### Sub Packages ########################################## + + packageEntries "syslibs" \ + $relativeLibDir/libgcc_s.so \ + $relativeLibDir/libgcc_s.so.$libgccSoVersion \ + $relativeLibDir/libstdc++.so \ + $relativeLibDir/libstdc++.so.$libstdcxxSoVersion \ + $relativeLibDir/libstdc++.so.$libstdcxxLibVersion \ + $relativeLibDir/libsupc++.so + + packageEntries "syslibs_devel" \ + $relativeDevelopLibDir/libgcc.a \ + $relativeDevelopLibDir/libgcc-kernel.a \ + $relativeDevelopLibDir/libgcc_eh.a \ + $relativeDevelopLibDir/libgcc_eh-kernel.a \ + $relativeDevelopLibDir/libstdc++.a \ + $relativeDevelopLibDir/libsupc++.a \ + $relativeDevelopLibDir/libsupc++-kernel.a \ + $relativeIncludeDir + + rm -rf $includeDir + rm -rf $developLibDir +} + +# ----- syslibs package ----------------------------------------------------- + +SUMMARY_syslibs="\ +GCC c/c++-runtime shared libraries, needed to execute c/c++ programs" +DESCRIPTION_syslibs="The c/c++-runtime libraries that are part of the gcc \ +distribution. This package contains the shared libraries for the runtime \ +loader, so it is required for executing most c/c++ programs." + +PROVIDES_syslibs=" + gcc_syslibs$secondaryArchSuffix = $portVersion compat >= 4 + lib:libgcc_s$secondaryArchSuffix = $portVersion compat >= 4 + lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 4 + lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES_syslibs=" + haiku$secondaryArchSuffix + " + +# ----- syslibs_devel package ----------------------------------------------- + +SUMMARY_syslibs_devel="\ +GCC c/c++-runtime static libraries and c++ headers, needed to build Haiku" +DESCRIPTION_syslibs_devel="\ +This package is not of general interest - it contains the set of gcc's c/c++-\ +runtime libraries and headers that is required by Haiku's build system when \ +building Haiku." + +PROVIDES_syslibs_devel=" + gcc_syslibs_devel$secondaryArchSuffix = $portVersion compat >= 4 + " + +REQUIRES_syslibs_devel="" From 585bdba3b365d870700dc662790b0281497bbc4e Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Mon, 22 Dec 2014 06:17:41 +0000 Subject: [PATCH 110/326] This will add the recipe and patch for SDL_bomber. --- .../patches/sdl_bomber-1.0.4.patchset | 33 +++++++++++++ .../sdl_bomber/sdl_bomber-1.0.4.patch | 25 ++++++++++ .../sdl_bomber/sdl_bomber-1.0.4.recipe | 49 +++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 games-action/sdl_bomber/patches/sdl_bomber-1.0.4.patchset create mode 100644 games-action/sdl_bomber/sdl_bomber-1.0.4.patch create mode 100644 games-action/sdl_bomber/sdl_bomber-1.0.4.recipe diff --git a/games-action/sdl_bomber/patches/sdl_bomber-1.0.4.patchset b/games-action/sdl_bomber/patches/sdl_bomber-1.0.4.patchset new file mode 100644 index 000000000..37f754596 --- /dev/null +++ b/games-action/sdl_bomber/patches/sdl_bomber-1.0.4.patchset @@ -0,0 +1,33 @@ +From 6a6c051e1f8e4d906d26e576c5af7f35ec9d81c9 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Sun, 21 Dec 2014 00:24:59 -0800 +Subject: applying patch sdl_bomber-1.0.4.patch + + +diff --git a/bomber.c b/bomber.c +index 6c66afe..78a6fb0 100644 +--- a/bomber.c ++++ b/bomber.c +@@ -14,6 +14,9 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#endif + + void domode(void); + int iterate(void); +@@ -1917,6 +1920,10 @@ int main(int argc,char **argv) + int i; + char *p; + ++#ifdef __HAIKU__ ++ chdir(dirname(argv[0])); ++#endif ++ + mname=0; + + for(i=1;i + #include + ++#ifdef __HAIKU__ ++#include ++#endif + + void domode(void); + int iterate(void); +@@ -1917,6 +1920,10 @@ int main(int argc,char **argv) + int i; + char *p; + ++#ifdef __HAIKU__ ++ chdir(dirname(argv[0])); ++#endif ++ + mname=0; + + for(i=1;i Date: Sun, 21 Dec 2014 23:06:53 +0000 Subject: [PATCH 111/326] Add librsync port Loosely based on work by: Vladislav Dzhidzho Signed-off-by: Timothy Gu --- net-libs/librsync/librsync-1.0.0pre.recipe | 94 ++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 net-libs/librsync/librsync-1.0.0pre.recipe diff --git a/net-libs/librsync/librsync-1.0.0pre.recipe b/net-libs/librsync/librsync-1.0.0pre.recipe new file mode 100644 index 000000000..f50168be7 --- /dev/null +++ b/net-libs/librsync/librsync-1.0.0pre.recipe @@ -0,0 +1,94 @@ +SUMMARY="Free implementation of rsync remote-delta algorithm" +DESCRIPTION="librsync is a free software library that implements the \ +rsync remote-delta algorithm. This algorithm allows efficient remote \ +updates of a file, without requiring the old and new versions to \ +both be presentat the sending end. The library uses a \"streaming\" \ +design similar to that of zlib with the aim of allowing it to be embedded \ +into many different applications." + +HOMEPAGE="http://librsync.sourcefrog.net" +GIT_HASH='ad8d065bfd' +SRC_URI="git://github.com/librsync/librsync.git#$GIT_HASH" +#CHECKSUM_SHA256="" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1995 Patrick Powell +1996-1999 Andrew Tridgell +1996 Paul Mackerras +1999-2014 Martin Pool +2002-2003 Donovan Baarda +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libpopt$secondaryArchSuffix + lib:libz$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix + devel:libpopt$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:autoreconf + cmd:gcc$secondaryArchSuffix + cmd:gawk + cmd:grep + cmd:libtoolize + cmd:make + cmd:perl + cmd:sed + cmd:which +" + +PROVIDES=" + $portName = $portVersion + cmd:rdiff$secondaryArchSuffix = $portVersion + lib:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 +" + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac +} + +BUILD() +{ + mkdir -p m4 + autoreconf -fi + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs librsync + packageEntries devel \ + $developDir \ + $manDir/man3 +} + +TEST() +{ + make check +} + +PROVIDES_devel=" + ${portName}_devel = $portVersion + devel:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + " +REQUIRES_devel=" + librsync$secondaryArchSuffix == $portVersion base + " + From 86e46a7fed96f088f58387d0716f949282c9756b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 22 Dec 2014 08:13:27 +0000 Subject: [PATCH 112/326] sdl_bomber-1.0.4.patch deleted online with Bitbucket Deleting stray patch as it's not needed. It uses a patchset instead now. --- .../sdl_bomber/sdl_bomber-1.0.4.patch | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 games-action/sdl_bomber/sdl_bomber-1.0.4.patch diff --git a/games-action/sdl_bomber/sdl_bomber-1.0.4.patch b/games-action/sdl_bomber/sdl_bomber-1.0.4.patch deleted file mode 100644 index b674100ab..000000000 --- a/games-action/sdl_bomber/sdl_bomber-1.0.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/bomber.c b/bomber.c -index 6c66afe..78a6fb0 100644 ---- a/bomber.c -+++ b/bomber.c -@@ -14,6 +14,9 @@ - #include - #include - -+#ifdef __HAIKU__ -+#include -+#endif - - void domode(void); - int iterate(void); -@@ -1917,6 +1920,10 @@ int main(int argc,char **argv) - int i; - char *p; - -+#ifdef __HAIKU__ -+ chdir(dirname(argv[0])); -+#endif -+ - mname=0; - - for(i=1;i Date: Mon, 22 Dec 2014 10:10:43 +0100 Subject: [PATCH 113/326] Removed $haikuVersion from REQUIRES and BUILD_PREREQUIRES. Not needed anymore after commit 35a5732 to haikuporter. --- haiku-apps/paladin/paladin-git.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/paladin/paladin-git.recipe b/haiku-apps/paladin/paladin-git.recipe index 0897e3235..c0e9c7240 100644 --- a/haiku-apps/paladin/paladin-git.recipe +++ b/haiku-apps/paladin/paladin-git.recipe @@ -39,7 +39,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix lib:libpcre$secondaryArchSuffix lib:libz$secondaryArchSuffix cmd:lua @@ -51,7 +51,7 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:ld cmd:find From f66163d720be9937c833e9cfa40052c0476ce504 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Mon, 22 Dec 2014 13:43:08 +0100 Subject: [PATCH 114/326] Update to latest commit. Small edits in summary/description. --- haiku-apps/fontboy/fontboy-0.9.7.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe index 77525b44d..f6d8a02dc 100644 --- a/haiku-apps/fontboy/fontboy-0.9.7.recipe +++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe @@ -1,13 +1,12 @@ -SUMMARY="A small application to show your installed fonts in Haiku." +SUMMARY="A small application to show your installed fonts" DESCRIPTION=" Fontboy is a small application to show your installed fonts in Haiku. You can \ get additional information of the selected font and a preview of the complete \ -Unicode charset. Fontboy allows you to adjust the appearence to your desired \ -needs and it's fast because Haiku is. +Unicode charset. " HOMEPAGE="https://github.com/HaikuArchives/FontBoy" -SRC_URI="git://github.com/HaikuArchives/FontBoy.git#2195924e69096a5e7a9774cfaec8fdc277045ecf" -REVISION="1" +SRC_URI="git://github.com/HaikuArchives/FontBoy.git#37177cb9f816f112954a04ddc6f99abd2d608326" +REVISION="2" LICENSE="FontBoy" COPYRIGHT="1999-2003 Oliver 'Madison' Kohl" From 8bf7451033e2d3c6f0ed99c1107ae01e59257c09 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 21 Dec 2014 16:02:27 -0500 Subject: [PATCH 115/326] Add recipe for DGen. --- games-emulation/dgen/dgen-1.33.recipe | 59 +++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 games-emulation/dgen/dgen-1.33.recipe diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe new file mode 100644 index 000000000..14a7063e7 --- /dev/null +++ b/games-emulation/dgen/dgen-1.33.recipe @@ -0,0 +1,59 @@ +SUMMARY="SEGA Genesis/Mega Drive emulator" +DESCRIPTION="DGen is a free, open source and portable emulator for the Sega \ +Genesis and Mega Drive systems. Features: + * Game Genie/Hex codes support + * PAL/NTSC, fullscreen modes + * Joypad/joystick support + * Mouse support + * Highly configurable controls + * Screenshots, demos recording and playback" +HOMEPAGE="http://dgen.sourceforge.net/" +COPYRIGHT="1998-2014 tamentis & zamaz" +SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz" +CHECKSUM_SHA256="99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e" +SOURCE_DIR="dgen-sdl-$portVersion" +REVISION="1" +LICENSE="BSD (2-clause)" + +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=" + dgen$secondaryArchSuffix = $portVersion + cmd:dgen = $portVersion + cmd:dgen_tobin = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsdl_1.2$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl_1.2$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:nasm + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install + addAppDeskbarSymlink $prefix/bin/dgen "DGen" +} From 0caa7740651945d9064255a4824b0d3fd6c3836b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 22 Dec 2014 11:55:06 -0500 Subject: [PATCH 116/326] Fix DGen recipe. --- games-emulation/dgen/dgen-1.33.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe index 14a7063e7..bab2ce96a 100644 --- a/games-emulation/dgen/dgen-1.33.recipe +++ b/games-emulation/dgen/dgen-1.33.recipe @@ -9,7 +9,8 @@ Genesis and Mega Drive systems. Features: * Screenshots, demos recording and playback" HOMEPAGE="http://dgen.sourceforge.net/" COPYRIGHT="1998-2014 tamentis & zamaz" -SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz" +SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz/download" +SRC_FILENAME="dgen-sdl-$portVersion.tar.gz" CHECKSUM_SHA256="99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e" SOURCE_DIR="dgen-sdl-$portVersion" REVISION="1" From a75d8dde630259acf4ca61dd2b40c66a9ff415d8 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Mon, 22 Dec 2014 17:14:51 +0000 Subject: [PATCH 117/326] Updated tolmach-1.1.0.recipe with the newest version --- haiku-apps/tolmach/tolmach-1.1.0.recipe | 70 +++++++++++++------------ 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index ef253b700..d50ee56fe 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -7,48 +7,50 @@ mainly is a real BeOS program. COPYRIGHT="1999 Ivan V. Murasko" LICENSE="GNU GPL v2" HOMEPAGE="https://gitorious.org/desknotes/tolmach" -SRC_URI="git+https://gitorious.org/desknotes/tolmach.git#dcddbac" +SRC_URI="git+http://github.com/haikuarchives/tolmach.git#5a67e9d38292d5dd482e116e8ee7aa605dee5398" REVISION="1" - + ARCHITECTURES="x86_gcc2 x86 ?x86_64" - + PROVIDES=" - tolmach = $portVersion - app:Tolmach = $portVersion - lib:libfSub - " - + tolmach = $portVersion + app:Tolmach = $portVersion + lib:libfSub + " + +REQUIRES=" + haiku + " + BUILD_REQUIRES=" - haiku_devel - " - + haiku_devel + " + BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc - cmd:make - cmd:mkdepend - " - -PATCHES="tolmach-1.1.0.patch" - + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + USER_SETTINGS_FILES=" - settings/Tolmach_Preferences directory" - + settings/Tolmach_Preferences directory" + BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } - + INSTALL() { - architecture=`echo $buildArchitecture | sed 's/_/-/g'` - - mkdir -p $appsDir/Tolmach $dataDir/Tolmach - - cd objects.$architecture-release - cp Tolmach $appsDir/Tolmach - addAppDeskbarSymlink $appsDir/Tolmach/Tolmach - - cd ../Dictionaries - cp *.pgb $dataDir/Tolmach -} + architecture=`echo $buildArchitecture | sed 's/_/-/g'` + + mkdir -p $appsDir/Tolmach $dataDir/Tolmach + + cd objects.$architecture-release + cp Tolmach $appsDir/Tolmach + addAppDeskbarSymlink $appsDir/Tolmach/Tolmach + + cd ../Dictionaries + cp *.pgb $dataDir/Tolmach +} \ No newline at end of file From d14af8367205715f75c385f1757850fb582f8277 Mon Sep 17 00:00:00 2001 From: Vale Tolpegin Date: Mon, 22 Dec 2014 17:15:54 +0000 Subject: [PATCH 118/326] Removed tolmach-1.1.0.patch --- haiku-apps/tolmach/patches/tolmach-1.1.0.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 haiku-apps/tolmach/patches/tolmach-1.1.0.patch diff --git a/haiku-apps/tolmach/patches/tolmach-1.1.0.patch b/haiku-apps/tolmach/patches/tolmach-1.1.0.patch deleted file mode 100644 index 00afa60d2..000000000 --- a/haiku-apps/tolmach/patches/tolmach-1.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/TolmachApp.cpp b/TolmachApp.cpp -index acfacb1..c7c190a 100644 ---- a/TolmachApp.cpp -+++ b/TolmachApp.cpp -@@ -421,7 +421,7 @@ void - TolmachApplication::LoadDictList() - { - BPath pathDicts; -- find_directory(B_COMMON_DATA_DIRECTORY, &pathDicts); -+ find_directory(B_USER_DATA_DIRECTORY, &pathDicts); - pathDicts.Append(cszDictionariesDir); - BDirectory dir(pathDicts.Path()); - BEntry entry; From 65da5083898045ade4317d26b2cfdd3564f24e83 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 22 Dec 2014 12:34:21 -0500 Subject: [PATCH 119/326] Add gcc_syslibs require. --- games-emulation/dgen/dgen-1.33.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe index bab2ce96a..9e5f00cae 100644 --- a/games-emulation/dgen/dgen-1.33.recipe +++ b/games-emulation/dgen/dgen-1.33.recipe @@ -34,6 +34,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libsdl_1.2$secondaryArchSuffix + gcc_syslibs$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel From eb99616ca0759b8b66427793f3b302138f85944d Mon Sep 17 00:00:00 2001 From: Yourself Date: Mon, 22 Dec 2014 15:20:57 +0000 Subject: [PATCH 120/326] Added Snapshot recipe --- haiku-apps/snapshot/snapshot-1.0.recipe | 43 +++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 haiku-apps/snapshot/snapshot-1.0.recipe diff --git a/haiku-apps/snapshot/snapshot-1.0.recipe b/haiku-apps/snapshot/snapshot-1.0.recipe new file mode 100644 index 000000000..d04396364 --- /dev/null +++ b/haiku-apps/snapshot/snapshot-1.0.recipe @@ -0,0 +1,43 @@ +SUMMARY="Tracker add-on to take snapshots of files or folders" +DESCRIPTION="This Tracker add-on lets you take snapshots of a folder, saving it \ +as zip file, with a timestamp, to a preset folder. Snapshots are \ +currently saved to /boot/home/Snapshots" +HOMEPAGE="https://github.com/HaikuArchives/SnapShot" +SRC_URI="git+https://github.com/HaikuArchives/Snapshot#9ba592336a0d54707b7e5983dce93f8958b61d37 +LICENSE="BSD (3-clause)" +COPYRIGHT="2000 Jonas Sundström" + +USER_SETTINGS_FILES="settings/Kirilla/Snapshot/settings" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + snapshot = $portVersion + addon:snapshot = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + cd Source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $addOnsDir/Tracker + cp -a Source/objects/Snapshot $addOnsDir/Tracker +} From 591c3562a0a85ae4b554e573b5e41d51a8d23d78 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 08:41:30 +0200 Subject: [PATCH 121/326] Updated bafx recipe to point at a more recent commit and removed patch --- haiku-apps/bafx/bafx-0.0.1.recipe | 6 ++---- haiku-apps/bafx/patches/bafx-0.0.1.patchset | 22 --------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 haiku-apps/bafx/patches/bafx-0.0.1.patchset diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index 187eae185..15c1bc8f0 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -3,10 +3,10 @@ DESCRIPTION=" BAfx is a file manager for Haiku. " HOMEPAGE="https://github.com/marbocub/BAfx" -SRC_URI="git+https://github.com/marbocub/BAfx#4b14a8ba4c" +SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" LICENSE="MIT" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" @@ -25,8 +25,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="bafx-0.0.1.patchset" - BUILD() { make OBJ_DIR=objects \ diff --git a/haiku-apps/bafx/patches/bafx-0.0.1.patchset b/haiku-apps/bafx/patches/bafx-0.0.1.patchset deleted file mode 100644 index f5c0c7ee4..000000000 --- a/haiku-apps/bafx/patches/bafx-0.0.1.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 7c5605074b639c6daa54275d1ced9720555da3d1 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 17:37:11 -0700 -Subject: Fix makefile stdc++ libs - - -diff --git a/Makefile b/Makefile -index 6f14782..50893a9 100755 ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,7 @@ RSRCS= - # naming scheme you need to specify the path to the library - # and it's name - # library: my_lib.a entry: my_lib.a or path/my_lib.a --LIBS= be -+LIBS= be $(STDCPPLIBS) - - # specify additional paths to directories following the standard - # libXXX.so or libXXX.a naming scheme. You can specify full paths --- -1.8.3.4 - From 031a13aefb7fabc539345503f943709ee2c36bc1 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Dec 2014 05:55:24 +0000 Subject: [PATCH 122/326] librsync: Update version Also addresses Adrien's request of using the full Git commit hash, which unfortunately is still needed although in the Git history it seems the version has already been released. Signed-off-by: Timothy Gu --- ...-1.0.0pre.recipe => librsync-1.0.0.recipe} | 30 +++++++++++-------- .../librsync/patches/librsync-1.0.0.patchset | 28 +++++++++++++++++ 2 files changed, 46 insertions(+), 12 deletions(-) rename net-libs/librsync/{librsync-1.0.0pre.recipe => librsync-1.0.0.recipe} (64%) create mode 100644 net-libs/librsync/patches/librsync-1.0.0.patchset diff --git a/net-libs/librsync/librsync-1.0.0pre.recipe b/net-libs/librsync/librsync-1.0.0.recipe similarity index 64% rename from net-libs/librsync/librsync-1.0.0pre.recipe rename to net-libs/librsync/librsync-1.0.0.recipe index f50168be7..1153bc485 100644 --- a/net-libs/librsync/librsync-1.0.0pre.recipe +++ b/net-libs/librsync/librsync-1.0.0.recipe @@ -7,10 +7,20 @@ design similar to that of zlib with the aim of allowing it to be embedded \ into many different applications." HOMEPAGE="http://librsync.sourcefrog.net" -GIT_HASH='ad8d065bfd' -SRC_URI="git://github.com/librsync/librsync.git#$GIT_HASH" -#CHECKSUM_SHA256="" + +# Unfortunately the maintainer of librsync did not publish a tag or released +# tarball for the 1.0.0 release (yet?). Use a static tarball with Git hash +# for now (which comparing to directly cloning allows for double-checking +# correctness of the source). +GIT_HASH='02f1cc19182845d37cfb6a893f54af220a294ce7' +# Attach the $GIT_HASH to the file name just in case upstream publishes an +# official release tarball. +SRC_FILENAME="librsync-${portVersion}-${GIT_HASH}.tar.gz" +SRC_URI="https://github.com/librsync/librsync/archive/${GIT_HASH}.tar.gz" +CHECKSUM_SHA256='25d046a8cbc6e075cc68925b5070c1f0e731e3a018446f6bda20ec9723a5631a' REVISION="1" +SOURCE_DIR="librsync-${GIT_HASH}" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" LICENSE="GNU LGPL v2.1" @@ -53,17 +63,11 @@ BUILD_PREREQUIRES=" PROVIDES=" $portName = $portVersion cmd:rdiff$secondaryArchSuffix = $portVersion - lib:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2 " -PATCH() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac -} - BUILD() { - mkdir -p m4 autoreconf -fi runConfigure ./configure \ --enable-shared @@ -84,9 +88,11 @@ TEST() make check } +# Although the librsync soname is bumped to 2.0.0, it is purely an ABI change, +# so the compat level for the devel package remains at 1. PROVIDES_devel=" - ${portName}_devel = $portVersion - devel:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + ${portName}_devel = $portVersion compat >= 1 + devel:librsync$secondaryArchSuffix = 2.0.0 compat >= 1 " REQUIRES_devel=" librsync$secondaryArchSuffix == $portVersion base diff --git a/net-libs/librsync/patches/librsync-1.0.0.patchset b/net-libs/librsync/patches/librsync-1.0.0.patchset new file mode 100644 index 000000000..70a04f5bd --- /dev/null +++ b/net-libs/librsync/patches/librsync-1.0.0.patchset @@ -0,0 +1,28 @@ +From 6fdcdff86e215e06817462c0fe4d63a0ca64cf21 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 23 Dec 2014 06:15:47 +0000 +Subject: blake2b: Separate declaration and code + +Fixes old compilers like gcc 2.95.3. + +Signed-off-by: Timothy Gu + +diff --git a/blake2b-ref.c b/blake2b-ref.c +index bcf81da..43cf4c1 100644 +--- a/blake2b-ref.c ++++ b/blake2b-ref.c +@@ -149,10 +149,10 @@ static inline int blake2b_init0( blake2b_state *S ) + /* init xors IV with input parameter block */ + int blake2b_init_param( blake2b_state *S, const blake2b_param *P ) + { +- blake2b_init0( S ); + uint8_t *p = ( uint8_t * )( P ); + size_t i; + ++ blake2b_init0( S ); + /* IV XOR ParamBlock */ + for( i = 0; i < 8; ++i ) + S->h[i] ^= load64( p + sizeof( S->h[i] ) * i ); +-- +1.8.3.4 + From 58775420acbdbba23a8c7b97448ec6176761a211 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Dec 2014 07:34:58 +0000 Subject: [PATCH 123/326] librsync: Do not depend on zlib and libbz2 They are not actually used upstream, although a configure check is in place. This commit warrants a rev bump but it should be in the same push as the previous commit which updates the package, so I skipped over it. Signed-off-by: Timothy Gu --- net-libs/librsync/librsync-1.0.0.recipe | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net-libs/librsync/librsync-1.0.0.recipe b/net-libs/librsync/librsync-1.0.0.recipe index 1153bc485..6d132d571 100644 --- a/net-libs/librsync/librsync-1.0.0.recipe +++ b/net-libs/librsync/librsync-1.0.0.recipe @@ -33,16 +33,12 @@ COPYRIGHT="1995 Patrick Powell REQUIRES=" haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix lib:libpopt$secondaryArchSuffix - lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix devel:libpopt$secondaryArchSuffix - devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -66,6 +62,8 @@ PROVIDES=" lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2 " +PATCHES="librsync-${portVersion}.patchset" + BUILD() { autoreconf -fi From fe6045b28bda732063d9056aff94fb61f4e2cbaf Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Tue, 23 Dec 2014 11:36:29 +0300 Subject: [PATCH 124/326] Tolmach: style fixes --- haiku-apps/tolmach/tolmach-1.1.0.recipe | 64 ++++++++++++------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index d50ee56fe..089e2ccee 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -9,48 +9,44 @@ LICENSE="GNU GPL v2" HOMEPAGE="https://gitorious.org/desknotes/tolmach" SRC_URI="git+http://github.com/haikuarchives/tolmach.git#5a67e9d38292d5dd482e116e8ee7aa605dee5398" REVISION="1" - + ARCHITECTURES="x86_gcc2 x86 ?x86_64" - + PROVIDES=" - tolmach = $portVersion - app:Tolmach = $portVersion - lib:libfSub - " - + tolmach = $portVersion + app:Tolmach = $portVersion + lib:libfSub + " + REQUIRES=" - haiku - " - + haiku + " + BUILD_REQUIRES=" - haiku_devel - " - + haiku_devel + " + BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc - cmd:make - cmd:mkdepend - " - + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + USER_SETTINGS_FILES=" - settings/Tolmach_Preferences directory" - + settings/Tolmach_Preferences directory" + BUILD() { - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` OBJ_DIR=objects } - + INSTALL() { - architecture=`echo $buildArchitecture | sed 's/_/-/g'` - - mkdir -p $appsDir/Tolmach $dataDir/Tolmach - - cd objects.$architecture-release - cp Tolmach $appsDir/Tolmach - addAppDeskbarSymlink $appsDir/Tolmach/Tolmach - - cd ../Dictionaries - cp *.pgb $dataDir/Tolmach -} \ No newline at end of file + mkdir -p $appsDir $dataDir/Tolmach + + cp objects/Tolmach $appsDir + cp Dictionaries/*.pgb $dataDir/Tolmach + + addAppDeskbarSymlink $appsDir/Tolmach/Tolmach +} From 8270e194ceade944aaa965fc6410bd707d590f03 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 11:32:04 +0200 Subject: [PATCH 125/326] Updated bafx description --- haiku-apps/bafx/bafx-0.0.1.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index bc232f853..03631f167 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -1,7 +1,8 @@ SUMMARY="A file manager for Haiku." DESCRIPTION=" -BAfx is a file manager for Haiku. -" +BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ +with directory view implemented. File and directory operations, built-in \ +text viewer and built-in image viewer are still under development." HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" From c7283439ee6c9f8abae2fe0b0289806e8ead0893 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 11:33:14 +0200 Subject: [PATCH 126/326] Updated bafx description --- haiku-apps/bafx/bafx-0.0.1.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.0.1.recipe index 03631f167..5929141d2 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.0.1.recipe @@ -1,6 +1,5 @@ SUMMARY="A file manager for Haiku." -DESCRIPTION=" -BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ +DESCRIPTION="BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ with directory view implemented. File and directory operations, built-in \ text viewer and built-in image viewer are still under development." HOMEPAGE="https://github.com/marbocub/BAfx" From abab702011f773bbe3bcfb0e4f8e3bf76ca5d28b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 23 Dec 2014 10:34:49 +0100 Subject: [PATCH 127/326] Beam: avoid triggering #6400. --- haiku-apps/beam/beam-1.2alpha.recipe | 2 +- .../beam/patches/beam-1.2alpha.patchset | 28 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 86dc8d459..1fe158b50 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,7 +1,7 @@ SUMMARY="An e-mail client." HOMEPAGE="http://beam.sourceforge.net" SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset index 5ac3ffe2d..fbb9c2df8 100644 --- a/haiku-apps/beam/patches/beam-1.2alpha.patchset +++ b/haiku-apps/beam/patches/beam-1.2alpha.patchset @@ -1,4 +1,4 @@ -From 6545d15dfc53594f4141047bf4c84d55cfccda6d Mon Sep 17 00:00:00 2001 +From e6115845893578b237144c1660a686802598ff9a Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 14 Nov 2013 02:12:56 -0700 Subject: Adjust search path for libbnetapi @@ -20,3 +20,29 @@ index d411b68..4874ac6 100644 -- 1.8.3.4 + +From 63db87fb177e6c1649bf0aad0aa1922af47dd59e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 23 Dec 2014 10:18:56 +0100 +Subject: Remove leftover unlock. + +I can't find any place where the lock would be locked matching this call +to Unlock. Must be an error then. + +Triggers #6400 on Haiku. + +diff --git a/src-beam/BmGuiRoster.cpp b/src-beam/BmGuiRoster.cpp +index d16e0f1..cd4bf59 100644 +--- a/src-beam/BmGuiRoster.cpp ++++ b/src-beam/BmGuiRoster.cpp +@@ -516,7 +516,6 @@ void BmGuiRoster::RebuildLogMenu( BmMenuControllerBase* logMenu) { + } + logMenu->AddItem( smtpMenu); + } +- TheLogHandler->mLocker.Unlock(); + } + + /*------------------------------------------------------------------------------*\ +-- +1.8.3.4 + From 317544cca2345561b804c794fa210c61e385d855 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 12:03:51 +0200 Subject: [PATCH 128/326] Updated BAfx recipe --- haiku-apps/bafx/{bafx-0.0.1.recipe => bafx-0.2.3.recipe} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename haiku-apps/bafx/{bafx-0.0.1.recipe => bafx-0.2.3.recipe} (69%) diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.2.3.recipe similarity index 69% rename from haiku-apps/bafx/bafx-0.0.1.recipe rename to haiku-apps/bafx/bafx-0.2.3.recipe index 5929141d2..93587193c 100644 --- a/haiku-apps/bafx/bafx-0.0.1.recipe +++ b/haiku-apps/bafx/bafx-0.2.3.recipe @@ -1,7 +1,8 @@ SUMMARY="A file manager for Haiku." -DESCRIPTION="BAfx is a file manager for BeOS/Haiku that works with the BeOS InterfaceKit \ -with directory view implemented. File and directory operations, built-in \ -text viewer and built-in image viewer are still under development." +DESCRIPTION="BAfx is a file manager for BeOS/Haiku. It uses a single window \ +with two panes for source and destination folder. \ +The file manager is still in early stages of development. \ +A built-in text and image viewer are planned for future releases." HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" From a5c3d586eaa0886fc599cfe80f5dc8529e71c542 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 17:44:48 +0200 Subject: [PATCH 129/326] Removed patch from TakeNotes --- haiku-apps/takenotes/takenotes-1.0.0.recipe | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index c00265afc..12292e323 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -1,6 +1,6 @@ SUMMARY="A note taking application" DESCRIPTION=" -With this application you can: +With TakeNotes you can: - Write a note - Edit the font family, color and size - Change the color of your note @@ -12,9 +12,10 @@ With this application you can: COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/TakeNotes" -SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#3ee7d80b53" -REVISION="2" +SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#a8724dadac" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SOURCE_DIR="takesnotes-1.0.0/source" PROVIDES=" takenotes=$portVersion @@ -36,8 +37,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="takenotes-1.0.0.patchset" - BUILD() { make OBJ_DIR=objects \ @@ -49,4 +48,4 @@ INSTALL() mkdir -p $appsDir cp objects/TakeNotes $appsDir addAppDeskbarSymlink $appsDir/TakeNotes -} +} \ No newline at end of file From 91b400cd260bf9a50fcbce58edcdf79b2c9ae2d9 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 17:49:43 +0200 Subject: [PATCH 130/326] Updated SRC_URI for TakeNotes --- haiku-apps/takenotes/takenotes-1.0.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe index 12292e323..05df96c52 100644 --- a/haiku-apps/takenotes/takenotes-1.0.0.recipe +++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe @@ -12,7 +12,7 @@ With TakeNotes you can: COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved" LICENSE="GNU GPL v2" HOMEPAGE="https://github.com/HaikuArchives/TakeNotes" -SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#a8724dadac" +SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#7f84d8f50e" REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SOURCE_DIR="takesnotes-1.0.0/source" From 910a9df96061d624f46125b5eaef5f03d8c980de Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 17:52:24 +0200 Subject: [PATCH 131/326] Resetting BAfx's revision --- haiku-apps/bafx/bafx-0.2.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/bafx/bafx-0.2.3.recipe b/haiku-apps/bafx/bafx-0.2.3.recipe index 93587193c..b3b8581b9 100644 --- a/haiku-apps/bafx/bafx-0.2.3.recipe +++ b/haiku-apps/bafx/bafx-0.2.3.recipe @@ -7,7 +7,7 @@ HOMEPAGE="https://github.com/marbocub/BAfx" SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22" COPYRIGHT="2012 @marbocub" LICENSE="MIT" -REVISION="3" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" From 3782bb3e175e96a1146dcaefb657a3a8c5baddf0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 Dec 2014 18:01:49 +0000 Subject: [PATCH 132/326] libpng*: bump versions. --- .../{libpng-1.5.20.recipe => libpng-1.5.21.recipe} | 10 +++++----- ...bpng12-1.2.51.recipe => libpng12-1.2.52.recipe} | 14 +++++++------- ...bpng16-1.6.15.recipe => libpng16-1.6.16.recipe} | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) rename media-libs/libpng/{libpng-1.5.20.recipe => libpng-1.5.21.recipe} (83%) rename media-libs/libpng/{libpng12-1.2.51.recipe => libpng12-1.2.52.recipe} (79%) rename media-libs/libpng/{libpng16-1.6.15.recipe => libpng16-1.6.16.recipe} (85%) diff --git a/media-libs/libpng/libpng-1.5.20.recipe b/media-libs/libpng/libpng-1.5.21.recipe similarity index 83% rename from media-libs/libpng/libpng-1.5.20.recipe rename to media-libs/libpng/libpng-1.5.21.recipe index a47415858..2c9db48c5 100644 --- a/media-libs/libpng/libpng-1.5.20.recipe +++ b/media-libs/libpng/libpng-1.5.21.recipe @@ -11,15 +11,15 @@ COPYRIGHT=" " LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="ca16b85feea75604d6ee2072486afe3fb52d867b4105e0bc60dbea78b4bc2ee0" +CHECKSUM_SHA256="835ce1d42ea9f50eddf74754f2b06b1c0f7a1d8e46deb89b839a5ca018599793" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpng$secondaryArchSuffix = $portVersion compat >= 1.5 - lib:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 - lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 + lib:libpng$secondaryArchSuffix = 15.21.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15 " REQUIRES=" haiku$secondaryArchSuffix @@ -70,8 +70,8 @@ PROVIDES_devel=" libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5 cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5 - devel:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 - devel:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 + devel:libpng$secondaryArchSuffix = 15.21.0 compat >= 15 + devel:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15 " REQUIRES_devel=" libpng$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/libpng12-1.2.51.recipe b/media-libs/libpng/libpng12-1.2.52.recipe similarity index 79% rename from media-libs/libpng/libpng12-1.2.51.recipe rename to media-libs/libpng/libpng12-1.2.52.recipe index 8406b6ca9..6fb3d3cc6 100644 --- a/media-libs/libpng/libpng12-1.2.51.recipe +++ b/media-libs/libpng/libpng12-1.2.52.recipe @@ -13,17 +13,17 @@ COPYRIGHT=" 1995-1996 Guy Eric Schalnat, Group 42, Inc. " LICENSE="LibPNG" -SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/1.2.51/libpng-1.2.51.tar.bz2" -CHECKSUM_SHA256="b0ad409d7048c851eadb2abab6c1a1a1e131bc4d3d07501ff7c820cce5bec811" -SOURCE_DIR="libpng-1.2.51" +SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/$portVersion/libpng-$portVersion.tar.bz2" +CHECKSUM_SHA256="e90ede6d543152e68c08c91c45f39565185ac7eb8cb2b5d058a196050ab04229" +SOURCE_DIR="libpng-$portVersion" REVISION="1" ARCHITECTURES="x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" libpng12$secondaryArchSuffix = $portVersion compat >= 1.2 - lib:libpng$secondaryArchSuffix = 3.51.0 compat >= 3 - lib:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 + lib:libpng$secondaryArchSuffix = 3.52.0 compat >= 3 + lib:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix @@ -72,8 +72,8 @@ PROVIDES_devel=" libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2 cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2 - devel:libpng$secondaryArchSuffix = 3.51.0 compat >= 3 - devel:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 + devel:libpng$secondaryArchSuffix = 3.52.0 compat >= 3 + devel:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3 " REQUIRES_devel=" libpng12$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/libpng16-1.6.15.recipe b/media-libs/libpng/libpng16-1.6.16.recipe similarity index 85% rename from media-libs/libpng/libpng16-1.6.15.recipe rename to media-libs/libpng/libpng16-1.6.16.recipe index 39fde2cdc..db5882161 100644 --- a/media-libs/libpng/libpng16-1.6.15.recipe +++ b/media-libs/libpng/libpng16-1.6.16.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="dc4f90ff3ba4559b5eb653da9058e3d862d5e8162fe2612f9339a6f6d2a2139d" +CHECKSUM_SHA256="02f96b6bad5a381d36d7ba7a5d9be3b06f7fe6c274da00707509c23592a073ad" SOURCE_DIR="libpng-$portVersion" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" @@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpng16$secondaryArchSuffix = $portVersion compat >= 1.6 - lib:libpng$secondaryArchSuffix = 16.15.0 compat >= 16 - lib:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 + lib:libpng$secondaryArchSuffix = 16.16.0 compat >= 16 + lib:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16 " REQUIRES=" haiku$secondaryArchSuffix @@ -69,8 +69,8 @@ PROVIDES_devel=" cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6 - devel:libpng$secondaryArchSuffix = 16.15.0 compat >= 16 - devel:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 + devel:libpng$secondaryArchSuffix = 16.16.0 compat >= 16 + devel:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16 " REQUIRES_devel=" libpng16$secondaryArchSuffix == $portVersion base From ffdb78ace579d4022d80477cba76dcba7f30f8db Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 23 Dec 2014 18:46:42 +0100 Subject: [PATCH 133/326] binary_clock: Rename to binaryclock --- .../binaryclock-2.0.recipe} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename haiku-apps/{binary_clock/binary_clock-2.0.recipe => binaryclock/binaryclock-2.0.recipe} (100%) diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binaryclock/binaryclock-2.0.recipe similarity index 100% rename from haiku-apps/binary_clock/binary_clock-2.0.recipe rename to haiku-apps/binaryclock/binaryclock-2.0.recipe From 271a57f7faa274994f53d16189ff6c6175b0ed8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 18:59:34 +0000 Subject: [PATCH 134/326] OpenSceneGraph 3.2.1 --- games-engines/openscenegraph/licenses/OSGPL | 578 ++++++++++++++++++ .../openscenegraph-3.2.1.recipe | 151 +++++ 2 files changed, 729 insertions(+) create mode 100644 games-engines/openscenegraph/licenses/OSGPL create mode 100644 games-engines/openscenegraph/openscenegraph-3.2.1.recipe diff --git a/games-engines/openscenegraph/licenses/OSGPL b/games-engines/openscenegraph/licenses/OSGPL new file mode 100644 index 000000000..6340792d7 --- /dev/null +++ b/games-engines/openscenegraph/licenses/OSGPL @@ -0,0 +1,578 @@ + OpenSceneGraph Public License, Version 0.0 + ========================================== + + Copyright (C) 2002 Robert Osfield. + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + OPENSCENEGRAPH PUBLIC LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 + or later. + + Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid + out in the wxWindows section below. The LGPL is contained in the + final section of this license. + + +------------------------------------------------------------------------------- + + wxWindows Library Licence, Version 3 + ==================================== + + Copyright (C) 1998 Julian Smart, Robert Roebling [, ...] + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version 3 of the + Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under the user's own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + +------------------------------------------------------------------------------ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe new file mode 100644 index 000000000..eae625f33 --- /dev/null +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -0,0 +1,151 @@ +SUMMARY="The OpenSceneGraph is open source, real-time graphics middle-ware used by application developers" +DESCRIPTION=" +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used +by application developers in fields such as visual simulation, games, virtual +reality, scientific visualization and modelling. Written entirely in Standard +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well +established as the world leading scene graph technology, used widely in the +vis-sim, space, scientific, oil-gas, games and virtual reality industries." +HOMEPAGE="http://www.openscenegraph.org" +SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" +CHECKSUM_SHA256="d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d" +REVISION="1" +LICENSE="OSGPL" +COPYRIGHT="Copyright (C) 2002-2014 Robert Osfield and others" + +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=" + openscenegraph$secondaryArchSuffix = $portVersion + lib:libOpenThreads$secondaryArchSuffix = $portVersion + lib:libosg$secondaryArchSuffix = $portVersion + lib:libosgAnimation$secondaryArchSuffix = $portVersion + lib:libosgDB$secondaryArchSuffix = $portVersion + lib:libosgFX$secondaryArchSuffix = $portVersion + lib:libosgGA$secondaryArchSuffix = $portVersion + lib:libosgManipulator$secondaryArchSuffix = $portVersion + lib:libosgParticle$secondaryArchSuffix = $portVersion + lib:libosgPresentation$secondaryArchSuffix = $portVersion + lib:libosgShadow$secondaryArchSuffix = $portVersion + lib:libosgSim$secondaryArchSuffix = $portVersion + lib:libosgTerrain$secondaryArchSuffix = $portVersion + lib:libosgText$secondaryArchSuffix = $portVersion + lib:libosgUtil$secondaryArchSuffix = $portVersion + lib:libosgViewer$secondaryArchSuffix = $portVersion + lib:libosgVolume$secondaryArchSuffix = $portVersion + lib:libosgWidget$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + mesa$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + mesa${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix +" + +SOURCE_DIR="OpenSceneGraph-3.2.1" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None + make + +} + +INSTALL() +{ + make install + + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + mkdir -p $prefix/lib-temp + mv $prefix/lib/* $prefix/lib-temp/ + ls $prefix/lib-temp + mkdir -p $libDir + mv $prefix/lib-temp/* $libDir + rm -rf $prefix/lib-temp + + prepareInstalledDevelLibs libOpenThreads + prepareInstalledDevelLibs libosg + prepareInstalledDevelLibs libosgAnimation + prepareInstalledDevelLibs libosgDB + prepareInstalledDevelLibs libosgFX + prepareInstalledDevelLibs libosgGA + prepareInstalledDevelLibs libosgManipulator + prepareInstalledDevelLibs libosgParticle + prepareInstalledDevelLibs libosgPresentation + prepareInstalledDevelLibs libosgShadow + prepareInstalledDevelLibs libosgSim + prepareInstalledDevelLibs libosgTerrain + prepareInstalledDevelLibs libosgText + prepareInstalledDevelLibs libosgUtil + prepareInstalledDevelLibs libosgViewer + prepareInstalledDevelLibs libosgVolume + prepareInstalledDevelLibs libosgWidget + + fixPkgconfig + + packageEntries devel $developDir + +} + +PROVIDES_devel=" + devel:openscenegraph$secondaryArchSuffix = $portVersion + devel:libOpenThreads$secondaryArchSuffix = $portVersion + devel:libosg$secondaryArchSuffix = $portVersion + devel:libosgAnimation$secondaryArchSuffix = $portVersion + devel:libosgDB$secondaryArchSuffix = $portVersion + devel:libosgFX$secondaryArchSuffix = $portVersion + devel:libosgGA$secondaryArchSuffix = $portVersion + devel:libosgManipulator$secondaryArchSuffix = $portVersion + devel:libosgParticle$secondaryArchSuffix = $portVersion + devel:libosgPresentation$secondaryArchSuffix = $portVersion + devel:libosgShadow$secondaryArchSuffix = $portVersion + devel:libosgSim$secondaryArchSuffix = $portVersion + devel:libosgTerrain$secondaryArchSuffix = $portVersion + devel:libosgText$secondaryArchSuffix = $portVersion + devel:libosgUtil$secondaryArchSuffix = $portVersion + devel:libosgViewer$secondaryArchSuffix = $portVersion + devel:libosgVolume$secondaryArchSuffix = $portVersion + devel:libosgWidget$secondaryArchSuffix = $portVersion + +" +REQUIRES_devel=" + openscenegraph$secondaryArchSuffix == $portVersion +" From 2ad8737b49fa0545f3896fe895dd254294288b2d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 Dec 2014 18:13:16 +0000 Subject: [PATCH 135/326] dgen: the URL without download definitely works. --- games-emulation/dgen/dgen-1.33.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe index 9e5f00cae..619d0b82c 100644 --- a/games-emulation/dgen/dgen-1.33.recipe +++ b/games-emulation/dgen/dgen-1.33.recipe @@ -9,8 +9,7 @@ Genesis and Mega Drive systems. Features: * Screenshots, demos recording and playback" HOMEPAGE="http://dgen.sourceforge.net/" COPYRIGHT="1998-2014 tamentis & zamaz" -SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz/download" -SRC_FILENAME="dgen-sdl-$portVersion.tar.gz" +SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz" CHECKSUM_SHA256="99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e" SOURCE_DIR="dgen-sdl-$portVersion" REVISION="1" From 45f29ab922e5836e3695d21e47b4278c05725a97 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 23 Dec 2014 18:59:36 +0000 Subject: [PATCH 136/326] subversion: bump version --- ...{subversion-1.8.10.patchset => subversion-1.8.11.patchset} | 0 .../{subversion-1.8.10.recipe => subversion-1.8.11.recipe} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename dev-vcs/subversion/patches/{subversion-1.8.10.patchset => subversion-1.8.11.patchset} (100%) rename dev-vcs/subversion/{subversion-1.8.10.recipe => subversion-1.8.11.recipe} (97%) diff --git a/dev-vcs/subversion/patches/subversion-1.8.10.patchset b/dev-vcs/subversion/patches/subversion-1.8.11.patchset similarity index 100% rename from dev-vcs/subversion/patches/subversion-1.8.10.patchset rename to dev-vcs/subversion/patches/subversion-1.8.11.patchset diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.11.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.8.10.recipe rename to dev-vcs/subversion/subversion-1.8.11.recipe index 2d64dd0f5..aa05c4f6c 100644 --- a/dev-vcs/subversion/subversion-1.8.10.recipe +++ b/dev-vcs/subversion/subversion-1.8.11.recipe @@ -10,7 +10,7 @@ HOMEPAGE="http://subversion.apache.org" LICENSE="Apache-Subversion" COPYRIGHT="2010-2014 The Apache Software Foundation" SRC_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2" -CHECKSUM_SHA256="1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc" +CHECKSUM_SHA256="10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -81,7 +81,7 @@ USER_SETTINGS_FILES=" " -PATCHES="subversion-1.8.10.patchset" +PATCHES="subversion-$portVersion.patchset" BUILD() { From 2a840bccd7752b8778637cefa53e7ef5c11601f8 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Tue, 23 Dec 2014 19:04:04 +0100 Subject: [PATCH 137/326] binaryclock: Update to latest version --- ...2.0.recipe => binaryclock-20141223.recipe} | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) rename haiku-apps/binaryclock/{binaryclock-2.0.recipe => binaryclock-20141223.recipe} (63%) diff --git a/haiku-apps/binaryclock/binaryclock-2.0.recipe b/haiku-apps/binaryclock/binaryclock-20141223.recipe similarity index 63% rename from haiku-apps/binaryclock/binaryclock-2.0.recipe rename to haiku-apps/binaryclock/binaryclock-20141223.recipe index ef07650c9..a685cdd21 100644 --- a/haiku-apps/binaryclock/binaryclock-2.0.recipe +++ b/haiku-apps/binaryclock/binaryclock-20141223.recipe @@ -5,7 +5,7 @@ quite enjoyable to reprogram my brain to learn to read it at a glance. It just \ takes a little getting used to. " HOMEPAGE="http://github.com/HaikuArchives/BinaryClock" -SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137" +SRC_URI="git://github.com/HaikuArchives/BinaryClock#bfefbf7f93e7a07c841fdb1162e119b0364fee85" REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2000 David Enderson" @@ -13,7 +13,7 @@ COPYRIGHT="2000 David Enderson" ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" - binary_clock = $portVersion + binaryclock = $portVersion app:BinaryClock = $portVersion " @@ -26,26 +26,32 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + makefile_engine cmd:make cmd:gcc cmd:ld " USER_SETTINGS_FILES=" - settings/BinaryClock_2.xx + settings/BinaryClock " BUILD() { cd Application - g++ -o BinaryClock *.cpp -lbe -ltranslation - xres -o BinaryClock BinaryClock.rsrc - mimeset -f BinaryClock + make $jobArgs OBJ_DIR=objects + + cd ../Screensaver + make $jobArgs OBJ_DIR=objects } INSTALL() { - mkdir -p $appsDir - cp Application/BinaryClock $appsDir + mkdir -p $appsDir + mkdir -p $addOnsDir/Screen\ Savers/ + + cp Application/objects/BinaryClock $appsDir addAppDeskbarSymlink $appsDir/BinaryClock "Binary Clock" + + cp Screensaver/objects/BinaryClock $addOnsDir/Screen\ Savers } From 3ded2df0ab4f0fc6263c836b83dfab4157b9a1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 19:11:35 +0000 Subject: [PATCH 138/326] Add the patchset for OpenSceneGraph 3.2.1 --- .../openscenegraph-3.2.1.recipe | 2 + .../patches/openscenegraph_x86-3.2.1.patchset | 52 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index eae625f33..88ddb08bf 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -77,6 +77,8 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " +PATCH="openscenegraph_x86-3.2.1.patchset" + SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset new file mode 100644 index 000000000..6871ef357 --- /dev/null +++ b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset @@ -0,0 +1,52 @@ +From c4669d4e62e056fc2b29cc1372e41fcba9d286da Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Tue, 23 Dec 2014 19:08:44 +0000 +Subject: Haiku specific cases + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index affd682..47436d5 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -71,12 +71,13 @@ typedef char TCHAR; + // variable. (MIN_ALLOWED is set low by default so it is + // unhelpful in this case.) + // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 +- // for older OS's like Jaguar, Panther since they are not defined, ++ // for older OS's like Jaguar, Panther ++ since they are not defined, + // so I am going to hardcode the number. + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat + #endif +-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ ++#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ + (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) + #define stat64 stat + #endif +@@ -100,7 +101,7 @@ typedef char TCHAR; + #include + + #include +-#include ++#include + #include + + #include +diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h +index 3720ea6..6f4c6bc 100644 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h +@@ -51,7 +51,7 @@ + + #else + +- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) ++ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) + #include + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define __LITTLE_ENDIAN__ +-- +1.8.3.4 + From 700f39af1eeaa361b61ca01a55f6b7369fc48f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 19:27:23 +0000 Subject: [PATCH 139/326] Style fixes --- .../openscenegraph-3.2.1.recipe | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 88ddb08bf..79af87fb7 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -1,18 +1,18 @@ -SUMMARY="The OpenSceneGraph is open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by application developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used -by application developers in fields such as visual simulation, games, virtual -reality, scientific visualization and modelling. Written entirely in Standard -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well -established as the world leading scene graph technology, used widely in the +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ +by application developers in fields such as visual simulation, games, virtual\ +reality, scientific visualization and modelling. Written entirely in Standard\ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ +established as the world leading scene graph technology, used widely in the\ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" CHECKSUM_SHA256="d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d" REVISION="1" LICENSE="OSGPL" -COPYRIGHT="Copyright (C) 2002-2014 Robert Osfield and others" +COPYRIGHT="2002-2014 Robert Osfield and others" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -46,7 +46,7 @@ PROVIDES=" " REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion + haiku$secondaryArchSuffix mesa$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix @@ -58,7 +58,7 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel mesa${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix devel:libpng$secondaryArchSuffix From ee279b31f703fee2840ea122d3fc709d160d8f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 19:57:14 +0000 Subject: [PATCH 140/326] Fixing a type bug --- .../patches/openscenegraph_x86-3.2.1.patchset | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset index 6871ef357..593a5cef1 100644 --- a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset +++ b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset @@ -50,3 +50,28 @@ index 3720ea6..6f4c6bc 100644 -- 1.8.3.4 + +From 7fa67738f702dc39b16f2caa05b9301e09209a5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Tue, 23 Dec 2014 19:56:17 +0000 +Subject: Stupid type-bug + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index 47436d5..060eb29 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -71,8 +71,7 @@ typedef char TCHAR; + // variable. (MIN_ALLOWED is set low by default so it is + // unhelpful in this case.) + // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 +- // for older OS's like Jaguar, Panther +- since they are not defined, ++ // for older OS's like Jaguar, Panther since they are not defined, + // so I am going to hardcode the number. + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat +-- +1.8.3.4 + From ec041f4f81cd6fd6141a9e9cf121608f9f78add0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Tue, 23 Dec 2014 20:05:23 +0000 Subject: [PATCH 141/326] OpenSceneGraph Git --- .../openscenegraph/openscenegraph-git.recipe | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 games-engines/openscenegraph/openscenegraph-git.recipe diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe new file mode 100644 index 000000000..61b17c0a4 --- /dev/null +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -0,0 +1,152 @@ +SUMMARY="An open source, real-time graphics middle-ware used by application developers" +DESCRIPTION=" +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ +by application developers in fields such as visual simulation, games, virtual\ +reality, scientific visualization and modelling. Written entirely in Standard\ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ +established as the world leading scene graph technology, used widely in the\ +vis-sim, space, scientific, oil-gas, games and virtual reality industries." +HOMEPAGE="http://www.openscenegraph.org" +SRC_URI="git://github.com/openscenegraph/osg.git" +REVISION="1" +LICENSE="OSGPL" +COPYRIGHT="2002-2014 Robert Osfield and others" + +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=" + openscenegraph$secondaryArchSuffix = $portVersion + lib:libOpenThreads$secondaryArchSuffix = $portVersion + lib:libosg$secondaryArchSuffix = $portVersion + lib:libosgAnimation$secondaryArchSuffix = $portVersion + lib:libosgDB$secondaryArchSuffix = $portVersion + lib:libosgFX$secondaryArchSuffix = $portVersion + lib:libosgGA$secondaryArchSuffix = $portVersion + lib:libosgManipulator$secondaryArchSuffix = $portVersion + lib:libosgParticle$secondaryArchSuffix = $portVersion + lib:libosgPresentation$secondaryArchSuffix = $portVersion + lib:libosgShadow$secondaryArchSuffix = $portVersion + lib:libosgSim$secondaryArchSuffix = $portVersion + lib:libosgTerrain$secondaryArchSuffix = $portVersion + lib:libosgText$secondaryArchSuffix = $portVersion + lib:libosgUtil$secondaryArchSuffix = $portVersion + lib:libosgViewer$secondaryArchSuffix = $portVersion + lib:libosgVolume$secondaryArchSuffix = $portVersion + lib:libosgWidget$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix + mesa$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + mesa${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix +" + +PATCH="openscenegraph_x86-3.2.1.patchset" + +SOURCE_DIR="OpenSceneGraph" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None + make + +} + +INSTALL() +{ + make install + + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + mkdir -p $prefix/lib-temp + mv $prefix/lib/* $prefix/lib-temp/ + ls $prefix/lib-temp + mkdir -p $libDir + mv $prefix/lib-temp/* $libDir + rm -rf $prefix/lib-temp + + prepareInstalledDevelLibs libOpenThreads + prepareInstalledDevelLibs libosg + prepareInstalledDevelLibs libosgAnimation + prepareInstalledDevelLibs libosgDB + prepareInstalledDevelLibs libosgFX + prepareInstalledDevelLibs libosgGA + prepareInstalledDevelLibs libosgManipulator + prepareInstalledDevelLibs libosgParticle + prepareInstalledDevelLibs libosgPresentation + prepareInstalledDevelLibs libosgShadow + prepareInstalledDevelLibs libosgSim + prepareInstalledDevelLibs libosgTerrain + prepareInstalledDevelLibs libosgText + prepareInstalledDevelLibs libosgUtil + prepareInstalledDevelLibs libosgViewer + prepareInstalledDevelLibs libosgVolume + prepareInstalledDevelLibs libosgWidget + + fixPkgconfig + + packageEntries devel $developDir + +} + +PROVIDES_devel=" + devel:openscenegraph$secondaryArchSuffix = $portVersion + devel:libOpenThreads$secondaryArchSuffix = $portVersion + devel:libosg$secondaryArchSuffix = $portVersion + devel:libosgAnimation$secondaryArchSuffix = $portVersion + devel:libosgDB$secondaryArchSuffix = $portVersion + devel:libosgFX$secondaryArchSuffix = $portVersion + devel:libosgGA$secondaryArchSuffix = $portVersion + devel:libosgManipulator$secondaryArchSuffix = $portVersion + devel:libosgParticle$secondaryArchSuffix = $portVersion + devel:libosgPresentation$secondaryArchSuffix = $portVersion + devel:libosgShadow$secondaryArchSuffix = $portVersion + devel:libosgSim$secondaryArchSuffix = $portVersion + devel:libosgTerrain$secondaryArchSuffix = $portVersion + devel:libosgText$secondaryArchSuffix = $portVersion + devel:libosgUtil$secondaryArchSuffix = $portVersion + devel:libosgViewer$secondaryArchSuffix = $portVersion + devel:libosgVolume$secondaryArchSuffix = $portVersion + devel:libosgWidget$secondaryArchSuffix = $portVersion + +" +REQUIRES_devel=" + openscenegraph$secondaryArchSuffix == $portVersion +" From 36b2f3f5affe97663aa59c3d8c1b165f490af6d2 Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Tue, 23 Dec 2014 20:59:18 +0000 Subject: [PATCH 142/326] Added mythes recipe --- app-dicts/mythes/mythes-1.2.4.recipe | 84 ++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 app-dicts/mythes/mythes-1.2.4.recipe diff --git a/app-dicts/mythes/mythes-1.2.4.recipe b/app-dicts/mythes/mythes-1.2.4.recipe new file mode 100644 index 000000000..eb22a9f02 --- /dev/null +++ b/app-dicts/mythes/mythes-1.2.4.recipe @@ -0,0 +1,84 @@ +SUMMARY="A simple thesaurus" +DESCRIPTION="MyThes is a simple thesaurus that used a structured text \ +data file and an index file with binary search to lookup words \ +and phrases and return information on part of speech, \ +meanings, and synonyms. + +- written in C++ to make it easier to interface with \ +LibreOffice, OpenOffice, AbiWord, Pspell, etc +- it is stateless, uses no static variables and \ +should be completely reentrant with no ifdefs +- it compiles with -ansi and -pedantic and -Wall \ +with no warnigns so it shouldbe quite portable +- it uses a simple perl program to read the structured \ +text file and create the index needed for binary \ +searching +- it is very simple with *lots* of comments. \ +The main "smarts" are in the structure of the \ +text file that makes up the thesaurus data +- It comes with a ready-to-go structured thesaurus \ +data file for en_US extracted from the WordNet-2.0 data. +- Please see WordNet_license.txt and WordNet_readme.txt \ +for more information on the very useful project! +- See http://www.danielnaber.de/wn2ooo/ for utilities to \ +regenerate an up to date English thesaurus from the most \ +recent WordNet data." +HOMEPAGE="http://sourceforge.net/projects/hunspell/files/MyThes/1.2.4" +SRC_URI="http://prdownloads.sf.net/hunspell/mythes-1.2.4.tar.gz" +CHECKSUM_SHA256="1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f" +COPYRIGHT="1994 - 2009 Free Software Foundation, Inc." +LICENSE="BSD (2-clause)" +REVISION="1" + +PROVIDES=" + mythes$secondaryArchSuffix = $portVersion + cmd:mythes = $portVersion + cmd:th_gen_idx.pl + lib:libmythes_1.2$secondaryArchSuffix = $portVersion + " + +PROVIDES_devel=" + devel:libmythes_1.2$secondaryArchSuffix = $portVersion + mythes${secondaryArchSuffix}_devel = $portVersion + " + +ARCHITECTURES="x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libhunspell_1.3$secondaryArchSuffix + cmd:perl + " + +REQUIRES_devel=" + mythes$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + devel:libhunspell_1.3$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:awk + haiku${secondaryArchSuffix}_devel + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs \ + libmythes-1.2 + packageEntries devel \ + $developDir +} \ No newline at end of file From 487e1c8b9486abec3a1025002f35c0e0177534da Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Tue, 23 Dec 2014 21:22:52 +0000 Subject: [PATCH 143/326] Updated recipe for iozone --- app-benchmarks/iozone/iozone-3.326.recipe | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe index 398529eac..e51ee9554 100644 --- a/app-benchmarks/iozone/iozone-3.326.recipe +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -47,7 +47,9 @@ BUILD() INSTALL() { cd src/current/ - mkdir -p $binDir/iozone - cp iozone $binDir/iozone + cp iozone $binDir cp fileop $binDir + + mkdir -p $manDir/man1 + cp ../../docs/iozone.1 $manDir/man1 } \ No newline at end of file From 21676bb201cde132e2c6d50f5fd373193c7c672f Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 23 Dec 2014 16:39:34 +0000 Subject: [PATCH 144/326] Fix directory of installation of fonts Also, do not install README as it only contains licensing information or is the same text as the DESCRIPTION. --- media-fonts/ahem/ahem-1.0.recipe | 7 +++--- .../anonymous_pro-1.002.001.recipe | 5 ++-- .../arabeyes_fonts/arabeyes_fonts-1.1.recipe | 23 ++++++++----------- media-fonts/cardo/cardo-1.04.recipe | 4 ++-- .../courier_prime/courier_prime-1.0.recipe | 5 ++-- .../croscorefonts/croscorefonts-1.21.0.recipe | 8 +++---- media-fonts/droid/droid-113.recipe | 6 ++--- media-fonts/droid/droid-4.3_r2.2.recipe | 6 ++--- .../essays-1743/essays1743-2.001.recipe | 6 ++--- .../farsi_fonts/farsi_fonts-0.4.recipe | 4 ++-- media-fonts/humor_sans/humor_sans-1.0.recipe | 8 +++---- .../inconsolata/inconsolata-1.0.recipe | 4 ++-- .../kacst_fonts/kacst_fonts-5.0.recipe | 6 ++--- .../lateef_font/lateef_font-1.001.recipe | 4 ++-- .../liberation_fonts-1.06.0.20100721.recipe | 4 ++-- media-fonts/lohit/lohit-2.3.8.recipe | 6 ++--- media-fonts/mplus/mplus-2.2.4.recipe | 6 ++--- .../nafees_nastaleeq-1.02.recipe | 4 ++-- .../nafees_riqa/nafees_riqa-1.00.recipe | 4 ++-- media-fonts/nanumfont/nanumfont-2.0.recipe | 4 ++-- .../noto_sans_bengali-1.02.recipe | 4 ++-- .../noto_sans_cjk/noto_sans_cjk-1.001.recipe | 4 ++-- .../noto_sans_devanagari-1.05.recipe | 4 ++-- .../noto_sans_gujarati-1.02.recipe | 4 ++-- .../noto_sans_gurmukhi-1.01.recipe | 4 ++-- .../noto_sans_sinhala-1.01.recipe | 4 ++-- .../noto_sans_tamil-1.04.recipe | 4 ++-- .../noto_sans_telugu-1.02.recipe | 4 ++-- media-fonts/paratype/paratype-1.0.recipe | 11 +++++---- media-fonts/roboto/roboto-1.2.recipe | 4 ++-- .../scheherazade_font-1.005.recipe | 4 ++-- .../terminus_ttf/terminus_ttf-4.38.2.recipe | 4 ++-- .../ubuntu_font_family-0.80.recipe | 6 ++--- .../ukijorgfonts/ukijorgfonts-1.0.recipe | 4 ++-- media-fonts/unifont/unifont-7.0.06.recipe | 4 ++-- .../vl_gothic/vl_gothic-20140530.recipe | 4 ++-- media-fonts/vollkorn/vollkorn-2.1.recipe | 4 ++-- .../wqy_microhei-0.2.0~beta.recipe | 4 ++-- .../wqy_zenhei/wqy_zenhei-0.9.45.recipe | 4 ++-- .../x_series_fonts/x_series_fonts-2.0.recipe | 4 ++-- 40 files changed, 103 insertions(+), 110 deletions(-) diff --git a/media-fonts/ahem/ahem-1.0.recipe b/media-fonts/ahem/ahem-1.0.recipe index 215eef282..8080fb62a 100644 --- a/media-fonts/ahem/ahem-1.0.recipe +++ b/media-fonts/ahem/ahem-1.0.recipe @@ -20,7 +20,7 @@ SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz" CHECKSUM_SHA256="bae33954780217ea0e8e517f51e5a84c525ff22b39a508d50ab49e2d5cef7530" LICENSE="Public Domain" COPYRIGHT="Late-90s Todd Fahrner" -REVISION="1" +REVISION="2" SOURCE_DIR="Ahem-1.0" ARCHITECTURES="any" @@ -41,6 +41,7 @@ BUILD() INSTALL() { - mkdir -p $fontsDir/ahem - cp Ahem.ttf README $fontsDir/ahem + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + cp Ahem.ttf $FONTDIR } diff --git a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe index c3b0ad6dd..b14cb74d3 100644 --- a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe +++ b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe @@ -10,7 +10,7 @@ SRC_URI="http://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip CHECKSUM_SHA256="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009 Mark Simonson, with reserved font name Anonymous Pro" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,8 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/anonymous-pro + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/anonymous-pro-readme.txt } diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index 9a1b7b09a..16566f291 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -8,8 +8,7 @@ contributions. HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2" CHECKSUM_SHA256="c517f6ac0643d2416101c9b375be38ec4fe7810b7ad3a1465438dd45b819e054" -REVISION="1" -DEPEND="" +REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2003-2007 Arabeyes.org 2002-2005 Free Software Foundation" @@ -21,26 +20,24 @@ PROVIDES="arabeyes_fonts = $portVersion" REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES=" - cmd:tar coreutils " -SOURCE_DIR="ae_fonts1-1.1" +SOURCE_DIR="ae_fonts1-1.1/" BUILD() { - tar xvjf $portDir/download/ae_fonts1_ttf_1.1.tar.bz2 + true } INSTALL() { - cd ae_fonts1-1.1 - FONTDIR=$fontsDir/arabeyes + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp -rd AAHS ${FONTDIR}/ - cp -rd AGA ${FONTDIR}/ - cp -rd FS ${FONTDIR}/ - cp -rd Kasr ${FONTDIR}/ - cp -rd MCS ${FONTDIR}/ - cp -rd Shmookh ${FONTDIR}/ + cp AAHS/*.ttf ${FONTDIR}/ + cp AGA/*.ttf ${FONTDIR}/ + cp FS/*.ttf ${FONTDIR}/ + cp Kasr/*.ttf ${FONTDIR}/ + cp MCS/*.ttf ${FONTDIR}/ + cp Shmookh/*.ttf ${FONTDIR}/ } diff --git a/media-fonts/cardo/cardo-1.04.recipe b/media-fonts/cardo/cardo-1.04.recipe index c3c3274c7..87b719f3a 100644 --- a/media-fonts/cardo/cardo-1.04.recipe +++ b/media-fonts/cardo/cardo-1.04.recipe @@ -11,7 +11,7 @@ SRC_URI="http://scholarsfonts.net/cardo104.zip" CHECKSUM_SHA256="9401db6357cb71fa1f8791323679f81d6b0473d6280a7ec8abdf11b5e52f455f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2004–2011 David J. Perry, with Reserved Font Name Cardo" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -30,7 +30,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/cardo + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe index 309374cbe..23bf94b70 100644 --- a/media-fonts/courier_prime/courier_prime-1.0.recipe +++ b/media-fonts/courier_prime/courier_prime-1.0.recipe @@ -8,7 +8,7 @@ should not change. HOMEPAGE="http://quoteunquoteapps.com/courierprime/" SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" CHECKSUM_SHA256="d5d4faf1bee0d1f52bab1103cbfdfb354976331c86f999c110c22a098cb12d73" -REVISION="1" +REVISION="2" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2013 Quote-Unquote Apps" @@ -34,8 +34,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/courier-prime + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ - cp Read\ me.txt ${FONTDIR}/README.txt } diff --git a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe index 6fc578aa2..3282e1740 100644 --- a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe +++ b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe @@ -13,8 +13,8 @@ CHECKSUM_SHA256_3="89619d3f06b55495e94458eb8fbd69ae7c654db5782b2cecfdaffa2c8b291 SOURCE_DIR="" LICENSE="Apache v2" -COPYRIGHT="Mike Frysinger" -REVISION="1" +COPYRIGHT="2010-2013 Google Corporation" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -30,10 +30,10 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/croscorefonts/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} cp ../sources-2/*.ttf ${FONTDIR} cp ../sources-3/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index 2b908a4b0..06ba3babd 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -10,7 +10,7 @@ SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" CHECKSUM_SHA256="c9339f0f1aaa055f8b06a2b28c1c3fb5ddffe6c6a6a7a7735fc0ad93d0eab12f" LICENSE="Apache v2" COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -30,9 +30,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/droid + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp Ahem.ttf ${FONTDIR} cp DroidSans-Bold.ttf ${FONTDIR} cp DroidSansFallback.ttf ${FONTDIR} cp DroidSerif-Bold.ttf ${FONTDIR} @@ -41,5 +40,4 @@ INSTALL() cp DroidSansMono.ttf ${FONTDIR} cp DroidSerif-BoldItalic.ttf ${FONTDIR} cp DroidSerif-Regular.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/droid-fonts-readme.txt } diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe index 0b802f2c0..3923c917d 100644 --- a/media-fonts/droid/droid-4.3_r2.2.recipe +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -11,7 +11,7 @@ SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zi CHECKSUM_SHA256="221133c329efdb2b911c18ef222eeb3fcb011e5be7c37623e68faa90c15b8cd0" LICENSE="Apache v2" COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -31,7 +31,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/droid + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp . ${FONTDIR} -R + cp *.ttf ${FONTDIR} } diff --git a/media-fonts/essays-1743/essays1743-2.001.recipe b/media-fonts/essays-1743/essays1743-2.001.recipe index 64afcbf84..5d5bc6bb8 100644 --- a/media-fonts/essays-1743/essays1743-2.001.recipe +++ b/media-fonts/essays-1743/essays1743-2.001.recipe @@ -12,7 +12,7 @@ SOURCE_DIR="" LICENSE="GNU LGPL v2.1" COPYRIGHT="John Stracke" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -28,8 +28,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/essays1743/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp essays1743/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe index 0ad6033be..3fd24740d 100644 --- a/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe +++ b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Farsi (Perisian) Unicode fonts" HOMEPAGE="http://www.farsiweb.ir/" SRC_URI="http://www.farsiweb.ir/font/farsifonts-0.4.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe index f010cebeb..bcd270a35 100644 --- a/media-fonts/humor_sans/humor_sans-1.0.recipe +++ b/media-fonts/humor_sans/humor_sans-1.0.recipe @@ -1,6 +1,6 @@ -SUMMARY="The Human-Sans font" +SUMMARY="The Humor-Sans font" DESCRIPTION=" -A sanserif typeface in the style of xkcd. Xkcd is a popular webcomics with \ +A sans-serif typeface in the style of xkcd. Xkcd is a popular webcomics with \ focus on computer science or everything else. " HOMEPAGE="http://antiyawn.com/uploads/humorsans.html" @@ -8,7 +8,7 @@ SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf" CHECKSUM_SHA256="2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009, Michael Ciuffo, with Reserved Font Name Humor-Sans" -REVISION="1" +REVISION="2" ARCHITECTURES="!any" DISABLE_SOURCE_PACKAGE=yes @@ -27,7 +27,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/humor-sans + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/inconsolata/inconsolata-1.0.recipe b/media-fonts/inconsolata/inconsolata-1.0.recipe index 23cce1f39..eceb5c6c1 100644 --- a/media-fonts/inconsolata/inconsolata-1.0.recipe +++ b/media-fonts/inconsolata/inconsolata-1.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Inconsolata Programmer's font" HOMEPAGE="http://www.levien.com/type/myfonts/inconsolata.html" SRC_URI="http://media.nodnod.net/Inconsolata-dz.otf.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8510443343f43382566511e73abc06f8" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata + FONTDIR=${fontsDir}/otfonts mkdir -p ${FONTDIR} wget http://levien.com/type/myfonts/Inconsolata.otf wget http://www.cosmix.org/software/files/InconsolataHellenic.zip diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe index c2a34ed0e..0bef51cbe 100644 --- a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe +++ b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="KACST Arabic Truetype Fonts" HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/latest/download?source=files" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" @@ -13,11 +13,9 @@ BUILD() INSTALL() { cd kacst_one_5.0 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - cp KacstOne-Bold.sfd ${FONTDIR}/ cp KacstOne-Bold.ttf ${FONTDIR}/ - cp KacstOne.sfd ${FONTDIR}/ cp KacstOne.ttf ${FONTDIR}/ } diff --git a/media-fonts/lateef_font/lateef_font-1.001.recipe b/media-fonts/lateef_font/lateef_font-1.001.recipe index 0de1633c9..69b0ac8e9 100644 --- a/media-fonts/lateef_font/lateef_font-1.001.recipe +++ b/media-fonts/lateef_font/lateef_font-1.001.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Arabic font" HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe index 57da7e16c..a6f4c14a4 100644 --- a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe +++ b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe @@ -4,7 +4,7 @@ with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. " HOMEPAGE="https://fedorahosted.org/liberation-fonts" SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/liberation-fonts-1.06.0.20100721.tar.gz" -REVISION="1" +REVISION="2" STATUS_HAIKU="broken" DEPEND="fontforge" CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80" @@ -17,7 +17,7 @@ BUILD() INSTALL() { cd liberation-fonts-1.06.0.20100721 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/liberation + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -a *.ttf ${FONTDIR}/. } diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe index 2ebdbdbfe..9b2b05218 100644 --- a/media-fonts/lohit/lohit-2.3.8.recipe +++ b/media-fonts/lohit/lohit-2.3.8.recipe @@ -13,7 +13,7 @@ SRC_URI="http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-2.3.8.tar.g CHECKSUM_SHA256="68091ab047f9e4e22f069f802dceac52994267f126dc238b3815eed217a02991" LICENSE="GNU GPL v2" COPYRIGHT="2004-2011 Red Hat" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -34,8 +34,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/lohit + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} find . -name "*.ttf" -exec cp {} ${FONTDIR} \; - cp README ${FONTDIR}/lohit-readme.txt + cp README ${FONTDIR}/lohit.readme } diff --git a/media-fonts/mplus/mplus-2.2.4.recipe b/media-fonts/mplus/mplus-2.2.4.recipe index bd30c546a..df9750fd0 100644 --- a/media-fonts/mplus/mplus-2.2.4.recipe +++ b/media-fonts/mplus/mplus-2.2.4.recipe @@ -7,7 +7,7 @@ SOURCE_DIR="." CHECKSUM_SHA256="7862e113e04986646117267c4baee30aea163d43a382c14693f15287f16bbf25" LICENSE="GNU GPL v2" COPYRIGHT="2002-2008 M+ Fonts Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -23,8 +23,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/mplus/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp mplus-TESTFLIGHT-059/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe index 38f5396b4..bb1201e85 100644 --- a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe +++ b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe @@ -4,7 +4,7 @@ style of one of the finest calligraphers of Pakistan (Nafees Raqam). " HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesNastaleeq.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" @@ -15,7 +15,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} } diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe index 7ec14d2d5..bcd18aa0c 100644 --- a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe +++ b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe @@ -3,7 +3,7 @@ Open Type Font for writng Urdu in Riqa script based on Unicode standard. " HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesRiqa.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" @@ -14,7 +14,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp "Nafees Riqa v1.0.ttf" ${FONTDIR} } diff --git a/media-fonts/nanumfont/nanumfont-2.0.recipe b/media-fonts/nanumfont/nanumfont-2.0.recipe index 957a28fe2..a9af8355a 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.recipe +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -3,7 +3,7 @@ Korean monospace font distributed by NHN. " HOMEPAGE="http://dev.naver.com/projects/nanumfont" SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" @@ -14,7 +14,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ } diff --git a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe index 815468b0b..20d8d280f 100644 --- a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe +++ b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="bc9422930cb09b0736ed3ebf60f747bb0078e451087b52926a4ae0d1d50db42c" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe index fbcb049dd..c3d9dba0a 100644 --- a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe +++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe @@ -44,7 +44,7 @@ CHECKSUM_SHA256_7="e6e04ca22f7182eb87277d476564637b714a022cee51497737b0639e88c9f LICENSE="Apache v2" COPYRIGHT="2014 Adobe Systems Incorporated" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -65,7 +65,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/otfonts mkdir -p ${FONTDIR} cp `find ../sources* -type f -name \*.otf` ${FONTDIR} } diff --git a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe index a75967fef..f4fbba9cc 100644 --- a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe +++ b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="8601d16cb04d740d2a2a27299ae59445971bbbed3d6b401c14e6fb1d461dd353" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe index 213e0fb14..04621f266 100644 --- a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe +++ b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="44e6925fa81c7a59992415ffce24434e7b2609af7921d10e735879ebbc5a593f" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe index 7217207e1..bde6c207a 100644 --- a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe +++ b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="c154bacc4998fa6e8eb380cf6823a07c2cf6bcafbad373446fbb7576f61d1e48" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe index 62e386d5e..e28dbef76 100644 --- a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe +++ b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="2cf8027b61f0657e64959e17eb16f4d84658a950c36ee483d4bf1ade8df9d683" LICENSE="Apache v2" COPYRIGHT="2014 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe index 12c1e2f14..7047fe32a 100644 --- a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe +++ b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="15d8f1e5310f4d2eecf2e46a9d74b52c5a30afae00b90d2fe92bc8f00a5c1ee8" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe index 13724e96a..efbe61d73 100644 --- a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe +++ b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="8d434121cb8e10b02f80a1a7ab87a9a70ef2eee96aababe4ec871e554578c460" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/paratype/paratype-1.0.recipe b/media-fonts/paratype/paratype-1.0.recipe index af546807b..14c2dcfc5 100644 --- a/media-fonts/paratype/paratype-1.0.recipe +++ b/media-fonts/paratype/paratype-1.0.recipe @@ -10,7 +10,7 @@ CHECKSUM_SHA256_2="e7a2a27ed0481d20973f0d3b589362d055269082e3fc4d96f81dacd58bad8 CHECKSUM_SHA256_3="e34e729f9509cf85acc52caadf68e96db90457b7164ba45719967d53e7a20dcc" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009 ParaType" -REVISION="1" +REVISION="2" SOURCE_DIR="" ARCHITECTURES="any" @@ -31,9 +31,10 @@ BUILD() INSTALL() { - mkdir -p $fontsDir/paratype - cp *.ttf $fontsDir/paratype - cp ../sources-2/*.ttf $fontsDir/paratype - cp ../sources-3/*.ttf $fontsDir/paratype + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + cp *.ttf $FONTDIR + cp ../sources-2/*.ttf $FONTDIR + cp ../sources-3/*.ttf $FONTDIR } diff --git a/media-fonts/roboto/roboto-1.2.recipe b/media-fonts/roboto/roboto-1.2.recipe index 825c43caf..48d6d934b 100644 --- a/media-fonts/roboto/roboto-1.2.recipe +++ b/media-fonts/roboto/roboto-1.2.recipe @@ -16,7 +16,7 @@ SRC_URI="http://developer.android.com/downloads/design/roboto-1.2.zip" CHECKSUM_SHA256="5101b5bdb3b7b14cc922a771ba068bfcae8634467c1f446bc89bc2b4f8b4f1b5" LICENSE="Apache v2" COPYRIGHT="2013 Christian Robertson" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -36,7 +36,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/roboto + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cd Roboto_v$portVersion diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 68b702406..40681b41d 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -3,7 +3,7 @@ Arabic script font. " HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" @@ -15,7 +15,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe index 36a0677d4..9398cd1c2 100644 --- a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe +++ b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://files.ax86.net/terminus-ttf/" SRC_URI="http://files.ax86.net/terminus-ttf/files/$portVersion/terminus-ttf-$portVersion.zip" CHECKSUM_SHA256="95896b5711e8c96cae180e3c8c837f23618c611e1aebc40639bc983d519dd5bd" SOURCE_DIR="terminus-ttf-$portVersion" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_gcc2 x86_64" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2010 Dimitar Toshkov Zhekov @@ -26,7 +26,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/terminus-ttf + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ } diff --git a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index 9d4763f48..7a71b61fd 100644 --- a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -10,7 +10,7 @@ SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" CHECKSUM_SHA256="107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c" LICENSE="Ubuntu Font License 1.0" COPYRIGHT="2011 Canonical Ltd." -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,7 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ubuntu-font-family + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp Ubuntu-B.ttf ${FONTDIR} cp Ubuntu-BI.ttf ${FONTDIR} @@ -44,5 +44,5 @@ INSTALL() cp UbuntuMono-BI.ttf ${FONTDIR} cp UbuntuMono-R.ttf ${FONTDIR} cp UbuntuMono-RI.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt + cp README.txt ${FONTDIR}/ubuntu_font_family.readme } diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe index 05e2c6a67..318ea6621 100644 --- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Uyghur Computer Science Association font project" HOMEPAGE="http://www.ukij.org/fonts/" SRC_URI="http://ukijorgfonts.googlecode.com/files/ukijorgfonts.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/unifont/unifont-7.0.06.recipe b/media-fonts/unifont/unifont-7.0.06.recipe index 918e787d4..6bb3fb79b 100644 --- a/media-fonts/unifont/unifont-7.0.06.recipe +++ b/media-fonts/unifont/unifont-7.0.06.recipe @@ -8,7 +8,7 @@ SRC_URI="http://unifoundry.com/pub/unifont-7.0.06.tar.gz" SOURCE_DIR="" LICENSE="GNU GPL v2" COPYRIGHT="Unifoundry" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -24,7 +24,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/unifont/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp unifont-7.0.06/font/precompiled/*.ttf ${FONTDIR} diff --git a/media-fonts/vl_gothic/vl_gothic-20140530.recipe b/media-fonts/vl_gothic/vl_gothic-20140530.recipe index f63f269ac..f3f20e048 100644 --- a/media-fonts/vl_gothic/vl_gothic-20140530.recipe +++ b/media-fonts/vl_gothic/vl_gothic-20140530.recipe @@ -17,7 +17,7 @@ COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo. 2006-2014 Daisuke SUZUKI . 2006-2014 Project Vine . " -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -36,7 +36,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/VL-Gothic + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp VL-Gothic-Regular.ttf ${FONTDIR} cp VL-PGothic-Regular.ttf ${FONTDIR} diff --git a/media-fonts/vollkorn/vollkorn-2.1.recipe b/media-fonts/vollkorn/vollkorn-2.1.recipe index 63bf217a8..8a30610d4 100644 --- a/media-fonts/vollkorn/vollkorn-2.1.recipe +++ b/media-fonts/vollkorn/vollkorn-2.1.recipe @@ -10,7 +10,7 @@ SRC_URI="http://friedrichalthausen.de/wp-content/plugins/cimy-counter/cc_redirec CHECKSUM_SHA256="2eaa427dbe42e37bfdc182c1e3446abdc889806fe0b6c9a14e0fc0c3acc997f5" LICENSE="SIL Open Font License v1.1" COPYRIGHT="Friedrich Althausen" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,7 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/vollkorn + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe index 38e19e6bb..c1c5747ec 100644 --- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" 2007 Google Corp. 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang " -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -34,7 +34,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/wenquanyi + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf } diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index c04558372..11b106ba3 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -10,7 +10,7 @@ LICENSE=" GNU GPL v2 with font embedding exception " COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" -REVISION="2" +REVISION="3" ARCHITECTURES="any" PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/wenquanyi + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp wqy-zenhei.ttc ${FONTDIR}/wqy-zenhei.ttf } diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index f4ac36b1b..7a4a295ab 100644 --- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -5,7 +5,7 @@ Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \ " HOMEPAGE="http://wiki.irmug.com/index.php/X_Series_2" SRC_URI="http://irmug.com/downloads/dl.php?id=21" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" @@ -16,7 +16,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} wget http://irmug.com/downloads/dl.php?id=21 unzip -o Zar.zip From 10d51828fc56b811bf971a214a304beb0566be42 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 03:00:56 +0000 Subject: [PATCH 145/326] cantarell: Update to 0.0.16 Also install to otfonts/. --- ...tarell-0.0.7.recipe => cantarell-0.0.16.recipe} | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) rename media-fonts/cantarell/{cantarell-0.0.7.recipe => cantarell-0.0.16.recipe} (73%) diff --git a/media-fonts/cantarell/cantarell-0.0.7.recipe b/media-fonts/cantarell/cantarell-0.0.16.recipe similarity index 73% rename from media-fonts/cantarell/cantarell-0.0.7.recipe rename to media-fonts/cantarell/cantarell-0.0.16.recipe index b25153a71..d235ee43f 100644 --- a/media-fonts/cantarell/cantarell-0.0.7.recipe +++ b/media-fonts/cantarell/cantarell-0.0.16.recipe @@ -9,13 +9,15 @@ European, Dutch and Afrikaans writing systems. The Cantarell typeface is \ included in Google Fonts too. " HOMEPAGE="http://wiki.gnome.org/CantarellFonts" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.bz2" -CHECKSUM_SHA256="79f69beca780d84c7c5753566d801ca14e46b6c111ec71527e37ae29377c2c79" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-${portVersion}.tar.xz" +CHECKSUM_SHA256="15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c" LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2009-2011 Understanding Limited, 2010-2011 Jakub Steiner" +COPYRIGHT="2009-2011 Understanding Limited +2010-2012 Jakub Steiner" REVISION="1" ARCHITECTURES="any" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" DISABLE_SOURCE_PACKAGE=yes PROVIDES="cantarell = $portVersion" @@ -23,7 +25,7 @@ REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES="coreutils" -SOURCE_DIR="cantarell-fonts-0.0.7" +SOURCE_DIR="cantarell-fonts-$portVersion" BUILD() { @@ -32,8 +34,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/cantarell + FONTDIR=$fontsDir/otfonts mkdir -p ${FONTDIR} cp otf/*.otf ${FONTDIR} - cp README ${FONTDIR}/cantarell-readme.txt + cp README ${FONTDIR}/cantarell.readme } From f47ff3b92e52ea1aa599e422ba1f0d7cc2e94060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 24 Dec 2014 15:20:04 +0000 Subject: [PATCH 146/326] OpenSceneGraph 3.2.1 - More fixes --- .../openscenegraph-3.2.1.recipe | 41 ++++------ .../openscenegraph/openscenegraph-git.recipe | 49 +++++------- .../patches/openscenegraph-3.2.1.patchset | 36 +++++++++ .../patches/openscenegraph_x86-3.2.1.patchset | 77 ------------------- 4 files changed, 70 insertions(+), 133 deletions(-) create mode 100644 games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset delete mode 100644 games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 79af87fb7..e6a8785e8 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -1,11 +1,11 @@ -SUMMARY="An open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ -by application developers in fields such as visual simulation, games, virtual\ -reality, scientific visualization and modelling. Written entirely in Standard\ -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ -established as the world leading scene graph technology, used widely in the\ +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" @@ -77,14 +77,14 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH="openscenegraph_x86-3.2.1.patchset" +PATCHES="openscenegraph-3.2.1.patchset" SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None - make + make $jobArgs } @@ -103,23 +103,12 @@ INSTALL() mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp - prepareInstalledDevelLibs libOpenThreads - prepareInstalledDevelLibs libosg - prepareInstalledDevelLibs libosgAnimation - prepareInstalledDevelLibs libosgDB - prepareInstalledDevelLibs libosgFX - prepareInstalledDevelLibs libosgGA - prepareInstalledDevelLibs libosgManipulator - prepareInstalledDevelLibs libosgParticle - prepareInstalledDevelLibs libosgPresentation - prepareInstalledDevelLibs libosgShadow - prepareInstalledDevelLibs libosgSim - prepareInstalledDevelLibs libosgTerrain - prepareInstalledDevelLibs libosgText - prepareInstalledDevelLibs libosgUtil - prepareInstalledDevelLibs libosgViewer - prepareInstalledDevelLibs libosgVolume - prepareInstalledDevelLibs libosgWidget + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget fixPkgconfig diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index 61b17c0a4..474d351ec 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -1,23 +1,23 @@ -SUMMARY="An open source, real-time graphics middle-ware used by application developers" +SUMMARY="An open source, real-time graphics middle-ware used by developers" DESCRIPTION=" -The OpenSceneGraph is an open source high performance 3D graphics toolkit, used\ -by application developers in fields such as visual simulation, games, virtual\ -reality, scientific visualization and modelling. Written entirely in Standard\ -C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris\ -, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well\ -established as the world leading scene graph technology, used widely in the\ +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" -SRC_URI="git://github.com/openscenegraph/osg.git" +SRC_URI="git://github.com/openscenegraph/osg#77f09f9e649cfedd32608ed6ec67bf1de7cd53ac" REVISION="1" LICENSE="OSGPL" COPYRIGHT="2002-2014 Robert Osfield and others" -ARCHITECTURES="?x86 ?x86_64" +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" + ARCHITECTURES="$ARCHITECTURES x86_gcc2" else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi @@ -76,14 +76,14 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCH="openscenegraph_x86-3.2.1.patchset" +PATCHES="openscenegraph-3.2.1.patchset" -SOURCE_DIR="OpenSceneGraph" +SOURCE_DIR="OpenSceneGraph-3.2.1" BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None - make + make $jobArgs } @@ -102,23 +102,12 @@ INSTALL() mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp - prepareInstalledDevelLibs libOpenThreads - prepareInstalledDevelLibs libosg - prepareInstalledDevelLibs libosgAnimation - prepareInstalledDevelLibs libosgDB - prepareInstalledDevelLibs libosgFX - prepareInstalledDevelLibs libosgGA - prepareInstalledDevelLibs libosgManipulator - prepareInstalledDevelLibs libosgParticle - prepareInstalledDevelLibs libosgPresentation - prepareInstalledDevelLibs libosgShadow - prepareInstalledDevelLibs libosgSim - prepareInstalledDevelLibs libosgTerrain - prepareInstalledDevelLibs libosgText - prepareInstalledDevelLibs libosgUtil - prepareInstalledDevelLibs libosgViewer - prepareInstalledDevelLibs libosgVolume - prepareInstalledDevelLibs libosgWidget + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget fixPkgconfig diff --git a/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset new file mode 100644 index 000000000..28ee177e3 --- /dev/null +++ b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset @@ -0,0 +1,36 @@ +From 3e731d32a286903a4b75d445ec6fdf0b8359b5d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Wed, 24 Dec 2014 14:55:21 +0000 +Subject: Add __HAIKU__ when needed + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index affd682..dcbb532 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -76,7 +76,7 @@ typedef char TCHAR; + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat + #endif +-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ ++#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ + (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) + #define stat64 stat + #endif +diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h +index 3720ea6..6f4c6bc 100644 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h +@@ -51,7 +51,7 @@ + + #else + +- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) ++ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) + #include + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define __LITTLE_ENDIAN__ +-- +1.8.3.4 + diff --git a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset deleted file mode 100644 index 593a5cef1..000000000 --- a/games-engines/openscenegraph/patches/openscenegraph_x86-3.2.1.patchset +++ /dev/null @@ -1,77 +0,0 @@ -From c4669d4e62e056fc2b29cc1372e41fcba9d286da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Tue, 23 Dec 2014 19:08:44 +0000 -Subject: Haiku specific cases - - -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index affd682..47436d5 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -71,12 +71,13 @@ typedef char TCHAR; - // variable. (MIN_ALLOWED is set low by default so it is - // unhelpful in this case.) - // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 -- // for older OS's like Jaguar, Panther since they are not defined, -+ // for older OS's like Jaguar, Panther -+ since they are not defined, - // so I am going to hardcode the number. - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) - #define stat64 stat - #endif --#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ -+#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ - (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) - #define stat64 stat - #endif -@@ -100,7 +101,7 @@ typedef char TCHAR; - #include - - #include --#include -+#include - #include - - #include -diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h -index 3720ea6..6f4c6bc 100644 ---- a/src/osgPlugins/osc/osc/OscHostEndianness.h -+++ b/src/osgPlugins/osc/osc/OscHostEndianness.h -@@ -51,7 +51,7 @@ - - #else - -- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) -+ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) - #include - #if (__BYTE_ORDER == __LITTLE_ENDIAN) - #define __LITTLE_ENDIAN__ --- -1.8.3.4 - - -From 7fa67738f702dc39b16f2caa05b9301e09209a5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Tue, 23 Dec 2014 19:56:17 +0000 -Subject: Stupid type-bug - - -diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp -index 47436d5..060eb29 100644 ---- a/src/osgDB/FileUtils.cpp -+++ b/src/osgDB/FileUtils.cpp -@@ -71,8 +71,7 @@ typedef char TCHAR; - // variable. (MIN_ALLOWED is set low by default so it is - // unhelpful in this case.) - // Unfortunately, we can't use the label MAC_OS_X_VERSION_10_4 -- // for older OS's like Jaguar, Panther -- since they are not defined, -+ // for older OS's like Jaguar, Panther since they are not defined, - // so I am going to hardcode the number. - #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) - #define stat64 stat --- -1.8.3.4 - From cac637fe1963a2211edc057155654bcdda70ad9f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 24 Dec 2014 12:44:27 -0500 Subject: [PATCH 147/326] Create recipe for bash_completion v2.1. It doesn't work, I don't know why. Someone with more bash-fu than me should take a look at it. --- .../bash_completion-2.1.recipe | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 app-shells/bash_completion/bash_completion-2.1.recipe diff --git a/app-shells/bash_completion/bash_completion-2.1.recipe b/app-shells/bash_completion/bash_completion-2.1.recipe new file mode 100644 index 000000000..fd292206e --- /dev/null +++ b/app-shells/bash_completion/bash_completion-2.1.recipe @@ -0,0 +1,65 @@ +SUMMARY="Tab-completion for the Bash shell" +DESCRIPTION="Since v2.04, bash has allowed you to intelligently program \ +and extend its standard completion behavior to achieve complex command \ +lines with just a few keystrokes. Imagine typing ssh [Tab] and being \ +able to complete on hosts from your ~/.ssh/known_hosts files. Or typing \ +man 3 str [Tab] and getting a list of all string handling functions in \ +the UNIX manual. mount system: [Tab] would complete on all exported \ +file-systems from the host called system, while make [Tab] would complete \ +on all targets in Makefile. This project was conceived to produce \ +programmable completion routines for the most common Linux/UNIX commands, \ +reducing the amount of typing sysadmins and programmers need to do on \ +a daily basis." +HOMEPAGE="http://bash-completion.alioth.debian.org/" +SRC_URI="http://bash-completion.alioth.debian.org/files/bash-completion-$portVersion.tar.bz2" +CHECKSUM_SHA256="2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f" +SOURCE_DIR="bash-completion-$portVersion" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2014 Debian Project" +ARCHITECTURES="any" + +PROVIDES=" + bash_completion = $portVersion + " +REQUIRES=" + cmd:bash + " +BUILD_REQUIRES=" + cmd:bash + " +BUILD_PREREQUIRES=" + haiku + cmd:bash + cmd:awk + cmd:make + " + +GLOBAL_WRITABLE_FILES=" + settings/profile.d/bash_completion.sh auto-merge + " +USER_SETTINGS_FILES=" + settings/profile.d/bash_completion.sh + " + +PATCH() +{ + cd completions + for file in * + do + chmod +x $file + done +} + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + chmod +x $settingsDir/profile.d/bash_completion.sh + chmod +x $dataDir/bash-completion/bash_completion +} From 8b3a2ef307ae25d1b071415b8cadb2f963634bc9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 24 Dec 2014 13:33:16 -0500 Subject: [PATCH 148/326] rcs: recipe for 5.9.3. --- dev-vcs/rcs/rcs-5.9.3.recipe | 67 ++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 dev-vcs/rcs/rcs-5.9.3.recipe diff --git a/dev-vcs/rcs/rcs-5.9.3.recipe b/dev-vcs/rcs/rcs-5.9.3.recipe new file mode 100644 index 000000000..fa5e4376b --- /dev/null +++ b/dev-vcs/rcs/rcs-5.9.3.recipe @@ -0,0 +1,67 @@ +SUMMARY="Revision Control System" +DESCRIPTION="The Revision Control System (RCS) manages multiple revisions \ +of files. RCS automates the storing, retrieval, logging, identification, \ +and merging of revisions. RCS is useful for text that is revised \ +frequently, including source code, programs, documentation, graphics, \ +papers, and form letters. + +RCS is (mostly) deprecated now. Unless you have an existing RCS repository \ +that you need to access, using Subversion or Git is preferred." +HOMEPAGE="http://www.gnu.org/software/rcs/" +COPYRIGHT="1986-2005 Free Software Foundation, Inc." +LICENSE="GNU GPL v1 + GNU LGPL v2" +SRC_URI="https://ftp.gnu.org/gnu/rcs/rcs-5.9.3.tar.xz" +CHECKSUM_SHA256="68b0d1c1b8657766cd7dc78e10564ce4836220e64665fb35fbe74dbc1dff5b47" +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=" + rcs = $portVersion compat >= 5.9 + cmd:ci = $portVersion compat >= 5.9 + cmd:co = $portVersion compat >= 5.9 + cmd:ident = $portVersion compat >= 5.9 + cmd:merge = $portVersion compat >= 5.9 + cmd:rcs = $portVersion compat >= 5.9 + cmd:rcsclean = $portVersion compat >= 5.9 + cmd:rcsdiff = $portVersion compat >= 5.9 + cmd:rcsmerge = $portVersion compat >= 5.9 + cmd:rlog = $portVersion compat >= 5.9 + " +REQUIRES=" + haiku$secondaryArchSuffix + cmd:ed + cmd:awk + cmd:diff + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + + cmd:ed + cmd:awk + cmd:diff + " + +BUILD() +{ + runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install +} From 2974de68352a7211518c85374fa1546d66ff10f1 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Wed, 24 Dec 2014 19:51:34 +0100 Subject: [PATCH 149/326] bevexed: Update to newest version --- .../{bevexed-1.1.recipe => bevexed-20141224.recipe} | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) rename haiku-games/bevexed/{bevexed-1.1.recipe => bevexed-20141224.recipe} (78%) diff --git a/haiku-games/bevexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-20141224.recipe similarity index 78% rename from haiku-games/bevexed/bevexed-1.1.recipe rename to haiku-games/bevexed/bevexed-20141224.recipe index 2dae91d2c..c7987d621 100644 --- a/haiku-games/bevexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-20141224.recipe @@ -4,8 +4,8 @@ A maddeningly-addictive puzzle game. The concept is simple: put the tiles in \ the grid on the left such that the numbers match wherever 2 tiles touch. " HOMEPAGE="https://github.com/HaikuArchives/BeVexed" -SRC_URI="git+https://github.com/HaikuArchives/BeVexed#3a45d8f364" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed#01613e90e6ce3c2b47a592efe8e248db3445f536" +REVISION="2" LICENSE="MIT" COPYRIGHT="2006 DarkWyrm" @@ -45,8 +45,11 @@ BUILD() INSTALL() { - cd source mkdir -p $appsDir - cp -a objects/BeVexed $appsDir + mkdir -p $dataDir/BeVexed + + cp -r backgrounds $dataDir/BeVexed + + cp -a source/objects/BeVexed $appsDir addAppDeskbarSymlink $appsDir/BeVexed } From 91a39ed24a012e5d3da58282fabe5e412d92ecbe Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 24 Dec 2014 23:29:13 +0000 Subject: [PATCH 150/326] Add flite port --- app-accessibility/flite/flite-2.0.0.recipe | 119 ++++++++++ app-accessibility/flite/licenses/Flite | 206 ++++++++++++++++++ .../flite/patches/flite-2.0.0.patchset | 102 +++++++++ 3 files changed, 427 insertions(+) create mode 100644 app-accessibility/flite/flite-2.0.0.recipe create mode 100644 app-accessibility/flite/licenses/Flite create mode 100644 app-accessibility/flite/patches/flite-2.0.0.patchset diff --git a/app-accessibility/flite/flite-2.0.0.recipe b/app-accessibility/flite/flite-2.0.0.recipe new file mode 100644 index 000000000..1c0a9a0df --- /dev/null +++ b/app-accessibility/flite/flite-2.0.0.recipe @@ -0,0 +1,119 @@ +SUMMARY="A light-weight text-to-speech engine" +DESCRIPTION="Flite is a text-to-speech engine developed by the Carnegie \ +Mellon University. As a light-weight alternative to the Festival engine, it \ +is desinged to fit into small embedded machines as well as large-scale \ +servers. In addition to its native format flite supports voices generated by \ +the FestVox project as well. +" +HOMEPAGE="http://www.festvox.org/flite/" +SRC_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2" +CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411" +SOURCE_DIR="flite-${portVersion}-release" +REVISION="1" + +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE=" + Flite + " +COPYRIGHT=" + 1986 University of Toronto + 1992, 1995 Markus Mummert + 1996-2004 University of Edinburgh, UK + 1999-2014 Language Technologies Institute, Carnegie Mellon University + 2001 Cepstral, LLC + 2001 Sun Microsystems, Inc. + 2003-2004 Nagoya Institute of Technology + 2003-2004 Nara Institute of Science and Technology + 2008-2012 University of Illinois at Urbana-Champaign + " + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" + +EXTRA_CMD=" + cmu_time_awb + cmu_us_awb + cmu_us_kal + cmu_us_kal16 + cmu_us_rms + cmu_us_slt + " +EXTRA_LIBS=" + cmu_grapheme_lang + cmu_grapheme_lex + cmu_indic_lang + cmu_indic_lex + $EXTRA_CMD + cmulex + usenglish + " +PROVIDES=" + flite$secondaryArchSuffix = $portVersion + lib:libflite$secondaryArchSuffix = $portVersion compat >= 2 + flite_tools = $portVersion + cmd:flite$secondaryArchSuffix = $portVersion + cmd:flite_time$secondaryArchSuffix = $portVersion + " +DEVEL_LIBS="libflite" +for c in $EXTRA_CMD; do + PROVIDES=" + $PROVIDES + cmd:flite_${c} = $portVersion + " +done +PROVIDES_devel=" + flite${secondaryArchSuffix}_devel = $portVersion + devel:libflite$secondaryArchSuffix = $portVersion compat >= 2 + " +for l in $EXTRA_LIBS; do + PROVIDES=" + $PROVIDES + lib:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 + " + PROVIDES_devel=" + $PROVIDES_devel + devel:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 + " + DEVEL_LIBS=" + $DEVEL_LIBS + libflite_${l} + " +done +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + flite$secondaryArchSuffix == $portVersion base + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:awk + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PATCHES="flite-${portVersion}.patchset" + +BUILD() +{ + autoconf + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + $DEVEL_LIBS + packageEntries devel \ + $developDir +} diff --git a/app-accessibility/flite/licenses/Flite b/app-accessibility/flite/licenses/Flite new file mode 100644 index 000000000..7ec1cd92e --- /dev/null +++ b/app-accessibility/flite/licenses/Flite @@ -0,0 +1,206 @@ + +Flite is free software. + +We have kept the core code to BSD-like copyright, thus the system is +free to use in commercial products, with commercial extensions. GPL +code is only included as part of the build process and does not +taint any of the run-time code. + +As a collection it is distributed under the following license. Note +a few files in this distribution have a different but equally free +non-conflicting licence, see below. + + Language Technologies Institute + Carnegie Mellon University + Copyright (c) 1999-2014 + All Rights Reserved. + + Permission is hereby granted, free of charge, to use and distribute + this software and its documentation without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of this work, and to + permit persons to whom this work is furnished to do so, subject to + the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + + CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK + DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + +All files within this distribution have the above license except +the following + +src/cg/cst_mlpg.h +src/cg/cst_mlpg.c +src/cg/cst_mlsa.h +src/cg/cst_mlsa.c +src/cg/cst_vc.h +src/cg/cst_vc.c +/*********************************************************************/ +/* */ +/* Nagoya Institute of Technology, Aichi, Japan, */ +/* Nara Institute of Science and Technology, Nara, Japan */ +/* and */ +/* Carnegie Mellon University, Pittsburgh, PA */ +/* Copyright (c) 2003-2004 */ +/* All Rights Reserved. */ +/* */ +/* Permission is hereby granted, free of charge, to use and */ +/* distribute this software and its documentation without */ +/* restriction, including without limitation the rights to use, */ +/* copy, modify, merge, publish, distribute, sublicense, and/or */ +/* sell copies of this work, and to permit persons to whom this */ +/* work is furnished to do so, subject to the following conditions: */ +/* */ +/* 1. The code must retain the above copyright notice, this list */ +/* of conditions and the following disclaimer. */ +/* 2. Any modifications must be clearly marked as such. */ +/* 3. Original authors' names are not deleted. */ +/* */ +/* NAGOYA INSTITUTE OF TECHNOLOGY, NARA INSTITUTE OF SCIENCE AND */ +/* TECHNOLOGY, CARNEGIE MELLON UNIVERSITY, AND THE CONTRIBUTORS TO */ +/* THIS WORK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, */ +/* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, */ +/* IN NO EVENT SHALL NAGOYA INSTITUTE OF TECHNOLOGY, NARA */ +/* INSTITUTE OF SCIENCE AND TECHNOLOGY, CARNEGIE MELLON UNIVERSITY, */ +/* NOR THE CONTRIBUTORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR */ +/* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM */ +/* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, */ +/* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN */ +/* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* */ +/*********************************************************************/ + +These functions are derived from the versions in festvox/src/vc/ as +modified by Tomoki Toda which in turn contain code derived from +NITECH's HTS system. Their copyright has the same freedoms as +as Flite's but under NAIST, NITECH and/or CMU. + +src/audio/au_wince.c +src/utils/cst_file_stdio.c +src/utils/cst_mmap_posix.c +src/utils/cst_mmap_win32.c +src/utils/cst_mmap_none.c +src/utils/cst_file_wince.c +sapi/ + are copyright Cepstral, LLC rather than CMU but fall under the same + free licence as the above, except for the owner. (Note the SAPI stuff + probably doesn't work any more) + +doc/alice + Is the first two chapters of Alice in Wonderland as distributed by the + Gutenburg project and is now in the public domain + +src/regex/regexp.c +src/regex/regsub.c + + * Copyright (c) 1986 by University of Toronto. + * Written by Henry Spencer. Not derived from licensed software. + * + * Permission is granted to anyone to use this software for any + * purpose on any computer system, and to redistribute it freely, + * subject to the following restrictions: + * + * 1. The author is not responsible for the consequences of use of + * this software, no matter how awful, even if they arise + * from defects in it. + * + * 2. The origin of this software must not be misrepresented, either + * by explicit claim or by omission. + * + * 3. Altered versions must be plainly marked as such, and must not + * be misrepresented as being the original software. + +src/speech/rateconv.c + + * Copyright (c) 1992, 1995 by Markus Mummert + * + * Redistribution and use of this software, modifcation and inclusion + * into other forms of software are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of this software must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. If this software is redistributed in a modified condition + * it must reveal clearly that it has been modified. + +lang/usenglish/us_durz_cart.c +lang/usenglish/us_durz_cart.h +lang/usenglish/us_int_accent_cart.c +lang/usenglish/us_int_accent_cart.h +lang/usenglish/us_int_tone_cart.c +lang/usenglish/us_int_tone_cart.h +lang/usenglish/us_phoneset.c +lang/usenglish/us_f0lr.c + These are directly (or indirectly) compiled/derived from files that are + part of the Festival Speech Synthesis System (1.4.1). Hence they have + a joint copyright CMU/Edinburgh but with the same free licence + +configure + # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + +configure.sub +config.guess +missing +install-sh +mkinstalldirs + Copyright FSF, and under the GPL, these files are only used for + convenient configuration and are not part of the generated binary, + and therefore do not impose any GPL restrctions on the rest of the + system. But as they are standard methods for configuration they + are included. + +src/speech/g72x.h +src/speech/g721.c +src/speech/g72x.c +src/speech/g723_24.c +src/speech/g723_40.c + +/* + * This source code is a product of Sun Microsystems, Inc. and is provided + * for unrestricted use. Users may copy or modify this source code without + * charge. + * + * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING + * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun source code is provided with no support and without any obligation on + * the part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ + +lang/cmu_grapheme_lex/grapheme_unitran_tables.c +/* Copyright 2008-2012, University of Illinois at Urbana-Champaign */ +/* distributed under the Apache License, Version (2.0) */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* Original table developed by Richard Sproat and Kyoung-young Kim */ +/* Ported for Festvox by Gopala Anumachipalli gopalakr@cs.cmu.edu Sep 2012 */ +/* Then converted to C for CMU Flite (cmuflite.org) */ diff --git a/app-accessibility/flite/patches/flite-2.0.0.patchset b/app-accessibility/flite/patches/flite-2.0.0.patchset new file mode 100644 index 000000000..0d51c70e4 --- /dev/null +++ b/app-accessibility/flite/patches/flite-2.0.0.patchset @@ -0,0 +1,102 @@ +From b21c80cf33debb37b6638ab2be8d188c5a14eafb Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:37:15 +0000 +Subject: Support shared libraries on Haiku + + +diff --git a/configure.in b/configure.in +index 972d818..c2472a6 100644 +--- a/configure.in ++++ b/configure.in +@@ -265,6 +265,10 @@ fi + + if test "$shared" = true; then + case "$target_os" in ++ haiku*) ++ SHFLAGS="-fPIC" ++ OTHERLIBS="-lnetwork" ++ ;; + linux*|k*bsd*-gnu|gnu*) + SHFLAGS="-fPIC" + ;; +-- +1.8.3.4 + + +From 95e4aff793bbef466ed151897d71585bcb7e0321 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:38:03 +0000 +Subject: Do not unconditionally add `-lm` to linking commands + +TODO: make this more platform-independent. + +diff --git a/config/common_make_rules b/config/common_make_rules +index 7a03785..0dacbb6 100644 +--- a/config/common_make_rules ++++ b/config/common_make_rules +@@ -68,7 +68,7 @@ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) + + FLITELIBS = $(BUILDDIR)/lib/libflite.a + FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite +-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) ++LDFLAGS += $(AUDIOLIBS) $(OTHERLIBS) + + FULLOBJS = $(OBJS:%=$(OBJDIR)/%) + ifdef SHFLAGS +-- +1.8.3.4 + + +From 96416a919c8ea1fcafd457502ee2bc6fd3ef107f Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:39:36 +0000 +Subject: cmu_indic_lex: Separate code and declaration + + +diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c +index 3c586cb..ee682d6 100644 +--- a/lang/cmu_indic_lex/cmu_indic_lex.c ++++ b/lang/cmu_indic_lex/cmu_indic_lex.c +@@ -334,6 +334,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, + int cur_char_type = 0; + int next_char_type = 0; + ++ const cst_val *v, *vx; ++ cst_val *ph; ++ + // Ignore chars (filter) + in_ords = cmu_indic_lex_remove_ignore_chars(ords); + +@@ -431,8 +434,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, + } + } + +- const cst_val *v, *vx; +- cst_val *ph; + for(v=out_phone_strings; v; v=val_cdr(v)) { + ph = val_readlist_string(val_string(val_car(v))); + for(vx=ph; vx; vx=val_cdr(vx)) { +-- +1.8.3.4 + + +From 8b998ca76f21a8bb7cf240fd7ed40627eafbc2d8 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 23:44:02 +0000 +Subject: Bump shlib version to libflite.so.2 + +This way it is consistent with libflite.so.2.0.0 + +diff --git a/config/project.mak b/config/project.mak +index f42ee12..252f22a 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.0.0 + PROJECT_DATE = Dec 2014 + PROJECT_STATE = release + +-PROJECT_SHLIB_VERSION = 1 ++PROJECT_SHLIB_VERSION = 2 +-- +1.8.3.4 + From 3888896cf99135de2706cdb658a6d3aff756d4f3 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 25 Dec 2014 10:49:41 +0300 Subject: [PATCH 151/326] Tolmach: remove libfSub from provides --- haiku-apps/tolmach/tolmach-1.1.0.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index 089e2ccee..8b4214906 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -15,7 +15,6 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" tolmach = $portVersion app:Tolmach = $portVersion - lib:libfSub " REQUIRES=" From 2045b82d55d7825d3f80fd5b624774713d625a94 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 25 Dec 2014 23:09:43 +0100 Subject: [PATCH 152/326] beam: update recipe now that patches have been upstreamed. --- haiku-apps/beam/beam-1.2alpha.recipe | 6 +-- .../beam/patches/beam-1.2alpha.patchset | 48 ------------------- 2 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 haiku-apps/beam/patches/beam-1.2alpha.patchset diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 1fe158b50..fab9f0f64 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,7 +1,7 @@ SUMMARY="An e-mail client." HOMEPAGE="http://beam.sourceforge.net" -SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" -REVISION="4" +SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam#95dc769db2f9090a038bc5a2c46f009379b2d57b" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion @@ -26,8 +26,6 @@ BUILD_PREREQUIRES=" cmd:flex " -PATCHES="beam-1.2alpha.patchset" - BUILD() { jam -q $jobArgs diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset deleted file mode 100644 index fbb9c2df8..000000000 --- a/haiku-apps/beam/patches/beam-1.2alpha.patchset +++ /dev/null @@ -1,48 +0,0 @@ -From e6115845893578b237144c1660a686802598ff9a Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Thu, 14 Nov 2013 02:12:56 -0700 -Subject: Adjust search path for libbnetapi - - -diff --git a/build-jam/BuildSettings b/build-jam/BuildSettings -index d411b68..4874ac6 100644 ---- a/build-jam/BuildSettings -+++ b/build-jam/BuildSettings -@@ -44,7 +44,7 @@ if $(OSPLAT) = X86 { - PLATFORM = zeta ; - } - # check for libbnetapi... -- local haveLibbnetapi = [ GLOB /boot/develop/lib/x86 : libbnetapi.so ] ; -+ local haveLibbnetapi = [ GLOB /boot/system/develop/lib : libbnetapi.so ] ; - if $(haveLibbnetapi) { - LIBNETAPI = bnetapi ; - } --- -1.8.3.4 - - -From 63db87fb177e6c1649bf0aad0aa1922af47dd59e Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 23 Dec 2014 10:18:56 +0100 -Subject: Remove leftover unlock. - -I can't find any place where the lock would be locked matching this call -to Unlock. Must be an error then. - -Triggers #6400 on Haiku. - -diff --git a/src-beam/BmGuiRoster.cpp b/src-beam/BmGuiRoster.cpp -index d16e0f1..cd4bf59 100644 ---- a/src-beam/BmGuiRoster.cpp -+++ b/src-beam/BmGuiRoster.cpp -@@ -516,7 +516,6 @@ void BmGuiRoster::RebuildLogMenu( BmMenuControllerBase* logMenu) { - } - logMenu->AddItem( smtpMenu); - } -- TheLogHandler->mLocker.Unlock(); - } - - /*------------------------------------------------------------------------------*\ --- -1.8.3.4 - From b18c8663a3544780615bad3e3ca9181a0e7bf7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 26 Dec 2014 15:09:10 +0000 Subject: [PATCH 153/326] OpenSceneGraph fixing POLICY WARNINGS --- games-engines/openscenegraph/openscenegraph-3.2.1.recipe | 3 +++ games-engines/openscenegraph/openscenegraph-git.recipe | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index e6a8785e8..90ebb2aa3 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -48,6 +48,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -55,6 +56,8 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index 474d351ec..e5280374a 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -42,11 +42,13 @@ PROVIDES=" lib:libosgViewer$secondaryArchSuffix = $portVersion lib:libosgVolume$secondaryArchSuffix = $portVersion lib:libosgWidget$secondaryArchSuffix = $portVersion + lib:libosgUI$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -54,6 +56,8 @@ REQUIRES=" lib:libcurl$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" @@ -107,7 +111,7 @@ INSTALL() libosgGA libosgManipulator libosgParticle \ libosgPresentation libosgShadow libosgSim \ libosgTerrain libosgText libosgUtil libosgViewer \ - libosgVolume libosgWidget + libosgVolume libosgWidget libosgUI fixPkgconfig @@ -134,6 +138,7 @@ PROVIDES_devel=" devel:libosgViewer$secondaryArchSuffix = $portVersion devel:libosgVolume$secondaryArchSuffix = $portVersion devel:libosgWidget$secondaryArchSuffix = $portVersion + devel:libosgUI$secondaryArchSuffix = $portVersion " REQUIRES_devel=" From a0b01aaf2fc61498f4eb9ec557b1bd8c1a5f2c15 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 25 Dec 2014 18:15:18 -0800 Subject: [PATCH 154/326] Add Edinburgh Speech Tools port --- .../licenses/Edinburgh Speech Tools | 70 + .../patches/speech_tools-2.4.patchset | 2977 +++++++++++++++++ .../speech_tools/speech_tools-2.4.recipe | 150 + 3 files changed, 3197 insertions(+) create mode 100644 app-accessibility/speech_tools/licenses/Edinburgh Speech Tools create mode 100644 app-accessibility/speech_tools/patches/speech_tools-2.4.patchset create mode 100644 app-accessibility/speech_tools/speech_tools-2.4.recipe diff --git a/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools b/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools new file mode 100644 index 000000000..f26d8fce4 --- /dev/null +++ b/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools @@ -0,0 +1,70 @@ + Centre for Speech Technology Research + University of Edinburgh, UK + Copyright (c) 1994-2014 + All Rights Reserved. + +Permission is hereby granted, free of charge, to use and distribute +this software and its documentation without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of this work, and to +permit persons to whom this work is furnished to do so, subject to +the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + +THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK +DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT +SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + +COPYING +------------------------------------------------------------------------ + +Some files in the distribution do not fall under the above copyright. +However none have any commercial restrictions, and no files fall under +the GPL. Specifically files that have different licences are as +follows: + +grammar/wfst/wfst_train.cc + Copyright Carnegie Mellon University (under the same + open licences as much of the rest of the code). +siod/ +include/siod*.h +lib/siod/siod.scm + Apart from some new functionality under our licence the SIOD + files fall under the licence given in siod/slib.cc copyright + Paradigm Associates. This code has been substantially modified + by us though our changes are under that licence. + + editline.c editline.h el_complete.c el_sysunix.c el_unix.h + are copyright 1992 Simmule Turner and Rich Salz under the + "BSD like" licence in siod/editline.c Again substantial + changes have been made by us which continue to be under that + licence + +rxp/ +include/rxp/ + Is Copyright Richard Tobin. We have a specific version of RXP + which allows free (including non-commercial) use. + +base_class/raveconv.cc + Is copyright 1992, 1995 by Markus Mummert + +base_class/string/reg*.{c,cc} + Copyright (c) 1986 by University of Toronto. + +base_class/string/EST_strcasecmp.c + Copyright (c) 1987, 1993 + The Regents of the University of California. All rights reserved. + + The 3-clause BSD licence diff --git a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset new file mode 100644 index 000000000..ed06dd054 --- /dev/null +++ b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset @@ -0,0 +1,2977 @@ +From e6652c7af6115fb1e3465f79fa7344fcb030389e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:13:10 -0800 +Subject: Proper compiling routines + +Backported from Debian: debian_build.diff + +Signed-off-by: Timothy Gu + +diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak +index 193ce24..befcd31 100644 +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak +@@ -39,7 +39,7 @@ + ########################################################################### + + CC=gcc +-CXX=gcc ++CXX=g++ + ifeq ($(OSTYPE),Darwin) + CXX=g++ + endif +@@ -47,8 +47,9 @@ endif + COMPILER_DESC=FSF gcc + COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' + +-CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) +-CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) ++CFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) ++CXXFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) ++LINKFLAGS += $(LDFLAGS) + + DEBUG_CCFLAGS = -g + DEBUG_CXXFLAGS = -g +@@ -81,7 +82,7 @@ SHARED_CXXFLAGS = -fPIC + SHARED_LINKFLAGS = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +diff --git a/config/project.mak b/config/project.mak +index 5e9c216..2578fc1 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -103,12 +103,15 @@ PROJECT_LIBRARY_USES_estbase = eststring + + PROJECT_LIBRARY_USES_estjava = estbase eststring + +-PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1 +-PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_VERSION).1 +-PROJECT_LIBRARY_VERSION_eststring = 1.2 +-PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1 ++# These are used for the SONAME fields in ELF libraries ++PROJECT_LIBRARY_VERSION_estools = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_eststring = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_MAJOR_VERSION) + + PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1 ++# This line allows estbase to link with libpulse among others ++PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1 + + PROJECT_DEFAULT_LIBRARY = estools + +diff --git a/config/rules/bin_process.mak b/config/rules/bin_process.mak +index a1b9807..7158f83 100644 +--- a/config/rules/bin_process.mak ++++ b/config/rules/bin_process.mak +@@ -59,6 +59,7 @@ endif + Makefile ) : ;; \ + VCLocalRules ) : ;; \ + RCS|CVS ) : ;; \ ++ SCCS|BitKeeper ) : ;; \ + * ) $(ECHO_N) " $$i"; $(RM) -f "$$i";; \ + esac \ + done +diff --git a/config/rules/library.mak b/config/rules/library.mak +index 0181988..497180f 100644 +--- a/config/rules/library.mak ++++ b/config/rules/library.mak +@@ -102,15 +102,44 @@ endif + ## ## + ########################################################################### + ++libestools.so : libestools.a ++ echo Make Shared Library estools ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library estools ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_estools)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_estools),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_estools:%=-L. -l%) $$libs -L. -lestbase -leststring -lncurses ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_estools) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_estools) $@ ++ ++libestbase.so : libestbase.a ++ echo Make Shared Library estbase ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library estbase ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_estbase),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_estbase:%=-L. -l%) $$libs -L. ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_estbase) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_estbase) $@ ++ + lib%.so : lib%.a +- @echo Make Shared Library $* +- @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi +- @(cd shared_space ; $(AR) x ../$< ) +- @echo Link Shared Library $* ++ echo Make Shared Library $* ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library $* + if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ +- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs +- @$(RM) -f shared_space/*.o $@ +- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_$*),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_$*) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_$*) $@ + + ########################################################################### + ## ## +diff --git a/config/rules/targets.mak b/config/rules/targets.mak +index f052401..0c55b00 100644 +--- a/config/rules/targets.mak ++++ b/config/rules/targets.mak +@@ -71,7 +71,7 @@ ifdef ALL_DIRS + @ for i in $(ALL_DIRS) ; \ + do \ + echo "clean in $(DIRNAME)/$$i" ;\ +- $(MAKE) --no-print-directory -C $$i clean ; \ ++ $(MAKE) --no-print-directory -C $$i NO_DEPEND=1 clean ; \ + done + endif + ifdef EXTRA_LIB_BUILD_DIRS +diff --git a/config/system.sh b/config/system.sh +index af07781..71b271c 100644 +--- a/config/system.sh ++++ b/config/system.sh +@@ -60,8 +60,7 @@ OSREV=`{ uname -r || echo ""; } 2> /dev/null | + sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'` + + # Sort out various flavours of Linux +-if [ "$OSTYPE" = Linux ] +- then ++case "$OSTYPE" in Linux|GNU|GNU/*) + if [ -f "/etc/redhat-release" ] + then + OSTYPE=RedHatLinux +@@ -74,7 +73,8 @@ if [ "$OSTYPE" = Linux ] + # Generic unknown GNU/Linux system. + OSTYPE=Linux + fi +-fi ++;; ++esac + + # Make sure we actually have a .mak file for it, otherwise fall back + # to sensible defaults (for example, kernel version and architecture +-- +1.8.3.4 + + +From 0eca7062ef526b969b4bc63a396bf380838369ee Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:14:58 -0800 +Subject: Use datadir for architecure-independent runtime libs + +Backported from Debian: datadir_fhs.diff, revision 7ec39b344cab. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_cutils.h b/include/EST_cutils.h +index c285204..8c8dc31 100644 +--- a/include/EST_cutils.h ++++ b/include/EST_cutils.h +@@ -48,6 +48,7 @@ extern "C" { + extern const char * const est_tools_version; + extern const char * const est_name; + extern const char * const est_libdir; ++extern const char * const est_datadir; + extern const char * const est_ostype; + + #include "EST_walloc.h" +diff --git a/lib/siod/siod.scm b/lib/siod/siod.scm +index a910390..227d48f 100644 +--- a/lib/siod/siod.scm ++++ b/lib/siod/siod.scm +@@ -426,19 +426,28 @@ return values." + ;; will be set automatically on start-up + (defvar libdir ' + "libdir +- The pathname of the run-time libary directory. Note reseting is +- almost definitely not what you want to do. This value is automatically +- set at start up from the value specifed at compile-time or the value +- specifed with --libdir on the command line. A number of other variables +- depend on this value.") +- +-(defvar load-path (list libdir) ++ The pathname of the architecture-dependent run-time libary directory. ++ Note reseting is almost definitely not what you want to do. This ++ value is automatically set at start up from the value specifed at ++ compile-time or the value specifed with --libdir on the command line. ++ A number of other variables depend on this value.") ++ ++(defvar datadir ' ++ "datadir ++ The pathname of the architecture-independent run-time libary ++ directory. Note reseting is almost definitely not what you want to ++ do. This value is automatically set at start up from the value ++ specifed at compile-time or the value specifed with --datadir on the ++ command line. A number of other variables depend on this value.") ++ ++(defvar load-path (list datadir) + "load-path + A list of directories containing .scm files. Used for various functions + such as load_library and require. Follows the same use as EMACS. By +- default it is set up to the compile-time library directory but may be +- changed by the user at run time, by adding a user's own library directory +- or even replacing all of the standard library. [see Site initialization]") ++ default it is set up to the compile-time architecture-independent ++ library directory but may be changed by the user at run time, by ++ adding a user's own library directory or even replacing all of the ++ standard library. [see Site initialization]") + + ;; will be set automatically on start-up + (defvar *ostype* 'unknown +@@ -447,12 +456,6 @@ return values." + on, e.g. SunOS5, FreeBSD, linux etc. The value is taken from the Makefile + variable OSTYPE at compile time.") + +-(defvar etc-path (path-append libdir "etc/" *ostype*) +- "etc-path +- A list of directories where binaries specific to Festival may be located. +- This variable is automatically set to LIBDIR/etc/OSTYPE/ +- and that path is added to the end of the UNIX PATH environment variable.") +- + (define (library_expand_filename fname) + "(library_expand_filename FILENAME) + Search for filename by appending FILENAME to each member of load-path. +diff --git a/main/siod_main.cc b/main/siod_main.cc +index 2c4a1a0..e93ba6c 100644 +--- a/main/siod_main.cc ++++ b/main/siod_main.cc +@@ -178,7 +178,7 @@ static void siod_load_default_files(void) + EST_Pathname initfile; + + // Load library init first +- initfile = EST_Pathname(est_libdir).as_directory(); ++ initfile = EST_Pathname(est_datadir).as_directory(); + initfile += "siod"; + initfile += "init.scm"; + +@@ -197,9 +197,12 @@ static void siod_lisp_vars(void) + + lib = EST_Pathname(est_libdir).as_directory(); + lib += "siod"; +- + siod_set_lval("libdir",strintern(lib)); + ++ lib = EST_Pathname(est_datadir).as_directory(); ++ lib += "siod"; ++ siod_set_lval("datadir",strintern(lib)); ++ + if (!strcmp(est_ostype,"")) + siod_set_lval("*ostype*",rintern(est_ostype)); + siod_set_lval("est_version", +@@ -221,19 +224,10 @@ static void siod_lisp_vars(void) + cons(flocons(minor), + cons(flocons(subminor),NIL)))); + +- EST_Pathname etcdircommon = est_libdir; +- etcdircommon += "etc"; +- +- EST_Pathname etcdir = etcdircommon; +- etcdir += est_ostype; +- + // Modify my PATH to include these directories +- siod_set_lval("etc-path",cons(rintern(etcdir), +- cons(rintern(etcdircommon),NIL))); +- + EST_String path = getenv("PATH"); + +- path += ":" + EST_String(etcdir) + ":" + EST_String(etcdircommon); ++ path += ":" + EST_String(est_libdir); + + putenv(wstrdup("PATH=" + path)); + +diff --git a/main/xml_parser_main.cc b/main/xml_parser_main.cc +index 41579f6..8f8a7e1 100644 +--- a/main/xml_parser_main.cc ++++ b/main/xml_parser_main.cc +@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) + al.sval("-sysdir") + "/\\1"); + + pclass.register_id("//CSTR//EST \\(.*\\)", +- EST_String::cat(est_libdir, "/\\1.dtd")); ++ EST_String::cat(est_datadir, "/\\1.dtd")); + + /* An individual parser runs over a single source. + */ +diff --git a/utils/EST_cutils.c b/utils/EST_cutils.c +index fd29653..af30aed 100644 +--- a/utils/EST_cutils.c ++++ b/utils/EST_cutils.c +@@ -54,12 +54,19 @@ const char * const est_name = STRINGIZE(ESTNAME); + #ifdef ESTLIBDIRC + # define ESTLIBDIR STRINGIZE(ESTLIBDIRC) + #endif +- + #ifndef ESTLIBDIR + #define ESTLIBDIR "/usr/local/lib/speech_tools" + #endif + ++#ifdef ESTDATADIRC ++# define ESTDATADIR STRINGIZE(ESTDATADIRC) ++#endif ++#ifndef ESTDATADIR ++#define ESTDATADIR "/usr/local/share/speech_tools" ++#endif ++ + const char * const est_libdir = ESTLIBDIR; ++const char * const est_datadir = ESTDATADIR; + + const char * const est_ostype = STRINGIZE(ESTOSTYPE); + +diff --git a/utils/Makefile b/utils/Makefile +index c17bab4..62a0de8 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -58,5 +58,5 @@ ALL = .buildlibs + include $(TOP)/config/common_make_rules + + EST_cutils.o: EST_cutils.c +- $(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIRC='$(EST_HOME)/lib' -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c ++ $(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIR=\"$(EST_HOME)/lib\" -DESTDATADIR=\"$(EST_HOME)/share\" -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c + +-- +1.8.3.4 + + +From 30567c705c2e5aaf1c45737ebc409a87e70bf690 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:17:52 -0800 +Subject: Use standard headers + +Backported from Debian: use_standard_headers.diff, rev fc5c7c603109 + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_dynamic_model.h b/include/EST_dynamic_model.h +index a54a0c5..7807f8a 100644 +--- a/include/EST_dynamic_model.h ++++ b/include/EST_dynamic_model.h +@@ -38,8 +38,8 @@ + /*=======================================================================*/ + + #include +-#include +-#include ++#include ++#include + #include "EST.h" + #include "EST_model_types.h" + +-- +1.8.3.4 + + +From a03f11db6ac385ceb2f2897214e56fec6a477eff Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:19:24 -0800 +Subject: Force the use of actual template of EST_TIterator + +Backported from Debian: include_EST_TIterator.h.diff, rev c16015e8c96. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_TIterator.h b/include/EST_TIterator.h +index 7ce188e..832e8e3 100644 +--- a/include/EST_TIterator.h ++++ b/include/EST_TIterator.h +@@ -228,7 +228,7 @@ private: + + public: + +- typedef EST_TIterator Iter; ++ typedef EST_TRwIterator Iter; + + /// Create an iterator not associated with any specific container. + EST_TRwIterator() {this->cont=NULL;} +@@ -278,7 +278,7 @@ class EST_TRwStructIterator + { + public: + +- typedef EST_TIterator Iter; ++ typedef EST_TRwStructIterator Iter; + + /// Create an iterator not associated with any specific container. + EST_TRwStructIterator() {this->cont=NULL;} +-- +1.8.3.4 + + +From 5a0d0a6091371c358a47f4a6c14eadbd300b1ac0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:22:25 -0800 +Subject: Modify data loading memory management to avoid crashes + +Author: Samuel Thibault + +Backported from Debian: speech_class/EST_WaveFile.cc, rev 1d2d56519d + +Signed-off-by: Timothy Gu + +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index ba8a362..7f07a31 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -85,7 +85,10 @@ EST_read_status load_using(standard_load_fn_fp fn, + + if (status == read_ok) + { +- wv.values().set_memory(data, 0, nsamp, nchan, TRUE); ++ short *data2 = new short[nsamp*nchan]; ++ memcpy(data2, data, nsamp*nchan*sizeof(short)); ++ wfree(data); ++ wv.values().set_memory(data2, 0, nsamp, nchan, TRUE); + wv.set_sample_rate(srate); + } + +-- +1.8.3.4 + + +From 2a470daf58bcebc49461b08c678bb4dd694adf1b Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:24:19 -0800 +Subject: Use 3-clause BSD license for the files derived from BSD + +BSD (where these two files came from) already switched to 3-clause BSD. + +Backported from Debian: copyright_4clausefix.diff, rev 9d3453539788. + +Changes to README made by me (Timothy), with the same rationale as the original +Debian patch. + +Signed-off-by: Timothy Gu + +diff --git a/README b/README +index 88e3ded..dfdeae5 100644 +--- a/README ++++ b/README +@@ -126,7 +126,7 @@ base_class/string/EST_strcasecmp.c + Copyright (c) 1987, 1993 + The Regents of the University of California. All rights reserved. + +- The standard BSD licence ++ The 3-clause BSD licence + + + ACKNOWLEDGEMENTS +diff --git a/base_class/string/EST_strcasecmp.c b/base_class/string/EST_strcasecmp.c +index 72a9b7c..1c48a32 100755 +--- a/base_class/string/EST_strcasecmp.c ++++ b/base_class/string/EST_strcasecmp.c +@@ -10,11 +10,7 @@ + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. +- * 3. All advertising materials mentioning features or use of this software +- * must display the following acknowledgement: +- * This product includes software developed by the University of +- * California, Berkeley and its contributors. +- * 4. Neither the name of the University nor the names of its contributors ++ * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * +diff --git a/base_class/string/regexp.h b/base_class/string/regexp.h +index 578c968..8b310ae 100644 +--- a/base_class/string/regexp.h ++++ b/base_class/string/regexp.h +@@ -14,11 +14,7 @@ + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. +- * 3. All advertising materials mentioning features or use of this software +- * must display the following acknowledgement: +- * This product includes software developed by the University of +- * California, Berkeley and its contributors. +- * 4. Neither the name of the University nor the names of its contributors ++ * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * +-- +1.8.3.4 + + +From 3de08ae8da37beb2665fb8a256311315f5edd31c Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:33:54 -0800 +Subject: Seeking and reading interface to istreams in EST_TokenStream + +Reduces IO disk usage when using HTS voices. + +Backported from Debian: tokenstream_istream.diff, rev b3d550a5aa330. + +Signed-off-by: Timothy Gu + +diff --git a/base_class/EST_Token.cc b/base_class/EST_Token.cc +index 4287d19..533467d 100644 +--- a/base_class/EST_Token.cc ++++ b/base_class/EST_Token.cc +@@ -287,8 +287,9 @@ int EST_TokenStream::seek_end() + return -1; + break; + case tst_istream: +- cerr << "EST_TokenStream seek on istream not yet supported" << endl; +- return -1; ++ is->seekg(0,is->end); ++ p_filepos = is->tellg(); ++ return p_filepos; + break; + case tst_string: + pos = buffer_length; +@@ -320,8 +321,9 @@ int EST_TokenStream::seek(int position) + return -1; + break; + case tst_istream: +- cerr << "EST_TokenStream seek on istream not yet supported" << endl; +- return -1; ++ p_filepos = position; ++ is->seekg(position, is->beg); ++ return 0; + break; + case tst_string: + if (position >= pos) +@@ -381,8 +383,9 @@ int EST_TokenStream::fread(void *buff, int size, int nitems) + return 0; + break; + case tst_istream: +- cerr << "EST_TokenStream fread istream not yet supported" << endl; +- return 0; ++ is->read((char*)buff, (size_t) size*nitems); ++ return is->gcount()/size; ++ break; + case tst_string: + if ((buffer_length-pos)/size < nitems) + items_read = (buffer_length-pos)/size; +-- +1.8.3.4 + + +From 1a4805cb16dd6d322b8736c0846748f1bf8fa2f0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:48:11 -0800 +Subject: Add ALAW support + +Backported from Debian: alaw.diff, rev da4af248. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_wave_aux.h b/include/EST_wave_aux.h +index 4995794..9d2bfde 100644 +--- a/include/EST_wave_aux.h ++++ b/include/EST_wave_aux.h +@@ -97,6 +97,7 @@ void alaw_to_short(const unsigned char *alaw,short *data,int length); + void uchar_to_short(const unsigned char *chars,short *data,int length); + void short_to_char(const short *data,unsigned char *chars,int length); + void short_to_ulaw(const short *data,unsigned char *ulaw,int length); ++void short_to_alaw(const short *data,unsigned char *alaw,int length); + + // Used when setting Waves in Features + VAL_REGISTER_CLASS_DCLS(wave,EST_Wave) +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 7f07a31..5e8d46e 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -315,6 +315,27 @@ EST_write_status EST_WaveFile::save_ulaw(FILE *fp, + return save_using(save_wave_ulaw, fp, localwv, stype, bo); + } + ++EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, ++ EST_Wave &wv, ++ int rate, ++ EST_sample_type_t stype, int bo, int nchan, ++ int offset, int length) ++{ ++ return load_using(load_wave_alaw, ++ ts, wv, rate, ++ stype, bo, nchan, ++ offset, length); ++} ++ ++EST_write_status EST_WaveFile::save_alaw(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_alaw, fp, localwv, stype, bo); ++} ++ + static int parse_esps_r_option(EST_String arg, int &offset, int &length) + { + EST_String s, e; +@@ -385,6 +406,11 @@ EST_read_status read_wave(EST_Wave &sig, const EST_String &in_file, + al.add_item("-itype","ulaw"); + al.add_item("-f","8000"); + } ++ if (al.present("-alaw")) ++ { ++al.add_item("-itype","alaw"); ++al.add_item("-f","8000"); ++ } + if (al.present("-iswap")) + al.add_item("-ibo","other"); + +@@ -455,6 +481,11 @@ EST_read_status read_wave(EST_Wave &sig, const EST_String &in_file, + cerr << "Cannot recognize file format or cannot access file: \"" << in_file << "\"\n"; + return read_error; + } ++ if (file_type == "alaw") ++ { ++sample_rate = 8000; ++sample_type = "alaw"; ++ } + + if (al.present("-start") || al.present("-end") + || al.present("-to") || al.present("-from")) +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index 04fca06..e9217b9 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -57,7 +57,8 @@ typedef enum EST_WaveFileType{ + wff_aiff, + wff_riff, + wff_raw, +- wff_ulaw ++ wff_ulaw, ++ wff_alaw + } EST_WaveFileType; + + class EST_WaveFile { +@@ -125,6 +126,9 @@ public: + static EST_write_status save_ulaw(SaveWave_TokenStreamArgs); + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + ++ static EST_write_status save_alaw(SaveWave_TokenStreamArgs); ++ static EST_read_status load_alaw(LoadWave_TokenStreamArgs); ++ + static EST_TNamedEnumI map; + + static EST_String options_supported(void); +diff --git a/speech_class/EST_wave_aux.cc b/speech_class/EST_wave_aux.cc +index afd6a85..24eb430 100644 +--- a/speech_class/EST_wave_aux.cc ++++ b/speech_class/EST_wave_aux.cc +@@ -287,7 +287,7 @@ EST_String options_wave_input(void) + " endian)\n\n" + "-iswap Swap bytes. (For use on an unheadered input file)\n\n" + "-istype Sample type in an unheadered input file:\n" +- " short, mulaw, byte, ascii\n\n" ++ " short, alaw, mulaw, byte, ascii\n\n" + "-c Select a single channel (starts from 0). \n" + " Waveforms can have multiple channels. This option \n" + " extracts a single channel for progcessing and \n" +@@ -318,7 +318,7 @@ EST_String options_wave_output(void) + " Intel, Alpha, DEC Mips, Vax are LSB \n" + " (little endian)\n\n" + "-oswap Swap bytes when saving to output\n\n"+ +- "-ostype Output sample type: short, mulaw, byte or ascii\n\n"; ++ "-ostype Output sample type: short, alaw, mulaw, byte or ascii\n\n"; + } + + Declare_TNamedEnum(EST_sample_type_t) +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index e351d21..dae0963 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -107,15 +107,17 @@ const char *sample_type_to_nist(enum EST_sample_type_t sample_type) + { + const char *c; + switch (sample_type) { +- case st_unknown: ++ case st_unknown: + c = ""; break; +- case st_schar: ++ case st_schar: + c = "PCM-1"; break; ++ case st_alaw: ++ c = "ALAW"; break; + case st_mulaw: + c = "ULAW"; break; +- case st_short: ++ case st_short: + c = "pcm"; break; +- case st_int: ++ case st_int: + c = "PCM-4"; break; + case st_float: + c = "REAL"; break; +@@ -141,6 +143,9 @@ enum EST_sample_type_t nist_to_sample_type(char *type) + (EST_strcasecmp(type,"mu-law",NULL) == 0) || + (EST_strcasecmp(type,"mulaw",NULL) == 0)) + return st_mulaw; ++ else if ((EST_strcasecmp(type,"ALAW",NULL) == 0) || ++ (EST_strcasecmp(type,"A-LAW",NULL) == 0)) ++ return st_alaw; + else if (strcmp(type,"alaw") == 0) + return st_alaw; + else if (strcmp(type,"PCM-1") == 0) +@@ -192,6 +197,11 @@ enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + byte_order = wstrdup((EST_BIG_ENDIAN ? "10" : "01")); + sample_coding = wstrdup("ULAW"); + } ++ if (streq(byte_order,"a-law")) ++ { ++ byte_order = wstrdup((EST_BIG_ENDIAN ? "10" : "01")); ++ sample_coding = wstrdup("ALAW"); ++ } + + /* code for reading in Tony Robinson's shorten files. + This is a temporary fix which calls the unshorten program on the +@@ -473,12 +483,13 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + /* The follow are registered proprietary WAVE formats (?) */ + case WAVE_FORMAT_MULAW: + actual_sample_type = st_mulaw; break; ++ case WAVE_FORMAT_ALAW: ++ actual_sample_type = st_alaw; break; + case WAVE_FORMAT_ADPCM: +- fprintf(stderr, "RIFF file: unsupported proprietary sample format ADPCM\n"); ++ fprintf(stderr, "RIFF file: unsupported proprietary sample format ADPCM\n"); + actual_sample_type = st_short; + break; + /* actual_sample_type = st_adpcm; break; */ /* yes but which adpcm ! */ +- case WAVE_FORMAT_ALAW: + default: + fprintf(stderr, "RIFF file: unknown sample format\n"); + actual_sample_type = st_short; +@@ -843,50 +854,103 @@ enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + { + unsigned char *ulaw; + int data_length,samps; +- ++ + ts.seek_end(); + samps = ts.tell(); +- ++ + if (length == 0) + data_length = samps - offset; + else + data_length = length; +- ++ + ulaw = walloc(unsigned char, data_length); + ts.seek(offset); + if (ts.fread(ulaw,1,data_length) != data_length) + { +- wfree(ulaw); ++ wfree(ulaw); + return misc_read_error; + } +- ++ + *data = walloc(short,data_length); + ulaw_to_short(ulaw,*data,data_length); + wfree(ulaw); +- ++ + *num_samples = data_length; + *sample_rate = 8000; + *num_channels = 1; + *sample_type = st_short; + *word_size = 2; + *bo = EST_NATIVE_BO; +- ++ + return format_ok; + } + + enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, +- int sample_rate, ++ int num_samples, int num_channels, ++ int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { + (void)sample_rate; + (void)sample_type; + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_mulaw,bo); +- +- ++ ++ ++} ++ ++enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int ++ *num_samples, int *num_channels, int *word_size, int ++ *sample_rate, enum EST_sample_type_t *sample_type, int *bo, ++ int offset, int length) ++ ++{ ++ unsigned char *alaw; ++ int data_length,samps; ++ ++ ts.seek_end(); ++ samps = ts.tell(); ++ ++ if (length == 0) ++ data_length = samps - offset; ++ else ++ data_length = length; ++ ++ alaw = walloc(unsigned char, data_length); ++ ts.seek(offset); ++ if (ts.fread(alaw,1,data_length) != data_length) ++ { ++ wfree(alaw); ++ return misc_read_error; ++ } ++ ++ *data = walloc(short,data_length); ++ alaw_to_short(alaw,*data,data_length); ++ wfree(alaw); ++ ++ *num_samples = data_length; ++ *sample_rate = 8000; ++ *num_channels = 1; ++ *sample_type = st_short; ++ *word_size = 2; ++ *bo = EST_NATIVE_BO; ++ ++ return format_ok; + } + ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void)sample_rate; ++ (void)sample_type; ++ return save_wave_raw(fp,data,offset,num_samples,num_channels, ++ 8000,st_alaw,bo); ++ ++ ++} ++ ++ + /*=======================================================================*/ + /* Sun and Next snd files */ + /*=======================================================================*/ +diff --git a/speech_class/EST_wave_utils.cc b/speech_class/EST_wave_utils.cc +index d70ee87..55878b9 100644 +--- a/speech_class/EST_wave_utils.cc ++++ b/speech_class/EST_wave_utils.cc +@@ -53,7 +53,9 @@ + #include "EST_error.h" + + static short st_ulaw_to_short(unsigned char ulawbyte); ++static short st_alaw_to_short(unsigned char alawbyte); + static unsigned char st_short_to_ulaw(short sample); ++static unsigned char st_short_to_alaw(short sample); + + /* + * This table is +@@ -202,6 +204,16 @@ void short_to_ulaw(const short *data,unsigned char *ulaw,int length) + + } + ++void short_to_alaw(const short *data,unsigned char *alaw,int length) ++{ ++ /* Convert alaw to shorts */ ++ int i; ++ ++ for (i=0; i + +-/* The follow two (raw and ulaw) cannot be in the table as they cannot */ ++/* The follow two (raw, alaw and ulaw) cannot be in the table as they cannot */ + /* identify themselves from files (both are unheadered) */ + enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int +@@ -62,6 +62,15 @@ enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int ++ *num_samples, int *num_channels, int *word_size, int ++ *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int ++ offset, int length); ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int length, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t, int bo); ++ + enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +diff --git a/testsuite/correct/ch_wave_script.out b/testsuite/correct/ch_wave_script.out +index b656ff3..fa4aee1 100644 +--- a/testsuite/correct/ch_wave_script.out ++++ b/testsuite/correct/ch_wave_script.out +@@ -77,7 +77,7 @@ use "-" to make input and output files stdin/out + -iswap Swap bytes. (For use on an unheadered input file) + + -istype Sample type in an unheadered input file: +- short, mulaw, byte, ascii ++ short, alaw, mulaw, byte, ascii + + -c Select a single channel (starts from 0). + Waveforms can have multiple channels. This option +@@ -112,7 +112,7 @@ use "-" to make input and output files stdin/out + + -oswap Swap bytes when saving to output + +--ostype Output sample type: short, mulaw, byte or ascii ++-ostype Output sample type: short, alaw, mulaw, byte or ascii + + -scale Scaling factor. Increase or descrease the amplitude + of the whole waveform by the factor given +-- +1.8.3.4 + + +From 77a6c8d1f2fa93c2809ede4833d21e19b757df14 Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:48:54 -0800 +Subject: Allow saving wave files in parts + +Backported from Debian: wave_save_parts.diff, rev 5cf72e31d. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_Wave.h b/include/EST_Wave.h +index 053e2a9..1e7324e 100644 +--- a/include/EST_Wave.h ++++ b/include/EST_Wave.h +@@ -295,11 +295,18 @@ public: + + EST_write_status save_file(const EST_String filename, + EST_String filetype, +- EST_String sample_type, int bo); ++ EST_String sample_type, int bo, const char *mode = "wb"); + + EST_write_status save_file(FILE *fp, + EST_String filetype, + EST_String sample_type, int bo); ++ ++ EST_write_status save_file_header(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo); ++ EST_write_status save_file_data(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo); + //@} + + /// Assignment operator +diff --git a/include/EST_wave_aux.h b/include/EST_wave_aux.h +index 9d2bfde..942ffb3 100644 +--- a/include/EST_wave_aux.h ++++ b/include/EST_wave_aux.h +@@ -116,6 +116,13 @@ enum EST_sample_type_t { + st_alaw, + st_ascii}; + ++ ++enum EST_write_status wave_io_save_header(FILE *fp, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype); ++ + extern EST_TNamedEnum EST_sample_type_map; + + #endif /* __EST_WAVE_AUX_H__ */ +diff --git a/speech_class/EST_Wave.cc b/speech_class/EST_Wave.cc +index 7a882a0..816baec 100644 +--- a/speech_class/EST_Wave.cc ++++ b/speech_class/EST_Wave.cc +@@ -392,13 +392,13 @@ EST_write_status EST_Wave::save(FILE *fp, const EST_String type) + + EST_write_status EST_Wave::save_file(const EST_String filename, + EST_String ftype, +- EST_String stype, int obo) ++ EST_String stype, int obo, const char *mode) + { + FILE *fp; + + if (filename == "-") + fp = stdout; +- else if ((fp = fopen(filename,"wb")) == NULL) ++ else if ((fp = fopen(filename, mode)) == NULL) + { + cerr << "Wave save: can't open output file \"" << + filename << "\"" << endl; +@@ -433,7 +433,55 @@ EST_write_status EST_Wave::save_file(FILE *fp, + } + + return (*s_fun)(fp, *this, sample_type, obo); ++} ++ ++EST_write_status EST_Wave::save_file_data(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ ++ if (t == wff_none) ++ { ++ cerr << "Unknown Wave file type " << ftype << endl; ++ return write_fail; ++ } ++ ++ EST_WaveFile::Save_TokenStream * s_fun = EST_WaveFile::map.info(t).save_data; + ++ if (s_fun == NULL) ++ { ++ cerr << "Can't save wave data to files type " << ftype << endl; ++ return write_fail; ++ } ++ ++ return (*s_fun)(fp, *this, sample_type, obo); ++} ++ ++ ++EST_write_status EST_Wave::save_file_header(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ ++ if (t == wff_none) ++ { ++ cerr << "Unknown Wave file type " << ftype << endl; ++ return write_fail; ++ } ++ ++ EST_WaveFile::Save_TokenStream * s_fun = EST_WaveFile::map.info(t).save_header; ++ ++ if (s_fun == NULL) ++ { ++ cerr << "Can't save wave header to files type " << ftype << endl; ++ return write_fail; ++ } ++ ++ return (*s_fun)(fp, *this, sample_type, obo); + } + + void EST_Wave::resample(int new_freq) +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 5e8d46e..61d5c23 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -43,8 +43,8 @@ + #include "EST_cutils.h" + #include "EST_Option.h" + #include "EST_io_aux.h" +-#include "stdio.h" +-#include "math.h" ++#include ++#include + + void extract(EST_Wave &sig, EST_Option &al); + +@@ -62,7 +62,12 @@ EST_write_status (*standard_save_fn_fp)(FILE *fp, + int offset, int nsamp, + int nchan, int srate, + EST_sample_type_t stype, int bo); +- ++ ++typedef ++EST_write_status (*standard_save_header_fn_fp)(FILE *fp, ++ int nsamp, ++ int nchan, int srate, ++ EST_sample_type_t stype, int bo); + + static + EST_read_status load_using(standard_load_fn_fp fn, +@@ -109,6 +114,19 @@ EST_write_status status = (*fn)(fp, + return status; + } + ++static ++EST_write_status save_header_using(standard_save_header_fn_fp fn, ++ FILE *fp, const EST_Wave wv, ++ EST_sample_type_t stype, int bo) ++{ ++ ++EST_write_status status = (*fn)(fp, ++ wv.num_samples(), wv.num_channels(), ++ wv.sample_rate(), ++ stype, bo); ++return status; ++} ++ + EST_read_status EST_WaveFile::load_nist(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -128,6 +146,20 @@ EST_write_status EST_WaveFile::save_nist(FILE *fp, + return save_using(save_wave_nist, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_nist_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_nist_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_nist_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_nist_header, fp, wv, stype, bo); ++} ++ + EST_read_status EST_WaveFile::load_est(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -149,7 +181,24 @@ EST_write_status EST_WaveFile::save_est(FILE *fp, + return save_using(save_wave_est, + fp, wv, + stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_est_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_est_data, ++ fp, wv, ++ stype, bo); ++} + ++EST_write_status EST_WaveFile::save_est_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_est_header, ++ fp, wv, ++ stype, bo); + } + + EST_read_status EST_WaveFile::load_aiff(EST_TokenStream &ts, +@@ -171,6 +220,19 @@ EST_write_status EST_WaveFile::save_aiff(FILE *fp, + return save_using(save_wave_aiff, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_aiff_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_aiff_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_aiff_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_aiff_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_riff(EST_TokenStream &ts, + EST_Wave &wv, +@@ -191,6 +253,19 @@ EST_write_status EST_WaveFile::save_riff(FILE *fp, + return save_using(save_wave_riff, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_riff_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_riff_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_riff_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_riff_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_esps(EST_TokenStream &ts, + EST_Wave &wv, +@@ -213,6 +288,23 @@ EST_write_status EST_WaveFile::save_esps(FILE *fp, + stype, bo); + } + ++EST_write_status EST_WaveFile::save_esps_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_sd_data, ++ fp, wv, ++ stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_esps_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_sd_header, ++ fp, wv, ++ stype, bo); ++} + + EST_read_status EST_WaveFile::load_audlab(EST_TokenStream &ts, + EST_Wave &wv, +@@ -233,6 +325,19 @@ EST_write_status EST_WaveFile::save_audlab(FILE *fp, + return save_using(save_wave_audlab, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_audlab_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_audlab_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_audlab_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_audlab_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_snd(EST_TokenStream &ts, + EST_Wave &wv, +@@ -253,6 +358,21 @@ EST_write_status EST_WaveFile::save_snd(FILE *fp, + return save_using(save_wave_snd, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_snd_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_snd_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_snd_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_snd_header, fp, wv, stype, bo); ++} ++ ++ + + EST_read_status EST_WaveFile::load_raw(EST_TokenStream &ts, + EST_Wave &wv, +@@ -293,6 +413,20 @@ EST_write_status status = save_wave_raw(fp, + return status; + } + ++EST_write_status EST_WaveFile::save_raw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++return save_raw(fp, wv, stype, bo); ++} ++ ++ ++EST_write_status EST_WaveFile::save_raw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_raw_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_ulaw(EST_TokenStream &ts, + EST_Wave &wv, +@@ -315,6 +449,25 @@ EST_write_status EST_WaveFile::save_ulaw(FILE *fp, + return save_using(save_wave_ulaw, fp, localwv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_ulaw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_ulaw_data, fp, localwv, stype, bo); ++} ++ ++ ++EST_write_status EST_WaveFile::save_ulaw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_header_using(save_wave_ulaw_header, fp, localwv, stype, bo); ++} ++ + EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -575,25 +728,43 @@ static + EST_TValuedEnumDefinition wavefile_names[] = + { + { wff_none, { NULL }, +- { FALSE, NULL, NULL, "unknown track file type"} }, ++ { FALSE, NULL, NULL, NULL, NULL, "unknown track file type"} }, + { wff_nist, { "nist", "timit" }, +- { TRUE, EST_WaveFile::load_nist, EST_WaveFile::save_nist, "nist/timit" } }, ++ { TRUE, EST_WaveFile::load_nist, EST_WaveFile::save_nist, ++ EST_WaveFile::save_nist_header, EST_WaveFile::save_nist_data, ++ "nist/timit" } }, + { wff_est, { "est"}, +- { TRUE, EST_WaveFile::load_est, EST_WaveFile::save_est, "est" } }, ++ { TRUE, EST_WaveFile::load_est, EST_WaveFile::save_est, ++ EST_WaveFile::save_est_header, EST_WaveFile::save_est_data, ++ "est" } }, + { wff_esps, { "esps", "sd"}, +- { TRUE, EST_WaveFile::load_esps, EST_WaveFile::save_esps, "esps SD waveform" } }, ++ { TRUE, EST_WaveFile::load_esps, EST_WaveFile::save_esps, ++ EST_WaveFile::save_esps_header, EST_WaveFile::save_esps_data, ++ "esps SD waveform" } }, + { wff_audlab, { "audlab", "vox"}, +- { TRUE, EST_WaveFile::load_audlab, EST_WaveFile::save_audlab, "audlab waveform" } }, ++ { TRUE, EST_WaveFile::load_audlab, EST_WaveFile::save_audlab, ++ EST_WaveFile::save_audlab_header, EST_WaveFile::save_audlab_data, ++ "audlab waveform" } }, + { wff_snd, { "snd", "au"}, +- { TRUE, EST_WaveFile::load_snd, EST_WaveFile::save_snd, "Sun snd file" } }, ++ { TRUE, EST_WaveFile::load_snd, EST_WaveFile::save_snd, ++ EST_WaveFile::save_snd_header, EST_WaveFile::save_snd_data, ++ "Sun snd file" } }, + { wff_aiff, { "aiff" }, +- { TRUE, EST_WaveFile::load_aiff, EST_WaveFile::save_aiff, "Apple aiff file" } }, ++ { TRUE, EST_WaveFile::load_aiff, EST_WaveFile::save_aiff, ++ EST_WaveFile::save_aiff_header, EST_WaveFile::save_aiff_data, ++ "Apple aiff file" } }, + { wff_riff, { "riff", "wav" }, +- { TRUE, EST_WaveFile::load_riff, EST_WaveFile::save_riff, "Microsoft wav/riff file" } }, ++ { TRUE, EST_WaveFile::load_riff, EST_WaveFile::save_riff, ++ EST_WaveFile::save_riff_header, EST_WaveFile::save_riff_data, ++ "Microsoft wav/riff file" } }, + { wff_raw, { "raw" }, +- { FALSE, EST_WaveFile::load_raw, EST_WaveFile::save_raw, "Headerless File" } }, ++ { FALSE, EST_WaveFile::load_raw, EST_WaveFile::save_raw, ++ EST_WaveFile::save_raw_header, EST_WaveFile::save_raw_data, ++ "Headerless File" } }, + { wff_ulaw, { "ulaw", "basic" }, +- { FALSE, EST_WaveFile::load_ulaw, EST_WaveFile::save_ulaw, "Headerless 8K ulaw File" } }, ++ { FALSE, EST_WaveFile::load_ulaw, EST_WaveFile::save_ulaw, ++ EST_WaveFile::save_ulaw_header, EST_WaveFile::save_ulaw_data, ++ "Headerless 8K ulaw File" } }, + { wff_none, {NULL} } + }; + +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index e9217b9..a185f5a 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -96,34 +96,54 @@ public: + bool recognise; + Load_TokenStream *load; + Save_TokenStream *save; ++ Save_TokenStream *save_header; ++ Save_TokenStream *save_data; + const char *description; + } Info; + + static EST_write_status save_nist(SaveWave_TokenStreamArgs); ++ static EST_write_status save_nist_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_nist_data(SaveWave_TokenStreamArgs); + static EST_read_status load_nist(LoadWave_TokenStreamArgs); + + static EST_write_status save_est(SaveWave_TokenStreamArgs); ++ static EST_write_status save_est_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_est_data(SaveWave_TokenStreamArgs); + static EST_read_status load_est(LoadWave_TokenStreamArgs); + + static EST_write_status save_esps(SaveWave_TokenStreamArgs); ++ static EST_write_status save_esps_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_esps_data(SaveWave_TokenStreamArgs); + static EST_read_status load_esps(LoadWave_TokenStreamArgs); + + static EST_write_status save_audlab(SaveWave_TokenStreamArgs); ++ static EST_write_status save_audlab_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_audlab_data(SaveWave_TokenStreamArgs); + static EST_read_status load_audlab(LoadWave_TokenStreamArgs); + + static EST_write_status save_snd(SaveWave_TokenStreamArgs); ++ static EST_write_status save_snd_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_snd_data(SaveWave_TokenStreamArgs); + static EST_read_status load_snd(LoadWave_TokenStreamArgs); + + static EST_write_status save_aiff(SaveWave_TokenStreamArgs); ++ static EST_write_status save_aiff_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_aiff_data(SaveWave_TokenStreamArgs); + static EST_read_status load_aiff(LoadWave_TokenStreamArgs); + + static EST_write_status save_riff(SaveWave_TokenStreamArgs); ++ static EST_write_status save_riff_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_riff_data(SaveWave_TokenStreamArgs); + static EST_read_status load_riff(LoadWave_TokenStreamArgs); + + static EST_write_status save_raw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_raw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_raw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_raw(LoadWave_TokenStreamArgs); + + static EST_write_status save_ulaw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_ulaw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_ulaw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + + static EST_write_status save_alaw(SaveWave_TokenStreamArgs); +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index dae0963..7cec8f4 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -283,10 +283,10 @@ enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_nist_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + char h[1024], p[1024]; + const char *t; +@@ -322,13 +322,37 @@ enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, + strcat(h, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + + if (fwrite(&h, 1024, 1, fp) != 1) +- return misc_write_error; ++ return misc_write_error; + ++ return write_ok; ++} ++ ++ ++enum EST_write_status save_wave_nist_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo); + + } + ++enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_nist_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ return save_wave_nist_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); ++} ++ + /*=======================================================================*/ + /* EST's own format */ + /*=======================================================================*/ +@@ -401,10 +425,10 @@ enum EST_read_status load_wave_est(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_est_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + fprintf(fp, "EST_File wave\n"); + fprintf(fp, "DataType binary\n"); +@@ -416,10 +440,32 @@ enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, + fprintf(fp, "ByteOrder %s\n", ((bo == bo_big) ? "10" : "01")); + + fprintf(fp, "EST_Header_End\n"); +- ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_est_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp, data, offset, num_samples, num_channels, + sample_type, bo); ++} ++ ++enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_est_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_est_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + /*=======================================================================*/ +@@ -576,10 +622,9 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, +- int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++enum EST_write_status save_wave_riff_header(FILE *fp, int num_samples, ++ int num_channels, int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) + { + (void)bo; + const char *info; +@@ -636,10 +681,35 @@ enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, + if (EST_BIG_ENDIAN) data_size = SWAPINT(data_size); + fwrite(&data_size,1,4,fp); /* total number of bytes in data */ + ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_riff_data(FILE *fp, const short *data, ++ int offset, int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo_little); + } + ++ ++enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_riff_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ ++ return save_wave_riff_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++ ++} ++ + /*=======================================================================*/ + /* Amiga/Apple AIFF waveform format */ + /* This was constructed using info in AudioIFF1.3.hqx found on the web */ +@@ -776,10 +846,11 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++ ++enum EST_write_status save_wave_aiff_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + (void)bo; + const char *info; +@@ -830,16 +901,40 @@ enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, + data_int = SWAPINT(data_int); + fwrite(&data_int,1,4,fp); /* blocksize */ + +- if ((sample_type == st_short) || +- (sample_type == st_uchar)) +- return save_raw_data(fp,data,offset,num_samples,num_channels, +- sample_type,bo_big); ++ return write_ok; ++ ++} ++ ++enum EST_write_status save_wave_aiff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ ++ if (data == NULL) ++ return write_ok; ++ if ((sample_type == st_short) || (sample_type == st_uchar)) ++ return save_raw_data(fp,data, offset, num_samples, num_channels, ++ sample_type, bo_big); + else + { + fprintf(stderr,"AIFF: requested data type not uchar or short\n"); + return misc_write_error; + } +- ++} ++ ++ ++enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_aiff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ ++ return save_wave_aiff_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + /*=======================================================================*/ +@@ -885,19 +980,47 @@ enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, ++enum EST_write_status save_wave_ulaw_header(FILE *fp, + int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +- (void)sample_rate; +- (void)sample_type; ++ (void) sample_rate; ++ (void) sample_type; ++ (void) fp; ++ (void) num_samples; ++ (void) num_channels; ++ (void) bo; ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_ulaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_mulaw,bo); ++} + ++enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_ulaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_ulaw_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + ++ ++ + enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, +@@ -1050,8 +1173,8 @@ enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + return read_ok; + } + +-enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_snd_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +@@ -1103,11 +1226,35 @@ enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, + if (fwrite(&header, sizeof(header), 1, fp) != 1) + return misc_write_error; + ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_snd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + /* snd files are always in BIG_ENDIAN (sun) byte order */ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo_big); + } + ++ ++enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_snd_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ return save_wave_snd_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++} ++ ++ + /*=======================================================================*/ + /* CSTR Audlab files (from the last century) */ + /* They are always bigendian */ +@@ -1219,8 +1366,8 @@ enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_audlab_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +@@ -1260,12 +1407,34 @@ enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, + fwrite (&fh, sizeof(fh), 1, fp); + fwrite (&sh, sizeof(sh), 1, fp); + fwrite (&sd, sizeof(sd), 1, fp); +- ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_audlab_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + /* write data*/ + return save_raw_data(fp,data,offset,num_samples,num_channels, + st_short,bo_big); + } + ++enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_audlab_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ return save_wave_audlab_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); ++} ++ + /*=======================================================================*/ + /* Entropic ESPS SD files: portable (non-proprietary) method */ + /*=======================================================================*/ +@@ -1356,8 +1525,9 @@ enum EST_read_status load_wave_sd(EST_TokenStream &ts, short **data, int + + } + +-enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++ ++enum EST_write_status save_wave_sd_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + +@@ -1382,6 +1552,7 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + } + /* I believe all of the following are necessary and in this order */ + add_field(hdr,"samples",esps_type,num_channels); ++ /* FIXME: What is doing this path here?? */ + add_fea_special(hdr,ESPS_FEA_DIRECTORY,"margo:/disk/disk10/home/awb/projects/speech_tools/main"); + add_fea_special(hdr,ESPS_FEA_COMMAND, + "EDST waveform written as ESPS FEA_SD.\n\ +@@ -1397,11 +1568,37 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + } + /* lets ignore desired bo and sample type for the time being */ + delete_esps_hdr(hdr); +- ++ return write_ok; ++} ++ ++ ++enum EST_write_status save_wave_sd_data(FILE *fp, const short *data, ++ int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++ ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,EST_NATIVE_BO); + } + ++enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++ ++{ ++ save_wave_sd_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ return save_wave_sd_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++ ++} ++ + /*=======================================================================*/ + /* Raw data files -- unheadered */ + /* THESE FUNCTIONS ARE DIFFERENT FROM THE REST */ +@@ -1496,21 +1693,151 @@ enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_raw(FILE *fp, const short *data, ++enum EST_write_status save_wave_raw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_raw_data(FILE *fp, const short *data, + int offset, +- int num_samples, int num_channels, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { +- (void)sample_rate; ++ if (data == NULL) ++ return write_ok; + + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo); + } + ++enum EST_write_status save_wave_raw(FILE *fp, const short *data, ++ int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void)sample_rate; ++ ++ return save_wave_raw_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++} ++ + /***********************************************************************/ + /* */ + /* end of file type specific functions */ + /* */ + /***********************************************************************/ + ++enum EST_write_status wave_io_save_header(FILE *fp, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ switch(t) ++ { ++ case wff_nist: ++ return save_wave_nist_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_esps: ++ return save_wave_sd_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_est: ++ return save_wave_est_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_audlab: ++ return save_wave_audlab_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_snd: ++ return save_wave_snd_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_aiff: ++ return save_wave_aiff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_riff: ++ return save_wave_riff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_raw: ++ return save_wave_raw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_ulaw: ++ return save_wave_ulaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ default: ++ case wff_none: ++ cerr << "Can't save wave header to files type " << ftype << endl; ++ break; ++ } ++ return write_ok; ++} ++ ++ ++enum EST_write_status wave_io_save_data(FILE *fp, const short * data, ++ const int offset, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ switch(t) ++ { ++ case wff_nist: ++ return save_wave_nist_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_esps: ++ return save_wave_sd_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_est: ++ return save_wave_est_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_audlab: ++ return save_wave_audlab_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_snd: ++ return save_wave_snd_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_aiff: ++ return save_wave_aiff_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_riff: ++ return save_wave_riff_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_raw: ++ return save_wave_raw_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_ulaw: ++ return save_wave_ulaw_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ default: ++ case wff_none: ++ cerr << "Can't save wave data to files type " << ftype << endl; ++ break; ++ } ++ return write_ok; ++} +diff --git a/speech_class/waveP.h b/speech_class/waveP.h +index 9af6096..406e4b1 100644 +--- a/speech_class/waveP.h ++++ b/speech_class/waveP.h +@@ -51,7 +51,17 @@ enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + enum EST_write_status save_wave_raw(FILE *fp, const short *data, int offset, + int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ; ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_raw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_raw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); + + enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int +@@ -62,6 +72,16 @@ enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_write_status save_wave_ulaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_ulaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -81,6 +101,16 @@ enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_nist_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_nist_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_est(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -91,6 +121,16 @@ enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_est_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_est_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_sd(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -101,6 +141,16 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_sd_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_sd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -111,6 +161,16 @@ enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_audlab_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_audlab_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -121,6 +181,16 @@ enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_snd_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_snd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -131,6 +201,16 @@ enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_aiff_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_aiff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -141,4 +221,14 @@ enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_riff_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_riff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + #endif /* __EST_WAVEP_H__ */ +-- +1.8.3.4 + + +From cbb58d2c46f59b918f8bae060db2e7d2846edcca Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:50:41 -0800 +Subject: Allow writing ALAW files in parts + +Backported from Debian: wave_save_parts_alaw.diff, rev f150a7a5c75c. + +Signed-off-by: Timothy Gu + +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 61d5c23..6476849 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -480,6 +480,24 @@ EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, + offset, length); + } + ++EST_write_status EST_WaveFile::save_alaw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_header_using(save_wave_alaw_header, fp, localwv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_alaw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_alaw_data, fp, localwv, stype, bo); ++} ++ + EST_write_status EST_WaveFile::save_alaw(FILE *fp, + const EST_Wave &wv, + EST_sample_type_t stype, int bo) +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index a185f5a..cdf948c 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -147,6 +147,8 @@ public: + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + + static EST_write_status save_alaw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_alaw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_alaw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_alaw(LoadWave_TokenStreamArgs); + + static EST_TNamedEnumI map; +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index 7cec8f4..1bdaf4f 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -1060,17 +1060,44 @@ enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++enum EST_write_status save_wave_alaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void) sample_rate; ++ (void) sample_type; ++ (void) fp; ++ (void) num_samples; ++ (void) num_channels; ++ (void) bo; ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_alaw_data(FILE *fp, const short *data, int offset, + int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { + (void)sample_rate; + (void)sample_type; ++ if (data == NULL) ++ return write_ok; + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_alaw,bo); ++} + ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_alaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_alaw_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + +diff --git a/speech_class/waveP.h b/speech_class/waveP.h +index 406e4b1..aa78512 100644 +--- a/speech_class/waveP.h ++++ b/speech_class/waveP.h +@@ -91,6 +91,16 @@ enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_write_status save_wave_alaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_alaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +-- +1.8.3.4 + + +From 22e096d3b4122b80cce76b203fcdb8d2e75413ca Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:52:30 -0800 +Subject: Check all fread() calls + +Backported from Debian: check_fread.diff, rev 4a67fbe7e. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_Token.h b/include/EST_Token.h +index e6fe38d..6b9512f 100644 +--- a/include/EST_Token.h ++++ b/include/EST_Token.h +@@ -329,7 +329,7 @@ class EST_TokenStream{ + { if (!peeked_tokp) get(); + peeked_tokp = TRUE; return current_tok; } + /// Reading binary data, (don't use peek() immediately beforehand) +- int fread(void *buff,int size,int nitems); ++ int fread(void *buff,int size,int nitems) EST_WARN_UNUSED_RESULT; + //@} + /**@name stream initialization functions */ + //@{ +diff --git a/include/EST_common.h b/include/EST_common.h +index 42af9d9..ee63e1e 100644 +--- a/include/EST_common.h ++++ b/include/EST_common.h +@@ -43,6 +43,14 @@ + + /* all this stuff should be common to C and C++ */ + ++#if defined __GNUC__ ++ #define EST_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) ++#elif defined __clang__ ++ #define EST_WARN_UNUSED_RESULT __attribute__((annotate("lo_warn_unused"))) ++#else ++ #define EST_WARN_UNUSED_RESULT ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index 1bdaf4f..d3a35f0 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -503,7 +503,8 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + return wrong_format; + + /* We've got a riff file */ +- ts.fread(&dsize,4,1); ++ /* Next 4 bytes are the file size */ ++ if(ts.fread(&dsize,4,1) != 1) return misc_read_error; + /* .wav files are always little endian */ + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); + if ((ts.fread(info,sizeof(char),4) != 4) || +@@ -516,9 +517,9 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + (strncmp(info,"fmt ",4) != 0)) + return misc_read_error; /* something else wrong */ + +- ts.fread(&dsize,4,1); ++ if (ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + + switch (shortdata) +@@ -541,16 +542,16 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + actual_sample_type = st_short; + /* return misc_read_error; */ + } +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + *num_channels = shortdata; +- ts.fread(sample_rate,4,1); ++ if (ts.fread(sample_rate,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) *sample_rate = SWAPINT(*sample_rate); +- ts.fread(&intdata,4,1); /* average bytes per second -- ignored */ ++ if (ts.fread(&intdata,4,1) != 1) return misc_read_error; /* average bytes per second -- ignored */ + if (EST_BIG_ENDIAN) intdata = SWAPINT(intdata); +- ts.fread(&shortdata,2,1); /* block align ? */ ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; /* block align ? */ + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + + sample_width = (shortdata+7)/8; +@@ -567,14 +568,14 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + } + if (strncmp(info,"data",4) == 0) + { +- ts.fread(&samps,4,1); ++ if (ts.fread(&samps,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) samps = SWAPINT(samps); + samps /= (sample_width*(*num_channels)); + break; + } + else if (strncmp(info,"fact",4) == 0) + { /* some other type of chunk -- skip it */ +- ts.fread(&samps,4,1); ++ if (ts.fread(&samps,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) samps = SWAPINT(samps); + ts.seek(samps+ts.tell()); /* skip rest of header */ + /* Hope this is the right amount */ +@@ -584,7 +585,7 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + // fprintf(stderr,"Ignoring unsupported chunk type \"%c%c%c%c\" in RIFF file\n", + // info[0],info[1],info[2],info[3]); + //return misc_read_error; +- ts.fread(&dsize,4,1); ++ if(ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); + ts.seek(dsize+ts.tell()); /* skip this chunk */ + } +@@ -750,7 +751,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return wrong_format; + + /* We've got an aiff file, I hope */ +- ts.fread(&dsize,4,1); ++ if (ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_LITTLE_ENDIAN) /* file is in different byte order */ + dsize = SWAPINT(dsize); + if ((ts.fread(info,sizeof(char),4) != 4) || +@@ -760,7 +761,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return misc_read_error; + } + +- for ( ; ts.fread(&chunk,1,sizeof(chunk)) == sizeof(chunk) ; ) ++ for ( ; ts.fread(&chunk, sizeof(chunk), 1) == 1 ; ) + { /* for each chunk in the file */ + if (EST_LITTLE_ENDIAN) /* file is in different byte order */ + chunk.size = SWAPINT(chunk.size); +@@ -771,10 +772,13 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + fprintf(stderr,"AIFF chunk: bad size\n"); + return misc_read_error; + } +- ts.fread(&comm_channels,1,sizeof(short)); +- ts.fread(&comm_samples,1,sizeof(int)); +- ts.fread(&comm_bits,1,sizeof(short)); +- if (ts.fread(ieee_ext_sample_rate,1,10) != 10) ++ if (ts.fread(&comm_channels, sizeof(short), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&comm_samples, sizeof(int), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&comm_bits, sizeof(short), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(ieee_ext_sample_rate, 10, 1) != 1) + { + fprintf(stderr,"AIFF chunk: eof within COMM chunk\n"); + return misc_read_error; +@@ -789,7 +793,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + } + else if (strncmp(chunk.id,"SSND",4) == 0) + { +- if (ts.fread(&ssndchunk,1,sizeof(ssndchunk)) != sizeof(ssndchunk)) ++ if (ts.fread(&ssndchunk, sizeof(ssndchunk), 1) != 1) + { + fprintf(stderr,"AIFF chunk: eof within SSND chunk\n"); + return misc_read_error; +@@ -1127,7 +1131,8 @@ enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + int current_pos; + + current_pos = ts.tell(); +- ts.fread(&header, sizeof(Sun_au_header), 1); ++ if (ts.fread(&header, sizeof(Sun_au_header), 1) != 1) ++ return misc_read_error; + + /* test for magic number */ + if ((EST_LITTLE_ENDIAN) && +@@ -1347,12 +1352,16 @@ enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + + /* Read header structures from char array */ + current_pos = ts.tell(); +- ts.fread(&fh, sizeof(struct audlabfh), 1); ++ ++ if (ts.fread(&fh, sizeof(struct audlabfh), 1) != 1) ++ return misc_read_error; + if (strcmp(fh.file_type, "Sample") != 0) + return wrong_format; + +- ts.fread(&sh, sizeof(struct audlabsh), 1); +- ts.fread(&sd, sizeof(struct audlabsd), 1); ++ if (ts.fread(&sh, sizeof(struct audlabsh), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&sd, sizeof(struct audlabsd), 1) != 1) ++ return misc_read_error; + hdr_length = sizeof(struct audlabfh) + + sizeof(struct audlabsh) + + sizeof(struct audlabsd); +-- +1.8.3.4 + + +From 644690fc0c8e45fe5c58caa9bd928eedb178fa49 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:55:07 -0800 +Subject: Fix a few memory handling bugs + +Backported from Debian: memory_bugs.diff, rev 0691e0f66a14c. + +Signed-off-by: Timothy Gu + +diff --git a/base_class/rateconv.cc b/base_class/rateconv.cc +index f27fb44..10ef465 100644 +--- a/base_class/rateconv.cc ++++ b/base_class/rateconv.cc +@@ -431,7 +431,7 @@ static int outmax; + + static int ioerr(void) + { +- delete g_coep; ++ delete[] g_coep; + return -1; + } + +@@ -585,7 +585,7 @@ int rateconv(short *in,int isize, short **out, int *osize, + return ioerr(); + } while (outsize == OUTBUFFSIZE); + +- delete g_coep; ++ delete[] g_coep; + + *osize = outpos; + +diff --git a/base_class/string/EST_String.cc b/base_class/string/EST_String.cc +index 3cab0f1..3e33da3 100644 +--- a/base_class/string/EST_String.cc ++++ b/base_class/string/EST_String.cc +@@ -329,6 +329,7 @@ int EST_String::gsub_internal (const char *os, int olength, const char *s, int l + p += length; + at=end; + } ++ if (p != from+at) + memcpy(p, from+at, size-at); + + p += size-at; +diff --git a/stats/EST_Discrete.cc b/stats/EST_Discrete.cc +index f151888..89d3d74 100644 +--- a/stats/EST_Discrete.cc ++++ b/stats/EST_Discrete.cc +@@ -151,7 +151,7 @@ Discretes::~Discretes() + + for (i=0; i +Date: Thu, 25 Dec 2014 14:56:46 -0800 +Subject: Allow `-pc longest` in lower case + +Backported from Debian: ch_wave-LONGEST.diff, rev: a9c9f0e91f. + +Signed-off-by: Timothy Gu + +diff --git a/main/ch_wave_main.cc b/main/ch_wave_main.cc +index 3e74a12..e7859ac 100644 +--- a/main/ch_wave_main.cc ++++ b/main/ch_wave_main.cc +@@ -199,7 +199,7 @@ int main (int argc, char *argv[]) + wave_info(sigload); + else if (al.present("-pc")) + { +- if ((al.val("-pc") == "longest") && ++ if ((downcase(al.val("-pc")) == "longest") && + (sig.num_samples() < sigload.num_samples())) + sig.resize(sigload.num_samples()); + else /* "first" or sig is longer */ +-- +1.8.3.4 + + +From 295c71122265d274429dd6712323d8f624a712fa Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 15:27:31 -0800 +Subject: Add Haiku configurations + + +diff --git a/config/systems/Haiku.mak b/config/systems/Haiku.mak +new file mode 100644 +index 0000000..5d78efd +--- /dev/null ++++ b/config/systems/Haiku.mak +@@ -0,0 +1,56 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/default.mak ++ ++## Don't assume echo -n works ++ECHO_N = /bin/printf "%s" ++ ++## No native audio ++NATIVE_AUDIO = ++ ++## ncurses available, and sockets operations are in libnetwork ++OS_LIBS = -lncurses -lnetwork ++ ++## No math library needed. Empty $(sort) needed so that `ifdef MATH_LIBRARY` ++## returns true. ++MATH_LIBRARY = $(sort ) ++ ++## awk is a compatible awk, usually gawk. ++NAWK=awk +diff --git a/config/systems/ix86_Haiku.mak b/config/systems/ix86_Haiku.mak +new file mode 100644 +index 0000000..3822625 +--- /dev/null ++++ b/config/systems/ix86_Haiku.mak +@@ -0,0 +1,41 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/Haiku.mak ++ +diff --git a/config/systems/x86_64_Haiku.mak b/config/systems/x86_64_Haiku.mak +new file mode 100644 +index 0000000..3822625 +--- /dev/null ++++ b/config/systems/x86_64_Haiku.mak +@@ -0,0 +1,41 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/Haiku.mak ++ +-- +1.8.3.4 + + +From ce49b8a8bf93cf694281be2e979ec58c3950635e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 15:30:42 -0800 +Subject: Haiku-specific configuration + +Signed-off-by: Timothy Gu + +diff --git a/config/config.in b/config/config.in +index 15d563e..e7e6a65 100644 +--- a/config/config.in ++++ b/config/config.in +@@ -61,7 +61,7 @@ WARN=1 + # VERBOSE=1 + #DEBUG=1 + # PROFILE=gprof +-#SHARED=2 ++SHARED=2 + + ## Directory specific selections which override the above + +@@ -83,7 +83,7 @@ OPTIMISE_sigpr = 3 + # INCLUDE_MODULES += ESD_AUDIO + + ## Native audio for your platform (sun, linux, freebsd, irix, macosx, windows) +-INCLUDE_MODULES += NATIVE_AUDIO ++# INCLUDE_MODULES += NATIVE_AUDIO + + ## Special code to run Windows MPLAYER + # INCLUDE_MODULES += MPLAYER_AUDIO +@@ -172,7 +172,7 @@ INCLUDE_MODULES += RXP + + # Languages to generate wrappers for. Currently: PYTHON + # PERL5 is no longer supported +-CONFIG_WRAPPER_LANGUAGES = PYTHON ++CONFIG_WRAPPER_LANGUAGES = + + # Language specific includes should be set to correct site paths + CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/ +-- +1.8.3.4 + + +From a88060a26c29c6f61b6e18824d0164f82456c6ac Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 16:30:07 -0800 +Subject: Add missing library major version + + +diff --git a/config/project.mak b/config/project.mak +index 2578fc1..11884c5 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -42,6 +42,7 @@ + PROJECT_NAME = Edinburgh Speech Tools Library + PROJECT_PREFIX = EST + PROJECT_VERSION = 2.4 ++PROJECT_MAJOR_VERSION = 2 + PROJECT_DATE = December 2014 + PROJECT_STATE = release + +-- +1.8.3.4 + + +From f50c1e621e9d510f475032474438b2df97ac07a0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 02:35:24 +0000 +Subject: config/system.sh: Use `uname -p` for machine type + +Fixes Haiku detection + +diff --git a/config/system.sh b/config/system.sh +index 71b271c..b7ac4a1 100644 +--- a/config/system.sh ++++ b/config/system.sh +@@ -46,9 +46,9 @@ OSTYPE=`uname -s | + sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'` + + # CPU, downcased, /s and some uninteresting details eliminated +-MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null | ++MACHINETYPE=`{ mach || uname -p || echo unknown ; } 2>/dev/null | + tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | +- sed -e 's/i[0-9]86/ix86/' \ ++ sed -e 's/i\{0,1\}[0-9x]86/ix86/' \ + -e 's/sun4/sparc/' \ + -e 's/ip[0-9]*/ip/'\ + -e 's/ /_/g'\ +-- +1.8.3.4 + diff --git a/app-accessibility/speech_tools/speech_tools-2.4.recipe b/app-accessibility/speech_tools/speech_tools-2.4.recipe new file mode 100644 index 000000000..7c644a8f0 --- /dev/null +++ b/app-accessibility/speech_tools/speech_tools-2.4.recipe @@ -0,0 +1,150 @@ +SUMMARY="Edinburgh speech tools library" +SUMMARY_tools="Edinburgh Speech Tools" + +DESCRIPTION="The Edinburgh speech tools library is a collection of C++ classes \ +that aide in developing machine-synthesized voices. Developed by the University \ +of Edinburgh, it is used in Festival, a text-to-speech engine developed by \ +the University of Edinburgh as well. +" +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" +SRC_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz" +CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010" +SOURCE_DIR="speech_tools" +REVISION="1" + +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE=" + Edinburgh Speech Tools + " +COPYRIGHT=" + 1986 University of Toronto + 1987, 1993 The Regents of the University of California + 1992, 1995 Markus Mummert + 1992 Rich Salz + 1992 Simmule Turner + 1994-2014 University of Edinburgh, UK + 1997-1998 Richard Tobin + 1999-2003 Language Technologies Institute, Carnegie Mellon University + " + +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 !x86_gcc2" + +PROVIDES=" + speech_tools$secondaryArchSuffix = $portVersion + lib:libestbase$secondaryArchSuffix = $portVersion compat >= 2 + lib:libestools$secondaryArchSuffix = $portVersion compat >= 2 + lib:libeststring$secondaryArchSuffix = $portVersion compat >= 2 + " +PROVIDES_devel=" + flite${secondaryArchSuffix}_devel = $portVersion + devel:libestbase$secondaryArchSuffix = $portVersion compat >= 2 + devel:libestools$secondaryArchSuffix = $portVersion compat >= 2 + devel:libeststring$secondaryArchSuffix = $portVersion compat >= 2 + " +PROGS=" bcat ch_lab ch_track ch_utt ch_wave design_filter dp \ + na_play na_record ngram_build ngram_test ols \ + ols_test pda pitchmark scfg_make \ + scfg_parse scfg_test scfg_train sig2fv sigfilter spectgen \ + tilt_analysis tilt_synthesis viterbi wagon wagon_test \ + wfst_build wfst_run wfst_train xml_parser + " +SCRIPTS=" + make_wagon_desc + raw_to_xgraph + resynth + " +PROVIDES_tools=" + speech_tools_tools = $portVersion + cmd:simple_pitchmark = $portVersion + " +for p in $PROGS $SCRIPTS; do + PROVIDES_tools=" + $PROVIDES_tools + cmd:$p = $portVersion + " +done +REQUIRES=" + haiku$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs + lib:libncurses$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + speech_tools$secondaryArchSuffix == $portVersion base + " +REQUIRES_tools=" + haiku$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs + speech_tools$secondaryArchSuffix == $portVersion base + cmd:perl + lib:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:awk + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PATCHES="speech_tools-${portVersion}.patchset" + +BUILD() +{ + runConfigure ./configure + # There are some problems with concurrency. + make +} + +INSTALL() +{ + cmdBinDir=$prefix/bin + mkdir -p $cmdBinDir + (cd main && cp $PROGS $cmdBinDir) + for s in $SCRIPTS; do + sed 's,__PERL__,/bin/perl,g' $cmdBinDir/$s + chmod +x $cmdBinDir/$s + done + sed 's,__PERL__,/bin/perl,g' \ + $cmdBinDir/simple-pitchmark + chmod +x $cmdBinDir/simple-pitchmark + + mkdir -p $libDir + # Install everything to lib/ and let prepareInstalledDevelLibs handle + # devel libs, etc. + cp lib/*.a lib/*.so lib/*.so.* $libDir + + # Installs possibly internal headers as well, as debian installs them + mkdir -p $includeDir/ + cp -a include/* $includeDir/ + rm -rf $includeDir/Makefile \ + $includeDir/*/Makefile \ + $includeDir/win32 + cp -a base_class/*.h $includeDir/ + mkdir -p $includeDir/base_class/ + cp -a base_class/*.cc $includeDir/base_class/ + + prepareInstalledDevelLibs \ + libestbase \ + libestools \ + libeststring + packageEntries devel \ + $developDir + packageEntries tools \ + $cmdBinDir +} From 37a03426ccf3628bae6740275e440f38c777a318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 26 Dec 2014 16:16:38 +0000 Subject: [PATCH 155/326] Fix version and description --- .../openscenegraph-3.2.1.recipe | 77 +++++++++-------- .../openscenegraph/openscenegraph-git.recipe | 83 +++++++++---------- 2 files changed, 79 insertions(+), 81 deletions(-) diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe index 90ebb2aa3..51a0b2afc 100644 --- a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -5,7 +5,7 @@ by application developers in fields such as visual simulation, games, virtual \ reality, scientific visualization and modelling. Written entirely in Standard \ C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ , HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ -established as the world leading scene graph technology, used widely in the \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" @@ -25,30 +25,30 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - openscenegraph$secondaryArchSuffix = $portVersion - lib:libOpenThreads$secondaryArchSuffix = $portVersion - lib:libosg$secondaryArchSuffix = $portVersion - lib:libosgAnimation$secondaryArchSuffix = $portVersion - lib:libosgDB$secondaryArchSuffix = $portVersion - lib:libosgFX$secondaryArchSuffix = $portVersion - lib:libosgGA$secondaryArchSuffix = $portVersion - lib:libosgManipulator$secondaryArchSuffix = $portVersion - lib:libosgParticle$secondaryArchSuffix = $portVersion - lib:libosgPresentation$secondaryArchSuffix = $portVersion - lib:libosgShadow$secondaryArchSuffix = $portVersion - lib:libosgSim$secondaryArchSuffix = $portVersion - lib:libosgTerrain$secondaryArchSuffix = $portVersion - lib:libosgText$secondaryArchSuffix = $portVersion - lib:libosgUtil$secondaryArchSuffix = $portVersion - lib:libosgViewer$secondaryArchSuffix = $portVersion - lib:libosgVolume$secondaryArchSuffix = $portVersion - lib:libosgWidget$secondaryArchSuffix = $portVersion + openscenegraph$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libOpenThreads$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosg$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgAnimation$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgDB$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgFX$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgGA$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgManipulator$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgParticle$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgPresentation$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgShadow$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgSim$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgTerrain$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgText$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgUtil$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix - lib:libGL$secondaryArchSuffix + lib:libgl$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -101,7 +101,6 @@ INSTALL() mkdir -p $prefix/lib-temp mv $prefix/lib/* $prefix/lib-temp/ - ls $prefix/lib-temp mkdir -p $libDir mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp @@ -120,24 +119,24 @@ INSTALL() } PROVIDES_devel=" - devel:openscenegraph$secondaryArchSuffix = $portVersion - devel:libOpenThreads$secondaryArchSuffix = $portVersion - devel:libosg$secondaryArchSuffix = $portVersion - devel:libosgAnimation$secondaryArchSuffix = $portVersion - devel:libosgDB$secondaryArchSuffix = $portVersion - devel:libosgFX$secondaryArchSuffix = $portVersion - devel:libosgGA$secondaryArchSuffix = $portVersion - devel:libosgManipulator$secondaryArchSuffix = $portVersion - devel:libosgParticle$secondaryArchSuffix = $portVersion - devel:libosgPresentation$secondaryArchSuffix = $portVersion - devel:libosgShadow$secondaryArchSuffix = $portVersion - devel:libosgSim$secondaryArchSuffix = $portVersion - devel:libosgTerrain$secondaryArchSuffix = $portVersion - devel:libosgText$secondaryArchSuffix = $portVersion - devel:libosgUtil$secondaryArchSuffix = $portVersion - devel:libosgViewer$secondaryArchSuffix = $portVersion - devel:libosgVolume$secondaryArchSuffix = $portVersion - devel:libosgWidget$secondaryArchSuffix = $portVersion + openscenegraph${secondaryArchSuffix}_devel = 3.2.1 compat >= 3 + devel:libOpenThreads$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosg$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgAnimation$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgDB$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgFX$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgGA$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgManipulator$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgParticle$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgPresentation$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgShadow$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgSim$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgTerrain$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgText$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgUtil$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 " REQUIRES_devel=" diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe index e5280374a..e499fb7ca 100644 --- a/games-engines/openscenegraph/openscenegraph-git.recipe +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -5,7 +5,7 @@ by application developers in fields such as visual simulation, games, virtual \ reality, scientific visualization and modelling. Written entirely in Standard \ C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ , HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ -established as the world leading scene graph technology, used widely in the \ +established as the world leading scene graph technology, used widely in the \ vis-sim, space, scientific, oil-gas, games and virtual reality industries." HOMEPAGE="http://www.openscenegraph.org" SRC_URI="git://github.com/openscenegraph/osg#77f09f9e649cfedd32608ed6ec67bf1de7cd53ac" @@ -24,31 +24,31 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" - openscenegraph$secondaryArchSuffix = $portVersion - lib:libOpenThreads$secondaryArchSuffix = $portVersion - lib:libosg$secondaryArchSuffix = $portVersion - lib:libosgAnimation$secondaryArchSuffix = $portVersion - lib:libosgDB$secondaryArchSuffix = $portVersion - lib:libosgFX$secondaryArchSuffix = $portVersion - lib:libosgGA$secondaryArchSuffix = $portVersion - lib:libosgManipulator$secondaryArchSuffix = $portVersion - lib:libosgParticle$secondaryArchSuffix = $portVersion - lib:libosgPresentation$secondaryArchSuffix = $portVersion - lib:libosgShadow$secondaryArchSuffix = $portVersion - lib:libosgSim$secondaryArchSuffix = $portVersion - lib:libosgTerrain$secondaryArchSuffix = $portVersion - lib:libosgText$secondaryArchSuffix = $portVersion - lib:libosgUtil$secondaryArchSuffix = $portVersion - lib:libosgViewer$secondaryArchSuffix = $portVersion - lib:libosgVolume$secondaryArchSuffix = $portVersion - lib:libosgWidget$secondaryArchSuffix = $portVersion - lib:libosgUI$secondaryArchSuffix = $portVersion + openscenegraph$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libOpenThreads$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosg$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgAnimation$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgDB$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgFX$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgGA$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgManipulator$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgParticle$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgPresentation$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgShadow$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgSim$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgTerrain$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgText$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgUtil$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgViewer$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix mesa$secondaryArchSuffix - lib:libGL$secondaryArchSuffix + lib:libgl$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix @@ -101,7 +101,6 @@ INSTALL() mkdir -p $prefix/lib-temp mv $prefix/lib/* $prefix/lib-temp/ - ls $prefix/lib-temp mkdir -p $libDir mv $prefix/lib-temp/* $libDir rm -rf $prefix/lib-temp @@ -120,27 +119,27 @@ INSTALL() } PROVIDES_devel=" - devel:openscenegraph$secondaryArchSuffix = $portVersion - devel:libOpenThreads$secondaryArchSuffix = $portVersion - devel:libosg$secondaryArchSuffix = $portVersion - devel:libosgAnimation$secondaryArchSuffix = $portVersion - devel:libosgDB$secondaryArchSuffix = $portVersion - devel:libosgFX$secondaryArchSuffix = $portVersion - devel:libosgGA$secondaryArchSuffix = $portVersion - devel:libosgManipulator$secondaryArchSuffix = $portVersion - devel:libosgParticle$secondaryArchSuffix = $portVersion - devel:libosgPresentation$secondaryArchSuffix = $portVersion - devel:libosgShadow$secondaryArchSuffix = $portVersion - devel:libosgSim$secondaryArchSuffix = $portVersion - devel:libosgTerrain$secondaryArchSuffix = $portVersion - devel:libosgText$secondaryArchSuffix = $portVersion - devel:libosgUtil$secondaryArchSuffix = $portVersion - devel:libosgViewer$secondaryArchSuffix = $portVersion - devel:libosgVolume$secondaryArchSuffix = $portVersion - devel:libosgWidget$secondaryArchSuffix = $portVersion - devel:libosgUI$secondaryArchSuffix = $portVersion + openscenegraph${secondaryArchSuffix}_devel = 3.3.4 compat >= 3 + devel:libOpenThreads$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libosg$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgAnimation$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgDB$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgFX$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgGA$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgManipulator$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgParticle$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgPresentation$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgShadow$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgSim$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgTerrain$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgText$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgUtil$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgViewer$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 " REQUIRES_devel=" - openscenegraph$secondaryArchSuffix == $portVersion + openscenegraph$secondaryArchSuffix == 3.3.4 " From b5e0e65187f86ca1b0bd05e8d3794ff41c6798fa Mon Sep 17 00:00:00 2001 From: Nolan Clark Date: Wed, 24 Dec 2014 17:54:55 -0600 Subject: [PATCH 156/326] Added recipe for unlzx --- .../additional-files/unlzx-expander-rules | 1 + app-arch/unlzx/unlzx-1.1.recipe | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 app-arch/unlzx/additional-files/unlzx-expander-rules create mode 100644 app-arch/unlzx/unlzx-1.1.recipe diff --git a/app-arch/unlzx/additional-files/unlzx-expander-rules b/app-arch/unlzx/additional-files/unlzx-expander-rules new file mode 100644 index 000000000..75b5f81ce --- /dev/null +++ b/app-arch/unlzx/additional-files/unlzx-expander-rules @@ -0,0 +1 @@ +"application/x-lzx" .lzx "unlzx -v %s" "unlzx %s" diff --git a/app-arch/unlzx/unlzx-1.1.recipe b/app-arch/unlzx/unlzx-1.1.recipe new file mode 100644 index 000000000..938de0dbc --- /dev/null +++ b/app-arch/unlzx/unlzx-1.1.recipe @@ -0,0 +1,41 @@ +SUMMARY="Decompresses LZX archives on multiple platforms" +DESCRIPTION="LZX is the name of an LZ77 family compression algorithm invented \ +by Johnathon Forbes and Tomi Poutanen. unlzx is a program designed to extract \ +these archives." +HOMEPAGE="http://aminet.net/package/misc/unix/unlzx.c.gz" +SRC_URI="git+https://github.com/tweakdeveloper/unlzx.git#36a85e7" +ADDITIONAL_FILES="unlzx-expander-rules" +REVISION="3" +LICENSE="Public Domain" +COPYRIGHT="2001 Erik Meusel" + +ARCHITECTURES="x86_gcc2 x86" + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + cmd:gcc + cmd:strip + " + +PROVIDES=" + unlzx = $portVersion + cmd:unlzx + " + +BUILD() +{ + gcc unlzx.c -o unlzx + strip unlzx +} + +INSTALL() +{ + expanderRulesDir=$dataDir/expander/rules + mkdir -p $binDir $expanderRulesDir + cp unlzx $binDir + cp $portDir/additional-files/unlzx-expander-rules $expanderRulesDir +} From 2a60c74d7d79f0be8a22d1b8ed8717e254316623 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 21 Dec 2014 22:03:22 +0200 Subject: [PATCH 157/326] Update plee-the-bear recipe and patchset * Mark plee-the-bear as working on x86 * Add lib:libplee_the_bear to PROVIDES * Rename boost devel requirement * Add -DNDEBUG to CXX_FLAGS * Regenerate patchset (i.e. add [PATCH N/M] to subject lines) * Make sure Plee the Bear library get installed in the appropriate directory if there is a secondary arch suffix * Change data directory on Haiku --- .../patches/plee_the_bear-0.7.0.patchset | 100 ++++++++++++++++-- .../plee_the_bear/plee_the_bear-0.7.0.recipe | 37 +++---- 2 files changed, 110 insertions(+), 27 deletions(-) diff --git a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset index fdd9681f1..c121a7061 100644 --- a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset +++ b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset @@ -1,8 +1,12 @@ -From 03033c51349e01d5d06ee74545a15a534525d785 Mon Sep 17 00:00:00 2001 +From 33e29a8c2f19b290ed6e9056a60aac6fd27426c6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 14:54:36 +0200 -Subject: Fix search paths for SDL2 header files. +Subject: [PATCH 1/4] Fix search paths for SDL2 header files. +--- + bear/cmake-helper/FindSDL2.cmake | 2 +- + bear/cmake-helper/FindSDL2_mixer.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bear/cmake-helper/FindSDL2.cmake b/bear/cmake-helper/FindSDL2.cmake index 7665a55..bcd3050 100644 @@ -33,12 +37,15 @@ index 59ed911..d795965 100644 -- 1.8.3.4 - -From 4a4404ab5a5b9c67925ec6d910ddc5f47fb1b910 Mon Sep 17 00:00:00 2001 +From 864a651724bec4acce7b92fd3e1bddaa00f17c19 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 17:02:35 +0200 -Subject: Link libintl on haiku. +Subject: [PATCH 2/4] Link libintl on haiku. +--- + bear/bear-engine/running_bear/CMakeLists.txt | 2 +- + plee-the-bear/launcher/src/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bear/bear-engine/running_bear/CMakeLists.txt b/bear/bear-engine/running_bear/CMakeLists.txt index 8b04d89..4fffd94 100644 @@ -69,12 +76,16 @@ index 9ed5d32..ff88206 100644 -- 1.8.3.4 - -From 415c83accad83bf6677dd3d578ab6712582910b9 Mon Sep 17 00:00:00 2001 +From c929f602fb74adcdf495e144b66f4981c0655ba5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 19:41:58 +0200 -Subject: Fix install directories. +Subject: [PATCH 3/4] Fix install directories. +--- + bear/cmake-helper/bear-config.cmake | 2 +- + bear/cmake-module/CMakeLists.txt | 2 +- + plee-the-bear/CMakeLists.txt | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake index e66d79e..b483445 100644 @@ -103,7 +114,7 @@ index e182689..24c2113 100644 set( BEAR_CMAKE_MODULES diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt -index 6a123d9..9bc8df3 100644 +index 6a123d9..c3dbb90 100644 --- a/plee-the-bear/CMakeLists.txt +++ b/plee-the-bear/CMakeLists.txt @@ -23,7 +23,7 @@ include( docbook-to-man ) @@ -115,6 +126,15 @@ index 6a123d9..9bc8df3 100644 endif( NOT PTB_INSTALL_DATA_DIR ) # where the game executables are installed +@@ -38,7 +38,7 @@ if( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) + "${PTB_INSTALL_EXECUTABLE_DIR}" + ) + else( WIN32 ) +- set( PTB_INSTALL_CUSTOM_LIBRARY_DIR lib ) ++ set( PTB_INSTALL_CUSTOM_LIBRARY_DIR lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) + endif( WIN32 ) + endif( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) + @@ -154,7 +154,7 @@ subdirs( install( @@ -127,3 +147,65 @@ index 6a123d9..9bc8df3 100644 -- 1.8.3.4 +From 34aca4d0b287e50d35957badf3e72060264f7a45 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Wed, 24 Dec 2014 23:53:14 +0200 +Subject: [PATCH 4/4] Change settings location on Haiku + +--- + .../bear-engine/core/src/engine/code/game_local_client.cpp | 14 ++++++++++++++ + .../src/engine/system/code/default_game_filesystem.cpp | 6 +++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/bear/bear-engine/core/src/engine/code/game_local_client.cpp b/bear/bear-engine/core/src/engine/code/game_local_client.cpp +index 51c055b..83ab880 100644 +--- a/bear/bear-engine/core/src/engine/code/game_local_client.cpp ++++ b/bear/bear-engine/core/src/engine/code/game_local_client.cpp +@@ -51,6 +51,11 @@ + #include + #include + ++#if defined(__HAIKU__) ++ #include ++ #include ++#endif ++ + /*----------------------------------------------------------------------------*/ + /** + * \brief Print the options of the program. +@@ -1107,6 +1112,15 @@ void bear::engine::game_local_client::init_game_filesystem() + m_game_filesystem = + freedesktop_game_filesystem( m_game_description.game_name() ); + ++#elif defined( __HAIKU__ ) ++ BPath path; ++ status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path); ++ if (status < B_OK) ++ // fall back to default ++ m_game_filesystem = default_game_filesystem( m_game_description.game_name() ); ++ else ++ m_game_filesystem = default_game_filesystem( m_game_description.game_name(), path.Path()); ++ + #else + + m_game_filesystem = default_game_filesystem( m_game_description.game_name() ); +diff --git a/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp b/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp +index 99ea2f8..0435b5a 100644 +--- a/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp ++++ b/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp +@@ -107,7 +107,11 @@ std::string bear::engine::default_game_filesystem::get_game_directory() const + boost::filesystem::path dir( m_root ); + + std::string result; +- std::string subdir = '.' + get_name_as_filename( m_game_name ); ++ #if defined(__HAIKU__) ++ std::string subdir = get_name_as_filename( m_game_name ); ++ #else ++ std::string subdir = '.' + get_name_as_filename( m_game_name ); ++ #endif + + dir /= boost::filesystem::path( subdir ); + +-- +1.8.3.4 + diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe index a14612159..a9f89c7ca 100644 --- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe +++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe @@ -6,18 +6,21 @@ SRC_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=s CHECKSUM_SHA256="41dfe864fe2d791d6f99ba7cd330e22c94fce19d82909054eeac594aa4f2924e" SRC_FILENAME="plee-the-bear-0.7.0.tgz" -REVISION="1" -ARCHITECTURES="?x86" +REVISION="2" +ARCHITECTURES="x86" 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" + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" plee_the_bear = $portVersion cmd:plee_the_bear = $portVersion + lib:libplee_the_bear$secondaryArchSuffix lib:libbear_audio$secondaryArchSuffix lib:libbear_communication$secondaryArchSuffix lib:libbear_debug$secondaryArchSuffix @@ -65,7 +68,7 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libintl$secondaryArchSuffix - boost_devel${secondaryArchSuffix} + boost${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel @@ -79,7 +82,7 @@ SOURCE_DIR="plee-the-bear-0.7.0-light" PATCHES="plee_the_bear-$portVersion.patchset" BUILD() { - cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix + cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_CXX_FLAGS="-DNDEBUG" make $jobArgs } @@ -93,16 +96,14 @@ INSTALL() # ----- DESCRIPTION ----------------------------------------------------------- -DESCRIPTION=" -Plee the Bear is a platform game in which you play an angry bear whose son has -been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey -to find and rescue your son. Because you want to rescue him, don't you? Or to -slap him? Maybe both…. +DESCRIPTION="Plee the Bear is a platform game in which you play an angry bear whose son has \ +been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey \ +to find and rescue your son. Because you want to rescue him, don't you? Or to \ +slap him? Maybe both…. \ -With three levels of the storyline and four mini-games, Plee the Bear did -received very positive criticisms. The players loved the fun, the graphics and -the music; the community around the free software movement appreciated the -overall process and the quality of the resources, remarkable for a free game; -and the indie gaming community was pleasantly surprised by the technical skills -and the details of the game. -" +With three levels of the storyline and four mini-games, Plee the Bear \ +received very positive criticisms. The players loved the fun, the graphics and \ +the music; the community around the free software movement appreciated the \ +overall process and the quality of the resources, remarkable for a free game; \ +and the indie gaming community was pleasantly surprised by the technical skills \ +and the details of the game." From 1f30cb96ce8cac78f84b4768adb518e8784c97a1 Mon Sep 17 00:00:00 2001 From: begasus Date: Thu, 25 Dec 2014 14:54:58 +0100 Subject: [PATCH 158/326] heroes, new recipe --- games-action/heroes/heroes-0.21.recipe | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 games-action/heroes/heroes-0.21.recipe diff --git a/games-action/heroes/heroes-0.21.recipe b/games-action/heroes/heroes-0.21.recipe new file mode 100644 index 000000000..c63805256 --- /dev/null +++ b/games-action/heroes/heroes-0.21.recipe @@ -0,0 +1,63 @@ +SUMMARY="An action game similar to Tron and Nibbles." +DESCRIPTION="Heroes is similar to the Tron and Nibbles games of yore, but \ +includes many graphical improvements and new game features. In it, you must \ +maneuver a small vehicle around a world and collect powerups while avoiding \ +obstacles, your opponents trails, and even your own trail." +HOMEPAGE="http://heroes.sourceforge.net/" +SRC_URI="http://prdownloads.sourceforge.net/heroes/heroes-0.21.tar.gz" +CHECKSUM_SHA256="1264981d37d0fa12905ca627e6329c22ae6db10a1abaf3ec9b9c7357d391b54f" +SRC_URI_2="http://prdownloads.sourceforge.net/heroes/heroes-data-1.5.tar.gz" +CHECKSUM_SHA256_2="af2af6b1fd83636db03d0d2aa77243d31dccd1cb14a20269ed765edb2bb4ff43" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2002 Alexandre Duret-Lutz, \ +Romual Genevois, \ +Alexandre Liverneaux, \ +Philippe Meisburger" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + heroes = portVersion + app:heroes = $portVersion + cmd:heroeslvl = $portVersion +" + +REQUIRES=" + haiku + lib:libintl + lib:libsdl + lib:libsdl_mixer +" + +BUILD_REQUIRES=" + haiku_devel + devel:libintl + devel:libsdl + devel:libsdl_mixer +" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:libtoolize + cmd:make +" + +BUILD() +{ + libtoolize -fci + ./configure --prefix=$appsDir/Heroes + make $jobArgs + cd ../../sources-2/heroes-data-1.5 + libtoolize -fci + ./configure --prefix=$appsDir/Heroes + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/Heroes + make install + cd ../../sources-2/heroes-data-1.5 + make install +} From 789ab408db4a3685c740d70e6a6867030b18b589 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 25 Dec 2014 22:05:01 +0100 Subject: [PATCH 159/326] Add recipe for ftp --- net-ftp/ftp/ftp-20121221.recipe | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 net-ftp/ftp/ftp-20121221.recipe diff --git a/net-ftp/ftp/ftp-20121221.recipe b/net-ftp/ftp/ftp-20121221.recipe new file mode 100644 index 000000000..adeb2c922 --- /dev/null +++ b/net-ftp/ftp/ftp-20121221.recipe @@ -0,0 +1,49 @@ +SUMMARY="Standard FTP client" +DESCRIPTION="ftp is a standard command line client for connecting to FTP \ +servers. The File Transfer protocol (defined in RFC 959) is used for \ +transferring files from one computer to another over a network." +HOMEPAGE="http://netbsd.org/" +SRC_URI="cvs://anoncvs@anoncvs.NetBSD.org:/cvsroot/src/usr.bin/ftp#2012-12-21" +REVISION="1" +LICENSE="BSD (3-clause)" +COPYRIGHT="1997-2012 The NetBSD Foundation, Inc." + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + ftp = $portVersion + cmd:ftp + " + +REQUIRES=" + haiku + lib:libedit + " + +BUILD_REQUIRES=" + haiku_devel + devel:libedit + " + +BUILD_PREREQUIRES=" + cmd:gcc + " + +PATCH() +{ + sed -i 's/#include //g' *.c +} + +BUILD() +{ + gcc -Dlint -DDIRENT_MISSING_D_NAMLEN -DINFTIM=-1 -DSECSPERHOUR=3600 -DSECSPERDAY=86400 \ + cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \ + progressbar.c ruserpass.c util.c -o ftp \ + -lnetwork -ledit -lbsd +} + +INSTALL() +{ + mkdir -p $binDir + cp ftp $binDir +} From 5cc55b538284fced85fb59d15ac7187f1db91b2a Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 23 Dec 2014 19:56:14 +0200 Subject: [PATCH 160/326] Updated randomizer, removed patch and updated reicpe to point at a more recent commit --- app-accessibility/flite/flite-2.0.0.recipe | 119 + app-accessibility/flite/licenses/Flite | 206 ++ .../flite/patches/flite-2.0.0.patchset | 102 + .../licenses/Edinburgh Speech Tools | 70 + .../patches/speech_tools-2.4.patchset | 2977 +++++++++++++++++ .../speech_tools/speech_tools-2.4.recipe | 150 + .../additional-files/unlzx-expander-rules | 1 + app-arch/unlzx/unlzx-1.1.recipe | 41 + app-benchmarks/iozone/iozone-3.326.recipe | 6 +- app-dicts/mythes/mythes-1.2.4.recipe | 84 + .../bash_completion-2.1.recipe | 65 + dev-vcs/rcs/rcs-5.9.3.recipe | 67 + ...10.patchset => subversion-1.8.11.patchset} | 0 ...1.8.10.recipe => subversion-1.8.11.recipe} | 4 +- games-action/heroes/heroes-0.21.recipe | 63 + .../patches/plee_the_bear-0.7.0.patchset | 100 +- .../plee_the_bear/plee_the_bear-0.7.0.recipe | 37 +- games-emulation/dgen/dgen-1.33.recipe | 3 +- games-engines/openscenegraph/licenses/OSGPL | 578 ++++ .../openscenegraph-3.2.1.recipe | 144 + .../openscenegraph/openscenegraph-git.recipe | 145 + .../patches/openscenegraph-3.2.1.patchset | 36 + haiku-apps/beam/beam-1.2alpha.recipe | 6 +- .../beam/patches/beam-1.2alpha.patchset | 22 - .../binaryclock-20141223.recipe} | 22 +- .../patches/randomizer-1.0.0b1.patch | 147 - .../randomizer/randomizer-1.0.0b1.recipe | 16 +- haiku-apps/snapshot/snapshot-1.0.recipe | 43 + haiku-apps/tolmach/tolmach-1.1.0.recipe | 1 - ...xed-1.1.recipe => bevexed-20141224.recipe} | 11 +- media-fonts/ahem/ahem-1.0.recipe | 7 +- .../anonymous_pro-1.002.001.recipe | 5 +- .../arabeyes_fonts/arabeyes_fonts-1.1.recipe | 23 +- ...l-0.0.7.recipe => cantarell-0.0.16.recipe} | 14 +- media-fonts/cardo/cardo-1.04.recipe | 4 +- .../courier_prime/courier_prime-1.0.recipe | 5 +- .../croscorefonts/croscorefonts-1.21.0.recipe | 8 +- media-fonts/droid/droid-113.recipe | 6 +- media-fonts/droid/droid-4.3_r2.2.recipe | 6 +- .../essays-1743/essays1743-2.001.recipe | 6 +- .../farsi_fonts/farsi_fonts-0.4.recipe | 4 +- media-fonts/humor_sans/humor_sans-1.0.recipe | 8 +- .../inconsolata/inconsolata-1.0.recipe | 4 +- .../kacst_fonts/kacst_fonts-5.0.recipe | 6 +- .../lateef_font/lateef_font-1.001.recipe | 4 +- .../liberation_fonts-1.06.0.20100721.recipe | 4 +- media-fonts/lohit/lohit-2.3.8.recipe | 6 +- media-fonts/mplus/mplus-2.2.4.recipe | 6 +- .../nafees_nastaleeq-1.02.recipe | 4 +- .../nafees_riqa/nafees_riqa-1.00.recipe | 4 +- media-fonts/nanumfont/nanumfont-2.0.recipe | 4 +- .../noto_sans_bengali-1.02.recipe | 4 +- .../noto_sans_cjk/noto_sans_cjk-1.001.recipe | 4 +- .../noto_sans_devanagari-1.05.recipe | 4 +- .../noto_sans_gujarati-1.02.recipe | 4 +- .../noto_sans_gurmukhi-1.01.recipe | 4 +- .../noto_sans_sinhala-1.01.recipe | 4 +- .../noto_sans_tamil-1.04.recipe | 4 +- .../noto_sans_telugu-1.02.recipe | 4 +- media-fonts/paratype/paratype-1.0.recipe | 11 +- media-fonts/roboto/roboto-1.2.recipe | 4 +- .../scheherazade_font-1.005.recipe | 4 +- .../terminus_ttf/terminus_ttf-4.38.2.recipe | 4 +- .../ubuntu_font_family-0.80.recipe | 6 +- .../ukijorgfonts/ukijorgfonts-1.0.recipe | 4 +- media-fonts/unifont/unifont-7.0.06.recipe | 4 +- .../vl_gothic/vl_gothic-20140530.recipe | 4 +- media-fonts/vollkorn/vollkorn-2.1.recipe | 4 +- .../wqy_microhei-0.2.0~beta.recipe | 4 +- .../wqy_zenhei/wqy_zenhei-0.9.45.recipe | 4 +- .../x_series_fonts/x_series_fonts-2.0.recipe | 4 +- ...png-1.5.20.recipe => libpng-1.5.21.recipe} | 10 +- ...2-1.2.51.recipe => libpng12-1.2.52.recipe} | 14 +- ...6-1.6.15.recipe => libpng16-1.6.16.recipe} | 10 +- ...-1.0.0pre.recipe => librsync-1.0.0.recipe} | 34 +- .../librsync/patches/librsync-1.0.0.patchset | 28 + 76 files changed, 5212 insertions(+), 377 deletions(-) create mode 100644 app-accessibility/flite/flite-2.0.0.recipe create mode 100644 app-accessibility/flite/licenses/Flite create mode 100644 app-accessibility/flite/patches/flite-2.0.0.patchset create mode 100644 app-accessibility/speech_tools/licenses/Edinburgh Speech Tools create mode 100644 app-accessibility/speech_tools/patches/speech_tools-2.4.patchset create mode 100644 app-accessibility/speech_tools/speech_tools-2.4.recipe create mode 100644 app-arch/unlzx/additional-files/unlzx-expander-rules create mode 100644 app-arch/unlzx/unlzx-1.1.recipe create mode 100644 app-dicts/mythes/mythes-1.2.4.recipe create mode 100644 app-shells/bash_completion/bash_completion-2.1.recipe create mode 100644 dev-vcs/rcs/rcs-5.9.3.recipe rename dev-vcs/subversion/patches/{subversion-1.8.10.patchset => subversion-1.8.11.patchset} (100%) rename dev-vcs/subversion/{subversion-1.8.10.recipe => subversion-1.8.11.recipe} (97%) create mode 100644 games-action/heroes/heroes-0.21.recipe create mode 100644 games-engines/openscenegraph/licenses/OSGPL create mode 100644 games-engines/openscenegraph/openscenegraph-3.2.1.recipe create mode 100644 games-engines/openscenegraph/openscenegraph-git.recipe create mode 100644 games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset delete mode 100644 haiku-apps/beam/patches/beam-1.2alpha.patchset rename haiku-apps/{binary_clock/binary_clock-2.0.recipe => binaryclock/binaryclock-20141223.recipe} (63%) delete mode 100644 haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch create mode 100644 haiku-apps/snapshot/snapshot-1.0.recipe rename haiku-games/bevexed/{bevexed-1.1.recipe => bevexed-20141224.recipe} (78%) rename media-fonts/cantarell/{cantarell-0.0.7.recipe => cantarell-0.0.16.recipe} (73%) rename media-libs/libpng/{libpng-1.5.20.recipe => libpng-1.5.21.recipe} (83%) rename media-libs/libpng/{libpng12-1.2.51.recipe => libpng12-1.2.52.recipe} (79%) rename media-libs/libpng/{libpng16-1.6.15.recipe => libpng16-1.6.16.recipe} (85%) rename net-libs/librsync/{librsync-1.0.0pre.recipe => librsync-1.0.0.recipe} (61%) create mode 100644 net-libs/librsync/patches/librsync-1.0.0.patchset diff --git a/app-accessibility/flite/flite-2.0.0.recipe b/app-accessibility/flite/flite-2.0.0.recipe new file mode 100644 index 000000000..1c0a9a0df --- /dev/null +++ b/app-accessibility/flite/flite-2.0.0.recipe @@ -0,0 +1,119 @@ +SUMMARY="A light-weight text-to-speech engine" +DESCRIPTION="Flite is a text-to-speech engine developed by the Carnegie \ +Mellon University. As a light-weight alternative to the Festival engine, it \ +is desinged to fit into small embedded machines as well as large-scale \ +servers. In addition to its native format flite supports voices generated by \ +the FestVox project as well. +" +HOMEPAGE="http://www.festvox.org/flite/" +SRC_URI="http://www.festvox.org/flite/packed/flite-2.0/flite-${portVersion}-release.tar.bz2" +CHECKSUM_SHA256="678c3860fd539402b5d1699b921239072af6acb4e72dc4720494112807cae411" +SOURCE_DIR="flite-${portVersion}-release" +REVISION="1" + +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE=" + Flite + " +COPYRIGHT=" + 1986 University of Toronto + 1992, 1995 Markus Mummert + 1996-2004 University of Edinburgh, UK + 1999-2014 Language Technologies Institute, Carnegie Mellon University + 2001 Cepstral, LLC + 2001 Sun Microsystems, Inc. + 2003-2004 Nagoya Institute of Technology + 2003-2004 Nara Institute of Science and Technology + 2008-2012 University of Illinois at Urbana-Champaign + " + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" + +EXTRA_CMD=" + cmu_time_awb + cmu_us_awb + cmu_us_kal + cmu_us_kal16 + cmu_us_rms + cmu_us_slt + " +EXTRA_LIBS=" + cmu_grapheme_lang + cmu_grapheme_lex + cmu_indic_lang + cmu_indic_lex + $EXTRA_CMD + cmulex + usenglish + " +PROVIDES=" + flite$secondaryArchSuffix = $portVersion + lib:libflite$secondaryArchSuffix = $portVersion compat >= 2 + flite_tools = $portVersion + cmd:flite$secondaryArchSuffix = $portVersion + cmd:flite_time$secondaryArchSuffix = $portVersion + " +DEVEL_LIBS="libflite" +for c in $EXTRA_CMD; do + PROVIDES=" + $PROVIDES + cmd:flite_${c} = $portVersion + " +done +PROVIDES_devel=" + flite${secondaryArchSuffix}_devel = $portVersion + devel:libflite$secondaryArchSuffix = $portVersion compat >= 2 + " +for l in $EXTRA_LIBS; do + PROVIDES=" + $PROVIDES + lib:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 + " + PROVIDES_devel=" + $PROVIDES_devel + devel:libflite_${l}${secondaryArchSuffix} = $portVersion compat >= 2 + " + DEVEL_LIBS=" + $DEVEL_LIBS + libflite_${l} + " +done +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + flite$secondaryArchSuffix == $portVersion base + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:awk + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PATCHES="flite-${portVersion}.patchset" + +BUILD() +{ + autoconf + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + $DEVEL_LIBS + packageEntries devel \ + $developDir +} diff --git a/app-accessibility/flite/licenses/Flite b/app-accessibility/flite/licenses/Flite new file mode 100644 index 000000000..7ec1cd92e --- /dev/null +++ b/app-accessibility/flite/licenses/Flite @@ -0,0 +1,206 @@ + +Flite is free software. + +We have kept the core code to BSD-like copyright, thus the system is +free to use in commercial products, with commercial extensions. GPL +code is only included as part of the build process and does not +taint any of the run-time code. + +As a collection it is distributed under the following license. Note +a few files in this distribution have a different but equally free +non-conflicting licence, see below. + + Language Technologies Institute + Carnegie Mellon University + Copyright (c) 1999-2014 + All Rights Reserved. + + Permission is hereby granted, free of charge, to use and distribute + this software and its documentation without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of this work, and to + permit persons to whom this work is furnished to do so, subject to + the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + + CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK + DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + +All files within this distribution have the above license except +the following + +src/cg/cst_mlpg.h +src/cg/cst_mlpg.c +src/cg/cst_mlsa.h +src/cg/cst_mlsa.c +src/cg/cst_vc.h +src/cg/cst_vc.c +/*********************************************************************/ +/* */ +/* Nagoya Institute of Technology, Aichi, Japan, */ +/* Nara Institute of Science and Technology, Nara, Japan */ +/* and */ +/* Carnegie Mellon University, Pittsburgh, PA */ +/* Copyright (c) 2003-2004 */ +/* All Rights Reserved. */ +/* */ +/* Permission is hereby granted, free of charge, to use and */ +/* distribute this software and its documentation without */ +/* restriction, including without limitation the rights to use, */ +/* copy, modify, merge, publish, distribute, sublicense, and/or */ +/* sell copies of this work, and to permit persons to whom this */ +/* work is furnished to do so, subject to the following conditions: */ +/* */ +/* 1. The code must retain the above copyright notice, this list */ +/* of conditions and the following disclaimer. */ +/* 2. Any modifications must be clearly marked as such. */ +/* 3. Original authors' names are not deleted. */ +/* */ +/* NAGOYA INSTITUTE OF TECHNOLOGY, NARA INSTITUTE OF SCIENCE AND */ +/* TECHNOLOGY, CARNEGIE MELLON UNIVERSITY, AND THE CONTRIBUTORS TO */ +/* THIS WORK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, */ +/* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, */ +/* IN NO EVENT SHALL NAGOYA INSTITUTE OF TECHNOLOGY, NARA */ +/* INSTITUTE OF SCIENCE AND TECHNOLOGY, CARNEGIE MELLON UNIVERSITY, */ +/* NOR THE CONTRIBUTORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR */ +/* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM */ +/* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, */ +/* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN */ +/* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* */ +/*********************************************************************/ + +These functions are derived from the versions in festvox/src/vc/ as +modified by Tomoki Toda which in turn contain code derived from +NITECH's HTS system. Their copyright has the same freedoms as +as Flite's but under NAIST, NITECH and/or CMU. + +src/audio/au_wince.c +src/utils/cst_file_stdio.c +src/utils/cst_mmap_posix.c +src/utils/cst_mmap_win32.c +src/utils/cst_mmap_none.c +src/utils/cst_file_wince.c +sapi/ + are copyright Cepstral, LLC rather than CMU but fall under the same + free licence as the above, except for the owner. (Note the SAPI stuff + probably doesn't work any more) + +doc/alice + Is the first two chapters of Alice in Wonderland as distributed by the + Gutenburg project and is now in the public domain + +src/regex/regexp.c +src/regex/regsub.c + + * Copyright (c) 1986 by University of Toronto. + * Written by Henry Spencer. Not derived from licensed software. + * + * Permission is granted to anyone to use this software for any + * purpose on any computer system, and to redistribute it freely, + * subject to the following restrictions: + * + * 1. The author is not responsible for the consequences of use of + * this software, no matter how awful, even if they arise + * from defects in it. + * + * 2. The origin of this software must not be misrepresented, either + * by explicit claim or by omission. + * + * 3. Altered versions must be plainly marked as such, and must not + * be misrepresented as being the original software. + +src/speech/rateconv.c + + * Copyright (c) 1992, 1995 by Markus Mummert + * + * Redistribution and use of this software, modifcation and inclusion + * into other forms of software are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of this software must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. If this software is redistributed in a modified condition + * it must reveal clearly that it has been modified. + +lang/usenglish/us_durz_cart.c +lang/usenglish/us_durz_cart.h +lang/usenglish/us_int_accent_cart.c +lang/usenglish/us_int_accent_cart.h +lang/usenglish/us_int_tone_cart.c +lang/usenglish/us_int_tone_cart.h +lang/usenglish/us_phoneset.c +lang/usenglish/us_f0lr.c + These are directly (or indirectly) compiled/derived from files that are + part of the Festival Speech Synthesis System (1.4.1). Hence they have + a joint copyright CMU/Edinburgh but with the same free licence + +configure + # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + +configure.sub +config.guess +missing +install-sh +mkinstalldirs + Copyright FSF, and under the GPL, these files are only used for + convenient configuration and are not part of the generated binary, + and therefore do not impose any GPL restrctions on the rest of the + system. But as they are standard methods for configuration they + are included. + +src/speech/g72x.h +src/speech/g721.c +src/speech/g72x.c +src/speech/g723_24.c +src/speech/g723_40.c + +/* + * This source code is a product of Sun Microsystems, Inc. and is provided + * for unrestricted use. Users may copy or modify this source code without + * charge. + * + * SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING + * THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR + * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + * + * Sun source code is provided with no support and without any obligation on + * the part of Sun Microsystems, Inc. to assist in its use, correction, + * modification or enhancement. + * + * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE + * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE + * OR ANY PART THEREOF. + * + * In no event will Sun Microsystems, Inc. be liable for any lost revenue + * or profits or other special, indirect and consequential damages, even if + * Sun has been advised of the possibility of such damages. + * + * Sun Microsystems, Inc. + * 2550 Garcia Avenue + * Mountain View, California 94043 + */ + +lang/cmu_grapheme_lex/grapheme_unitran_tables.c +/* Copyright 2008-2012, University of Illinois at Urbana-Champaign */ +/* distributed under the Apache License, Version (2.0) */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* Original table developed by Richard Sproat and Kyoung-young Kim */ +/* Ported for Festvox by Gopala Anumachipalli gopalakr@cs.cmu.edu Sep 2012 */ +/* Then converted to C for CMU Flite (cmuflite.org) */ diff --git a/app-accessibility/flite/patches/flite-2.0.0.patchset b/app-accessibility/flite/patches/flite-2.0.0.patchset new file mode 100644 index 000000000..0d51c70e4 --- /dev/null +++ b/app-accessibility/flite/patches/flite-2.0.0.patchset @@ -0,0 +1,102 @@ +From b21c80cf33debb37b6638ab2be8d188c5a14eafb Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:37:15 +0000 +Subject: Support shared libraries on Haiku + + +diff --git a/configure.in b/configure.in +index 972d818..c2472a6 100644 +--- a/configure.in ++++ b/configure.in +@@ -265,6 +265,10 @@ fi + + if test "$shared" = true; then + case "$target_os" in ++ haiku*) ++ SHFLAGS="-fPIC" ++ OTHERLIBS="-lnetwork" ++ ;; + linux*|k*bsd*-gnu|gnu*) + SHFLAGS="-fPIC" + ;; +-- +1.8.3.4 + + +From 95e4aff793bbef466ed151897d71585bcb7e0321 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:38:03 +0000 +Subject: Do not unconditionally add `-lm` to linking commands + +TODO: make this more platform-independent. + +diff --git a/config/common_make_rules b/config/common_make_rules +index 7a03785..0dacbb6 100644 +--- a/config/common_make_rules ++++ b/config/common_make_rules +@@ -68,7 +68,7 @@ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR) + + FLITELIBS = $(BUILDDIR)/lib/libflite.a + FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite +-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) ++LDFLAGS += $(AUDIOLIBS) $(OTHERLIBS) + + FULLOBJS = $(OBJS:%=$(OBJDIR)/%) + ifdef SHFLAGS +-- +1.8.3.4 + + +From 96416a919c8ea1fcafd457502ee2bc6fd3ef107f Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 22:39:36 +0000 +Subject: cmu_indic_lex: Separate code and declaration + + +diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c +index 3c586cb..ee682d6 100644 +--- a/lang/cmu_indic_lex/cmu_indic_lex.c ++++ b/lang/cmu_indic_lex/cmu_indic_lex.c +@@ -334,6 +334,9 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, + int cur_char_type = 0; + int next_char_type = 0; + ++ const cst_val *v, *vx; ++ cst_val *ph; ++ + // Ignore chars (filter) + in_ords = cmu_indic_lex_remove_ignore_chars(ords); + +@@ -431,8 +434,6 @@ cst_val *cmu_indic_lex_ord_to_phones(const cst_val *ords, + } + } + +- const cst_val *v, *vx; +- cst_val *ph; + for(v=out_phone_strings; v; v=val_cdr(v)) { + ph = val_readlist_string(val_string(val_car(v))); + for(vx=ph; vx; vx=val_cdr(vx)) { +-- +1.8.3.4 + + +From 8b998ca76f21a8bb7cf240fd7ed40627eafbc2d8 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 24 Dec 2014 23:44:02 +0000 +Subject: Bump shlib version to libflite.so.2 + +This way it is consistent with libflite.so.2.0.0 + +diff --git a/config/project.mak b/config/project.mak +index f42ee12..252f22a 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -40,4 +40,4 @@ PROJECT_VERSION = 2.0.0 + PROJECT_DATE = Dec 2014 + PROJECT_STATE = release + +-PROJECT_SHLIB_VERSION = 1 ++PROJECT_SHLIB_VERSION = 2 +-- +1.8.3.4 + diff --git a/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools b/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools new file mode 100644 index 000000000..f26d8fce4 --- /dev/null +++ b/app-accessibility/speech_tools/licenses/Edinburgh Speech Tools @@ -0,0 +1,70 @@ + Centre for Speech Technology Research + University of Edinburgh, UK + Copyright (c) 1994-2014 + All Rights Reserved. + +Permission is hereby granted, free of charge, to use and distribute +this software and its documentation without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of this work, and to +permit persons to whom this work is furnished to do so, subject to +the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + +THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK +DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT +SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + +COPYING +------------------------------------------------------------------------ + +Some files in the distribution do not fall under the above copyright. +However none have any commercial restrictions, and no files fall under +the GPL. Specifically files that have different licences are as +follows: + +grammar/wfst/wfst_train.cc + Copyright Carnegie Mellon University (under the same + open licences as much of the rest of the code). +siod/ +include/siod*.h +lib/siod/siod.scm + Apart from some new functionality under our licence the SIOD + files fall under the licence given in siod/slib.cc copyright + Paradigm Associates. This code has been substantially modified + by us though our changes are under that licence. + + editline.c editline.h el_complete.c el_sysunix.c el_unix.h + are copyright 1992 Simmule Turner and Rich Salz under the + "BSD like" licence in siod/editline.c Again substantial + changes have been made by us which continue to be under that + licence + +rxp/ +include/rxp/ + Is Copyright Richard Tobin. We have a specific version of RXP + which allows free (including non-commercial) use. + +base_class/raveconv.cc + Is copyright 1992, 1995 by Markus Mummert + +base_class/string/reg*.{c,cc} + Copyright (c) 1986 by University of Toronto. + +base_class/string/EST_strcasecmp.c + Copyright (c) 1987, 1993 + The Regents of the University of California. All rights reserved. + + The 3-clause BSD licence diff --git a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset new file mode 100644 index 000000000..ed06dd054 --- /dev/null +++ b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset @@ -0,0 +1,2977 @@ +From e6652c7af6115fb1e3465f79fa7344fcb030389e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:13:10 -0800 +Subject: Proper compiling routines + +Backported from Debian: debian_build.diff + +Signed-off-by: Timothy Gu + +diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak +index 193ce24..befcd31 100644 +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak +@@ -39,7 +39,7 @@ + ########################################################################### + + CC=gcc +-CXX=gcc ++CXX=g++ + ifeq ($(OSTYPE),Darwin) + CXX=g++ + endif +@@ -47,8 +47,9 @@ endif + COMPILER_DESC=FSF gcc + COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' + +-CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) +-CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) ++CFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) ++CXXFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) $(CPPFLAGS) ++LINKFLAGS += $(LDFLAGS) + + DEBUG_CCFLAGS = -g + DEBUG_CXXFLAGS = -g +@@ -81,7 +82,7 @@ SHARED_CXXFLAGS = -fPIC + SHARED_LINKFLAGS = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +diff --git a/config/project.mak b/config/project.mak +index 5e9c216..2578fc1 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -103,12 +103,15 @@ PROJECT_LIBRARY_USES_estbase = eststring + + PROJECT_LIBRARY_USES_estjava = estbase eststring + +-PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1 +-PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_VERSION).1 +-PROJECT_LIBRARY_VERSION_eststring = 1.2 +-PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1 ++# These are used for the SONAME fields in ELF libraries ++PROJECT_LIBRARY_VERSION_estools = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_eststring = $(PROJECT_MAJOR_VERSION) ++PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_MAJOR_VERSION) + + PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1 ++# This line allows estbase to link with libpulse among others ++PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1 + + PROJECT_DEFAULT_LIBRARY = estools + +diff --git a/config/rules/bin_process.mak b/config/rules/bin_process.mak +index a1b9807..7158f83 100644 +--- a/config/rules/bin_process.mak ++++ b/config/rules/bin_process.mak +@@ -59,6 +59,7 @@ endif + Makefile ) : ;; \ + VCLocalRules ) : ;; \ + RCS|CVS ) : ;; \ ++ SCCS|BitKeeper ) : ;; \ + * ) $(ECHO_N) " $$i"; $(RM) -f "$$i";; \ + esac \ + done +diff --git a/config/rules/library.mak b/config/rules/library.mak +index 0181988..497180f 100644 +--- a/config/rules/library.mak ++++ b/config/rules/library.mak +@@ -102,15 +102,44 @@ endif + ## ## + ########################################################################### + ++libestools.so : libestools.a ++ echo Make Shared Library estools ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library estools ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_estools)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_estools),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_estools:%=-L. -l%) $$libs -L. -lestbase -leststring -lncurses ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_estools) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_estools) $@ ++ ++libestbase.so : libestbase.a ++ echo Make Shared Library estbase ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library estbase ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_estbase),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_estbase:%=-L. -l%) $$libs -L. ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_estbase) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_estbase) $@ ++ + lib%.so : lib%.a +- @echo Make Shared Library $* +- @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi +- @(cd shared_space ; $(AR) x ../$< ) +- @echo Link Shared Library $* ++ echo Make Shared Library $* ++ if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi ++ (cd shared_space ; $(AR) x ../$< ) ++ echo Link Shared Library $* + if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ +- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs +- @$(RM) -f shared_space/*.o $@ +- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@ ++ $(subst YYY,$@.$(PROJECT_LIBRARY_VERSION_$*),\ ++ $(subst XXX,$@.$(PROJECT_VERSION),$(MAKE_SHARED_LIB))) \ ++ shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs ++ $(RM) -f shared_space/*.o $@ ++ -ln -sf $@.$(PROJECT_VERSION) $@.$(PROJECT_LIBRARY_VERSION_$*) ++ -ln -sf $@.$(PROJECT_LIBRARY_VERSION_$*) $@ + + ########################################################################### + ## ## +diff --git a/config/rules/targets.mak b/config/rules/targets.mak +index f052401..0c55b00 100644 +--- a/config/rules/targets.mak ++++ b/config/rules/targets.mak +@@ -71,7 +71,7 @@ ifdef ALL_DIRS + @ for i in $(ALL_DIRS) ; \ + do \ + echo "clean in $(DIRNAME)/$$i" ;\ +- $(MAKE) --no-print-directory -C $$i clean ; \ ++ $(MAKE) --no-print-directory -C $$i NO_DEPEND=1 clean ; \ + done + endif + ifdef EXTRA_LIB_BUILD_DIRS +diff --git a/config/system.sh b/config/system.sh +index af07781..71b271c 100644 +--- a/config/system.sh ++++ b/config/system.sh +@@ -60,8 +60,7 @@ OSREV=`{ uname -r || echo ""; } 2> /dev/null | + sed -e 's/^\([^.]*\)\(\.[^-. ]*\).*/\1\2/'` + + # Sort out various flavours of Linux +-if [ "$OSTYPE" = Linux ] +- then ++case "$OSTYPE" in Linux|GNU|GNU/*) + if [ -f "/etc/redhat-release" ] + then + OSTYPE=RedHatLinux +@@ -74,7 +73,8 @@ if [ "$OSTYPE" = Linux ] + # Generic unknown GNU/Linux system. + OSTYPE=Linux + fi +-fi ++;; ++esac + + # Make sure we actually have a .mak file for it, otherwise fall back + # to sensible defaults (for example, kernel version and architecture +-- +1.8.3.4 + + +From 0eca7062ef526b969b4bc63a396bf380838369ee Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:14:58 -0800 +Subject: Use datadir for architecure-independent runtime libs + +Backported from Debian: datadir_fhs.diff, revision 7ec39b344cab. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_cutils.h b/include/EST_cutils.h +index c285204..8c8dc31 100644 +--- a/include/EST_cutils.h ++++ b/include/EST_cutils.h +@@ -48,6 +48,7 @@ extern "C" { + extern const char * const est_tools_version; + extern const char * const est_name; + extern const char * const est_libdir; ++extern const char * const est_datadir; + extern const char * const est_ostype; + + #include "EST_walloc.h" +diff --git a/lib/siod/siod.scm b/lib/siod/siod.scm +index a910390..227d48f 100644 +--- a/lib/siod/siod.scm ++++ b/lib/siod/siod.scm +@@ -426,19 +426,28 @@ return values." + ;; will be set automatically on start-up + (defvar libdir ' + "libdir +- The pathname of the run-time libary directory. Note reseting is +- almost definitely not what you want to do. This value is automatically +- set at start up from the value specifed at compile-time or the value +- specifed with --libdir on the command line. A number of other variables +- depend on this value.") +- +-(defvar load-path (list libdir) ++ The pathname of the architecture-dependent run-time libary directory. ++ Note reseting is almost definitely not what you want to do. This ++ value is automatically set at start up from the value specifed at ++ compile-time or the value specifed with --libdir on the command line. ++ A number of other variables depend on this value.") ++ ++(defvar datadir ' ++ "datadir ++ The pathname of the architecture-independent run-time libary ++ directory. Note reseting is almost definitely not what you want to ++ do. This value is automatically set at start up from the value ++ specifed at compile-time or the value specifed with --datadir on the ++ command line. A number of other variables depend on this value.") ++ ++(defvar load-path (list datadir) + "load-path + A list of directories containing .scm files. Used for various functions + such as load_library and require. Follows the same use as EMACS. By +- default it is set up to the compile-time library directory but may be +- changed by the user at run time, by adding a user's own library directory +- or even replacing all of the standard library. [see Site initialization]") ++ default it is set up to the compile-time architecture-independent ++ library directory but may be changed by the user at run time, by ++ adding a user's own library directory or even replacing all of the ++ standard library. [see Site initialization]") + + ;; will be set automatically on start-up + (defvar *ostype* 'unknown +@@ -447,12 +456,6 @@ return values." + on, e.g. SunOS5, FreeBSD, linux etc. The value is taken from the Makefile + variable OSTYPE at compile time.") + +-(defvar etc-path (path-append libdir "etc/" *ostype*) +- "etc-path +- A list of directories where binaries specific to Festival may be located. +- This variable is automatically set to LIBDIR/etc/OSTYPE/ +- and that path is added to the end of the UNIX PATH environment variable.") +- + (define (library_expand_filename fname) + "(library_expand_filename FILENAME) + Search for filename by appending FILENAME to each member of load-path. +diff --git a/main/siod_main.cc b/main/siod_main.cc +index 2c4a1a0..e93ba6c 100644 +--- a/main/siod_main.cc ++++ b/main/siod_main.cc +@@ -178,7 +178,7 @@ static void siod_load_default_files(void) + EST_Pathname initfile; + + // Load library init first +- initfile = EST_Pathname(est_libdir).as_directory(); ++ initfile = EST_Pathname(est_datadir).as_directory(); + initfile += "siod"; + initfile += "init.scm"; + +@@ -197,9 +197,12 @@ static void siod_lisp_vars(void) + + lib = EST_Pathname(est_libdir).as_directory(); + lib += "siod"; +- + siod_set_lval("libdir",strintern(lib)); + ++ lib = EST_Pathname(est_datadir).as_directory(); ++ lib += "siod"; ++ siod_set_lval("datadir",strintern(lib)); ++ + if (!strcmp(est_ostype,"")) + siod_set_lval("*ostype*",rintern(est_ostype)); + siod_set_lval("est_version", +@@ -221,19 +224,10 @@ static void siod_lisp_vars(void) + cons(flocons(minor), + cons(flocons(subminor),NIL)))); + +- EST_Pathname etcdircommon = est_libdir; +- etcdircommon += "etc"; +- +- EST_Pathname etcdir = etcdircommon; +- etcdir += est_ostype; +- + // Modify my PATH to include these directories +- siod_set_lval("etc-path",cons(rintern(etcdir), +- cons(rintern(etcdircommon),NIL))); +- + EST_String path = getenv("PATH"); + +- path += ":" + EST_String(etcdir) + ":" + EST_String(etcdircommon); ++ path += ":" + EST_String(est_libdir); + + putenv(wstrdup("PATH=" + path)); + +diff --git a/main/xml_parser_main.cc b/main/xml_parser_main.cc +index 41579f6..8f8a7e1 100644 +--- a/main/xml_parser_main.cc ++++ b/main/xml_parser_main.cc +@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) + al.sval("-sysdir") + "/\\1"); + + pclass.register_id("//CSTR//EST \\(.*\\)", +- EST_String::cat(est_libdir, "/\\1.dtd")); ++ EST_String::cat(est_datadir, "/\\1.dtd")); + + /* An individual parser runs over a single source. + */ +diff --git a/utils/EST_cutils.c b/utils/EST_cutils.c +index fd29653..af30aed 100644 +--- a/utils/EST_cutils.c ++++ b/utils/EST_cutils.c +@@ -54,12 +54,19 @@ const char * const est_name = STRINGIZE(ESTNAME); + #ifdef ESTLIBDIRC + # define ESTLIBDIR STRINGIZE(ESTLIBDIRC) + #endif +- + #ifndef ESTLIBDIR + #define ESTLIBDIR "/usr/local/lib/speech_tools" + #endif + ++#ifdef ESTDATADIRC ++# define ESTDATADIR STRINGIZE(ESTDATADIRC) ++#endif ++#ifndef ESTDATADIR ++#define ESTDATADIR "/usr/local/share/speech_tools" ++#endif ++ + const char * const est_libdir = ESTLIBDIR; ++const char * const est_datadir = ESTDATADIR; + + const char * const est_ostype = STRINGIZE(ESTOSTYPE); + +diff --git a/utils/Makefile b/utils/Makefile +index c17bab4..62a0de8 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -58,5 +58,5 @@ ALL = .buildlibs + include $(TOP)/config/common_make_rules + + EST_cutils.o: EST_cutils.c +- $(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIRC='$(EST_HOME)/lib' -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c ++ $(CC_COMMAND) -DESTNAME='$(PROJECT_NAME)' -DESTDATE='$(PROJECT_DATE)' -DESTVERSION='$(PROJECT_VERSION)' -DESTLIBDIR=\"$(EST_HOME)/lib\" -DESTDATADIR=\"$(EST_HOME)/share\" -DESTSTATE='$(PROJECT_STATE)' -DESTOSTYPE='$(SYSTEM_TYPE)' EST_cutils.c + +-- +1.8.3.4 + + +From 30567c705c2e5aaf1c45737ebc409a87e70bf690 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:17:52 -0800 +Subject: Use standard headers + +Backported from Debian: use_standard_headers.diff, rev fc5c7c603109 + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_dynamic_model.h b/include/EST_dynamic_model.h +index a54a0c5..7807f8a 100644 +--- a/include/EST_dynamic_model.h ++++ b/include/EST_dynamic_model.h +@@ -38,8 +38,8 @@ + /*=======================================================================*/ + + #include +-#include +-#include ++#include ++#include + #include "EST.h" + #include "EST_model_types.h" + +-- +1.8.3.4 + + +From a03f11db6ac385ceb2f2897214e56fec6a477eff Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:19:24 -0800 +Subject: Force the use of actual template of EST_TIterator + +Backported from Debian: include_EST_TIterator.h.diff, rev c16015e8c96. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_TIterator.h b/include/EST_TIterator.h +index 7ce188e..832e8e3 100644 +--- a/include/EST_TIterator.h ++++ b/include/EST_TIterator.h +@@ -228,7 +228,7 @@ private: + + public: + +- typedef EST_TIterator Iter; ++ typedef EST_TRwIterator Iter; + + /// Create an iterator not associated with any specific container. + EST_TRwIterator() {this->cont=NULL;} +@@ -278,7 +278,7 @@ class EST_TRwStructIterator + { + public: + +- typedef EST_TIterator Iter; ++ typedef EST_TRwStructIterator Iter; + + /// Create an iterator not associated with any specific container. + EST_TRwStructIterator() {this->cont=NULL;} +-- +1.8.3.4 + + +From 5a0d0a6091371c358a47f4a6c14eadbd300b1ac0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:22:25 -0800 +Subject: Modify data loading memory management to avoid crashes + +Author: Samuel Thibault + +Backported from Debian: speech_class/EST_WaveFile.cc, rev 1d2d56519d + +Signed-off-by: Timothy Gu + +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index ba8a362..7f07a31 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -85,7 +85,10 @@ EST_read_status load_using(standard_load_fn_fp fn, + + if (status == read_ok) + { +- wv.values().set_memory(data, 0, nsamp, nchan, TRUE); ++ short *data2 = new short[nsamp*nchan]; ++ memcpy(data2, data, nsamp*nchan*sizeof(short)); ++ wfree(data); ++ wv.values().set_memory(data2, 0, nsamp, nchan, TRUE); + wv.set_sample_rate(srate); + } + +-- +1.8.3.4 + + +From 2a470daf58bcebc49461b08c678bb4dd694adf1b Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:24:19 -0800 +Subject: Use 3-clause BSD license for the files derived from BSD + +BSD (where these two files came from) already switched to 3-clause BSD. + +Backported from Debian: copyright_4clausefix.diff, rev 9d3453539788. + +Changes to README made by me (Timothy), with the same rationale as the original +Debian patch. + +Signed-off-by: Timothy Gu + +diff --git a/README b/README +index 88e3ded..dfdeae5 100644 +--- a/README ++++ b/README +@@ -126,7 +126,7 @@ base_class/string/EST_strcasecmp.c + Copyright (c) 1987, 1993 + The Regents of the University of California. All rights reserved. + +- The standard BSD licence ++ The 3-clause BSD licence + + + ACKNOWLEDGEMENTS +diff --git a/base_class/string/EST_strcasecmp.c b/base_class/string/EST_strcasecmp.c +index 72a9b7c..1c48a32 100755 +--- a/base_class/string/EST_strcasecmp.c ++++ b/base_class/string/EST_strcasecmp.c +@@ -10,11 +10,7 @@ + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. +- * 3. All advertising materials mentioning features or use of this software +- * must display the following acknowledgement: +- * This product includes software developed by the University of +- * California, Berkeley and its contributors. +- * 4. Neither the name of the University nor the names of its contributors ++ * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * +diff --git a/base_class/string/regexp.h b/base_class/string/regexp.h +index 578c968..8b310ae 100644 +--- a/base_class/string/regexp.h ++++ b/base_class/string/regexp.h +@@ -14,11 +14,7 @@ + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. +- * 3. All advertising materials mentioning features or use of this software +- * must display the following acknowledgement: +- * This product includes software developed by the University of +- * California, Berkeley and its contributors. +- * 4. Neither the name of the University nor the names of its contributors ++ * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * +-- +1.8.3.4 + + +From 3de08ae8da37beb2665fb8a256311315f5edd31c Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:33:54 -0800 +Subject: Seeking and reading interface to istreams in EST_TokenStream + +Reduces IO disk usage when using HTS voices. + +Backported from Debian: tokenstream_istream.diff, rev b3d550a5aa330. + +Signed-off-by: Timothy Gu + +diff --git a/base_class/EST_Token.cc b/base_class/EST_Token.cc +index 4287d19..533467d 100644 +--- a/base_class/EST_Token.cc ++++ b/base_class/EST_Token.cc +@@ -287,8 +287,9 @@ int EST_TokenStream::seek_end() + return -1; + break; + case tst_istream: +- cerr << "EST_TokenStream seek on istream not yet supported" << endl; +- return -1; ++ is->seekg(0,is->end); ++ p_filepos = is->tellg(); ++ return p_filepos; + break; + case tst_string: + pos = buffer_length; +@@ -320,8 +321,9 @@ int EST_TokenStream::seek(int position) + return -1; + break; + case tst_istream: +- cerr << "EST_TokenStream seek on istream not yet supported" << endl; +- return -1; ++ p_filepos = position; ++ is->seekg(position, is->beg); ++ return 0; + break; + case tst_string: + if (position >= pos) +@@ -381,8 +383,9 @@ int EST_TokenStream::fread(void *buff, int size, int nitems) + return 0; + break; + case tst_istream: +- cerr << "EST_TokenStream fread istream not yet supported" << endl; +- return 0; ++ is->read((char*)buff, (size_t) size*nitems); ++ return is->gcount()/size; ++ break; + case tst_string: + if ((buffer_length-pos)/size < nitems) + items_read = (buffer_length-pos)/size; +-- +1.8.3.4 + + +From 1a4805cb16dd6d322b8736c0846748f1bf8fa2f0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:48:11 -0800 +Subject: Add ALAW support + +Backported from Debian: alaw.diff, rev da4af248. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_wave_aux.h b/include/EST_wave_aux.h +index 4995794..9d2bfde 100644 +--- a/include/EST_wave_aux.h ++++ b/include/EST_wave_aux.h +@@ -97,6 +97,7 @@ void alaw_to_short(const unsigned char *alaw,short *data,int length); + void uchar_to_short(const unsigned char *chars,short *data,int length); + void short_to_char(const short *data,unsigned char *chars,int length); + void short_to_ulaw(const short *data,unsigned char *ulaw,int length); ++void short_to_alaw(const short *data,unsigned char *alaw,int length); + + // Used when setting Waves in Features + VAL_REGISTER_CLASS_DCLS(wave,EST_Wave) +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 7f07a31..5e8d46e 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -315,6 +315,27 @@ EST_write_status EST_WaveFile::save_ulaw(FILE *fp, + return save_using(save_wave_ulaw, fp, localwv, stype, bo); + } + ++EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, ++ EST_Wave &wv, ++ int rate, ++ EST_sample_type_t stype, int bo, int nchan, ++ int offset, int length) ++{ ++ return load_using(load_wave_alaw, ++ ts, wv, rate, ++ stype, bo, nchan, ++ offset, length); ++} ++ ++EST_write_status EST_WaveFile::save_alaw(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_alaw, fp, localwv, stype, bo); ++} ++ + static int parse_esps_r_option(EST_String arg, int &offset, int &length) + { + EST_String s, e; +@@ -385,6 +406,11 @@ EST_read_status read_wave(EST_Wave &sig, const EST_String &in_file, + al.add_item("-itype","ulaw"); + al.add_item("-f","8000"); + } ++ if (al.present("-alaw")) ++ { ++al.add_item("-itype","alaw"); ++al.add_item("-f","8000"); ++ } + if (al.present("-iswap")) + al.add_item("-ibo","other"); + +@@ -455,6 +481,11 @@ EST_read_status read_wave(EST_Wave &sig, const EST_String &in_file, + cerr << "Cannot recognize file format or cannot access file: \"" << in_file << "\"\n"; + return read_error; + } ++ if (file_type == "alaw") ++ { ++sample_rate = 8000; ++sample_type = "alaw"; ++ } + + if (al.present("-start") || al.present("-end") + || al.present("-to") || al.present("-from")) +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index 04fca06..e9217b9 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -57,7 +57,8 @@ typedef enum EST_WaveFileType{ + wff_aiff, + wff_riff, + wff_raw, +- wff_ulaw ++ wff_ulaw, ++ wff_alaw + } EST_WaveFileType; + + class EST_WaveFile { +@@ -125,6 +126,9 @@ public: + static EST_write_status save_ulaw(SaveWave_TokenStreamArgs); + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + ++ static EST_write_status save_alaw(SaveWave_TokenStreamArgs); ++ static EST_read_status load_alaw(LoadWave_TokenStreamArgs); ++ + static EST_TNamedEnumI map; + + static EST_String options_supported(void); +diff --git a/speech_class/EST_wave_aux.cc b/speech_class/EST_wave_aux.cc +index afd6a85..24eb430 100644 +--- a/speech_class/EST_wave_aux.cc ++++ b/speech_class/EST_wave_aux.cc +@@ -287,7 +287,7 @@ EST_String options_wave_input(void) + " endian)\n\n" + "-iswap Swap bytes. (For use on an unheadered input file)\n\n" + "-istype Sample type in an unheadered input file:\n" +- " short, mulaw, byte, ascii\n\n" ++ " short, alaw, mulaw, byte, ascii\n\n" + "-c Select a single channel (starts from 0). \n" + " Waveforms can have multiple channels. This option \n" + " extracts a single channel for progcessing and \n" +@@ -318,7 +318,7 @@ EST_String options_wave_output(void) + " Intel, Alpha, DEC Mips, Vax are LSB \n" + " (little endian)\n\n" + "-oswap Swap bytes when saving to output\n\n"+ +- "-ostype Output sample type: short, mulaw, byte or ascii\n\n"; ++ "-ostype Output sample type: short, alaw, mulaw, byte or ascii\n\n"; + } + + Declare_TNamedEnum(EST_sample_type_t) +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index e351d21..dae0963 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -107,15 +107,17 @@ const char *sample_type_to_nist(enum EST_sample_type_t sample_type) + { + const char *c; + switch (sample_type) { +- case st_unknown: ++ case st_unknown: + c = ""; break; +- case st_schar: ++ case st_schar: + c = "PCM-1"; break; ++ case st_alaw: ++ c = "ALAW"; break; + case st_mulaw: + c = "ULAW"; break; +- case st_short: ++ case st_short: + c = "pcm"; break; +- case st_int: ++ case st_int: + c = "PCM-4"; break; + case st_float: + c = "REAL"; break; +@@ -141,6 +143,9 @@ enum EST_sample_type_t nist_to_sample_type(char *type) + (EST_strcasecmp(type,"mu-law",NULL) == 0) || + (EST_strcasecmp(type,"mulaw",NULL) == 0)) + return st_mulaw; ++ else if ((EST_strcasecmp(type,"ALAW",NULL) == 0) || ++ (EST_strcasecmp(type,"A-LAW",NULL) == 0)) ++ return st_alaw; + else if (strcmp(type,"alaw") == 0) + return st_alaw; + else if (strcmp(type,"PCM-1") == 0) +@@ -192,6 +197,11 @@ enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + byte_order = wstrdup((EST_BIG_ENDIAN ? "10" : "01")); + sample_coding = wstrdup("ULAW"); + } ++ if (streq(byte_order,"a-law")) ++ { ++ byte_order = wstrdup((EST_BIG_ENDIAN ? "10" : "01")); ++ sample_coding = wstrdup("ALAW"); ++ } + + /* code for reading in Tony Robinson's shorten files. + This is a temporary fix which calls the unshorten program on the +@@ -473,12 +483,13 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + /* The follow are registered proprietary WAVE formats (?) */ + case WAVE_FORMAT_MULAW: + actual_sample_type = st_mulaw; break; ++ case WAVE_FORMAT_ALAW: ++ actual_sample_type = st_alaw; break; + case WAVE_FORMAT_ADPCM: +- fprintf(stderr, "RIFF file: unsupported proprietary sample format ADPCM\n"); ++ fprintf(stderr, "RIFF file: unsupported proprietary sample format ADPCM\n"); + actual_sample_type = st_short; + break; + /* actual_sample_type = st_adpcm; break; */ /* yes but which adpcm ! */ +- case WAVE_FORMAT_ALAW: + default: + fprintf(stderr, "RIFF file: unknown sample format\n"); + actual_sample_type = st_short; +@@ -843,50 +854,103 @@ enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + { + unsigned char *ulaw; + int data_length,samps; +- ++ + ts.seek_end(); + samps = ts.tell(); +- ++ + if (length == 0) + data_length = samps - offset; + else + data_length = length; +- ++ + ulaw = walloc(unsigned char, data_length); + ts.seek(offset); + if (ts.fread(ulaw,1,data_length) != data_length) + { +- wfree(ulaw); ++ wfree(ulaw); + return misc_read_error; + } +- ++ + *data = walloc(short,data_length); + ulaw_to_short(ulaw,*data,data_length); + wfree(ulaw); +- ++ + *num_samples = data_length; + *sample_rate = 8000; + *num_channels = 1; + *sample_type = st_short; + *word_size = 2; + *bo = EST_NATIVE_BO; +- ++ + return format_ok; + } + + enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, +- int sample_rate, ++ int num_samples, int num_channels, ++ int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { + (void)sample_rate; + (void)sample_type; + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_mulaw,bo); +- +- ++ ++ ++} ++ ++enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int ++ *num_samples, int *num_channels, int *word_size, int ++ *sample_rate, enum EST_sample_type_t *sample_type, int *bo, ++ int offset, int length) ++ ++{ ++ unsigned char *alaw; ++ int data_length,samps; ++ ++ ts.seek_end(); ++ samps = ts.tell(); ++ ++ if (length == 0) ++ data_length = samps - offset; ++ else ++ data_length = length; ++ ++ alaw = walloc(unsigned char, data_length); ++ ts.seek(offset); ++ if (ts.fread(alaw,1,data_length) != data_length) ++ { ++ wfree(alaw); ++ return misc_read_error; ++ } ++ ++ *data = walloc(short,data_length); ++ alaw_to_short(alaw,*data,data_length); ++ wfree(alaw); ++ ++ *num_samples = data_length; ++ *sample_rate = 8000; ++ *num_channels = 1; ++ *sample_type = st_short; ++ *word_size = 2; ++ *bo = EST_NATIVE_BO; ++ ++ return format_ok; + } + ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void)sample_rate; ++ (void)sample_type; ++ return save_wave_raw(fp,data,offset,num_samples,num_channels, ++ 8000,st_alaw,bo); ++ ++ ++} ++ ++ + /*=======================================================================*/ + /* Sun and Next snd files */ + /*=======================================================================*/ +diff --git a/speech_class/EST_wave_utils.cc b/speech_class/EST_wave_utils.cc +index d70ee87..55878b9 100644 +--- a/speech_class/EST_wave_utils.cc ++++ b/speech_class/EST_wave_utils.cc +@@ -53,7 +53,9 @@ + #include "EST_error.h" + + static short st_ulaw_to_short(unsigned char ulawbyte); ++static short st_alaw_to_short(unsigned char alawbyte); + static unsigned char st_short_to_ulaw(short sample); ++static unsigned char st_short_to_alaw(short sample); + + /* + * This table is +@@ -202,6 +204,16 @@ void short_to_ulaw(const short *data,unsigned char *ulaw,int length) + + } + ++void short_to_alaw(const short *data,unsigned char *alaw,int length) ++{ ++ /* Convert alaw to shorts */ ++ int i; ++ ++ for (i=0; i + +-/* The follow two (raw and ulaw) cannot be in the table as they cannot */ ++/* The follow two (raw, alaw and ulaw) cannot be in the table as they cannot */ + /* identify themselves from files (both are unheadered) */ + enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int +@@ -62,6 +62,15 @@ enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int ++ *num_samples, int *num_channels, int *word_size, int ++ *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int ++ offset, int length); ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int length, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t, int bo); ++ + enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +diff --git a/testsuite/correct/ch_wave_script.out b/testsuite/correct/ch_wave_script.out +index b656ff3..fa4aee1 100644 +--- a/testsuite/correct/ch_wave_script.out ++++ b/testsuite/correct/ch_wave_script.out +@@ -77,7 +77,7 @@ use "-" to make input and output files stdin/out + -iswap Swap bytes. (For use on an unheadered input file) + + -istype Sample type in an unheadered input file: +- short, mulaw, byte, ascii ++ short, alaw, mulaw, byte, ascii + + -c Select a single channel (starts from 0). + Waveforms can have multiple channels. This option +@@ -112,7 +112,7 @@ use "-" to make input and output files stdin/out + + -oswap Swap bytes when saving to output + +--ostype Output sample type: short, mulaw, byte or ascii ++-ostype Output sample type: short, alaw, mulaw, byte or ascii + + -scale Scaling factor. Increase or descrease the amplitude + of the whole waveform by the factor given +-- +1.8.3.4 + + +From 77a6c8d1f2fa93c2809ede4833d21e19b757df14 Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:48:54 -0800 +Subject: Allow saving wave files in parts + +Backported from Debian: wave_save_parts.diff, rev 5cf72e31d. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_Wave.h b/include/EST_Wave.h +index 053e2a9..1e7324e 100644 +--- a/include/EST_Wave.h ++++ b/include/EST_Wave.h +@@ -295,11 +295,18 @@ public: + + EST_write_status save_file(const EST_String filename, + EST_String filetype, +- EST_String sample_type, int bo); ++ EST_String sample_type, int bo, const char *mode = "wb"); + + EST_write_status save_file(FILE *fp, + EST_String filetype, + EST_String sample_type, int bo); ++ ++ EST_write_status save_file_header(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo); ++ EST_write_status save_file_data(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo); + //@} + + /// Assignment operator +diff --git a/include/EST_wave_aux.h b/include/EST_wave_aux.h +index 9d2bfde..942ffb3 100644 +--- a/include/EST_wave_aux.h ++++ b/include/EST_wave_aux.h +@@ -116,6 +116,13 @@ enum EST_sample_type_t { + st_alaw, + st_ascii}; + ++ ++enum EST_write_status wave_io_save_header(FILE *fp, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype); ++ + extern EST_TNamedEnum EST_sample_type_map; + + #endif /* __EST_WAVE_AUX_H__ */ +diff --git a/speech_class/EST_Wave.cc b/speech_class/EST_Wave.cc +index 7a882a0..816baec 100644 +--- a/speech_class/EST_Wave.cc ++++ b/speech_class/EST_Wave.cc +@@ -392,13 +392,13 @@ EST_write_status EST_Wave::save(FILE *fp, const EST_String type) + + EST_write_status EST_Wave::save_file(const EST_String filename, + EST_String ftype, +- EST_String stype, int obo) ++ EST_String stype, int obo, const char *mode) + { + FILE *fp; + + if (filename == "-") + fp = stdout; +- else if ((fp = fopen(filename,"wb")) == NULL) ++ else if ((fp = fopen(filename, mode)) == NULL) + { + cerr << "Wave save: can't open output file \"" << + filename << "\"" << endl; +@@ -433,7 +433,55 @@ EST_write_status EST_Wave::save_file(FILE *fp, + } + + return (*s_fun)(fp, *this, sample_type, obo); ++} ++ ++EST_write_status EST_Wave::save_file_data(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ ++ if (t == wff_none) ++ { ++ cerr << "Unknown Wave file type " << ftype << endl; ++ return write_fail; ++ } ++ ++ EST_WaveFile::Save_TokenStream * s_fun = EST_WaveFile::map.info(t).save_data; + ++ if (s_fun == NULL) ++ { ++ cerr << "Can't save wave data to files type " << ftype << endl; ++ return write_fail; ++ } ++ ++ return (*s_fun)(fp, *this, sample_type, obo); ++} ++ ++ ++EST_write_status EST_Wave::save_file_header(FILE *fp, ++ EST_String ftype, ++ EST_String stype, int obo) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ ++ if (t == wff_none) ++ { ++ cerr << "Unknown Wave file type " << ftype << endl; ++ return write_fail; ++ } ++ ++ EST_WaveFile::Save_TokenStream * s_fun = EST_WaveFile::map.info(t).save_header; ++ ++ if (s_fun == NULL) ++ { ++ cerr << "Can't save wave header to files type " << ftype << endl; ++ return write_fail; ++ } ++ ++ return (*s_fun)(fp, *this, sample_type, obo); + } + + void EST_Wave::resample(int new_freq) +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 5e8d46e..61d5c23 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -43,8 +43,8 @@ + #include "EST_cutils.h" + #include "EST_Option.h" + #include "EST_io_aux.h" +-#include "stdio.h" +-#include "math.h" ++#include ++#include + + void extract(EST_Wave &sig, EST_Option &al); + +@@ -62,7 +62,12 @@ EST_write_status (*standard_save_fn_fp)(FILE *fp, + int offset, int nsamp, + int nchan, int srate, + EST_sample_type_t stype, int bo); +- ++ ++typedef ++EST_write_status (*standard_save_header_fn_fp)(FILE *fp, ++ int nsamp, ++ int nchan, int srate, ++ EST_sample_type_t stype, int bo); + + static + EST_read_status load_using(standard_load_fn_fp fn, +@@ -109,6 +114,19 @@ EST_write_status status = (*fn)(fp, + return status; + } + ++static ++EST_write_status save_header_using(standard_save_header_fn_fp fn, ++ FILE *fp, const EST_Wave wv, ++ EST_sample_type_t stype, int bo) ++{ ++ ++EST_write_status status = (*fn)(fp, ++ wv.num_samples(), wv.num_channels(), ++ wv.sample_rate(), ++ stype, bo); ++return status; ++} ++ + EST_read_status EST_WaveFile::load_nist(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -128,6 +146,20 @@ EST_write_status EST_WaveFile::save_nist(FILE *fp, + return save_using(save_wave_nist, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_nist_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_nist_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_nist_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_nist_header, fp, wv, stype, bo); ++} ++ + EST_read_status EST_WaveFile::load_est(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -149,7 +181,24 @@ EST_write_status EST_WaveFile::save_est(FILE *fp, + return save_using(save_wave_est, + fp, wv, + stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_est_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_est_data, ++ fp, wv, ++ stype, bo); ++} + ++EST_write_status EST_WaveFile::save_est_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_est_header, ++ fp, wv, ++ stype, bo); + } + + EST_read_status EST_WaveFile::load_aiff(EST_TokenStream &ts, +@@ -171,6 +220,19 @@ EST_write_status EST_WaveFile::save_aiff(FILE *fp, + return save_using(save_wave_aiff, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_aiff_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_aiff_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_aiff_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_aiff_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_riff(EST_TokenStream &ts, + EST_Wave &wv, +@@ -191,6 +253,19 @@ EST_write_status EST_WaveFile::save_riff(FILE *fp, + return save_using(save_wave_riff, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_riff_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_riff_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_riff_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_riff_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_esps(EST_TokenStream &ts, + EST_Wave &wv, +@@ -213,6 +288,23 @@ EST_write_status EST_WaveFile::save_esps(FILE *fp, + stype, bo); + } + ++EST_write_status EST_WaveFile::save_esps_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_sd_data, ++ fp, wv, ++ stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_esps_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_sd_header, ++ fp, wv, ++ stype, bo); ++} + + EST_read_status EST_WaveFile::load_audlab(EST_TokenStream &ts, + EST_Wave &wv, +@@ -233,6 +325,19 @@ EST_write_status EST_WaveFile::save_audlab(FILE *fp, + return save_using(save_wave_audlab, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_audlab_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_audlab_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_audlab_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_audlab_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_snd(EST_TokenStream &ts, + EST_Wave &wv, +@@ -253,6 +358,21 @@ EST_write_status EST_WaveFile::save_snd(FILE *fp, + return save_using(save_wave_snd, fp, wv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_snd_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_using(save_wave_snd_data, fp, wv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_snd_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_snd_header, fp, wv, stype, bo); ++} ++ ++ + + EST_read_status EST_WaveFile::load_raw(EST_TokenStream &ts, + EST_Wave &wv, +@@ -293,6 +413,20 @@ EST_write_status status = save_wave_raw(fp, + return status; + } + ++EST_write_status EST_WaveFile::save_raw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++return save_raw(fp, wv, stype, bo); ++} ++ ++ ++EST_write_status EST_WaveFile::save_raw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ return save_header_using(save_wave_raw_header, fp, wv, stype, bo); ++} + + EST_read_status EST_WaveFile::load_ulaw(EST_TokenStream &ts, + EST_Wave &wv, +@@ -315,6 +449,25 @@ EST_write_status EST_WaveFile::save_ulaw(FILE *fp, + return save_using(save_wave_ulaw, fp, localwv, stype, bo); + } + ++EST_write_status EST_WaveFile::save_ulaw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_ulaw_data, fp, localwv, stype, bo); ++} ++ ++ ++EST_write_status EST_WaveFile::save_ulaw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_header_using(save_wave_ulaw_header, fp, localwv, stype, bo); ++} ++ + EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, + EST_Wave &wv, + int rate, +@@ -575,25 +728,43 @@ static + EST_TValuedEnumDefinition wavefile_names[] = + { + { wff_none, { NULL }, +- { FALSE, NULL, NULL, "unknown track file type"} }, ++ { FALSE, NULL, NULL, NULL, NULL, "unknown track file type"} }, + { wff_nist, { "nist", "timit" }, +- { TRUE, EST_WaveFile::load_nist, EST_WaveFile::save_nist, "nist/timit" } }, ++ { TRUE, EST_WaveFile::load_nist, EST_WaveFile::save_nist, ++ EST_WaveFile::save_nist_header, EST_WaveFile::save_nist_data, ++ "nist/timit" } }, + { wff_est, { "est"}, +- { TRUE, EST_WaveFile::load_est, EST_WaveFile::save_est, "est" } }, ++ { TRUE, EST_WaveFile::load_est, EST_WaveFile::save_est, ++ EST_WaveFile::save_est_header, EST_WaveFile::save_est_data, ++ "est" } }, + { wff_esps, { "esps", "sd"}, +- { TRUE, EST_WaveFile::load_esps, EST_WaveFile::save_esps, "esps SD waveform" } }, ++ { TRUE, EST_WaveFile::load_esps, EST_WaveFile::save_esps, ++ EST_WaveFile::save_esps_header, EST_WaveFile::save_esps_data, ++ "esps SD waveform" } }, + { wff_audlab, { "audlab", "vox"}, +- { TRUE, EST_WaveFile::load_audlab, EST_WaveFile::save_audlab, "audlab waveform" } }, ++ { TRUE, EST_WaveFile::load_audlab, EST_WaveFile::save_audlab, ++ EST_WaveFile::save_audlab_header, EST_WaveFile::save_audlab_data, ++ "audlab waveform" } }, + { wff_snd, { "snd", "au"}, +- { TRUE, EST_WaveFile::load_snd, EST_WaveFile::save_snd, "Sun snd file" } }, ++ { TRUE, EST_WaveFile::load_snd, EST_WaveFile::save_snd, ++ EST_WaveFile::save_snd_header, EST_WaveFile::save_snd_data, ++ "Sun snd file" } }, + { wff_aiff, { "aiff" }, +- { TRUE, EST_WaveFile::load_aiff, EST_WaveFile::save_aiff, "Apple aiff file" } }, ++ { TRUE, EST_WaveFile::load_aiff, EST_WaveFile::save_aiff, ++ EST_WaveFile::save_aiff_header, EST_WaveFile::save_aiff_data, ++ "Apple aiff file" } }, + { wff_riff, { "riff", "wav" }, +- { TRUE, EST_WaveFile::load_riff, EST_WaveFile::save_riff, "Microsoft wav/riff file" } }, ++ { TRUE, EST_WaveFile::load_riff, EST_WaveFile::save_riff, ++ EST_WaveFile::save_riff_header, EST_WaveFile::save_riff_data, ++ "Microsoft wav/riff file" } }, + { wff_raw, { "raw" }, +- { FALSE, EST_WaveFile::load_raw, EST_WaveFile::save_raw, "Headerless File" } }, ++ { FALSE, EST_WaveFile::load_raw, EST_WaveFile::save_raw, ++ EST_WaveFile::save_raw_header, EST_WaveFile::save_raw_data, ++ "Headerless File" } }, + { wff_ulaw, { "ulaw", "basic" }, +- { FALSE, EST_WaveFile::load_ulaw, EST_WaveFile::save_ulaw, "Headerless 8K ulaw File" } }, ++ { FALSE, EST_WaveFile::load_ulaw, EST_WaveFile::save_ulaw, ++ EST_WaveFile::save_ulaw_header, EST_WaveFile::save_ulaw_data, ++ "Headerless 8K ulaw File" } }, + { wff_none, {NULL} } + }; + +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index e9217b9..a185f5a 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -96,34 +96,54 @@ public: + bool recognise; + Load_TokenStream *load; + Save_TokenStream *save; ++ Save_TokenStream *save_header; ++ Save_TokenStream *save_data; + const char *description; + } Info; + + static EST_write_status save_nist(SaveWave_TokenStreamArgs); ++ static EST_write_status save_nist_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_nist_data(SaveWave_TokenStreamArgs); + static EST_read_status load_nist(LoadWave_TokenStreamArgs); + + static EST_write_status save_est(SaveWave_TokenStreamArgs); ++ static EST_write_status save_est_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_est_data(SaveWave_TokenStreamArgs); + static EST_read_status load_est(LoadWave_TokenStreamArgs); + + static EST_write_status save_esps(SaveWave_TokenStreamArgs); ++ static EST_write_status save_esps_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_esps_data(SaveWave_TokenStreamArgs); + static EST_read_status load_esps(LoadWave_TokenStreamArgs); + + static EST_write_status save_audlab(SaveWave_TokenStreamArgs); ++ static EST_write_status save_audlab_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_audlab_data(SaveWave_TokenStreamArgs); + static EST_read_status load_audlab(LoadWave_TokenStreamArgs); + + static EST_write_status save_snd(SaveWave_TokenStreamArgs); ++ static EST_write_status save_snd_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_snd_data(SaveWave_TokenStreamArgs); + static EST_read_status load_snd(LoadWave_TokenStreamArgs); + + static EST_write_status save_aiff(SaveWave_TokenStreamArgs); ++ static EST_write_status save_aiff_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_aiff_data(SaveWave_TokenStreamArgs); + static EST_read_status load_aiff(LoadWave_TokenStreamArgs); + + static EST_write_status save_riff(SaveWave_TokenStreamArgs); ++ static EST_write_status save_riff_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_riff_data(SaveWave_TokenStreamArgs); + static EST_read_status load_riff(LoadWave_TokenStreamArgs); + + static EST_write_status save_raw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_raw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_raw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_raw(LoadWave_TokenStreamArgs); + + static EST_write_status save_ulaw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_ulaw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_ulaw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + + static EST_write_status save_alaw(SaveWave_TokenStreamArgs); +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index dae0963..7cec8f4 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -283,10 +283,10 @@ enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_nist_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + char h[1024], p[1024]; + const char *t; +@@ -322,13 +322,37 @@ enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, + strcat(h, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); + + if (fwrite(&h, 1024, 1, fp) != 1) +- return misc_write_error; ++ return misc_write_error; + ++ return write_ok; ++} ++ ++ ++enum EST_write_status save_wave_nist_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo); + + } + ++enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_nist_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ return save_wave_nist_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); ++} ++ + /*=======================================================================*/ + /* EST's own format */ + /*=======================================================================*/ +@@ -401,10 +425,10 @@ enum EST_read_status load_wave_est(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_est_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + fprintf(fp, "EST_File wave\n"); + fprintf(fp, "DataType binary\n"); +@@ -416,10 +440,32 @@ enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, + fprintf(fp, "ByteOrder %s\n", ((bo == bo_big) ? "10" : "01")); + + fprintf(fp, "EST_Header_End\n"); +- ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_est_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp, data, offset, num_samples, num_channels, + sample_type, bo); ++} ++ ++enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_est_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_est_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + /*=======================================================================*/ +@@ -576,10 +622,9 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, +- int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++enum EST_write_status save_wave_riff_header(FILE *fp, int num_samples, ++ int num_channels, int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) + { + (void)bo; + const char *info; +@@ -636,10 +681,35 @@ enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, + if (EST_BIG_ENDIAN) data_size = SWAPINT(data_size); + fwrite(&data_size,1,4,fp); /* total number of bytes in data */ + ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_riff_data(FILE *fp, const short *data, ++ int offset, int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo_little); + } + ++ ++enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_riff_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ ++ return save_wave_riff_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++ ++} ++ + /*=======================================================================*/ + /* Amiga/Apple AIFF waveform format */ + /* This was constructed using info in AudioIFF1.3.hqx found on the web */ +@@ -776,10 +846,11 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++ ++enum EST_write_status save_wave_aiff_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { + (void)bo; + const char *info; +@@ -830,16 +901,40 @@ enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, + data_int = SWAPINT(data_int); + fwrite(&data_int,1,4,fp); /* blocksize */ + +- if ((sample_type == st_short) || +- (sample_type == st_uchar)) +- return save_raw_data(fp,data,offset,num_samples,num_channels, +- sample_type,bo_big); ++ return write_ok; ++ ++} ++ ++enum EST_write_status save_wave_aiff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ ++ if (data == NULL) ++ return write_ok; ++ if ((sample_type == st_short) || (sample_type == st_uchar)) ++ return save_raw_data(fp,data, offset, num_samples, num_channels, ++ sample_type, bo_big); + else + { + fprintf(stderr,"AIFF: requested data type not uchar or short\n"); + return misc_write_error; + } +- ++} ++ ++ ++enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_aiff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ ++ return save_wave_aiff_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + /*=======================================================================*/ +@@ -885,19 +980,47 @@ enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, ++enum EST_write_status save_wave_ulaw_header(FILE *fp, + int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +- (void)sample_rate; +- (void)sample_type; ++ (void) sample_rate; ++ (void) sample_type; ++ (void) fp; ++ (void) num_samples; ++ (void) num_channels; ++ (void) bo; ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_ulaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_mulaw,bo); ++} + ++enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_ulaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_ulaw_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + ++ ++ + enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, +@@ -1050,8 +1173,8 @@ enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + return read_ok; + } + +-enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_snd_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +@@ -1103,11 +1226,35 @@ enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, + if (fwrite(&header, sizeof(header), 1, fp) != 1) + return misc_write_error; + ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_snd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + /* snd files are always in BIG_ENDIAN (sun) byte order */ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo_big); + } + ++ ++enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_snd_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ return save_wave_snd_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++} ++ ++ + /*=======================================================================*/ + /* CSTR Audlab files (from the last century) */ + /* They are always bigendian */ +@@ -1219,8 +1366,8 @@ enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++enum EST_write_status save_wave_audlab_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { +@@ -1260,12 +1407,34 @@ enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, + fwrite (&fh, sizeof(fh), 1, fp); + fwrite (&sh, sizeof(sh), 1, fp); + fwrite (&sd, sizeof(sd), 1, fp); +- ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_audlab_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ if (data == NULL) ++ return write_ok; ++ + /* write data*/ + return save_raw_data(fp,data,offset,num_samples,num_channels, + st_short,bo_big); + } + ++enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_audlab_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ return save_wave_audlab_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); ++} ++ + /*=======================================================================*/ + /* Entropic ESPS SD files: portable (non-proprietary) method */ + /*=======================================================================*/ +@@ -1356,8 +1525,9 @@ enum EST_read_status load_wave_sd(EST_TokenStream &ts, short **data, int + + } + +-enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, +- int num_samples, int num_channels, ++ ++enum EST_write_status save_wave_sd_header(FILE *fp, ++ int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + +@@ -1382,6 +1552,7 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + } + /* I believe all of the following are necessary and in this order */ + add_field(hdr,"samples",esps_type,num_channels); ++ /* FIXME: What is doing this path here?? */ + add_fea_special(hdr,ESPS_FEA_DIRECTORY,"margo:/disk/disk10/home/awb/projects/speech_tools/main"); + add_fea_special(hdr,ESPS_FEA_COMMAND, + "EDST waveform written as ESPS FEA_SD.\n\ +@@ -1397,11 +1568,37 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + } + /* lets ignore desired bo and sample type for the time being */ + delete_esps_hdr(hdr); +- ++ return write_ok; ++} ++ ++ ++enum EST_write_status save_wave_sd_data(FILE *fp, const short *data, ++ int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++ ++{ ++ if (data == NULL) ++ return write_ok; ++ + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,EST_NATIVE_BO); + } + ++enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++ ++{ ++ save_wave_sd_header(fp, num_samples, num_channels, sample_rate, ++ sample_type, bo); ++ return save_wave_sd_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++ ++} ++ + /*=======================================================================*/ + /* Raw data files -- unheadered */ + /* THESE FUNCTIONS ARE DIFFERENT FROM THE REST */ +@@ -1496,21 +1693,151 @@ enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_raw(FILE *fp, const short *data, ++enum EST_write_status save_wave_raw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_raw_data(FILE *fp, const short *data, + int offset, +- int num_samples, int num_channels, ++ int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ++ enum EST_sample_type_t sample_type, int bo) + { +- (void)sample_rate; ++ if (data == NULL) ++ return write_ok; + + return save_raw_data(fp,data,offset,num_samples,num_channels, + sample_type,bo); + } + ++enum EST_write_status save_wave_raw(FILE *fp, const short *data, ++ int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void)sample_rate; ++ ++ return save_wave_raw_data(fp, data, offset, num_samples, ++ num_channels, sample_rate, sample_type, bo); ++} ++ + /***********************************************************************/ + /* */ + /* end of file type specific functions */ + /* */ + /***********************************************************************/ + ++enum EST_write_status wave_io_save_header(FILE *fp, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ switch(t) ++ { ++ case wff_nist: ++ return save_wave_nist_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_esps: ++ return save_wave_sd_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_est: ++ return save_wave_est_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_audlab: ++ return save_wave_audlab_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_snd: ++ return save_wave_snd_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_aiff: ++ return save_wave_aiff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_riff: ++ return save_wave_riff_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_raw: ++ return save_wave_raw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_ulaw: ++ return save_wave_ulaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ default: ++ case wff_none: ++ cerr << "Can't save wave header to files type " << ftype << endl; ++ break; ++ } ++ return write_ok; ++} ++ ++ ++enum EST_write_status wave_io_save_data(FILE *fp, const short * data, ++ const int offset, ++ const int num_samples, const int num_channels, ++ const int sample_rate, ++ const EST_String& stype, const int bo, ++ const EST_String& ftype) ++{ ++ EST_WaveFileType t = EST_WaveFile::map.token(ftype); ++ EST_sample_type_t sample_type = EST_sample_type_map.token(stype); ++ switch(t) ++ { ++ case wff_nist: ++ return save_wave_nist_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_esps: ++ return save_wave_sd_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_est: ++ return save_wave_est_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_audlab: ++ return save_wave_audlab_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_snd: ++ return save_wave_snd_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_aiff: ++ return save_wave_aiff_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_riff: ++ return save_wave_riff_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_raw: ++ return save_wave_raw_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ case wff_ulaw: ++ return save_wave_ulaw_data(fp, data, offset, num_samples, num_channels, ++ sample_rate, sample_type, bo); ++ break; ++ default: ++ case wff_none: ++ cerr << "Can't save wave data to files type " << ftype << endl; ++ break; ++ } ++ return write_ok; ++} +diff --git a/speech_class/waveP.h b/speech_class/waveP.h +index 9af6096..406e4b1 100644 +--- a/speech_class/waveP.h ++++ b/speech_class/waveP.h +@@ -51,7 +51,17 @@ enum EST_read_status load_wave_raw(EST_TokenStream &ts, short **data, int + enum EST_write_status save_wave_raw(FILE *fp, const short *data, int offset, + int num_samples, int num_channels, + int sample_rate, +- enum EST_sample_type_t sample_type, int bo) ; ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_raw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_raw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); + + enum EST_read_status load_wave_ulaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int +@@ -62,6 +72,16 @@ enum EST_write_status save_wave_ulaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_write_status save_wave_ulaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_ulaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -81,6 +101,16 @@ enum EST_write_status save_wave_nist(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_nist_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_nist_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_est(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -91,6 +121,16 @@ enum EST_write_status save_wave_est(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_est_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_est_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_sd(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -101,6 +141,16 @@ enum EST_write_status save_wave_sd(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_sd_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_sd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -111,6 +161,16 @@ enum EST_write_status save_wave_audlab(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_audlab_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_audlab_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -121,6 +181,16 @@ enum EST_write_status save_wave_snd(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_snd_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_snd_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -131,6 +201,16 @@ enum EST_write_status save_wave_aiff(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_aiff_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_aiff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +@@ -141,4 +221,14 @@ enum EST_write_status save_wave_riff(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t sample_type, int bo); + ++enum EST_write_status save_wave_riff_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_riff_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + #endif /* __EST_WAVEP_H__ */ +-- +1.8.3.4 + + +From cbb58d2c46f59b918f8bae060db2e7d2846edcca Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Thu, 25 Dec 2014 14:50:41 -0800 +Subject: Allow writing ALAW files in parts + +Backported from Debian: wave_save_parts_alaw.diff, rev f150a7a5c75c. + +Signed-off-by: Timothy Gu + +diff --git a/speech_class/EST_WaveFile.cc b/speech_class/EST_WaveFile.cc +index 61d5c23..6476849 100644 +--- a/speech_class/EST_WaveFile.cc ++++ b/speech_class/EST_WaveFile.cc +@@ -480,6 +480,24 @@ EST_read_status EST_WaveFile::load_alaw(EST_TokenStream &ts, + offset, length); + } + ++EST_write_status EST_WaveFile::save_alaw_header(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_header_using(save_wave_alaw_header, fp, localwv, stype, bo); ++} ++ ++EST_write_status EST_WaveFile::save_alaw_data(FILE *fp, ++ const EST_Wave &wv, ++ EST_sample_type_t stype, int bo) ++{ ++ EST_Wave localwv = wv; ++ localwv.resample(8000); ++ return save_using(save_wave_alaw_data, fp, localwv, stype, bo); ++} ++ + EST_write_status EST_WaveFile::save_alaw(FILE *fp, + const EST_Wave &wv, + EST_sample_type_t stype, int bo) +diff --git a/speech_class/EST_WaveFile.h b/speech_class/EST_WaveFile.h +index a185f5a..cdf948c 100644 +--- a/speech_class/EST_WaveFile.h ++++ b/speech_class/EST_WaveFile.h +@@ -147,6 +147,8 @@ public: + static EST_read_status load_ulaw(LoadWave_TokenStreamArgs); + + static EST_write_status save_alaw(SaveWave_TokenStreamArgs); ++ static EST_write_status save_alaw_header(SaveWave_TokenStreamArgs); ++ static EST_write_status save_alaw_data(SaveWave_TokenStreamArgs); + static EST_read_status load_alaw(LoadWave_TokenStreamArgs); + + static EST_TNamedEnumI map; +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index 7cec8f4..1bdaf4f 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -1060,17 +1060,44 @@ enum EST_read_status load_wave_alaw(EST_TokenStream &ts, short **data, int + return format_ok; + } + +-enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++enum EST_write_status save_wave_alaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ (void) sample_rate; ++ (void) sample_type; ++ (void) fp; ++ (void) num_samples; ++ (void) num_channels; ++ (void) bo; ++ return write_ok; ++} ++ ++enum EST_write_status save_wave_alaw_data(FILE *fp, const short *data, int offset, + int num_samples, int num_channels, + int sample_rate, + enum EST_sample_type_t sample_type, int bo) + { + (void)sample_rate; + (void)sample_type; ++ if (data == NULL) ++ return write_ok; + return save_wave_raw(fp,data,offset,num_samples,num_channels, + 8000,st_alaw,bo); ++} + ++enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo) ++{ ++ save_wave_alaw_header(fp, num_samples, num_channels, ++ sample_rate, sample_type, bo); + ++ return save_wave_alaw_data(fp, data, offset, ++ num_samples, num_channels, ++ sample_rate, sample_type, bo); + } + + +diff --git a/speech_class/waveP.h b/speech_class/waveP.h +index 406e4b1..aa78512 100644 +--- a/speech_class/waveP.h ++++ b/speech_class/waveP.h +@@ -91,6 +91,16 @@ enum EST_write_status save_wave_alaw(FILE *fp, const short *data, int offset, + int sample_rate, + enum EST_sample_type_t, int bo); + ++enum EST_write_status save_wave_alaw_header(FILE *fp, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ ++enum EST_write_status save_wave_alaw_data(FILE *fp, const short *data, int offset, ++ int num_samples, int num_channels, ++ int sample_rate, ++ enum EST_sample_type_t sample_type, int bo); ++ + enum EST_read_status load_wave_nist(EST_TokenStream &ts, short **data, int + *num_samples, int *num_channels, int *word_size, int + *sample_rate, enum EST_sample_type_t *sample_type, int *bo, int +-- +1.8.3.4 + + +From 22e096d3b4122b80cce76b203fcdb8d2e75413ca Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:52:30 -0800 +Subject: Check all fread() calls + +Backported from Debian: check_fread.diff, rev 4a67fbe7e. + +Signed-off-by: Timothy Gu + +diff --git a/include/EST_Token.h b/include/EST_Token.h +index e6fe38d..6b9512f 100644 +--- a/include/EST_Token.h ++++ b/include/EST_Token.h +@@ -329,7 +329,7 @@ class EST_TokenStream{ + { if (!peeked_tokp) get(); + peeked_tokp = TRUE; return current_tok; } + /// Reading binary data, (don't use peek() immediately beforehand) +- int fread(void *buff,int size,int nitems); ++ int fread(void *buff,int size,int nitems) EST_WARN_UNUSED_RESULT; + //@} + /**@name stream initialization functions */ + //@{ +diff --git a/include/EST_common.h b/include/EST_common.h +index 42af9d9..ee63e1e 100644 +--- a/include/EST_common.h ++++ b/include/EST_common.h +@@ -43,6 +43,14 @@ + + /* all this stuff should be common to C and C++ */ + ++#if defined __GNUC__ ++ #define EST_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) ++#elif defined __clang__ ++ #define EST_WARN_UNUSED_RESULT __attribute__((annotate("lo_warn_unused"))) ++#else ++ #define EST_WARN_UNUSED_RESULT ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +diff --git a/speech_class/EST_wave_io.cc b/speech_class/EST_wave_io.cc +index 1bdaf4f..d3a35f0 100644 +--- a/speech_class/EST_wave_io.cc ++++ b/speech_class/EST_wave_io.cc +@@ -503,7 +503,8 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + return wrong_format; + + /* We've got a riff file */ +- ts.fread(&dsize,4,1); ++ /* Next 4 bytes are the file size */ ++ if(ts.fread(&dsize,4,1) != 1) return misc_read_error; + /* .wav files are always little endian */ + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); + if ((ts.fread(info,sizeof(char),4) != 4) || +@@ -516,9 +517,9 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + (strncmp(info,"fmt ",4) != 0)) + return misc_read_error; /* something else wrong */ + +- ts.fread(&dsize,4,1); ++ if (ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + + switch (shortdata) +@@ -541,16 +542,16 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + actual_sample_type = st_short; + /* return misc_read_error; */ + } +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + *num_channels = shortdata; +- ts.fread(sample_rate,4,1); ++ if (ts.fread(sample_rate,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) *sample_rate = SWAPINT(*sample_rate); +- ts.fread(&intdata,4,1); /* average bytes per second -- ignored */ ++ if (ts.fread(&intdata,4,1) != 1) return misc_read_error; /* average bytes per second -- ignored */ + if (EST_BIG_ENDIAN) intdata = SWAPINT(intdata); +- ts.fread(&shortdata,2,1); /* block align ? */ ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; /* block align ? */ + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); +- ts.fread(&shortdata,2,1); ++ if (ts.fread(&shortdata,2,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) shortdata = SWAPSHORT(shortdata); + + sample_width = (shortdata+7)/8; +@@ -567,14 +568,14 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + } + if (strncmp(info,"data",4) == 0) + { +- ts.fread(&samps,4,1); ++ if (ts.fread(&samps,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) samps = SWAPINT(samps); + samps /= (sample_width*(*num_channels)); + break; + } + else if (strncmp(info,"fact",4) == 0) + { /* some other type of chunk -- skip it */ +- ts.fread(&samps,4,1); ++ if (ts.fread(&samps,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) samps = SWAPINT(samps); + ts.seek(samps+ts.tell()); /* skip rest of header */ + /* Hope this is the right amount */ +@@ -584,7 +585,7 @@ enum EST_read_status load_wave_riff(EST_TokenStream &ts, short **data, int + // fprintf(stderr,"Ignoring unsupported chunk type \"%c%c%c%c\" in RIFF file\n", + // info[0],info[1],info[2],info[3]); + //return misc_read_error; +- ts.fread(&dsize,4,1); ++ if(ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_BIG_ENDIAN) dsize = SWAPINT(dsize); + ts.seek(dsize+ts.tell()); /* skip this chunk */ + } +@@ -750,7 +751,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return wrong_format; + + /* We've got an aiff file, I hope */ +- ts.fread(&dsize,4,1); ++ if (ts.fread(&dsize,4,1) != 1) return misc_read_error; + if (EST_LITTLE_ENDIAN) /* file is in different byte order */ + dsize = SWAPINT(dsize); + if ((ts.fread(info,sizeof(char),4) != 4) || +@@ -760,7 +761,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + return misc_read_error; + } + +- for ( ; ts.fread(&chunk,1,sizeof(chunk)) == sizeof(chunk) ; ) ++ for ( ; ts.fread(&chunk, sizeof(chunk), 1) == 1 ; ) + { /* for each chunk in the file */ + if (EST_LITTLE_ENDIAN) /* file is in different byte order */ + chunk.size = SWAPINT(chunk.size); +@@ -771,10 +772,13 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + fprintf(stderr,"AIFF chunk: bad size\n"); + return misc_read_error; + } +- ts.fread(&comm_channels,1,sizeof(short)); +- ts.fread(&comm_samples,1,sizeof(int)); +- ts.fread(&comm_bits,1,sizeof(short)); +- if (ts.fread(ieee_ext_sample_rate,1,10) != 10) ++ if (ts.fread(&comm_channels, sizeof(short), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&comm_samples, sizeof(int), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&comm_bits, sizeof(short), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(ieee_ext_sample_rate, 10, 1) != 1) + { + fprintf(stderr,"AIFF chunk: eof within COMM chunk\n"); + return misc_read_error; +@@ -789,7 +793,7 @@ enum EST_read_status load_wave_aiff(EST_TokenStream &ts, short **data, int + } + else if (strncmp(chunk.id,"SSND",4) == 0) + { +- if (ts.fread(&ssndchunk,1,sizeof(ssndchunk)) != sizeof(ssndchunk)) ++ if (ts.fread(&ssndchunk, sizeof(ssndchunk), 1) != 1) + { + fprintf(stderr,"AIFF chunk: eof within SSND chunk\n"); + return misc_read_error; +@@ -1127,7 +1131,8 @@ enum EST_read_status load_wave_snd(EST_TokenStream &ts, short **data, int + int current_pos; + + current_pos = ts.tell(); +- ts.fread(&header, sizeof(Sun_au_header), 1); ++ if (ts.fread(&header, sizeof(Sun_au_header), 1) != 1) ++ return misc_read_error; + + /* test for magic number */ + if ((EST_LITTLE_ENDIAN) && +@@ -1347,12 +1352,16 @@ enum EST_read_status load_wave_audlab(EST_TokenStream &ts, short **data, int + + /* Read header structures from char array */ + current_pos = ts.tell(); +- ts.fread(&fh, sizeof(struct audlabfh), 1); ++ ++ if (ts.fread(&fh, sizeof(struct audlabfh), 1) != 1) ++ return misc_read_error; + if (strcmp(fh.file_type, "Sample") != 0) + return wrong_format; + +- ts.fread(&sh, sizeof(struct audlabsh), 1); +- ts.fread(&sd, sizeof(struct audlabsd), 1); ++ if (ts.fread(&sh, sizeof(struct audlabsh), 1) != 1) ++ return misc_read_error; ++ if (ts.fread(&sd, sizeof(struct audlabsd), 1) != 1) ++ return misc_read_error; + hdr_length = sizeof(struct audlabfh) + + sizeof(struct audlabsh) + + sizeof(struct audlabsd); +-- +1.8.3.4 + + +From 644690fc0c8e45fe5c58caa9bd928eedb178fa49 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 14:55:07 -0800 +Subject: Fix a few memory handling bugs + +Backported from Debian: memory_bugs.diff, rev 0691e0f66a14c. + +Signed-off-by: Timothy Gu + +diff --git a/base_class/rateconv.cc b/base_class/rateconv.cc +index f27fb44..10ef465 100644 +--- a/base_class/rateconv.cc ++++ b/base_class/rateconv.cc +@@ -431,7 +431,7 @@ static int outmax; + + static int ioerr(void) + { +- delete g_coep; ++ delete[] g_coep; + return -1; + } + +@@ -585,7 +585,7 @@ int rateconv(short *in,int isize, short **out, int *osize, + return ioerr(); + } while (outsize == OUTBUFFSIZE); + +- delete g_coep; ++ delete[] g_coep; + + *osize = outpos; + +diff --git a/base_class/string/EST_String.cc b/base_class/string/EST_String.cc +index 3cab0f1..3e33da3 100644 +--- a/base_class/string/EST_String.cc ++++ b/base_class/string/EST_String.cc +@@ -329,6 +329,7 @@ int EST_String::gsub_internal (const char *os, int olength, const char *s, int l + p += length; + at=end; + } ++ if (p != from+at) + memcpy(p, from+at, size-at); + + p += size-at; +diff --git a/stats/EST_Discrete.cc b/stats/EST_Discrete.cc +index f151888..89d3d74 100644 +--- a/stats/EST_Discrete.cc ++++ b/stats/EST_Discrete.cc +@@ -151,7 +151,7 @@ Discretes::~Discretes() + + for (i=0; i +Date: Thu, 25 Dec 2014 14:56:46 -0800 +Subject: Allow `-pc longest` in lower case + +Backported from Debian: ch_wave-LONGEST.diff, rev: a9c9f0e91f. + +Signed-off-by: Timothy Gu + +diff --git a/main/ch_wave_main.cc b/main/ch_wave_main.cc +index 3e74a12..e7859ac 100644 +--- a/main/ch_wave_main.cc ++++ b/main/ch_wave_main.cc +@@ -199,7 +199,7 @@ int main (int argc, char *argv[]) + wave_info(sigload); + else if (al.present("-pc")) + { +- if ((al.val("-pc") == "longest") && ++ if ((downcase(al.val("-pc")) == "longest") && + (sig.num_samples() < sigload.num_samples())) + sig.resize(sigload.num_samples()); + else /* "first" or sig is longer */ +-- +1.8.3.4 + + +From 295c71122265d274429dd6712323d8f624a712fa Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 15:27:31 -0800 +Subject: Add Haiku configurations + + +diff --git a/config/systems/Haiku.mak b/config/systems/Haiku.mak +new file mode 100644 +index 0000000..5d78efd +--- /dev/null ++++ b/config/systems/Haiku.mak +@@ -0,0 +1,56 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/default.mak ++ ++## Don't assume echo -n works ++ECHO_N = /bin/printf "%s" ++ ++## No native audio ++NATIVE_AUDIO = ++ ++## ncurses available, and sockets operations are in libnetwork ++OS_LIBS = -lncurses -lnetwork ++ ++## No math library needed. Empty $(sort) needed so that `ifdef MATH_LIBRARY` ++## returns true. ++MATH_LIBRARY = $(sort ) ++ ++## awk is a compatible awk, usually gawk. ++NAWK=awk +diff --git a/config/systems/ix86_Haiku.mak b/config/systems/ix86_Haiku.mak +new file mode 100644 +index 0000000..3822625 +--- /dev/null ++++ b/config/systems/ix86_Haiku.mak +@@ -0,0 +1,41 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/Haiku.mak ++ +diff --git a/config/systems/x86_64_Haiku.mak b/config/systems/x86_64_Haiku.mak +new file mode 100644 +index 0000000..3822625 +--- /dev/null ++++ b/config/systems/x86_64_Haiku.mak +@@ -0,0 +1,41 @@ ++ ########################################################################### ++ ## ## ++ ## Centre for Speech Technology Research ## ++ ## University of Edinburgh, UK ## ++ ## Copyright (c) 2014 ## ++ ## All Rights Reserved. ## ++ ## ## ++ ## Permission is hereby granted, free of charge, to use and distribute ## ++ ## this software and its documentation without restriction, including ## ++ ## without limitation the rights to use, copy, modify, merge, publish, ## ++ ## distribute, sublicense, and/or sell copies of this work, and to ## ++ ## permit persons to whom this work is furnished to do so, subject to ## ++ ## the following conditions: ## ++ ## 1. The code must retain the above copyright notice, this list of ## ++ ## conditions and the following disclaimer. ## ++ ## 2. Any modifications must be clearly marked as such. ## ++ ## 3. Original authors' names are not deleted. ## ++ ## 4. The authors' names are not used to endorse or promote products ## ++ ## derived from this software without specific prior written ## ++ ## permission. ## ++ ## ## ++ ## THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK ## ++ ## DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ## ++ ## ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT ## ++ ## SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE ## ++ ## FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ## ++ ## WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ## ++ ## AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ## ++ ## ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF ## ++ ## THIS SOFTWARE. ## ++ ## ## ++ ########################################################################### ++ ## ## ++ ## Author: Tiancheng "Timothy" Gu ## ++ ## -------------------------------------------------------------------- ## ++ ## Settings for BeOS-derived systems, e.g. Haiku ## ++ ## ## ++ ########################################################################### ++ ++include $(EST)/config/systems/Haiku.mak ++ +-- +1.8.3.4 + + +From ce49b8a8bf93cf694281be2e979ec58c3950635e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 15:30:42 -0800 +Subject: Haiku-specific configuration + +Signed-off-by: Timothy Gu + +diff --git a/config/config.in b/config/config.in +index 15d563e..e7e6a65 100644 +--- a/config/config.in ++++ b/config/config.in +@@ -61,7 +61,7 @@ WARN=1 + # VERBOSE=1 + #DEBUG=1 + # PROFILE=gprof +-#SHARED=2 ++SHARED=2 + + ## Directory specific selections which override the above + +@@ -83,7 +83,7 @@ OPTIMISE_sigpr = 3 + # INCLUDE_MODULES += ESD_AUDIO + + ## Native audio for your platform (sun, linux, freebsd, irix, macosx, windows) +-INCLUDE_MODULES += NATIVE_AUDIO ++# INCLUDE_MODULES += NATIVE_AUDIO + + ## Special code to run Windows MPLAYER + # INCLUDE_MODULES += MPLAYER_AUDIO +@@ -172,7 +172,7 @@ INCLUDE_MODULES += RXP + + # Languages to generate wrappers for. Currently: PYTHON + # PERL5 is no longer supported +-CONFIG_WRAPPER_LANGUAGES = PYTHON ++CONFIG_WRAPPER_LANGUAGES = + + # Language specific includes should be set to correct site paths + CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/ +-- +1.8.3.4 + + +From a88060a26c29c6f61b6e18824d0164f82456c6ac Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 25 Dec 2014 16:30:07 -0800 +Subject: Add missing library major version + + +diff --git a/config/project.mak b/config/project.mak +index 2578fc1..11884c5 100644 +--- a/config/project.mak ++++ b/config/project.mak +@@ -42,6 +42,7 @@ + PROJECT_NAME = Edinburgh Speech Tools Library + PROJECT_PREFIX = EST + PROJECT_VERSION = 2.4 ++PROJECT_MAJOR_VERSION = 2 + PROJECT_DATE = December 2014 + PROJECT_STATE = release + +-- +1.8.3.4 + + +From f50c1e621e9d510f475032474438b2df97ac07a0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 02:35:24 +0000 +Subject: config/system.sh: Use `uname -p` for machine type + +Fixes Haiku detection + +diff --git a/config/system.sh b/config/system.sh +index 71b271c..b7ac4a1 100644 +--- a/config/system.sh ++++ b/config/system.sh +@@ -46,9 +46,9 @@ OSTYPE=`uname -s | + sed -e '/^\([^_]*\).*/s//\1/' -e '/\//s///g'` + + # CPU, downcased, /s and some uninteresting details eliminated +-MACHINETYPE=`{ mach || uname -m || echo unknown ; } 2>/dev/null | ++MACHINETYPE=`{ mach || uname -p || echo unknown ; } 2>/dev/null | + tr ABCDEFGHIJKLMNOPQRSTUVWXYZ/ abcdefghijklmnopqrstuvwxyz_ | +- sed -e 's/i[0-9]86/ix86/' \ ++ sed -e 's/i\{0,1\}[0-9x]86/ix86/' \ + -e 's/sun4/sparc/' \ + -e 's/ip[0-9]*/ip/'\ + -e 's/ /_/g'\ +-- +1.8.3.4 + diff --git a/app-accessibility/speech_tools/speech_tools-2.4.recipe b/app-accessibility/speech_tools/speech_tools-2.4.recipe new file mode 100644 index 000000000..7c644a8f0 --- /dev/null +++ b/app-accessibility/speech_tools/speech_tools-2.4.recipe @@ -0,0 +1,150 @@ +SUMMARY="Edinburgh speech tools library" +SUMMARY_tools="Edinburgh Speech Tools" + +DESCRIPTION="The Edinburgh speech tools library is a collection of C++ classes \ +that aide in developing machine-synthesized voices. Developed by the University \ +of Edinburgh, it is used in Festival, a text-to-speech engine developed by \ +the University of Edinburgh as well. +" +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" +SRC_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz" +CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010" +SOURCE_DIR="speech_tools" +REVISION="1" + +# Although individually many files have different licenses, as a whole this +# license covers all the files. +LICENSE=" + Edinburgh Speech Tools + " +COPYRIGHT=" + 1986 University of Toronto + 1987, 1993 The Regents of the University of California + 1992, 1995 Markus Mummert + 1992 Rich Salz + 1992 Simmule Turner + 1994-2014 University of Edinburgh, UK + 1997-1998 Richard Tobin + 1999-2003 Language Technologies Institute, Carnegie Mellon University + " + +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 !x86_gcc2" + +PROVIDES=" + speech_tools$secondaryArchSuffix = $portVersion + lib:libestbase$secondaryArchSuffix = $portVersion compat >= 2 + lib:libestools$secondaryArchSuffix = $portVersion compat >= 2 + lib:libeststring$secondaryArchSuffix = $portVersion compat >= 2 + " +PROVIDES_devel=" + flite${secondaryArchSuffix}_devel = $portVersion + devel:libestbase$secondaryArchSuffix = $portVersion compat >= 2 + devel:libestools$secondaryArchSuffix = $portVersion compat >= 2 + devel:libeststring$secondaryArchSuffix = $portVersion compat >= 2 + " +PROGS=" bcat ch_lab ch_track ch_utt ch_wave design_filter dp \ + na_play na_record ngram_build ngram_test ols \ + ols_test pda pitchmark scfg_make \ + scfg_parse scfg_test scfg_train sig2fv sigfilter spectgen \ + tilt_analysis tilt_synthesis viterbi wagon wagon_test \ + wfst_build wfst_run wfst_train xml_parser + " +SCRIPTS=" + make_wagon_desc + raw_to_xgraph + resynth + " +PROVIDES_tools=" + speech_tools_tools = $portVersion + cmd:simple_pitchmark = $portVersion + " +for p in $PROGS $SCRIPTS; do + PROVIDES_tools=" + $PROVIDES_tools + cmd:$p = $portVersion + " +done +REQUIRES=" + haiku$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs + lib:libncurses$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + speech_tools$secondaryArchSuffix == $portVersion base + " +REQUIRES_tools=" + haiku$secondaryArchSuffix + gcc${secondaryArchSuffix}_syslibs + speech_tools$secondaryArchSuffix == $portVersion base + cmd:perl + lib:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:awk + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PATCHES="speech_tools-${portVersion}.patchset" + +BUILD() +{ + runConfigure ./configure + # There are some problems with concurrency. + make +} + +INSTALL() +{ + cmdBinDir=$prefix/bin + mkdir -p $cmdBinDir + (cd main && cp $PROGS $cmdBinDir) + for s in $SCRIPTS; do + sed 's,__PERL__,/bin/perl,g' $cmdBinDir/$s + chmod +x $cmdBinDir/$s + done + sed 's,__PERL__,/bin/perl,g' \ + $cmdBinDir/simple-pitchmark + chmod +x $cmdBinDir/simple-pitchmark + + mkdir -p $libDir + # Install everything to lib/ and let prepareInstalledDevelLibs handle + # devel libs, etc. + cp lib/*.a lib/*.so lib/*.so.* $libDir + + # Installs possibly internal headers as well, as debian installs them + mkdir -p $includeDir/ + cp -a include/* $includeDir/ + rm -rf $includeDir/Makefile \ + $includeDir/*/Makefile \ + $includeDir/win32 + cp -a base_class/*.h $includeDir/ + mkdir -p $includeDir/base_class/ + cp -a base_class/*.cc $includeDir/base_class/ + + prepareInstalledDevelLibs \ + libestbase \ + libestools \ + libeststring + packageEntries devel \ + $developDir + packageEntries tools \ + $cmdBinDir +} diff --git a/app-arch/unlzx/additional-files/unlzx-expander-rules b/app-arch/unlzx/additional-files/unlzx-expander-rules new file mode 100644 index 000000000..75b5f81ce --- /dev/null +++ b/app-arch/unlzx/additional-files/unlzx-expander-rules @@ -0,0 +1 @@ +"application/x-lzx" .lzx "unlzx -v %s" "unlzx %s" diff --git a/app-arch/unlzx/unlzx-1.1.recipe b/app-arch/unlzx/unlzx-1.1.recipe new file mode 100644 index 000000000..938de0dbc --- /dev/null +++ b/app-arch/unlzx/unlzx-1.1.recipe @@ -0,0 +1,41 @@ +SUMMARY="Decompresses LZX archives on multiple platforms" +DESCRIPTION="LZX is the name of an LZ77 family compression algorithm invented \ +by Johnathon Forbes and Tomi Poutanen. unlzx is a program designed to extract \ +these archives." +HOMEPAGE="http://aminet.net/package/misc/unix/unlzx.c.gz" +SRC_URI="git+https://github.com/tweakdeveloper/unlzx.git#36a85e7" +ADDITIONAL_FILES="unlzx-expander-rules" +REVISION="3" +LICENSE="Public Domain" +COPYRIGHT="2001 Erik Meusel" + +ARCHITECTURES="x86_gcc2 x86" + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + cmd:gcc + cmd:strip + " + +PROVIDES=" + unlzx = $portVersion + cmd:unlzx + " + +BUILD() +{ + gcc unlzx.c -o unlzx + strip unlzx +} + +INSTALL() +{ + expanderRulesDir=$dataDir/expander/rules + mkdir -p $binDir $expanderRulesDir + cp unlzx $binDir + cp $portDir/additional-files/unlzx-expander-rules $expanderRulesDir +} diff --git a/app-benchmarks/iozone/iozone-3.326.recipe b/app-benchmarks/iozone/iozone-3.326.recipe index 398529eac..e51ee9554 100644 --- a/app-benchmarks/iozone/iozone-3.326.recipe +++ b/app-benchmarks/iozone/iozone-3.326.recipe @@ -47,7 +47,9 @@ BUILD() INSTALL() { cd src/current/ - mkdir -p $binDir/iozone - cp iozone $binDir/iozone + cp iozone $binDir cp fileop $binDir + + mkdir -p $manDir/man1 + cp ../../docs/iozone.1 $manDir/man1 } \ No newline at end of file diff --git a/app-dicts/mythes/mythes-1.2.4.recipe b/app-dicts/mythes/mythes-1.2.4.recipe new file mode 100644 index 000000000..eb22a9f02 --- /dev/null +++ b/app-dicts/mythes/mythes-1.2.4.recipe @@ -0,0 +1,84 @@ +SUMMARY="A simple thesaurus" +DESCRIPTION="MyThes is a simple thesaurus that used a structured text \ +data file and an index file with binary search to lookup words \ +and phrases and return information on part of speech, \ +meanings, and synonyms. + +- written in C++ to make it easier to interface with \ +LibreOffice, OpenOffice, AbiWord, Pspell, etc +- it is stateless, uses no static variables and \ +should be completely reentrant with no ifdefs +- it compiles with -ansi and -pedantic and -Wall \ +with no warnigns so it shouldbe quite portable +- it uses a simple perl program to read the structured \ +text file and create the index needed for binary \ +searching +- it is very simple with *lots* of comments. \ +The main "smarts" are in the structure of the \ +text file that makes up the thesaurus data +- It comes with a ready-to-go structured thesaurus \ +data file for en_US extracted from the WordNet-2.0 data. +- Please see WordNet_license.txt and WordNet_readme.txt \ +for more information on the very useful project! +- See http://www.danielnaber.de/wn2ooo/ for utilities to \ +regenerate an up to date English thesaurus from the most \ +recent WordNet data." +HOMEPAGE="http://sourceforge.net/projects/hunspell/files/MyThes/1.2.4" +SRC_URI="http://prdownloads.sf.net/hunspell/mythes-1.2.4.tar.gz" +CHECKSUM_SHA256="1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f" +COPYRIGHT="1994 - 2009 Free Software Foundation, Inc." +LICENSE="BSD (2-clause)" +REVISION="1" + +PROVIDES=" + mythes$secondaryArchSuffix = $portVersion + cmd:mythes = $portVersion + cmd:th_gen_idx.pl + lib:libmythes_1.2$secondaryArchSuffix = $portVersion + " + +PROVIDES_devel=" + devel:libmythes_1.2$secondaryArchSuffix = $portVersion + mythes${secondaryArchSuffix}_devel = $portVersion + " + +ARCHITECTURES="x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libhunspell_1.3$secondaryArchSuffix + cmd:perl + " + +REQUIRES_devel=" + mythes$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + devel:libhunspell_1.3$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:awk + haiku${secondaryArchSuffix}_devel + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs \ + libmythes-1.2 + packageEntries devel \ + $developDir +} \ No newline at end of file diff --git a/app-shells/bash_completion/bash_completion-2.1.recipe b/app-shells/bash_completion/bash_completion-2.1.recipe new file mode 100644 index 000000000..fd292206e --- /dev/null +++ b/app-shells/bash_completion/bash_completion-2.1.recipe @@ -0,0 +1,65 @@ +SUMMARY="Tab-completion for the Bash shell" +DESCRIPTION="Since v2.04, bash has allowed you to intelligently program \ +and extend its standard completion behavior to achieve complex command \ +lines with just a few keystrokes. Imagine typing ssh [Tab] and being \ +able to complete on hosts from your ~/.ssh/known_hosts files. Or typing \ +man 3 str [Tab] and getting a list of all string handling functions in \ +the UNIX manual. mount system: [Tab] would complete on all exported \ +file-systems from the host called system, while make [Tab] would complete \ +on all targets in Makefile. This project was conceived to produce \ +programmable completion routines for the most common Linux/UNIX commands, \ +reducing the amount of typing sysadmins and programmers need to do on \ +a daily basis." +HOMEPAGE="http://bash-completion.alioth.debian.org/" +SRC_URI="http://bash-completion.alioth.debian.org/files/bash-completion-$portVersion.tar.bz2" +CHECKSUM_SHA256="2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f" +SOURCE_DIR="bash-completion-$portVersion" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2006-2014 Debian Project" +ARCHITECTURES="any" + +PROVIDES=" + bash_completion = $portVersion + " +REQUIRES=" + cmd:bash + " +BUILD_REQUIRES=" + cmd:bash + " +BUILD_PREREQUIRES=" + haiku + cmd:bash + cmd:awk + cmd:make + " + +GLOBAL_WRITABLE_FILES=" + settings/profile.d/bash_completion.sh auto-merge + " +USER_SETTINGS_FILES=" + settings/profile.d/bash_completion.sh + " + +PATCH() +{ + cd completions + for file in * + do + chmod +x $file + done +} + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + chmod +x $settingsDir/profile.d/bash_completion.sh + chmod +x $dataDir/bash-completion/bash_completion +} diff --git a/dev-vcs/rcs/rcs-5.9.3.recipe b/dev-vcs/rcs/rcs-5.9.3.recipe new file mode 100644 index 000000000..fa5e4376b --- /dev/null +++ b/dev-vcs/rcs/rcs-5.9.3.recipe @@ -0,0 +1,67 @@ +SUMMARY="Revision Control System" +DESCRIPTION="The Revision Control System (RCS) manages multiple revisions \ +of files. RCS automates the storing, retrieval, logging, identification, \ +and merging of revisions. RCS is useful for text that is revised \ +frequently, including source code, programs, documentation, graphics, \ +papers, and form letters. + +RCS is (mostly) deprecated now. Unless you have an existing RCS repository \ +that you need to access, using Subversion or Git is preferred." +HOMEPAGE="http://www.gnu.org/software/rcs/" +COPYRIGHT="1986-2005 Free Software Foundation, Inc." +LICENSE="GNU GPL v1 + GNU LGPL v2" +SRC_URI="https://ftp.gnu.org/gnu/rcs/rcs-5.9.3.tar.xz" +CHECKSUM_SHA256="68b0d1c1b8657766cd7dc78e10564ce4836220e64665fb35fbe74dbc1dff5b47" +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=" + rcs = $portVersion compat >= 5.9 + cmd:ci = $portVersion compat >= 5.9 + cmd:co = $portVersion compat >= 5.9 + cmd:ident = $portVersion compat >= 5.9 + cmd:merge = $portVersion compat >= 5.9 + cmd:rcs = $portVersion compat >= 5.9 + cmd:rcsclean = $portVersion compat >= 5.9 + cmd:rcsdiff = $portVersion compat >= 5.9 + cmd:rcsmerge = $portVersion compat >= 5.9 + cmd:rlog = $portVersion compat >= 5.9 + " +REQUIRES=" + haiku$secondaryArchSuffix + cmd:ed + cmd:awk + cmd:diff + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + + cmd:ed + cmd:awk + cmd:diff + " + +BUILD() +{ + runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/dev-vcs/subversion/patches/subversion-1.8.10.patchset b/dev-vcs/subversion/patches/subversion-1.8.11.patchset similarity index 100% rename from dev-vcs/subversion/patches/subversion-1.8.10.patchset rename to dev-vcs/subversion/patches/subversion-1.8.11.patchset diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.11.recipe similarity index 97% rename from dev-vcs/subversion/subversion-1.8.10.recipe rename to dev-vcs/subversion/subversion-1.8.11.recipe index 2d64dd0f5..aa05c4f6c 100644 --- a/dev-vcs/subversion/subversion-1.8.10.recipe +++ b/dev-vcs/subversion/subversion-1.8.11.recipe @@ -10,7 +10,7 @@ HOMEPAGE="http://subversion.apache.org" LICENSE="Apache-Subversion" COPYRIGHT="2010-2014 The Apache Software Foundation" SRC_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2" -CHECKSUM_SHA256="1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc" +CHECKSUM_SHA256="10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -81,7 +81,7 @@ USER_SETTINGS_FILES=" " -PATCHES="subversion-1.8.10.patchset" +PATCHES="subversion-$portVersion.patchset" BUILD() { diff --git a/games-action/heroes/heroes-0.21.recipe b/games-action/heroes/heroes-0.21.recipe new file mode 100644 index 000000000..c63805256 --- /dev/null +++ b/games-action/heroes/heroes-0.21.recipe @@ -0,0 +1,63 @@ +SUMMARY="An action game similar to Tron and Nibbles." +DESCRIPTION="Heroes is similar to the Tron and Nibbles games of yore, but \ +includes many graphical improvements and new game features. In it, you must \ +maneuver a small vehicle around a world and collect powerups while avoiding \ +obstacles, your opponents trails, and even your own trail." +HOMEPAGE="http://heroes.sourceforge.net/" +SRC_URI="http://prdownloads.sourceforge.net/heroes/heroes-0.21.tar.gz" +CHECKSUM_SHA256="1264981d37d0fa12905ca627e6329c22ae6db10a1abaf3ec9b9c7357d391b54f" +SRC_URI_2="http://prdownloads.sourceforge.net/heroes/heroes-data-1.5.tar.gz" +CHECKSUM_SHA256_2="af2af6b1fd83636db03d0d2aa77243d31dccd1cb14a20269ed765edb2bb4ff43" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2002 Alexandre Duret-Lutz, \ +Romual Genevois, \ +Alexandre Liverneaux, \ +Philippe Meisburger" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + heroes = portVersion + app:heroes = $portVersion + cmd:heroeslvl = $portVersion +" + +REQUIRES=" + haiku + lib:libintl + lib:libsdl + lib:libsdl_mixer +" + +BUILD_REQUIRES=" + haiku_devel + devel:libintl + devel:libsdl + devel:libsdl_mixer +" + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:libtoolize + cmd:make +" + +BUILD() +{ + libtoolize -fci + ./configure --prefix=$appsDir/Heroes + make $jobArgs + cd ../../sources-2/heroes-data-1.5 + libtoolize -fci + ./configure --prefix=$appsDir/Heroes + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/Heroes + make install + cd ../../sources-2/heroes-data-1.5 + make install +} diff --git a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset index fdd9681f1..c121a7061 100644 --- a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset +++ b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset @@ -1,8 +1,12 @@ -From 03033c51349e01d5d06ee74545a15a534525d785 Mon Sep 17 00:00:00 2001 +From 33e29a8c2f19b290ed6e9056a60aac6fd27426c6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 14:54:36 +0200 -Subject: Fix search paths for SDL2 header files. +Subject: [PATCH 1/4] Fix search paths for SDL2 header files. +--- + bear/cmake-helper/FindSDL2.cmake | 2 +- + bear/cmake-helper/FindSDL2_mixer.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bear/cmake-helper/FindSDL2.cmake b/bear/cmake-helper/FindSDL2.cmake index 7665a55..bcd3050 100644 @@ -33,12 +37,15 @@ index 59ed911..d795965 100644 -- 1.8.3.4 - -From 4a4404ab5a5b9c67925ec6d910ddc5f47fb1b910 Mon Sep 17 00:00:00 2001 +From 864a651724bec4acce7b92fd3e1bddaa00f17c19 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 17:02:35 +0200 -Subject: Link libintl on haiku. +Subject: [PATCH 2/4] Link libintl on haiku. +--- + bear/bear-engine/running_bear/CMakeLists.txt | 2 +- + plee-the-bear/launcher/src/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bear/bear-engine/running_bear/CMakeLists.txt b/bear/bear-engine/running_bear/CMakeLists.txt index 8b04d89..4fffd94 100644 @@ -69,12 +76,16 @@ index 9ed5d32..ff88206 100644 -- 1.8.3.4 - -From 415c83accad83bf6677dd3d578ab6712582910b9 Mon Sep 17 00:00:00 2001 +From c929f602fb74adcdf495e144b66f4981c0655ba5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 19:41:58 +0200 -Subject: Fix install directories. +Subject: [PATCH 3/4] Fix install directories. +--- + bear/cmake-helper/bear-config.cmake | 2 +- + bear/cmake-module/CMakeLists.txt | 2 +- + plee-the-bear/CMakeLists.txt | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake index e66d79e..b483445 100644 @@ -103,7 +114,7 @@ index e182689..24c2113 100644 set( BEAR_CMAKE_MODULES diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt -index 6a123d9..9bc8df3 100644 +index 6a123d9..c3dbb90 100644 --- a/plee-the-bear/CMakeLists.txt +++ b/plee-the-bear/CMakeLists.txt @@ -23,7 +23,7 @@ include( docbook-to-man ) @@ -115,6 +126,15 @@ index 6a123d9..9bc8df3 100644 endif( NOT PTB_INSTALL_DATA_DIR ) # where the game executables are installed +@@ -38,7 +38,7 @@ if( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) + "${PTB_INSTALL_EXECUTABLE_DIR}" + ) + else( WIN32 ) +- set( PTB_INSTALL_CUSTOM_LIBRARY_DIR lib ) ++ set( PTB_INSTALL_CUSTOM_LIBRARY_DIR lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) + endif( WIN32 ) + endif( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) + @@ -154,7 +154,7 @@ subdirs( install( @@ -127,3 +147,65 @@ index 6a123d9..9bc8df3 100644 -- 1.8.3.4 +From 34aca4d0b287e50d35957badf3e72060264f7a45 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Wed, 24 Dec 2014 23:53:14 +0200 +Subject: [PATCH 4/4] Change settings location on Haiku + +--- + .../bear-engine/core/src/engine/code/game_local_client.cpp | 14 ++++++++++++++ + .../src/engine/system/code/default_game_filesystem.cpp | 6 +++++- + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/bear/bear-engine/core/src/engine/code/game_local_client.cpp b/bear/bear-engine/core/src/engine/code/game_local_client.cpp +index 51c055b..83ab880 100644 +--- a/bear/bear-engine/core/src/engine/code/game_local_client.cpp ++++ b/bear/bear-engine/core/src/engine/code/game_local_client.cpp +@@ -51,6 +51,11 @@ + #include + #include + ++#if defined(__HAIKU__) ++ #include ++ #include ++#endif ++ + /*----------------------------------------------------------------------------*/ + /** + * \brief Print the options of the program. +@@ -1107,6 +1112,15 @@ void bear::engine::game_local_client::init_game_filesystem() + m_game_filesystem = + freedesktop_game_filesystem( m_game_description.game_name() ); + ++#elif defined( __HAIKU__ ) ++ BPath path; ++ status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path); ++ if (status < B_OK) ++ // fall back to default ++ m_game_filesystem = default_game_filesystem( m_game_description.game_name() ); ++ else ++ m_game_filesystem = default_game_filesystem( m_game_description.game_name(), path.Path()); ++ + #else + + m_game_filesystem = default_game_filesystem( m_game_description.game_name() ); +diff --git a/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp b/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp +index 99ea2f8..0435b5a 100644 +--- a/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp ++++ b/bear/bear-engine/core/src/engine/system/code/default_game_filesystem.cpp +@@ -107,7 +107,11 @@ std::string bear::engine::default_game_filesystem::get_game_directory() const + boost::filesystem::path dir( m_root ); + + std::string result; +- std::string subdir = '.' + get_name_as_filename( m_game_name ); ++ #if defined(__HAIKU__) ++ std::string subdir = get_name_as_filename( m_game_name ); ++ #else ++ std::string subdir = '.' + get_name_as_filename( m_game_name ); ++ #endif + + dir /= boost::filesystem::path( subdir ); + +-- +1.8.3.4 + diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe index a14612159..a9f89c7ca 100644 --- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe +++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe @@ -6,18 +6,21 @@ SRC_URI="http://www.stuff-o-matic.com/plee-the-bear/download/file.php?platform=s CHECKSUM_SHA256="41dfe864fe2d791d6f99ba7cd330e22c94fce19d82909054eeac594aa4f2924e" SRC_FILENAME="plee-the-bear-0.7.0.tgz" -REVISION="1" -ARCHITECTURES="?x86" +REVISION="2" +ARCHITECTURES="x86" 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" + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" fi -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" plee_the_bear = $portVersion cmd:plee_the_bear = $portVersion + lib:libplee_the_bear$secondaryArchSuffix lib:libbear_audio$secondaryArchSuffix lib:libbear_communication$secondaryArchSuffix lib:libbear_debug$secondaryArchSuffix @@ -65,7 +68,7 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libintl$secondaryArchSuffix - boost_devel${secondaryArchSuffix} + boost${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel @@ -79,7 +82,7 @@ SOURCE_DIR="plee-the-bear-0.7.0-light" PATCHES="plee_the_bear-$portVersion.patchset" BUILD() { - cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix + cmake . -DBEAR_EDITORS_ENABLED=FALSE -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_CXX_FLAGS="-DNDEBUG" make $jobArgs } @@ -93,16 +96,14 @@ INSTALL() # ----- DESCRIPTION ----------------------------------------------------------- -DESCRIPTION=" -Plee the Bear is a platform game in which you play an angry bear whose son has -been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey -to find and rescue your son. Because you want to rescue him, don't you? Or to -slap him? Maybe both…. +DESCRIPTION="Plee the Bear is a platform game in which you play an angry bear whose son has \ +been kidnapped by god. Here is a guy hard to brave! Jump in this amazing journey \ +to find and rescue your son. Because you want to rescue him, don't you? Or to \ +slap him? Maybe both…. \ -With three levels of the storyline and four mini-games, Plee the Bear did -received very positive criticisms. The players loved the fun, the graphics and -the music; the community around the free software movement appreciated the -overall process and the quality of the resources, remarkable for a free game; -and the indie gaming community was pleasantly surprised by the technical skills -and the details of the game. -" +With three levels of the storyline and four mini-games, Plee the Bear \ +received very positive criticisms. The players loved the fun, the graphics and \ +the music; the community around the free software movement appreciated the \ +overall process and the quality of the resources, remarkable for a free game; \ +and the indie gaming community was pleasantly surprised by the technical skills \ +and the details of the game." diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe index 9e5f00cae..619d0b82c 100644 --- a/games-emulation/dgen/dgen-1.33.recipe +++ b/games-emulation/dgen/dgen-1.33.recipe @@ -9,8 +9,7 @@ Genesis and Mega Drive systems. Features: * Screenshots, demos recording and playback" HOMEPAGE="http://dgen.sourceforge.net/" COPYRIGHT="1998-2014 tamentis & zamaz" -SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz/download" -SRC_FILENAME="dgen-sdl-$portVersion.tar.gz" +SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz" CHECKSUM_SHA256="99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e" SOURCE_DIR="dgen-sdl-$portVersion" REVISION="1" diff --git a/games-engines/openscenegraph/licenses/OSGPL b/games-engines/openscenegraph/licenses/OSGPL new file mode 100644 index 000000000..6340792d7 --- /dev/null +++ b/games-engines/openscenegraph/licenses/OSGPL @@ -0,0 +1,578 @@ + OpenSceneGraph Public License, Version 0.0 + ========================================== + + Copyright (C) 2002 Robert Osfield. + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + OPENSCENEGRAPH PUBLIC LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 + or later. + + Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid + out in the wxWindows section below. The LGPL is contained in the + final section of this license. + + +------------------------------------------------------------------------------- + + wxWindows Library Licence, Version 3 + ==================================== + + Copyright (C) 1998 Julian Smart, Robert Roebling [, ...] + + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + WXWINDOWS LIBRARY LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public Licence as published by + the Free Software Foundation; either version 2 of the Licence, or (at + your option) any later version. + + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library + General Public Licence for more details. + + You should have received a copy of the GNU Library General Public Licence + along with this software, usually in a file named COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA. + + EXCEPTION NOTICE + + 1. As a special exception, the copyright holders of this library give + permission for additional uses of the text contained in this release of + the library as licenced under the wxWindows Library Licence, applying + either version 3 of the Licence, or (at your option) any later version of + the Licence as published by the copyright holders of version 3 of the + Licence document. + + 2. The exception is that you may use, copy, link, modify and distribute + under the user's own terms, binary object code versions of works based + on the Library. + + 3. If you copy code from files distributed under the terms of the GNU + General Public Licence or the GNU Library General Public Licence into a + copy of this library, as this licence permits, the exception does not + apply to the code that you add in this way. To avoid misleading anyone as + to the status of such modified files, you must delete this exception + notice from such code and/or adjust the licensing conditions notice + accordingly. + + 4. If you write modifications of your own for this library, it is your + choice whether to permit this exception to apply to your modifications. + If you do not wish that, you must delete the exception notice from such + code and/or adjust the licensing conditions notice accordingly. + + +------------------------------------------------------------------------------ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/games-engines/openscenegraph/openscenegraph-3.2.1.recipe b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe new file mode 100644 index 000000000..51a0b2afc --- /dev/null +++ b/games-engines/openscenegraph/openscenegraph-3.2.1.recipe @@ -0,0 +1,144 @@ +SUMMARY="An open source, real-time graphics middle-ware used by developers" +DESCRIPTION=" +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ +vis-sim, space, scientific, oil-gas, games and virtual reality industries." +HOMEPAGE="http://www.openscenegraph.org" +SRC_URI="http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-3.2.1.zip" +CHECKSUM_SHA256="d9ae72263d0191855b0f804d93c586d489f119aca0499292acc09bb0fa0b3e6d" +REVISION="1" +LICENSE="OSGPL" +COPYRIGHT="2002-2014 Robert Osfield and others" + +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=" + openscenegraph$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libOpenThreads$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosg$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgAnimation$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgDB$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgFX$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgGA$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgManipulator$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgParticle$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgPresentation$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgShadow$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgSim$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgTerrain$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgText$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgUtil$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 + lib:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 +" + +REQUIRES=" + haiku$secondaryArchSuffix + mesa$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + mesa${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix +" + +PATCHES="openscenegraph-3.2.1.patchset" + +SOURCE_DIR="OpenSceneGraph-3.2.1" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None + make $jobArgs + +} + +INSTALL() +{ + make install + + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + mkdir -p $prefix/lib-temp + mv $prefix/lib/* $prefix/lib-temp/ + mkdir -p $libDir + mv $prefix/lib-temp/* $libDir + rm -rf $prefix/lib-temp + + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget + + fixPkgconfig + + packageEntries devel $developDir + +} + +PROVIDES_devel=" + openscenegraph${secondaryArchSuffix}_devel = 3.2.1 compat >= 3 + devel:libOpenThreads$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosg$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgAnimation$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgDB$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgFX$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgGA$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgManipulator$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgParticle$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgPresentation$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgShadow$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgSim$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgTerrain$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgText$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgUtil$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgViewer$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgVolume$secondaryArchSuffix = 3.2.1 compat >= 3 + devel:libosgWidget$secondaryArchSuffix = 3.2.1 compat >= 3 + +" +REQUIRES_devel=" + openscenegraph$secondaryArchSuffix == $portVersion +" diff --git a/games-engines/openscenegraph/openscenegraph-git.recipe b/games-engines/openscenegraph/openscenegraph-git.recipe new file mode 100644 index 000000000..e499fb7ca --- /dev/null +++ b/games-engines/openscenegraph/openscenegraph-git.recipe @@ -0,0 +1,145 @@ +SUMMARY="An open source, real-time graphics middle-ware used by developers" +DESCRIPTION=" +The OpenSceneGraph is an open source high performance 3D graphics toolkit, used \ +by application developers in fields such as visual simulation, games, virtual \ +reality, scientific visualization and modelling. Written entirely in Standard \ +C++ and OpenGL it runs on all Windows platforms, OSX, GNU/Linux, IRIX, Solaris \ +, HP-Ux, AIX and FreeBSD operating systems. The OpenSceneGraph is now well \ +established as the world leading scene graph technology, used widely in the \ +vis-sim, space, scientific, oil-gas, games and virtual reality industries." +HOMEPAGE="http://www.openscenegraph.org" +SRC_URI="git://github.com/openscenegraph/osg#77f09f9e649cfedd32608ed6ec67bf1de7cd53ac" +REVISION="1" +LICENSE="OSGPL" +COPYRIGHT="2002-2014 Robert Osfield and others" + +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=" + openscenegraph$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libOpenThreads$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosg$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgAnimation$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgDB$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgFX$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgGA$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgManipulator$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgParticle$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgPresentation$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgShadow$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgSim$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgTerrain$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgText$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgUtil$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgViewer$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 + lib:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 +" + +REQUIRES=" + haiku$secondaryArchSuffix + mesa$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + mesa${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix +" + +PATCHES="openscenegraph-3.2.1.patchset" + +SOURCE_DIR="OpenSceneGraph-3.2.1" + +BUILD() +{ + cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DOSG_USE_QT=OFF -DBUILD_OSG_APPLICATIONS=OFF -DOSG_WINDOWING_SYSTEM=None + make $jobArgs + +} + +INSTALL() +{ + make install + + mkdir -p $includeDir + mv $prefix/include/* $includeDir/ + rm -rf $prefix/include + + mkdir -p $prefix/lib-temp + mv $prefix/lib/* $prefix/lib-temp/ + mkdir -p $libDir + mv $prefix/lib-temp/* $libDir + rm -rf $prefix/lib-temp + + prepareInstalledDevelLibs libOpenThreads \ + libosg libosgAnimation libosgDB libosgFX \ + libosgGA libosgManipulator libosgParticle \ + libosgPresentation libosgShadow libosgSim \ + libosgTerrain libosgText libosgUtil libosgViewer \ + libosgVolume libosgWidget libosgUI + + fixPkgconfig + + packageEntries devel $developDir + +} + +PROVIDES_devel=" + openscenegraph${secondaryArchSuffix}_devel = 3.3.4 compat >= 3 + devel:libOpenThreads$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libosg$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgAnimation$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgDB$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgFX$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgGA$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgManipulator$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgParticle$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgPresentation$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgShadow$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgSim$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgTerrain$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgText$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgUtil$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgViewer$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgVolume$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgWidget$secondaryArchSuffix = 3.3.4 compat >= 3 + devel:libosgUI$secondaryArchSuffix = 3.3.4 compat >= 3 + +" +REQUIRES_devel=" + openscenegraph$secondaryArchSuffix == 3.3.4 +" diff --git a/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset new file mode 100644 index 000000000..28ee177e3 --- /dev/null +++ b/games-engines/openscenegraph/patches/openscenegraph-3.2.1.patchset @@ -0,0 +1,36 @@ +From 3e731d32a286903a4b75d445ec6fdf0b8359b5d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Wed, 24 Dec 2014 14:55:21 +0000 +Subject: Add __HAIKU__ when needed + + +diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp +index affd682..dcbb532 100644 +--- a/src/osgDB/FileUtils.cpp ++++ b/src/osgDB/FileUtils.cpp +@@ -76,7 +76,7 @@ typedef char TCHAR; + #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040) + #define stat64 stat + #endif +-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ ++#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \ + (defined(__hpux) && !defined(_LARGEFILE64_SOURCE)) + #define stat64 stat + #endif +diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h +index 3720ea6..6f4c6bc 100644 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h +@@ -51,7 +51,7 @@ + + #else + +- #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) ++ #if defined(__GLIBC__) || defined(__ANDROID__) || defined(__CYGWIN__) || defined(__HAIKU__) + #include + #if (__BYTE_ORDER == __LITTLE_ENDIAN) + #define __LITTLE_ENDIAN__ +-- +1.8.3.4 + diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index 86dc8d459..fab9f0f64 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,7 +1,7 @@ SUMMARY="An e-mail client." HOMEPAGE="http://beam.sourceforge.net" -SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" -REVISION="3" +SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam#95dc769db2f9090a038bc5a2c46f009379b2d57b" +REVISION="5" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion @@ -26,8 +26,6 @@ BUILD_PREREQUIRES=" cmd:flex " -PATCHES="beam-1.2alpha.patchset" - BUILD() { jam -q $jobArgs diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset deleted file mode 100644 index 5ac3ffe2d..000000000 --- a/haiku-apps/beam/patches/beam-1.2alpha.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 6545d15dfc53594f4141047bf4c84d55cfccda6d Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Thu, 14 Nov 2013 02:12:56 -0700 -Subject: Adjust search path for libbnetapi - - -diff --git a/build-jam/BuildSettings b/build-jam/BuildSettings -index d411b68..4874ac6 100644 ---- a/build-jam/BuildSettings -+++ b/build-jam/BuildSettings -@@ -44,7 +44,7 @@ if $(OSPLAT) = X86 { - PLATFORM = zeta ; - } - # check for libbnetapi... -- local haveLibbnetapi = [ GLOB /boot/develop/lib/x86 : libbnetapi.so ] ; -+ local haveLibbnetapi = [ GLOB /boot/system/develop/lib : libbnetapi.so ] ; - if $(haveLibbnetapi) { - LIBNETAPI = bnetapi ; - } --- -1.8.3.4 - diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binaryclock/binaryclock-20141223.recipe similarity index 63% rename from haiku-apps/binary_clock/binary_clock-2.0.recipe rename to haiku-apps/binaryclock/binaryclock-20141223.recipe index ef07650c9..a685cdd21 100644 --- a/haiku-apps/binary_clock/binary_clock-2.0.recipe +++ b/haiku-apps/binaryclock/binaryclock-20141223.recipe @@ -5,7 +5,7 @@ quite enjoyable to reprogram my brain to learn to read it at a glance. It just \ takes a little getting used to. " HOMEPAGE="http://github.com/HaikuArchives/BinaryClock" -SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137" +SRC_URI="git://github.com/HaikuArchives/BinaryClock#bfefbf7f93e7a07c841fdb1162e119b0364fee85" REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2000 David Enderson" @@ -13,7 +13,7 @@ COPYRIGHT="2000 David Enderson" ARCHITECTURES="x86_gcc2 !x86 !x86_64" PROVIDES=" - binary_clock = $portVersion + binaryclock = $portVersion app:BinaryClock = $portVersion " @@ -26,26 +26,32 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + makefile_engine cmd:make cmd:gcc cmd:ld " USER_SETTINGS_FILES=" - settings/BinaryClock_2.xx + settings/BinaryClock " BUILD() { cd Application - g++ -o BinaryClock *.cpp -lbe -ltranslation - xres -o BinaryClock BinaryClock.rsrc - mimeset -f BinaryClock + make $jobArgs OBJ_DIR=objects + + cd ../Screensaver + make $jobArgs OBJ_DIR=objects } INSTALL() { - mkdir -p $appsDir - cp Application/BinaryClock $appsDir + mkdir -p $appsDir + mkdir -p $addOnsDir/Screen\ Savers/ + + cp Application/objects/BinaryClock $appsDir addAppDeskbarSymlink $appsDir/BinaryClock "Binary Clock" + + cp Screensaver/objects/BinaryClock $addOnsDir/Screen\ Savers } diff --git a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch b/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch deleted file mode 100644 index 0951e990f..000000000 --- a/haiku-apps/randomizer/patches/randomizer-1.0.0b1.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 24da7eed9c8cd793d4f873100584b70ea11d4458 Mon Sep 17 00:00:00 2001 -From: Luke -Date: Sat, 7 Dec 2013 13:04:48 +0000 -Subject: [PATCH] Add makefile - ---- - src/makefile | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 128 insertions(+) - create mode 100644 src/makefile - -diff --git a/src/makefile b/src/makefile -new file mode 100644 -index 0000000..c6df5ad ---- /dev/null -+++ b/src/makefile -@@ -0,0 +1,128 @@ -+## BeOS Generic Makefile v2.3 ## -+ -+## Fill in this file to specify the project being created, and the referenced -+## makefile-engine will do all of the hard work for you. This handles both -+## Intel and PowerPC builds of the BeOS and Haiku. -+ -+## Application Specific Settings --------------------------------------------- -+ -+# specify the name of the binary -+NAME=Randomizer -+ -+# specify the type of binary -+# APP: Application -+# SHARED: Shared library or add-on -+# STATIC: Static library archive -+# DRIVER: Kernel Driver -+TYPE=APP -+ -+# add support for new Pe and Eddie features -+# to fill in generic makefile -+ -+#%{ -+# @src->@ -+ -+# specify the source files to use -+# full paths or paths relative to the makefile can be included -+# all files, regardless of directory, will have their object -+# files created in the common object directory. -+# Note that this means this makefile will not work correctly -+# if two source files with the same name (source.c or source.cpp) -+# are included from different directories. Also note that spaces -+# in folder names do not work well with this makefile. -+SRCS=App.cpp AppView.cpp AppWindow.cpp Generator.cpp main.cpp \ -+RandoBox.cpp RandoMenuBar.cpp RandoTextView.cpp -+ -+# specify the resource definition files to use -+# full path or a relative path to the resource file can be used. -+RDEFS= -+ -+# specify the resource files to use. -+# full path or a relative path to the resource file can be used. -+# both RDEFS and RSRCS can be defined in the same makefile. -+RSRCS=Randomizer.rsrc -+ -+# @<-src@ -+#%} -+ -+# end support for Pe and Eddie -+ -+# specify additional libraries to link against -+# there are two acceptable forms of library specifications -+# - if your library follows the naming pattern of: -+# libXXX.so or libXXX.a you can simply specify XXX -+# library: libbe.so entry: be -+# -+# - if your library does not follow the standard library -+# naming scheme you need to specify the path to the library -+# and it's name -+# library: my_lib.a entry: my_lib.a or path/my_lib.a -+LIBS=be $(STDCPPLIBS) -+ -+# specify additional paths to directories following the standard -+# libXXX.so or libXXX.a naming scheme. You can specify full paths -+# or paths relative to the makefile. The paths included may not -+# be recursive, so include all of the paths where libraries can -+# be found. Directories where source files are found are -+# automatically included. -+LIBPATHS= -+ -+# additional paths to look for system headers -+# thes use the form: #include
-+# source file directories are NOT auto-included here -+SYSTEM_INCLUDE_PATHS = -+ -+# additional paths to look for local headers -+# thes use the form: #include "header" -+# source file directories are automatically included -+LOCAL_INCLUDE_PATHS = -+ -+# specify the level of optimization that you desire -+# NONE, SOME, FULL -+OPTIMIZE= -+ -+# specify any preprocessor symbols to be defined. The symbols will not -+# have their values set automatically; you must supply the value (if any) -+# to use. For example, setting DEFINES to "DEBUG=1" will cause the -+# compiler option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" -+# would pass "-DDEBUG" on the compiler's command line. -+DEFINES= -+ -+# specify special warning levels -+# if unspecified default warnings will be used -+# NONE = supress all warnings -+# ALL = enable all warnings -+WARNINGS = -+ -+# specify whether image symbols will be created -+# so that stack crawls in the debugger are meaningful -+# if TRUE symbols will be created -+SYMBOLS = -+ -+# specify debug settings -+# if TRUE will allow application to be run from a source-level -+# debugger. Note that this will disable all optimzation. -+DEBUGGER = -+ -+# specify additional compiler flags for all files -+COMPILER_FLAGS = -+ -+# specify additional linker flags -+LINKER_FLAGS = -+ -+# specify the version of this particular item -+# (for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") -+# This may also be specified in a resource. -+APP_VERSION = -+ -+# (for TYPE == DRIVER only) Specify desired location of driver in the /dev -+# hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will -+# instruct the driverinstall rule to place a symlink to your driver's binary in -+# ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at -+# /dev/video/usb when loaded. Default is "misc". -+DRIVER_PATH = -+ -+TARGET_DIR = . -+ -+## include the makefile-engine -+include $(BUILDHOME)/etc/makefile-engine --- -1.8.3.4 - diff --git a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe index 672daa2d7..aa2253004 100644 --- a/haiku-apps/randomizer/randomizer-1.0.0b1.recipe +++ b/haiku-apps/randomizer/randomizer-1.0.0b1.recipe @@ -5,12 +5,13 @@ any given length, and control what characters are used. This program can be used for many purposes, such as for generating random \ passwords or random numbers. " -HOMEPAGE="https://code.google.com/p/randomizer/" -SRC_URI="svn+http://randomizer.googlecode.com/svn/trunk/@r12" +HOMEPAGE="https://github.com/HaikuArchives/Randomizer/" +SRC_URI="git+https://github.com/HaikuArchives/Randomizer#06c248254f" LICENSE="MIT" COPYRIGHT="2005-2009 Sergey S. Kazenyuk" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SOURCE_DIR="randomizer-1.0.0b1/src" PROVIDES=" randomizer = $portVersion @@ -31,21 +32,16 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES=" - randomizer-1.0.0b1.patch - " - SRC_FILENAME="download" BUILD() { - cd src - make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` + make } INSTALL() { mkdir -p $appsDir - cp src/Randomizer $appsDir + cp Randomizer $appsDir addAppDeskbarSymlink $appsDir/Randomizer } diff --git a/haiku-apps/snapshot/snapshot-1.0.recipe b/haiku-apps/snapshot/snapshot-1.0.recipe new file mode 100644 index 000000000..d04396364 --- /dev/null +++ b/haiku-apps/snapshot/snapshot-1.0.recipe @@ -0,0 +1,43 @@ +SUMMARY="Tracker add-on to take snapshots of files or folders" +DESCRIPTION="This Tracker add-on lets you take snapshots of a folder, saving it \ +as zip file, with a timestamp, to a preset folder. Snapshots are \ +currently saved to /boot/home/Snapshots" +HOMEPAGE="https://github.com/HaikuArchives/SnapShot" +SRC_URI="git+https://github.com/HaikuArchives/Snapshot#9ba592336a0d54707b7e5983dce93f8958b61d37 +LICENSE="BSD (3-clause)" +COPYRIGHT="2000 Jonas Sundström" + +USER_SETTINGS_FILES="settings/Kirilla/Snapshot/settings" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + snapshot = $portVersion + addon:snapshot = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + cd Source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $addOnsDir/Tracker + cp -a Source/objects/Snapshot $addOnsDir/Tracker +} diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe index 089e2ccee..8b4214906 100644 --- a/haiku-apps/tolmach/tolmach-1.1.0.recipe +++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe @@ -15,7 +15,6 @@ ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" tolmach = $portVersion app:Tolmach = $portVersion - lib:libfSub " REQUIRES=" diff --git a/haiku-games/bevexed/bevexed-1.1.recipe b/haiku-games/bevexed/bevexed-20141224.recipe similarity index 78% rename from haiku-games/bevexed/bevexed-1.1.recipe rename to haiku-games/bevexed/bevexed-20141224.recipe index 2dae91d2c..c7987d621 100644 --- a/haiku-games/bevexed/bevexed-1.1.recipe +++ b/haiku-games/bevexed/bevexed-20141224.recipe @@ -4,8 +4,8 @@ A maddeningly-addictive puzzle game. The concept is simple: put the tiles in \ the grid on the left such that the numbers match wherever 2 tiles touch. " HOMEPAGE="https://github.com/HaikuArchives/BeVexed" -SRC_URI="git+https://github.com/HaikuArchives/BeVexed#3a45d8f364" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/BeVexed#01613e90e6ce3c2b47a592efe8e248db3445f536" +REVISION="2" LICENSE="MIT" COPYRIGHT="2006 DarkWyrm" @@ -45,8 +45,11 @@ BUILD() INSTALL() { - cd source mkdir -p $appsDir - cp -a objects/BeVexed $appsDir + mkdir -p $dataDir/BeVexed + + cp -r backgrounds $dataDir/BeVexed + + cp -a source/objects/BeVexed $appsDir addAppDeskbarSymlink $appsDir/BeVexed } diff --git a/media-fonts/ahem/ahem-1.0.recipe b/media-fonts/ahem/ahem-1.0.recipe index 215eef282..8080fb62a 100644 --- a/media-fonts/ahem/ahem-1.0.recipe +++ b/media-fonts/ahem/ahem-1.0.recipe @@ -20,7 +20,7 @@ SRC_URI="https://github.com/Kozea/Ahem/archive/1.0.tar.gz" CHECKSUM_SHA256="bae33954780217ea0e8e517f51e5a84c525ff22b39a508d50ab49e2d5cef7530" LICENSE="Public Domain" COPYRIGHT="Late-90s Todd Fahrner" -REVISION="1" +REVISION="2" SOURCE_DIR="Ahem-1.0" ARCHITECTURES="any" @@ -41,6 +41,7 @@ BUILD() INSTALL() { - mkdir -p $fontsDir/ahem - cp Ahem.ttf README $fontsDir/ahem + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + cp Ahem.ttf $FONTDIR } diff --git a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe index c3b0ad6dd..b14cb74d3 100644 --- a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe +++ b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe @@ -10,7 +10,7 @@ SRC_URI="http://www.marksimonson.com/assets/content/fonts/AnonymousPro-1.002.zip CHECKSUM_SHA256="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009 Mark Simonson, with reserved font name Anonymous Pro" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,8 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/anonymous-pro + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/anonymous-pro-readme.txt } diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index 9a1b7b09a..16566f291 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -8,8 +8,7 @@ contributions. HOMEPAGE="http://projects.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/Fonts/ae_fonts/ae_fonts1_ttf_1.1.tar.bz2" CHECKSUM_SHA256="c517f6ac0643d2416101c9b375be38ec4fe7810b7ad3a1465438dd45b819e054" -REVISION="1" -DEPEND="" +REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2003-2007 Arabeyes.org 2002-2005 Free Software Foundation" @@ -21,26 +20,24 @@ PROVIDES="arabeyes_fonts = $portVersion" REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES=" - cmd:tar coreutils " -SOURCE_DIR="ae_fonts1-1.1" +SOURCE_DIR="ae_fonts1-1.1/" BUILD() { - tar xvjf $portDir/download/ae_fonts1_ttf_1.1.tar.bz2 + true } INSTALL() { - cd ae_fonts1-1.1 - FONTDIR=$fontsDir/arabeyes + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp -rd AAHS ${FONTDIR}/ - cp -rd AGA ${FONTDIR}/ - cp -rd FS ${FONTDIR}/ - cp -rd Kasr ${FONTDIR}/ - cp -rd MCS ${FONTDIR}/ - cp -rd Shmookh ${FONTDIR}/ + cp AAHS/*.ttf ${FONTDIR}/ + cp AGA/*.ttf ${FONTDIR}/ + cp FS/*.ttf ${FONTDIR}/ + cp Kasr/*.ttf ${FONTDIR}/ + cp MCS/*.ttf ${FONTDIR}/ + cp Shmookh/*.ttf ${FONTDIR}/ } diff --git a/media-fonts/cantarell/cantarell-0.0.7.recipe b/media-fonts/cantarell/cantarell-0.0.16.recipe similarity index 73% rename from media-fonts/cantarell/cantarell-0.0.7.recipe rename to media-fonts/cantarell/cantarell-0.0.16.recipe index b25153a71..d235ee43f 100644 --- a/media-fonts/cantarell/cantarell-0.0.7.recipe +++ b/media-fonts/cantarell/cantarell-0.0.16.recipe @@ -9,13 +9,15 @@ European, Dutch and Afrikaans writing systems. The Cantarell typeface is \ included in Google Fonts too. " HOMEPAGE="http://wiki.gnome.org/CantarellFonts" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.7.tar.bz2" -CHECKSUM_SHA256="79f69beca780d84c7c5753566d801ca14e46b6c111ec71527e37ae29377c2c79" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/cantarell-fonts/0.0/cantarell-fonts-${portVersion}.tar.xz" +CHECKSUM_SHA256="15bf87555321556750bc68ace360f3df420359a8ab257e15c44fb69710152f1c" LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2009-2011 Understanding Limited, 2010-2011 Jakub Steiner" +COPYRIGHT="2009-2011 Understanding Limited +2010-2012 Jakub Steiner" REVISION="1" ARCHITECTURES="any" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" DISABLE_SOURCE_PACKAGE=yes PROVIDES="cantarell = $portVersion" @@ -23,7 +25,7 @@ REQUIRES="" BUILD_REQUIRES="" BUILD_PREREQUIRES="coreutils" -SOURCE_DIR="cantarell-fonts-0.0.7" +SOURCE_DIR="cantarell-fonts-$portVersion" BUILD() { @@ -32,8 +34,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/cantarell + FONTDIR=$fontsDir/otfonts mkdir -p ${FONTDIR} cp otf/*.otf ${FONTDIR} - cp README ${FONTDIR}/cantarell-readme.txt + cp README ${FONTDIR}/cantarell.readme } diff --git a/media-fonts/cardo/cardo-1.04.recipe b/media-fonts/cardo/cardo-1.04.recipe index c3c3274c7..87b719f3a 100644 --- a/media-fonts/cardo/cardo-1.04.recipe +++ b/media-fonts/cardo/cardo-1.04.recipe @@ -11,7 +11,7 @@ SRC_URI="http://scholarsfonts.net/cardo104.zip" CHECKSUM_SHA256="9401db6357cb71fa1f8791323679f81d6b0473d6280a7ec8abdf11b5e52f455f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2004–2011 David J. Perry, with Reserved Font Name Cardo" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -30,7 +30,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/cardo + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/courier_prime/courier_prime-1.0.recipe b/media-fonts/courier_prime/courier_prime-1.0.recipe index 309374cbe..23bf94b70 100644 --- a/media-fonts/courier_prime/courier_prime-1.0.recipe +++ b/media-fonts/courier_prime/courier_prime-1.0.recipe @@ -8,7 +8,7 @@ should not change. HOMEPAGE="http://quoteunquoteapps.com/courierprime/" SRC_URI="http://quoteunquoteapps.com/downloads/courier-prime.zip" CHECKSUM_SHA256="d5d4faf1bee0d1f52bab1103cbfdfb354976331c86f999c110c22a098cb12d73" -REVISION="1" +REVISION="2" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2013 Quote-Unquote Apps" @@ -34,8 +34,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/courier-prime + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ - cp Read\ me.txt ${FONTDIR}/README.txt } diff --git a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe index 6fc578aa2..3282e1740 100644 --- a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe +++ b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe @@ -13,8 +13,8 @@ CHECKSUM_SHA256_3="89619d3f06b55495e94458eb8fbd69ae7c654db5782b2cecfdaffa2c8b291 SOURCE_DIR="" LICENSE="Apache v2" -COPYRIGHT="Mike Frysinger" -REVISION="1" +COPYRIGHT="2010-2013 Google Corporation" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -30,10 +30,10 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/croscorefonts/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} cp ../sources-2/*.ttf ${FONTDIR} cp ../sources-3/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index 2b908a4b0..06ba3babd 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -10,7 +10,7 @@ SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-113.tar.gz" CHECKSUM_SHA256="c9339f0f1aaa055f8b06a2b28c1c3fb5ddffe6c6a6a7a7735fc0ad93d0eab12f" LICENSE="Apache v2" COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -30,9 +30,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/droid + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp Ahem.ttf ${FONTDIR} cp DroidSans-Bold.ttf ${FONTDIR} cp DroidSansFallback.ttf ${FONTDIR} cp DroidSerif-Bold.ttf ${FONTDIR} @@ -41,5 +40,4 @@ INSTALL() cp DroidSansMono.ttf ${FONTDIR} cp DroidSerif-BoldItalic.ttf ${FONTDIR} cp DroidSerif-Regular.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/droid-fonts-readme.txt } diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe index 0b802f2c0..3923c917d 100644 --- a/media-fonts/droid/droid-4.3_r2.2.recipe +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -11,7 +11,7 @@ SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/droid-4.3_r2.2.zi CHECKSUM_SHA256="221133c329efdb2b911c18ef222eeb3fcb011e5be7c37623e68faa90c15b8cd0" LICENSE="Apache v2" COPYRIGHT="2005-2008 The Android Open Source Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -31,7 +31,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/droid + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp . ${FONTDIR} -R + cp *.ttf ${FONTDIR} } diff --git a/media-fonts/essays-1743/essays1743-2.001.recipe b/media-fonts/essays-1743/essays1743-2.001.recipe index 64afcbf84..5d5bc6bb8 100644 --- a/media-fonts/essays-1743/essays1743-2.001.recipe +++ b/media-fonts/essays-1743/essays1743-2.001.recipe @@ -12,7 +12,7 @@ SOURCE_DIR="" LICENSE="GNU LGPL v2.1" COPYRIGHT="John Stracke" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -28,8 +28,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/essays1743/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp essays1743/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe index 0ad6033be..3fd24740d 100644 --- a/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe +++ b/media-fonts/farsi_fonts/farsi_fonts-0.4.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Farsi (Perisian) Unicode fonts" HOMEPAGE="http://www.farsiweb.ir/" SRC_URI="http://www.farsiweb.ir/font/farsifonts-0.4.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="65a78975c923fd9db7b9441c32559c1b" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe index f010cebeb..bcd270a35 100644 --- a/media-fonts/humor_sans/humor_sans-1.0.recipe +++ b/media-fonts/humor_sans/humor_sans-1.0.recipe @@ -1,6 +1,6 @@ -SUMMARY="The Human-Sans font" +SUMMARY="The Humor-Sans font" DESCRIPTION=" -A sanserif typeface in the style of xkcd. Xkcd is a popular webcomics with \ +A sans-serif typeface in the style of xkcd. Xkcd is a popular webcomics with \ focus on computer science or everything else. " HOMEPAGE="http://antiyawn.com/uploads/humorsans.html" @@ -8,7 +8,7 @@ SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf" CHECKSUM_SHA256="2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009, Michael Ciuffo, with Reserved Font Name Humor-Sans" -REVISION="1" +REVISION="2" ARCHITECTURES="!any" DISABLE_SOURCE_PACKAGE=yes @@ -27,7 +27,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/humor-sans + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/inconsolata/inconsolata-1.0.recipe b/media-fonts/inconsolata/inconsolata-1.0.recipe index 23cce1f39..eceb5c6c1 100644 --- a/media-fonts/inconsolata/inconsolata-1.0.recipe +++ b/media-fonts/inconsolata/inconsolata-1.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Inconsolata Programmer's font" HOMEPAGE="http://www.levien.com/type/myfonts/inconsolata.html" SRC_URI="http://media.nodnod.net/Inconsolata-dz.otf.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="8510443343f43382566511e73abc06f8" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/inconsolata + FONTDIR=${fontsDir}/otfonts mkdir -p ${FONTDIR} wget http://levien.com/type/myfonts/Inconsolata.otf wget http://www.cosmix.org/software/files/InconsolataHellenic.zip diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe index c2a34ed0e..0bef51cbe 100644 --- a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe +++ b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="KACST Arabic Truetype Fonts" HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/latest/download?source=files" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" @@ -13,11 +13,9 @@ BUILD() INSTALL() { cd kacst_one_5.0 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/arabeyes + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - cp KacstOne-Bold.sfd ${FONTDIR}/ cp KacstOne-Bold.ttf ${FONTDIR}/ - cp KacstOne.sfd ${FONTDIR}/ cp KacstOne.ttf ${FONTDIR}/ } diff --git a/media-fonts/lateef_font/lateef_font-1.001.recipe b/media-fonts/lateef_font/lateef_font-1.001.recipe index 0de1633c9..69b0ac8e9 100644 --- a/media-fonts/lateef_font/lateef_font-1.001.recipe +++ b/media-fonts/lateef_font/lateef_font-1.001.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Arabic font" HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe index 57da7e16c..a6f4c14a4 100644 --- a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe +++ b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe @@ -4,7 +4,7 @@ with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. " HOMEPAGE="https://fedorahosted.org/liberation-fonts" SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/liberation-fonts-1.06.0.20100721.tar.gz" -REVISION="1" +REVISION="2" STATUS_HAIKU="broken" DEPEND="fontforge" CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80" @@ -17,7 +17,7 @@ BUILD() INSTALL() { cd liberation-fonts-1.06.0.20100721 - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/liberation + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -a *.ttf ${FONTDIR}/. } diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe index 2ebdbdbfe..9b2b05218 100644 --- a/media-fonts/lohit/lohit-2.3.8.recipe +++ b/media-fonts/lohit/lohit-2.3.8.recipe @@ -13,7 +13,7 @@ SRC_URI="http://rbhalera.fedorapeople.org/released/lohit/lohit-fonts-2.3.8.tar.g CHECKSUM_SHA256="68091ab047f9e4e22f069f802dceac52994267f126dc238b3815eed217a02991" LICENSE="GNU GPL v2" COPYRIGHT="2004-2011 Red Hat" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -34,8 +34,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/lohit + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} find . -name "*.ttf" -exec cp {} ${FONTDIR} \; - cp README ${FONTDIR}/lohit-readme.txt + cp README ${FONTDIR}/lohit.readme } diff --git a/media-fonts/mplus/mplus-2.2.4.recipe b/media-fonts/mplus/mplus-2.2.4.recipe index bd30c546a..df9750fd0 100644 --- a/media-fonts/mplus/mplus-2.2.4.recipe +++ b/media-fonts/mplus/mplus-2.2.4.recipe @@ -7,7 +7,7 @@ SOURCE_DIR="." CHECKSUM_SHA256="7862e113e04986646117267c4baee30aea163d43a382c14693f15287f16bbf25" LICENSE="GNU GPL v2" COPYRIGHT="2002-2008 M+ Fonts Project" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -23,8 +23,8 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/mplus/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp mplus-TESTFLIGHT-059/*.ttf ${FONTDIR} -} \ No newline at end of file +} diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe index 38f5396b4..bb1201e85 100644 --- a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe +++ b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe @@ -4,7 +4,7 @@ style of one of the finest calligraphers of Pakistan (Nafees Raqam). " HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesNastaleeq.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" @@ -15,7 +15,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-nastaleeq + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} } diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe index 7ec14d2d5..bcd18aa0c 100644 --- a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe +++ b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe @@ -3,7 +3,7 @@ Open Type Font for writng Urdu in Riqa script based on Unicode standard. " HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesRiqa.html" SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" @@ -14,7 +14,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nafees-riqa + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp "Nafees Riqa v1.0.ttf" ${FONTDIR} } diff --git a/media-fonts/nanumfont/nanumfont-2.0.recipe b/media-fonts/nanumfont/nanumfont-2.0.recipe index 957a28fe2..a9af8355a 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.recipe +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -3,7 +3,7 @@ Korean monospace font distributed by NHN. " HOMEPAGE="http://dev.naver.com/projects/nanumfont" SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" @@ -14,7 +14,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/nanumfont + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ } diff --git a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe index 815468b0b..20d8d280f 100644 --- a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe +++ b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="bc9422930cb09b0736ed3ebf60f747bb0078e451087b52926a4ae0d1d50db42c" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe index fbcb049dd..c3d9dba0a 100644 --- a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe +++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe @@ -44,7 +44,7 @@ CHECKSUM_SHA256_7="e6e04ca22f7182eb87277d476564637b714a022cee51497737b0639e88c9f LICENSE="Apache v2" COPYRIGHT="2014 Adobe Systems Incorporated" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -65,7 +65,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/otfonts mkdir -p ${FONTDIR} cp `find ../sources* -type f -name \*.otf` ${FONTDIR} } diff --git a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe index a75967fef..f4fbba9cc 100644 --- a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe +++ b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="8601d16cb04d740d2a2a27299ae59445971bbbed3d6b401c14e6fb1d461dd353" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe index 213e0fb14..04621f266 100644 --- a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe +++ b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="44e6925fa81c7a59992415ffce24434e7b2609af7921d10e735879ebbc5a593f" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe index 7217207e1..bde6c207a 100644 --- a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe +++ b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="c154bacc4998fa6e8eb380cf6823a07c2cf6bcafbad373446fbb7576f61d1e48" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe index 62e386d5e..e28dbef76 100644 --- a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe +++ b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="2cf8027b61f0657e64959e17eb16f4d84658a950c36ee483d4bf1ade8df9d683" LICENSE="Apache v2" COPYRIGHT="2014 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe index 12c1e2f14..7047fe32a 100644 --- a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe +++ b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="15d8f1e5310f4d2eecf2e46a9d74b52c5a30afae00b90d2fe92bc8f00a5c1ee8" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe index 13724e96a..efbe61d73 100644 --- a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe +++ b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe @@ -12,7 +12,7 @@ SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" CHECKSUM_SHA256="8d434121cb8e10b02f80a1a7ab87a9a70ef2eee96aababe4ec871e554578c460" LICENSE="Apache v2" COPYRIGHT="2013 Google Inc." -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/NotoSans${LANG_DL} + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} diff --git a/media-fonts/paratype/paratype-1.0.recipe b/media-fonts/paratype/paratype-1.0.recipe index af546807b..14c2dcfc5 100644 --- a/media-fonts/paratype/paratype-1.0.recipe +++ b/media-fonts/paratype/paratype-1.0.recipe @@ -10,7 +10,7 @@ CHECKSUM_SHA256_2="e7a2a27ed0481d20973f0d3b589362d055269082e3fc4d96f81dacd58bad8 CHECKSUM_SHA256_3="e34e729f9509cf85acc52caadf68e96db90457b7164ba45719967d53e7a20dcc" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009 ParaType" -REVISION="1" +REVISION="2" SOURCE_DIR="" ARCHITECTURES="any" @@ -31,9 +31,10 @@ BUILD() INSTALL() { - mkdir -p $fontsDir/paratype - cp *.ttf $fontsDir/paratype - cp ../sources-2/*.ttf $fontsDir/paratype - cp ../sources-3/*.ttf $fontsDir/paratype + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + cp *.ttf $FONTDIR + cp ../sources-2/*.ttf $FONTDIR + cp ../sources-3/*.ttf $FONTDIR } diff --git a/media-fonts/roboto/roboto-1.2.recipe b/media-fonts/roboto/roboto-1.2.recipe index 825c43caf..48d6d934b 100644 --- a/media-fonts/roboto/roboto-1.2.recipe +++ b/media-fonts/roboto/roboto-1.2.recipe @@ -16,7 +16,7 @@ SRC_URI="http://developer.android.com/downloads/design/roboto-1.2.zip" CHECKSUM_SHA256="5101b5bdb3b7b14cc922a771ba068bfcae8634467c1f446bc89bc2b4f8b4f1b5" LICENSE="Apache v2" COPYRIGHT="2013 Christian Robertson" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes PROVIDES=" @@ -36,7 +36,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/roboto + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cd Roboto_v$portVersion diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 68b702406..40681b41d 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -3,7 +3,7 @@ Arabic script font. " HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" @@ -15,7 +15,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/scheherazade + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR} } diff --git a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe index 36a0677d4..9398cd1c2 100644 --- a/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe +++ b/media-fonts/terminus_ttf/terminus_ttf-4.38.2.recipe @@ -4,7 +4,7 @@ HOMEPAGE="http://files.ax86.net/terminus-ttf/" SRC_URI="http://files.ax86.net/terminus-ttf/files/$portVersion/terminus-ttf-$portVersion.zip" CHECKSUM_SHA256="95896b5711e8c96cae180e3c8c837f23618c611e1aebc40639bc983d519dd5bd" SOURCE_DIR="terminus-ttf-$portVersion" -REVISION="1" +REVISION="2" ARCHITECTURES="x86 x86_gcc2 x86_64" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2010 Dimitar Toshkov Zhekov @@ -26,7 +26,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/terminus-ttf + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp -r *.ttf ${FONTDIR}/ } diff --git a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index 9d4763f48..7a71b61fd 100644 --- a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -10,7 +10,7 @@ SRC_URI="http://font.ubuntu.com/download/ubuntu-font-family-0.80.zip" CHECKSUM_SHA256="107170099bbc3beae8602b97a5c423525d363106c3c24f787d43e09811298e4c" LICENSE="Ubuntu Font License 1.0" COPYRIGHT="2011 Canonical Ltd." -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,7 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ubuntu-font-family + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp Ubuntu-B.ttf ${FONTDIR} cp Ubuntu-BI.ttf ${FONTDIR} @@ -44,5 +44,5 @@ INSTALL() cp UbuntuMono-BI.ttf ${FONTDIR} cp UbuntuMono-R.ttf ${FONTDIR} cp UbuntuMono-RI.ttf ${FONTDIR} - cp README.txt ${FONTDIR}/ubuntu-fonts-readme.txt + cp README.txt ${FONTDIR}/ubuntu_font_family.readme } diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe index 05e2c6a67..318ea6621 100644 --- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe @@ -1,7 +1,7 @@ DESCRIPTION="Uyghur Computer Science Association font project" HOMEPAGE="http://www.ukij.org/fonts/" SRC_URI="http://ukijorgfonts.googlecode.com/files/ukijorgfonts.zip" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" @@ -12,7 +12,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/ukijorgfonts + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/unifont/unifont-7.0.06.recipe b/media-fonts/unifont/unifont-7.0.06.recipe index 918e787d4..6bb3fb79b 100644 --- a/media-fonts/unifont/unifont-7.0.06.recipe +++ b/media-fonts/unifont/unifont-7.0.06.recipe @@ -8,7 +8,7 @@ SRC_URI="http://unifoundry.com/pub/unifont-7.0.06.tar.gz" SOURCE_DIR="" LICENSE="GNU GPL v2" COPYRIGHT="Unifoundry" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE="yes" @@ -24,7 +24,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/ttfonts/unifont/ + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp unifont-7.0.06/font/precompiled/*.ttf ${FONTDIR} diff --git a/media-fonts/vl_gothic/vl_gothic-20140530.recipe b/media-fonts/vl_gothic/vl_gothic-20140530.recipe index f63f269ac..f3f20e048 100644 --- a/media-fonts/vl_gothic/vl_gothic-20140530.recipe +++ b/media-fonts/vl_gothic/vl_gothic-20140530.recipe @@ -17,7 +17,7 @@ COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo. 2006-2014 Daisuke SUZUKI . 2006-2014 Project Vine . " -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -36,7 +36,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/VL-Gothic + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp VL-Gothic-Regular.ttf ${FONTDIR} cp VL-PGothic-Regular.ttf ${FONTDIR} diff --git a/media-fonts/vollkorn/vollkorn-2.1.recipe b/media-fonts/vollkorn/vollkorn-2.1.recipe index 63bf217a8..8a30610d4 100644 --- a/media-fonts/vollkorn/vollkorn-2.1.recipe +++ b/media-fonts/vollkorn/vollkorn-2.1.recipe @@ -10,7 +10,7 @@ SRC_URI="http://friedrichalthausen.de/wp-content/plugins/cimy-counter/cc_redirec CHECKSUM_SHA256="2eaa427dbe42e37bfdc182c1e3446abdc889806fe0b6c9a14e0fc0c3acc997f5" LICENSE="SIL Open Font License v1.1" COPYRIGHT="Friedrich Althausen" -REVISION="1" +REVISION="2" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -29,7 +29,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/vollkorn + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe index 38e19e6bb..c1c5747ec 100644 --- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -14,7 +14,7 @@ COPYRIGHT=" 2007 Google Corp. 2008-2010 WenQuanYi Board of Trustees and Qianqian Fang " -REVISION="3" +REVISION="4" ARCHITECTURES="any" DISABLE_SOURCE_PACKAGE=yes @@ -34,7 +34,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/wenquanyi + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp wqy-microhei.ttc ${FONTDIR}/wqy-microhei.ttf } diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index c04558372..11b106ba3 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -10,7 +10,7 @@ LICENSE=" GNU GPL v2 with font embedding exception " COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees" -REVISION="2" +REVISION="3" ARCHITECTURES="any" PROVIDES=" @@ -32,7 +32,7 @@ BUILD() INSTALL() { - FONTDIR=$fontsDir/wenquanyi + FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} cp wqy-zenhei.ttc ${FONTDIR}/wqy-zenhei.ttf } diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index f4ac36b1b..7a4a295ab 100644 --- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -5,7 +5,7 @@ Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \ " HOMEPAGE="http://wiki.irmug.com/index.php/X_Series_2" SRC_URI="http://irmug.com/downloads/dl.php?id=21" -REVISION="1" +REVISION="2" STATUS_HAIKU="stable" DEPEND="" CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" @@ -16,7 +16,7 @@ BUILD() INSTALL() { - FONTDIR=${DESTDIR}/`finddir B_COMMON_FONTS_DIRECTORY`/x-series + FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} wget http://irmug.com/downloads/dl.php?id=21 unzip -o Zar.zip diff --git a/media-libs/libpng/libpng-1.5.20.recipe b/media-libs/libpng/libpng-1.5.21.recipe similarity index 83% rename from media-libs/libpng/libpng-1.5.20.recipe rename to media-libs/libpng/libpng-1.5.21.recipe index a47415858..2c9db48c5 100644 --- a/media-libs/libpng/libpng-1.5.20.recipe +++ b/media-libs/libpng/libpng-1.5.21.recipe @@ -11,15 +11,15 @@ COPYRIGHT=" " LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="ca16b85feea75604d6ee2072486afe3fb52d867b4105e0bc60dbea78b4bc2ee0" +CHECKSUM_SHA256="835ce1d42ea9f50eddf74754f2b06b1c0f7a1d8e46deb89b839a5ca018599793" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpng$secondaryArchSuffix = $portVersion compat >= 1.5 - lib:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 - lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 + lib:libpng$secondaryArchSuffix = 15.21.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15 " REQUIRES=" haiku$secondaryArchSuffix @@ -70,8 +70,8 @@ PROVIDES_devel=" libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5 cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5 - devel:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 - devel:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 + devel:libpng$secondaryArchSuffix = 15.21.0 compat >= 15 + devel:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15 " REQUIRES_devel=" libpng$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/libpng12-1.2.51.recipe b/media-libs/libpng/libpng12-1.2.52.recipe similarity index 79% rename from media-libs/libpng/libpng12-1.2.51.recipe rename to media-libs/libpng/libpng12-1.2.52.recipe index 8406b6ca9..6fb3d3cc6 100644 --- a/media-libs/libpng/libpng12-1.2.51.recipe +++ b/media-libs/libpng/libpng12-1.2.52.recipe @@ -13,17 +13,17 @@ COPYRIGHT=" 1995-1996 Guy Eric Schalnat, Group 42, Inc. " LICENSE="LibPNG" -SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/1.2.51/libpng-1.2.51.tar.bz2" -CHECKSUM_SHA256="b0ad409d7048c851eadb2abab6c1a1a1e131bc4d3d07501ff7c820cce5bec811" -SOURCE_DIR="libpng-1.2.51" +SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/$portVersion/libpng-$portVersion.tar.bz2" +CHECKSUM_SHA256="e90ede6d543152e68c08c91c45f39565185ac7eb8cb2b5d058a196050ab04229" +SOURCE_DIR="libpng-$portVersion" REVISION="1" ARCHITECTURES="x86_gcc2" SECONDARY_ARCHITECTURES="x86_gcc2" PROVIDES=" libpng12$secondaryArchSuffix = $portVersion compat >= 1.2 - lib:libpng$secondaryArchSuffix = 3.51.0 compat >= 3 - lib:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 + lib:libpng$secondaryArchSuffix = 3.52.0 compat >= 3 + lib:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix @@ -72,8 +72,8 @@ PROVIDES_devel=" libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2 cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2 - devel:libpng$secondaryArchSuffix = 3.51.0 compat >= 3 - devel:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3 + devel:libpng$secondaryArchSuffix = 3.52.0 compat >= 3 + devel:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3 " REQUIRES_devel=" libpng12$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/libpng16-1.6.15.recipe b/media-libs/libpng/libpng16-1.6.16.recipe similarity index 85% rename from media-libs/libpng/libpng16-1.6.15.recipe rename to media-libs/libpng/libpng16-1.6.16.recipe index 39fde2cdc..db5882161 100644 --- a/media-libs/libpng/libpng16-1.6.15.recipe +++ b/media-libs/libpng/libpng16-1.6.16.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " LICENSE="LibPNG" SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="dc4f90ff3ba4559b5eb653da9058e3d862d5e8162fe2612f9339a6f6d2a2139d" +CHECKSUM_SHA256="02f96b6bad5a381d36d7ba7a5d9be3b06f7fe6c274da00707509c23592a073ad" SOURCE_DIR="libpng-$portVersion" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" @@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libpng16$secondaryArchSuffix = $portVersion compat >= 1.6 - lib:libpng$secondaryArchSuffix = 16.15.0 compat >= 16 - lib:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 + lib:libpng$secondaryArchSuffix = 16.16.0 compat >= 16 + lib:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16 " REQUIRES=" haiku$secondaryArchSuffix @@ -69,8 +69,8 @@ PROVIDES_devel=" cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6 - devel:libpng$secondaryArchSuffix = 16.15.0 compat >= 16 - devel:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16 + devel:libpng$secondaryArchSuffix = 16.16.0 compat >= 16 + devel:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16 " REQUIRES_devel=" libpng16$secondaryArchSuffix == $portVersion base diff --git a/net-libs/librsync/librsync-1.0.0pre.recipe b/net-libs/librsync/librsync-1.0.0.recipe similarity index 61% rename from net-libs/librsync/librsync-1.0.0pre.recipe rename to net-libs/librsync/librsync-1.0.0.recipe index f50168be7..6d132d571 100644 --- a/net-libs/librsync/librsync-1.0.0pre.recipe +++ b/net-libs/librsync/librsync-1.0.0.recipe @@ -7,10 +7,20 @@ design similar to that of zlib with the aim of allowing it to be embedded \ into many different applications." HOMEPAGE="http://librsync.sourcefrog.net" -GIT_HASH='ad8d065bfd' -SRC_URI="git://github.com/librsync/librsync.git#$GIT_HASH" -#CHECKSUM_SHA256="" + +# Unfortunately the maintainer of librsync did not publish a tag or released +# tarball for the 1.0.0 release (yet?). Use a static tarball with Git hash +# for now (which comparing to directly cloning allows for double-checking +# correctness of the source). +GIT_HASH='02f1cc19182845d37cfb6a893f54af220a294ce7' +# Attach the $GIT_HASH to the file name just in case upstream publishes an +# official release tarball. +SRC_FILENAME="librsync-${portVersion}-${GIT_HASH}.tar.gz" +SRC_URI="https://github.com/librsync/librsync/archive/${GIT_HASH}.tar.gz" +CHECKSUM_SHA256='25d046a8cbc6e075cc68925b5070c1f0e731e3a018446f6bda20ec9723a5631a' REVISION="1" +SOURCE_DIR="librsync-${GIT_HASH}" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" LICENSE="GNU LGPL v2.1" @@ -23,16 +33,12 @@ COPYRIGHT="1995 Patrick Powell REQUIRES=" haiku$secondaryArchSuffix - lib:libbz2$secondaryArchSuffix lib:libpopt$secondaryArchSuffix - lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libbz2$secondaryArchSuffix devel:libpopt$secondaryArchSuffix - devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -53,17 +59,13 @@ BUILD_PREREQUIRES=" PROVIDES=" $portName = $portVersion cmd:rdiff$secondaryArchSuffix = $portVersion - lib:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2 " -PATCH() -{ - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac -} +PATCHES="librsync-${portVersion}.patchset" BUILD() { - mkdir -p m4 autoreconf -fi runConfigure ./configure \ --enable-shared @@ -84,9 +86,11 @@ TEST() make check } +# Although the librsync soname is bumped to 2.0.0, it is purely an ABI change, +# so the compat level for the devel package remains at 1. PROVIDES_devel=" - ${portName}_devel = $portVersion - devel:librsync$secondaryArchSuffix = 1.0.2 compat >= 1 + ${portName}_devel = $portVersion compat >= 1 + devel:librsync$secondaryArchSuffix = 2.0.0 compat >= 1 " REQUIRES_devel=" librsync$secondaryArchSuffix == $portVersion base diff --git a/net-libs/librsync/patches/librsync-1.0.0.patchset b/net-libs/librsync/patches/librsync-1.0.0.patchset new file mode 100644 index 000000000..70a04f5bd --- /dev/null +++ b/net-libs/librsync/patches/librsync-1.0.0.patchset @@ -0,0 +1,28 @@ +From 6fdcdff86e215e06817462c0fe4d63a0ca64cf21 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 23 Dec 2014 06:15:47 +0000 +Subject: blake2b: Separate declaration and code + +Fixes old compilers like gcc 2.95.3. + +Signed-off-by: Timothy Gu + +diff --git a/blake2b-ref.c b/blake2b-ref.c +index bcf81da..43cf4c1 100644 +--- a/blake2b-ref.c ++++ b/blake2b-ref.c +@@ -149,10 +149,10 @@ static inline int blake2b_init0( blake2b_state *S ) + /* init xors IV with input parameter block */ + int blake2b_init_param( blake2b_state *S, const blake2b_param *P ) + { +- blake2b_init0( S ); + uint8_t *p = ( uint8_t * )( P ); + size_t i; + ++ blake2b_init0( S ); + /* IV XOR ParamBlock */ + for( i = 0; i < 8; ++i ) + S->h[i] ^= load64( p + sizeof( S->h[i] ) * i ); +-- +1.8.3.4 + From 00f9452bd6075b624e797f8886b38756408924a0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 27 Dec 2014 22:05:17 +0000 Subject: [PATCH 161/326] harfbuzz: bump version. --- .../{harfbuzz-0.9.36.recipe => harfbuzz-0.9.37.recipe} | 6 +++--- .../{harfbuzz-0.9.36.patchset => harfbuzz-0.9.37.patchset} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename media-libs/harfbuzz/{harfbuzz-0.9.36.recipe => harfbuzz-0.9.37.recipe} (92%) rename media-libs/harfbuzz/patches/{harfbuzz-0.9.36.patchset => harfbuzz-0.9.37.patchset} (100%) diff --git a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe b/media-libs/harfbuzz/harfbuzz-0.9.37.recipe similarity index 92% rename from media-libs/harfbuzz/harfbuzz-0.9.36.recipe rename to media-libs/harfbuzz/harfbuzz-0.9.37.recipe index f596c98b4..7ea78d210 100644 --- a/media-libs/harfbuzz/harfbuzz-0.9.36.recipe +++ b/media-libs/harfbuzz/harfbuzz-0.9.37.recipe @@ -19,7 +19,7 @@ COPYRIGHT=" 1998-2004 David Turner and Werner Lemberg " SRC_URI="http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$portVersion.tar.bz2" -CHECKSUM_SHA256="3bfbf7b016167ee6b2a2f83948fef75cc1253081873d6a91022161815956b9be" +CHECKSUM_SHA256="255f3b3842dead16863d1d0c216643d97b80bfa087aaa8fc5926da24ac120207" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -33,7 +33,7 @@ PATCHES="harfbuzz-$portVersion.patchset" PROVIDES=" harfbuzz$secondaryArchSuffix = $portVersion compat >= 0.9 - lib:libharfbuzz$secondaryArchSuffix = 0.936.0 compat >= 0.936 + lib:libharfbuzz$secondaryArchSuffix = 0.937.0 compat >= 0.937 cmd:hb_ot_shape_closure$secondaryArchSuffix cmd:hb_shape$secondaryArchSuffix " @@ -98,7 +98,7 @@ INSTALL() PROVIDES_devel=" harfbuzz${secondaryArchSuffix}_devel = $portVersion compat >= 0.9 - devel:libharfbuzz$secondaryArchSuffix = 0.936.0 compat >= 0.936 + devel:libharfbuzz$secondaryArchSuffix = 0.937.0 compat >= 0.937 " REQUIRES_devel=" harfbuzz$secondaryArchSuffix == $portVersion base diff --git a/media-libs/harfbuzz/patches/harfbuzz-0.9.36.patchset b/media-libs/harfbuzz/patches/harfbuzz-0.9.37.patchset similarity index 100% rename from media-libs/harfbuzz/patches/harfbuzz-0.9.36.patchset rename to media-libs/harfbuzz/patches/harfbuzz-0.9.37.patchset From d7a1c1abbb882c36b8c3787be8bd8088f9a38b6f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 27 Dec 2014 22:24:11 +0000 Subject: [PATCH 162/326] xz_utils: bump version --- .../xz_utils/{xz_utils-5.0.7.recipe => xz_utils-5.0.8.recipe} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename app-arch/xz_utils/{xz_utils-5.0.7.recipe => xz_utils-5.0.8.recipe} (97%) diff --git a/app-arch/xz_utils/xz_utils-5.0.7.recipe b/app-arch/xz_utils/xz_utils-5.0.8.recipe similarity index 97% rename from app-arch/xz_utils/xz_utils-5.0.7.recipe rename to app-arch/xz_utils/xz_utils-5.0.8.recipe index ec402ecb7..d5bf16d25 100644 --- a/app-arch/xz_utils/xz_utils-5.0.7.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.8.recipe @@ -4,7 +4,7 @@ a high compression ratio. They are the successors to LZMA Utils. " HOMEPAGE="http://tukaani.org/xz/" SRC_URI="http://tukaani.org/xz/xz-$portVersion.tar.bz2" -CHECKSUM_SHA256="e8851dc749df2340dac6c9297cb2653eff684e73c3dedf690930119502edd616" +CHECKSUM_SHA256="2286f9d90bb0a0de34cba990df1b10cfad0777f00cb2883def26b8ec1b326bda" SOURCE_DIR="xz-$portVersion" LICENSE="GNU LGPL v2.1 GNU GPL v2 From 2e134443c2677b491338aa337584855192faf91b Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 04:21:28 +0000 Subject: [PATCH 163/326] Add Noto fonts for Southeast Asian languages --- .../noto_sans_khmer-1.00.recipe | 39 +++++++++++++++++ .../noto_sans_lao/noto_sans_lao-1.00.recipe | 39 +++++++++++++++++ .../noto_sans_myanmar-1.05.recipe | 42 +++++++++++++++++++ .../noto_sans_thai/noto_sans_thai-1.02.recipe | 39 +++++++++++++++++ .../noto_serif_khmer-1.00.recipe | 39 +++++++++++++++++ .../noto_serif_lao/noto_serif_lao-1.00.recipe | 39 +++++++++++++++++ .../noto_serif_thai-1.02.recipe | 39 +++++++++++++++++ 7 files changed, 276 insertions(+) create mode 100644 media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe create mode 100644 media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe create mode 100644 media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe create mode 100644 media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe create mode 100644 media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe create mode 100644 media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe create mode 100644 media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe diff --git a/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe b/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe new file mode 100644 index 000000000..ee0480345 --- /dev/null +++ b/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Khmer" +LANG_DL="${LANG_EN}" +LANG_LC="khmer" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="045bc145fe06b9fb6ccc12b5fe5eb38b1b6a425d54163b43c284f6503acb0844" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe b/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe new file mode 100644 index 000000000..fd7880646 --- /dev/null +++ b/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Lao" +LANG_DL="${LANG_EN}" +LANG_LC="lao" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="d19fd542e8d246583dfdd4d3ed0915f41437b95142cabdbb0b4204e77542dad5" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe b/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe new file mode 100644 index 000000000..674a82363 --- /dev/null +++ b/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe @@ -0,0 +1,42 @@ +# At the time of writing this, the version for the bold face is 1.04, while +# for the regular it is 1.05. Using 1.05 as the package version for now. + +LANG_EN="Myanmar" +LANG_DL="${LANG_EN}" +LANG_LC="myanmar" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="5d4df9b779e0cde386adf8a10c87e8c27c21e50d2edcb64d064d2ff832cd9d70" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe b/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe new file mode 100644 index 000000000..a095a9e2d --- /dev/null +++ b/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Thai" +LANG_DL="${LANG_EN}" +LANG_LC="thai" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="53d37597667ce7388a7b29a44ee843cfad4dba8d584de6c10b6bfa90fb522648" +LICENSE="Apache v2" +COPYRIGHT="2009, 2011 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe b/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe new file mode 100644 index 000000000..587cd7a6e --- /dev/null +++ b/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Khmer" +LANG_DL="${LANG_EN}" +LANG_LC="khmer" + +SUMMARY="The Noto Serif font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Serif fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="c9bd280737a77e3fc2bb62a29c1dca09d546b7c528279957e5c5ad4026f6f35f" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe b/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe new file mode 100644 index 000000000..fbd13e23a --- /dev/null +++ b/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe @@ -0,0 +1,39 @@ +LANG_EN="Lao" +LANG_DL="${LANG_EN}" +LANG_LC="lao" + +SUMMARY="The Noto Serif font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Serif fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="9eaddceb84c296197d88936d687a2178554d0b5f25b6b30b7d2b01a2e1729974" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe b/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe new file mode 100644 index 000000000..0a5dbd591 --- /dev/null +++ b/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe @@ -0,0 +1,39 @@ +LANG_EN="Thai" +LANG_DL="${LANG_EN}" +LANG_LC="thai" + +SUMMARY="The Noto Serif font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Serif fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif${LANG_DL}-hinted.zip" +CHECKSUM_SHA256="328795118275f01d03a74a95f327a5e0ad930e6e865f983408e67c0fa2eea1ee" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 008725f5201f0e53406c24b862f3b2159ae30321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 28 Dec 2014 10:26:00 +0100 Subject: [PATCH 164/326] binutils: added recipe for 2.25 --- .../binutils/binutils-2.25_2014_12_27.recipe | 177 ++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 sys-devel/binutils/binutils-2.25_2014_12_27.recipe diff --git a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe new file mode 100644 index 000000000..19e9ecb0e --- /dev/null +++ b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe @@ -0,0 +1,177 @@ +SUMMARY="Assembler, linker and binary tools for target ${targetMachineTriple}" +HOMEPAGE="http://www.gnu.org/software/binutils" + +srcGitRev="a05bd9155a41ad87382134678e93d67ceb959cfc" +SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" +SRC_FILENAME="binutils-$portVersion.tar.gz" +REVISION="1" +LICENSE=" + GNU GPL v3 + GNU LGPL v3 + " +COPYRIGHT="1988-2014 Free Software Foundation, Inc." + + +ARCHITECTURES="x86 x86_64 arm" +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" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + binutils$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:addr2line$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ar$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:as$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:c++filt$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:elfedit$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:gprof$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ld.bfd$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:nm$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objcopy$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:objdump$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:ranlib$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:readelf$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:size$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strings$secondaryArchSuffix = $portVersion compat >= 2.23 + cmd:strip$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libbfd_2.25$secondaryArchSuffix = $portVersion compat >= 2.23 + lib:libopcodes_2.25$secondaryArchSuffix = $portVersion compat >= 2.23 + " + +REQUIRES=" + haiku$secondaryArchSuffix + " +BUILD_REQUIRES=" + cmd:find + cmd:xargs + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:autoconf + cmd:awk + cmd:find + cmd:flex + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:sed + cmd:strip + cmd:tar + cmd:xargs + " + +SOURCE_DIR="buildtools-$srcGitRev/binutils" +BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL + +sourceDir=$(pwd) +relativeInstallDir="develop/tools$secondaryArchSubDir" +installDir="$prefix/$relativeInstallDir" +objectsDir=$(pwd)/../${portVersionedName}-obj + +BUILD() +{ + rm -rf $objectsDir + + # Touch all *.info files, as newer texinfos don't like their format + (cd $sourceDir; find . -name \*.info | xargs touch) + + mkdir -p $objectsDir + cd $objectsDir + + CFLAGS=-O2 CXXFLAGS=-O2 runConfigure "$sourceDir/configure" \ + --exec-prefix=$installDir \ + --includedir=$includeDir/binutils \ + --docdir=$docDir \ + --disable-nls --enable-shared=yes \ + --with-sysroot=/ + # Note: The sysroot option is normally superfluous. We have to specify + # it, however, since these binutils may be used by the bootstrap-gcc, + # which passes --sysroot= to ld. + + make $jobArgs LEXLIB= +} + +INSTALL() +{ + cd $objectsDir + + make install + make install-html + + # Remove the development libraries and headers. Nobody uses those anyway. + rm $libDir/*.a $libDir/*.la $libDir/libbfd.so $libDir/libopcodes.so + rm -r $developDir/headers + + ### HTML documentation #################################### + + echo "Organizing HTML documentation..." + cd $docDir + + # beautify HTML docs and remove stuff we don't need + mv as.html as + ln -sf as/index.html as.html + mv bfd.html bfd + ln -sf bfd/index.html bfd.html + mv binutils.html binutils + ln -sf binutils/index.html binutils.html + mv gprof.html gprof + ln -sf gprof/index.html gprof.html + mv ld.html ld + ln -sf ld/index.html ld.html + rm libiberty.html standards.html + + # no info documentation + rm -r $infoDir + + ### Strip ################################################# + + echo "Strip debug info" + + strip --strip-debug $binDir/* + + ### Symlinks ############################################## + + echo "Creating required symlinks" + + # There are copies of a subset of the commands below installDir. We + # overwrite those with symlinks to the ones in binDir. + for file in $installDir/$effectiveTargetMachineTriple/bin/*; do + symlinkRelative -sfn $binDir/$(basename $file) $file + done + + ### Cleanup ################################################# + + echo "Cleanup" + + # delete man pages for commands that we aren't including + cd $manDir + for cmd in dlltool nlmconv windmc windres; do + rm -f man1/$cmd.1 + done +} + +DESCRIPTION=" +The GNU Binutils are a collection of binary tools. The main ones are: +- ld - the GNU linker. +- as - the GNU assembler. +But they also include: +- addr2line - Converts addresses into filenames and line numbers. +- ar - A utility for creating, modifying and extracting from archives. +- c++filt - Filter to demangle encoded C++ symbols. +- nm - Lists symbols from object files. +- objcopy - Copys and translates object files. +- objdump - Displays information from object files. +- ranlib - Generates an index to the contents of an archive. +- readelf - Displays information from any ELF format object file. +- size - Lists the section sizes of an object or archive file. +- strings - Lists printable strings from files. +- strip - Discards symbols. +The tools of this package can be used for cross-builds to \ +$effectiveTargetMachineTriple. +" From 980e58537ba1de4f51e9fc3dd8d235c2fc375148 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 28 Dec 2014 09:52:51 +0000 Subject: [PATCH 165/326] binutils: fix checksum and install section. --- sys-devel/binutils/binutils-2.25_2014_12_27.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe index 19e9ecb0e..b04fde642 100644 --- a/sys-devel/binutils/binutils-2.25_2014_12_27.recipe +++ b/sys-devel/binutils/binutils-2.25_2014_12_27.recipe @@ -3,7 +3,7 @@ HOMEPAGE="http://www.gnu.org/software/binutils" srcGitRev="a05bd9155a41ad87382134678e93d67ceb959cfc" SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6" +CHECKSUM_SHA256="011e60e9ba3ce92af766adc222d55a6f7291991a85074e2b5b280b62317b201d" SRC_FILENAME="binutils-$portVersion.tar.gz" REVISION="1" LICENSE=" @@ -124,7 +124,7 @@ INSTALL() ln -sf gprof/index.html gprof.html mv ld.html ld ln -sf ld/index.html ld.html - rm libiberty.html standards.html + rm libiberty.html # no info documentation rm -r $infoDir From 663441f82df38249275271e8e855262ea73d7972 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 27 Dec 2014 10:50:33 +0100 Subject: [PATCH 166/326] sdl2_mixer: build fix. --- media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe index d9b1deb77..c30705f73 100644 --- a/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe +++ b/media-libs/sdl2_mixer/sdl2_mixer-2.0.0.recipe @@ -28,6 +28,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix # No clue, it wants it + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix lib:libSDL2_2.0$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix @@ -39,8 +41,8 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libsdl$secondaryArchSuffix devel:libsdl2$secondaryArchSuffix + devel:libGL$secondaryArchSuffix # Needed by SDL2, not transitive... devel:libogg$secondaryArchSuffix devel:libflac$secondaryArchSuffix devel:libfluidsynth$secondaryArchSuffix From 4ac3c394ebccc20bb07cbf67f67a934b5e8ff058 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 28 Dec 2014 11:59:54 +0100 Subject: [PATCH 167/326] llvm: fix policy warnings * Move cmake files to data/llvm * Add missing cmd: entries. --- sys-devel/llvm/llvm-3.5.0.recipe | 3 + sys-devel/llvm/patches/llvm-3.5.0.patchset | 70 ++++++++++++++++++---- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe index 84e25e69c..b47d34e70 100644 --- a/sys-devel/llvm/llvm-3.5.0.recipe +++ b/sys-devel/llvm/llvm-3.5.0.recipe @@ -45,6 +45,9 @@ PROVIDES=" cmd:llvm_tblgen cmd:macho_dump cmd:opt + cmd:FileCheck + cmd:count + cmd:not lib:BugpointPasses$secondaryArchSuffix lib:LLVMHello$secondaryArchSuffix lib:libLTO$secondaryArchSuffix diff --git a/sys-devel/llvm/patches/llvm-3.5.0.patchset b/sys-devel/llvm/patches/llvm-3.5.0.patchset index b73c6ab55..1880876e5 100644 --- a/sys-devel/llvm/patches/llvm-3.5.0.patchset +++ b/sys-devel/llvm/patches/llvm-3.5.0.patchset @@ -1,11 +1,8 @@ -From ea9fabb4c279b2d94e54e6a416d8c1d971cc2383 Mon Sep 17 00:00:00 2001 +From 2ffaad9e30a03b5688307fa31ab1a43a23013325 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 22 Jan 2014 05:04:31 +0000 -Subject: [PATCH 1/2] haiku: fix Host.h for endian.h +Subject: haiku: fix Host.h for endian.h ---- - include/llvm/Support/Host.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h index 8f4bf3c..8114f9b 100644 @@ -23,17 +20,12 @@ index 8f4bf3c..8114f9b 100644 -- 1.8.3.4 -From 568aa3d732e8482db2797470235f363077ab2900 Mon Sep 17 00:00:00 2001 + +From 346e9d142e5d8d34bd05e6f51b75f562df1269e3 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 9 Dec 2014 01:20:26 +0000 -Subject: [PATCH 2/2] LLVM: Update autoconf for Haiku x86_64 support +Subject: LLVM: Update autoconf for Haiku x86_64 support ---- - autoconf/config.guess | 371 ++++++++++++++++++-------------------------------- - autoconf/config.sub | 165 +++++++++++++--------- - 2 files changed, 235 insertions(+), 301 deletions(-) - mode change 100755 => 100644 autoconf/config.guess - mode change 100755 => 100644 autoconf/config.sub diff --git a/autoconf/config.guess b/autoconf/config.guess old mode 100755 @@ -1038,3 +1030,55 @@ index a8d8528..7ffe373 -- 1.8.3.4 + +From cfbee5322c336f241ec9dfac456e77e4e71a0478 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sat, 27 Dec 2014 15:47:00 +0100 +Subject: Fix datadir for Haiku. + +Hardcoded to share... + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index c87193d..925c6e1 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -1,4 +1,4 @@ +-set(LLVM_INSTALL_PACKAGE_DIR share/llvm/cmake) ++set(LLVM_INSTALL_PACKAGE_DIR data/llvm/cmake) + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + get_property(LLVM_EXPORTS GLOBAL PROPERTY LLVM_EXPORTS) +diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile +index ba45f17..615a19a 100644 +--- a/cmake/modules/Makefile ++++ b/cmake/modules/Makefile +@@ -13,7 +13,7 @@ LINK_COMPONENTS := all + + include $(LEVEL)/Makefile.common + +-PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/share/llvm/cmake ++PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/data/llvm/cmake + + ifeq ($(DISABLE_ASSERTIONS),1) + LLVM_ENABLE_ASSERTIONS := 0 +diff --git a/configure b/configure +index c11c395..b83ff65 100755 +--- a/configure ++++ b/configure +@@ -18539,10 +18539,10 @@ if test "${prefix}" = "NONE" ; then + fi + eval LLVM_PREFIX="${prefix}"; + eval LLVM_BINDIR="${prefix}/bin"; +-eval LLVM_DATADIR="${prefix}/share/llvm"; +-eval LLVM_DOCSDIR="${prefix}/share/doc/llvm"; ++eval LLVM_DATADIR="${prefix}/data/llvm"; ++eval LLVM_DOCSDIR="${prefix}/data/doc/llvm"; + eval LLVM_ETCDIR="${prefix}/etc/llvm"; +-eval LLVM_INCLUDEDIR="${prefix}/include"; ++eval LLVM_INCLUDEDIR="${prefix}/devlop/headers"; + eval LLVM_INFODIR="${prefix}/info"; + eval LLVM_MANDIR="${prefix}/man"; + LLVM_CONFIGTIME=`date` +-- +1.8.3.4 + From 4a1cf034662a99c2cadb57bd9362b4e0eec822b8 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sun, 28 Dec 2014 16:13:53 +0300 Subject: [PATCH 168/326] findutils: add missing requires --- sys-apps/findutils/findutils-4.4.2.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe index b8c77f540..552bb1bac 100644 --- a/sys-apps/findutils/findutils-4.4.2.recipe +++ b/sys-apps/findutils/findutils-4.4.2.recipe @@ -14,7 +14,7 @@ COPYRIGHT="1994-2011 Free Software Foundation, Inc." LICENSE="GNU GPL v3" SRC_URI="http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz" CHECKSUM_SHA256="434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PROVIDES=" @@ -26,6 +26,10 @@ PROVIDES=" " REQUIRES=" haiku + cmd:awk + cmd:sed + cmd:sort + cmd:tr " BUILD_PREREQUIRES=" haiku_devel From 6375af8cfbf47edc5687cb23284059bc5fe20fa2 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 21 Dec 2014 22:03:22 +0200 Subject: [PATCH 169/326] Fix Deskbar symlink to plee-the-bear --- .../patches/plee_the_bear-0.7.0.patchset | 18 ++++++++++++------ .../plee_the_bear/plee_the_bear-0.7.0.recipe | 6 +++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset index c121a7061..dd33cee14 100644 --- a/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset +++ b/games-arcade/plee_the_bear/patches/plee_the_bear-0.7.0.patchset @@ -76,7 +76,7 @@ index 9ed5d32..ff88206 100644 -- 1.8.3.4 -From c929f602fb74adcdf495e144b66f4981c0655ba5 Mon Sep 17 00:00:00 2001 +From d04f6bda69bbf66b5aa9e3dd8e06c0b6f487bc0f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 6 Apr 2014 19:41:58 +0200 Subject: [PATCH 3/4] Fix install directories. @@ -84,8 +84,8 @@ Subject: [PATCH 3/4] Fix install directories. --- bear/cmake-helper/bear-config.cmake | 2 +- bear/cmake-module/CMakeLists.txt | 2 +- - plee-the-bear/CMakeLists.txt | 6 +++--- - 3 files changed, 5 insertions(+), 5 deletions(-) + plee-the-bear/CMakeLists.txt | 8 ++++---- + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bear/cmake-helper/bear-config.cmake b/bear/cmake-helper/bear-config.cmake index e66d79e..b483445 100644 @@ -114,10 +114,10 @@ index e182689..24c2113 100644 set( BEAR_CMAKE_MODULES diff --git a/plee-the-bear/CMakeLists.txt b/plee-the-bear/CMakeLists.txt -index 6a123d9..c3dbb90 100644 +index 6a123d9..3d81af2 100644 --- a/plee-the-bear/CMakeLists.txt +++ b/plee-the-bear/CMakeLists.txt -@@ -23,7 +23,7 @@ include( docbook-to-man ) +@@ -23,12 +23,12 @@ include( docbook-to-man ) #------------------------------------------------------------------------------- # where the game resources are installed if( NOT PTB_INSTALL_DATA_DIR ) @@ -126,6 +126,12 @@ index 6a123d9..c3dbb90 100644 endif( NOT PTB_INSTALL_DATA_DIR ) # where the game executables are installed + if( NOT PTB_INSTALL_EXECUTABLE_DIR ) +- set( PTB_INSTALL_EXECUTABLE_DIR bin ) ++ set( PTB_INSTALL_EXECUTABLE_DIR bin${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} ) + endif( NOT PTB_INSTALL_EXECUTABLE_DIR ) + + # where the game libraries (the items) are installed @@ -38,7 +38,7 @@ if( NOT PTB_INSTALL_CUSTOM_LIBRARY_DIR ) "${PTB_INSTALL_EXECUTABLE_DIR}" ) @@ -147,7 +153,7 @@ index 6a123d9..c3dbb90 100644 -- 1.8.3.4 -From 34aca4d0b287e50d35957badf3e72060264f7a45 Mon Sep 17 00:00:00 2001 +From c842dde59df8ca44ecf4e318e8641bcc335e1ec5 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 24 Dec 2014 23:53:14 +0200 Subject: [PATCH 4/4] Change settings location on Haiku diff --git a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe index a9f89c7ca..f6de5b3fa 100644 --- a/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe +++ b/games-arcade/plee_the_bear/plee_the_bear-0.7.0.recipe @@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PROVIDES=" plee_the_bear = $portVersion - cmd:plee_the_bear = $portVersion - lib:libplee_the_bear$secondaryArchSuffix + cmd:plee_the_bear$secondaryArchSuffix = $portVersion + lib:libplee_the_bear$secondaryArchSuffix = $portVersion lib:libbear_audio$secondaryArchSuffix lib:libbear_communication$secondaryArchSuffix lib:libbear_debug$secondaryArchSuffix @@ -91,7 +91,7 @@ INSTALL() make install rm -r $prefix/share - addAppDeskbarSymlink $binDir/plee_the_bear "Plee the Bear" + addAppDeskbarSymlink $binDir/plee-the-bear "Plee the Bear" } # ----- DESCRIPTION ----------------------------------------------------------- From 875da08305ea68d9eeb366e3e6d193dcb5dc6523 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 29 Dec 2014 13:49:25 +0000 Subject: [PATCH 170/326] libsolv: patch is now applied on Haiku's libsolv repository. --- .../libsolv-0.3.0_haiku_2014_12_22.recipe | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe new file mode 100644 index 000000000..10f151ef1 --- /dev/null +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2014_12_22.recipe @@ -0,0 +1,86 @@ +SUMMARY="A library for solving packages and reading repositories" +DESCRIPTION="A Library for solving packages and reading repositories." +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013, Novell Inc." +HOMEPAGE="http://github.com/openSUSE/libsolv" +srcGitRev="da2650933f85f5a30d8146bfb22af53d2620d0c7" +SRC_URI="https://github.com/weinhold/libsolv/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="79aa7772bfe403f003e8063480ddc3d4f491b3f5d7b8cace610605fba3318150" +SRC_FILENAME="$portVersionedName.tar.gz" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64 ppc arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libsolv$secondaryArchSuffix = $portVersion + lib:libsolv$secondaryArchSuffix = $portVersion + lib:libsolvext$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libexpat$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libexpat$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + +SOURCE_DIR="libsolv-$srcGitRev" + +PATCH() +{ + sed -i 's,${CMAKE_INSTALL_PREFIX}/bin',$binDir, CMakeLists.txt + sed -i 's,${CMAKE_INSTALL_PREFIX}/include',$includeDir, \ + src/CMakeLists.txt ext/CMakeLists.txt +} + +BUILD() +{ + rm -rf build + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -DLIB=$relativeLibDir .. + make $jobArgs +} + +INSTALL() +{ + cd build + make install + + # set up the develop directory correctly + prepareInstalledDevelLibs libsolv libsolvext + + # move cmake files + mkdir -p $dataDir + mv $prefix/share/cmake $dataDir + rmdir $prefix/share + + # We don't want the executables. + rm -r $prefix/bin + + # devel package + packageEntries devel \ + $dataDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libsolv${secondaryArchSuffix}_devel = $portVersion + devel:libsolv${secondaryArchSuffix} = $portVersion + devel:libsolvext${secondaryArchSuffix} = $portVersion + " +REQUIRES_devel=" + libsolv${secondaryArchSuffix} == $portVersion base + " From f3a981550b001c9f115cd9e00333c622e4a66603 Mon Sep 17 00:00:00 2001 From: DarkmatterVale Date: Mon, 29 Dec 2014 18:09:32 +0000 Subject: [PATCH 171/326] Added SimplyVorbis --- haiku-apps/simplyvorbis/licenses/SimplyVorbis | 3 ++ .../simplyvorbis/simplyvorbis-0.1.recipe | 53 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 haiku-apps/simplyvorbis/licenses/SimplyVorbis create mode 100644 haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe diff --git a/haiku-apps/simplyvorbis/licenses/SimplyVorbis b/haiku-apps/simplyvorbis/licenses/SimplyVorbis new file mode 100644 index 000000000..17c0271ba --- /dev/null +++ b/haiku-apps/simplyvorbis/licenses/SimplyVorbis @@ -0,0 +1,3 @@ +Like most other software I have written, SimplyVorbis is released under a license where you can do just about anything you like with it +except say that you wrote the code in it, and I feel that anyone who wants to use SimplyVorbis as the basis for a commercial app should +not have to concern themselves with licensing issues. \ No newline at end of file diff --git a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe new file mode 100644 index 000000000..8b5fe4b83 --- /dev/null +++ b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe @@ -0,0 +1,53 @@ +SUMMARY="A program to rip CDs into digital music files" +DESCRIPTION="MP3 or Ogg Vorbis. Designed with ease-of-use as being priority one, \ +it is simple, effective, and lets you get on to bigger and better things, like \ +listening to your to music. SimplyVorbis is not for the audiophile and probably \ +not for the hardcore geek; it is for the rest of us, people who don't want to be \ +hassled with technical details, who just want to turn CDs into music files to \ +listen to while we work at the keyboard or take with us on an iPod and want to have \ +all the BeOS goodness of attributes without having to resort to something like \ +ArmyKnife (which does have its uses). Pop in a CD, select the songs you want, and \ +hit 'Go'. Period. It can even make playlists for you if you like. Your music isn't \ +limited by copy protection (DRM) either, so you can have all the flexibility of Fair Use." +HOMEPAGE="https://github.com/HaikuArchives/SimplyVorbis" +SRC_URI="git+https://github.com/HaikuArchives/SimplyVorbis.git#63290af1f2cda8e5e31393780ee96a16132b4dba" +CHECKSUM_SHA256="" +LICENSE="SimplyVorbis" +COPYRIGHT="2007 Darkwyrm" +REVISION="1" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + app:SimplyVorbis = $portVersion + " + +REQUIRES=" + haiku + lib:libogg + lib:libvorbis + lib:libvorbisenc + " + +BUILD_REQUIRES=" + haiku_devel + makefile_engine + devel:libogg + devel:libvorbis + devel:libvorbisenc + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:g++ + " + +BUILD() +{ + make +} + +INSTALL() +{ + make install +} \ No newline at end of file From a776592824cec53fcfcb647614d7dbcfe31ceb70 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 27 Dec 2014 12:51:28 -0800 Subject: [PATCH 172/326] speech_tools: Various improvements - Fix gcc_syslibs dep on secondary architectures - Remove -lstdc++ from linking commands - Fix provide of devel package - Make the devel package depend on devel:libncurses - Install headers to speech_tools directory inside $includeDir - Work around Festival's broken build system by symlinking configuration files and makefile rules - Remove unneeded dependency on makefile_engine --- .../patches/speech_tools-2.4.patchset | 38 +++++++++++++++++++ .../speech_tools/speech_tools-2.4.recipe | 30 ++++++++++++--- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset index ed06dd054..0f31a31a8 100644 --- a/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset +++ b/app-accessibility/speech_tools/patches/speech_tools-2.4.patchset @@ -2975,3 +2975,41 @@ index 71b271c..b7ac4a1 100644 -- 1.8.3.4 +From d1dec5aa5d0de6e3f83fcf1ad07b2486a5f62e63 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:17:23 -0800 +Subject: Remove -lstdc++ from linking command + + +diff --git a/config/compilers/gcc32.mak b/config/compilers/gcc32.mak +index 9703a3e..43fea62 100644 +--- a/config/compilers/gcc32.mak ++++ b/config/compilers/gcc32.mak +@@ -56,7 +56,7 @@ STATIC_LINKFLAGS = -Dstatic + MAKE_DEPEND_C = $(CC) -MM $(INCLUDES) $(TEMPLATES) $(TEMPLATE_SPECIFIC) + MAKE_DEPEND_CXX = $(CC) -MM $(INCLUDES) $(WARN_CXXFLAGS) $(TEMPLATES) $(TEMPLATE_SPECIFIC) + +-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ ++COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) + + + +diff --git a/config/compilers/gcc_defaults.mak b/config/compilers/gcc_defaults.mak +index befcd31..0be771d 100644 +--- a/config/compilers/gcc_defaults.mak ++++ b/config/compilers/gcc_defaults.mak +@@ -96,10 +96,7 @@ STATIC_LINKFLAGS = -static + TEMPLATE_SPECIFIC = -DINSTANTIATE_TEMPLATES + TEMPLATE_ARGS = + +-## The -lgcc here is redundant - gcc does this anyway - but it +-## helps java know what needs to be loaded. +- +-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ ++COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) + + ## special ways of doing things, blank means default + +-- +1.8.3.4 + diff --git a/app-accessibility/speech_tools/speech_tools-2.4.recipe b/app-accessibility/speech_tools/speech_tools-2.4.recipe index 7c644a8f0..1998e6c26 100644 --- a/app-accessibility/speech_tools/speech_tools-2.4.recipe +++ b/app-accessibility/speech_tools/speech_tools-2.4.recipe @@ -10,7 +10,7 @@ HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/" SRC_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz" CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010" SOURCE_DIR="speech_tools" -REVISION="1" +REVISION="2" # Although individually many files have different licenses, as a whole this # license covers all the files. @@ -45,7 +45,7 @@ PROVIDES=" lib:libeststring$secondaryArchSuffix = $portVersion compat >= 2 " PROVIDES_devel=" - flite${secondaryArchSuffix}_devel = $portVersion + speech_tools${secondaryArchSuffix}_devel = $portVersion devel:libestbase$secondaryArchSuffix = $portVersion compat >= 2 devel:libestools$secondaryArchSuffix = $portVersion compat >= 2 devel:libeststring$secondaryArchSuffix = $portVersion compat >= 2 @@ -63,7 +63,7 @@ SCRIPTS=" resynth " PROVIDES_tools=" - speech_tools_tools = $portVersion + speech_tools${secondaryArchSuffix}_tools = $portVersion cmd:simple_pitchmark = $portVersion " for p in $PROGS $SCRIPTS; do @@ -74,26 +74,28 @@ for p in $PROGS $SCRIPTS; do done REQUIRES=" haiku$secondaryArchSuffix - gcc${secondaryArchSuffix}_syslibs + lib:libgcc_s$secondaryArchSuffix lib:libncurses$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " REQUIRES_devel=" haiku${secondaryArchSuffix}_devel speech_tools$secondaryArchSuffix == $portVersion base + devel:libncurses$secondaryArchSuffix " REQUIRES_tools=" haiku$secondaryArchSuffix - gcc${secondaryArchSuffix}_syslibs speech_tools$secondaryArchSuffix == $portVersion base cmd:perl + lib:libgcc_s$secondaryArchSuffix lib:libncurses$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " BUILD_PREREQUIRES=" - makefile_engine cmd:awk cmd:find cmd:gcc$secondaryArchSuffix @@ -130,6 +132,7 @@ INSTALL() cp lib/*.a lib/*.so lib/*.so.* $libDir # Installs possibly internal headers as well, as debian installs them + includeDir=$includeDir/speech_tools mkdir -p $includeDir/ cp -a include/* $includeDir/ rm -rf $includeDir/Makefile \ @@ -139,10 +142,25 @@ INSTALL() mkdir -p $includeDir/base_class/ cp -a base_class/*.cc $includeDir/base_class/ + # Install configurations as festival need them. Yes it's ugly but it's + # the only way to do it. (Debian does this too.) + privDir=$developLibDir/$portName + mkdir -p $privDir/lib/siod + cp -a make.include config $privDir + cp -a lib/siod/*.scm $privDir/lib/siod + prepareInstalledDevelLibs \ libestbase \ libestools \ libeststring + + # Evil linking for Festival + for i in $developLibDir/libest*.a \ + $developLibDir/libest*.so; do + ln -s "$i" "$privDir/lib/`basename $i`" + done + ln -s "$includeDir" "$privDir/include" + packageEntries devel \ $developDir packageEntries tools \ From 26451775eeb4188ce80ef301cddd22d3defd1fe6 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 27 Dec 2014 13:17:59 -0800 Subject: [PATCH 173/326] Add festival port --- .../festival/festival-2.4.recipe | 119 ++ app-accessibility/festival/licenses/Festival | 113 ++ .../festival/patches/festival-2.4.patchset | 1148 +++++++++++++++++ 3 files changed, 1380 insertions(+) create mode 100644 app-accessibility/festival/festival-2.4.recipe create mode 100644 app-accessibility/festival/licenses/Festival create mode 100644 app-accessibility/festival/patches/festival-2.4.patchset diff --git a/app-accessibility/festival/festival-2.4.recipe b/app-accessibility/festival/festival-2.4.recipe new file mode 100644 index 000000000..6b6a9b346 --- /dev/null +++ b/app-accessibility/festival/festival-2.4.recipe @@ -0,0 +1,119 @@ +SUMMARY="Text-to-speech engine" +DESCRIPTION="Festival is a text-to-speech engine co-developed by the \ +University of Edinburgh, UK, and Carnegie Mellon University. It is designed to \ +support multiple languages and to be easy to extend, both in terms of voices \ +and new languages." +HOMEPAGE="http://www.cstr.ed.ac.uk/projects/festival" +SRC_URI=" + http://festvox.org/packed/festival/$portVersion/festival-${portVersion}-release.tar.gz + " +CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84" +SOURCE_DIR="festival" +REVISION="1" + +# Only including the licenses that cover the files that are actually used +# and/or installed +LICENSE=" + Festival + " +COPYRIGHT=" + 1996 Alan W. Black + 1996-2004 University of Edinburgh, UK + 1997 Jacques H. de Villiers + 1997 Kevin A. Lenzo + 1997 Center for Spoken Language Understanding, Oregon Graduate \ + Institute of Science & Technology + 1999-2004 Language Technologies Institute, Carnegie Mellon University + 2001-2008 Tokyo Institute of Technology + 2001-2012 Nagoya Institute of Technology + 2012 The Department of Arts and Culture, The Government of the \ + Republic of South Africa + " + +ARCHITECTURES="x86_gcc2 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 !x86_gcc2" + +PROVIDES=" + festival$secondaryArchSuffix = $portVersion + cmd:festival = $portVersion + cmd:festival_client = $portVersion + cmd:text2wave = $portVersion + " +PROVIDES_devel=" + festival${secondaryArchSuffix}_devel = $portVersion + devel:libFestival$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + speech_tools$secondaryArchSuffix >= 2.4 + lib:libgcc_s$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + festival$secondaryArchSuffix == $portVersion base + speech_tools${secondaryArchSuffix}_devel >= 2.4 + devel:libncurses$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + speech_tools${secondaryArchSuffix}_devel >= 2.4 + devel:libncurses$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:awk + cmd:find + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:mkdepend + " + +PATCHES="festival-${portVersion}.patchset" + +BUILD() +{ + binDir=$prefix/bin + export binDir \ + portPackageLinksDir \ + relativeDevelopLibDir \ + secondaryArchSuffix + for f in lib/festival.scm \ + lib/lexicons.scm \ + lib/voices.scm \ + src/arch/festival/festival.cc + do + sed -e "s,@DOCDIR@,$docDir,g" \ + -e "s,@DATADIR@,$dataDir/festival,g" \ + -e "s,@LIBDIR@,$libDir/festival,g" \ + ${f}.in > ${f} + done + + make +} + +INSTALL() +{ + mkdir -p \ + $developLibDir \ + $prefix/bin \ + $dataDir/festival \ + $manDir/man1 \ + $docDir/examples + cp -a src/lib/libFestival.a $developLibDir + cp -a src/main/festival $prefix/bin + cp -a src/main/festival_client $prefix/bin + cp -a examples/text2wave $prefix/bin + cp -a lib/* $dataDir/festival + cp -a doc/*.1 $manDir/man1 + cp -a examples/*intro.text $docDir/examples + packageEntries devel \ + $developDir +} diff --git a/app-accessibility/festival/licenses/Festival b/app-accessibility/festival/licenses/Festival new file mode 100644 index 000000000..ff734e38a --- /dev/null +++ b/app-accessibility/festival/licenses/Festival @@ -0,0 +1,113 @@ +The system as a whole and most of the files in it are distributed +under the following copyright and conditions + + The Festival Speech Synthesis System + Centre for Speech Technology Research + University of Edinburgh, UK + Copyright (c) 1996-2014 + All Rights Reserved. + + Permission is hereby granted, free of charge, to use and distribute + this software and its documentation without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of this work, and to + permit persons to whom this work is furnished to do so, subject to + the following conditions: + 1. The code must retain the above copyright notice, this list of + conditions and the following disclaimer. + 2. Any modifications must be clearly marked as such. + 3. Original authors' names are not deleted. + 4. The authors' names are not used to endorse or promote products + derived from this software without specific prior written + permission. + + THE UNIVERSITY OF EDINBURGH AND THE CONTRIBUTORS TO THIS WORK + DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + SHALL THE UNIVERSITY OF EDINBURGH NOR THE CONTRIBUTORS BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + +Some further comments: + +Every effort has been made to ensure that Festival does not contain +any violation of intellectual property rights through disclosure of +trade secrets, copyright or patent violation. Considerable time and +effort has been spent to ensure that this is the case. However, +especially with patent problems, it is not always within our control +to know what has or has not been restricted. If you do suspect that +some part of Festival cannot be legally distributed please inform us +so that an alternative may be sought. Festival is only useful if it +is truly free to distribute. + +As of 1.4.0 the core distribution (and speech tools) is free. Unlike +previous versions which had a commercial restriction. You are free to +incorporate Festival in commercial (and of course non-commercial +systems), without any further communication or licence from us. +However if you are seriously using Festival within a commercial +application we would like to know, both so we know we are contributing +and so we can keep you informed of future developments. Also if you +require maintenance, support or wish us to provide consultancy feel +free to contact us. + +The voices however aren't all free. At present the US voices, kal and +ked are free. Our British voices are free themselves but they use OALD +which is restricted for non-commercial use. Our Spanish voice is also +so restricted. + +Note other modules that festival supports e.g MBROLA and OGI +extensions, may have different licencing please take care when using +the system to understand what you are actually using. + +-------------------------------------------------- + +A number of individual files in the system fall under a different +copyright from the above. All however are termed "free software" +but most people. + +./src/arch/festival/tcl.c + * Copyright (C)1997 Jacques H. de Villiers + * Copyright (C)1997 Center for Spoken Language Understanding, + * Oregon Graduate Institute of Science & Technology + See conditions in file. This is the standard TCL licence and hence + shouldn't cause problems from most people. + +./examples/festival_client.pl +# Copyright (C) 1997 +# Kevin A. Lenzo (lenzo@cs.cmu.edu) 7/97 + See condition in file + +./src/modules/clunits/* +./lib/*clunits* + Joint copyright University of Edinburgh and Carnegie Mellon University + Conditions remain as free software like the rest of distribution + +./src/modules/clustergen/* + Copyright Carnegie Mellon University + Nagoya Insitute of Technology (derived code from HTS) + HTS_vocoder_me.c HTS_vocoder_me.h + contains additions from Aby Louw + Copyright (c) 2012 The Department of Arts and Culture, + The Government of the Republic of South Africa. + under a free software licence compatible with the other + free software copyrights in this work + +./src/modules/hts_engine/* +./lib/hts.scm + The HMM-based speech synthesis system (HTS) + hts_engine API version 1.07 (http://hts-engine.sourceforge.net/) + Copyright (C) 2001-2012 Nagoya Institute of Technology + 2001-2008 Tokyo Institute of Technology + All rights reserved. + distributed under the Modified BSD licence. + +./lib/festival.el +;;; Copyright (C) Alan W Black 1996 +copyright under FSF General Public Licence + +Please also read the COPYING section of speech_tools/README for the +conditions on those files. + diff --git a/app-accessibility/festival/patches/festival-2.4.patchset b/app-accessibility/festival/patches/festival-2.4.patchset new file mode 100644 index 000000000..9dd69ea32 --- /dev/null +++ b/app-accessibility/festival/patches/festival-2.4.patchset @@ -0,0 +1,1148 @@ +From 3c12f4ea6c71f2775b73aa83edce01563b788fa6 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:20:33 -0800 +Subject: Fix include of base_class files + + +diff --git a/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc b/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc +index 1c4d1e5..54d3b77 100644 +--- a/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/hash_itemp_tcdatap_t.cc +@@ -50,7 +50,7 @@ template <> TCData* EST_THash< EST_Item*, TCData* >::Dummy_Value=0; + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_THash.cc" ++#include "base_class/EST_THash.cc" + + Instantiate_THash_T(EST_Item*, TCData*, TCDataP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc b/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc +index b2a443a..036806e 100644 +--- a/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/hash_s_itemlistp_t.cc +@@ -51,7 +51,7 @@ template <> ItemList* EST_THash< EST_String, ItemList* >::Dummy_Value=0; + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_THash.cc" ++#include "base_class/EST_THash.cc" + + Instantiate_TStringHash_T(ItemList *, ItemListP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc b/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc +index 45f6f18..78c513d 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_itemp_t.cc +@@ -51,8 +51,8 @@ Declare_TList_T(EST_Item *, EST_ItemP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + + Instantiate_TList_T(EST_Item *, EST_ItemP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc b/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc +index b03fe22..1207bd4 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_scorepair_t.cc +@@ -45,8 +45,8 @@ Declare_TList(ScorePair) + Declare_TSortable(ScorePair) + + #if defined(INSTANTIATE_TEMPLATES) +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + Instantiate_TList(ScorePair); + Instantiate_TSortable(ScorePair); + #endif +diff --git a/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc b/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc +index 5ccf452..0760b64 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_strlist_t.cc +@@ -46,6 +46,6 @@ + Declare_TList_T(EST_TList,STR_LIST) + + #if defined(INSTANTIATE_TEMPLATES) +-#include "../base_class/EST_TList.cc" ++#include "base_class/EST_TList.cc" + Instantiate_TList_T(EST_StrList,STR_LIST); + #endif +diff --git a/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc b/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc +index f0fbb8a..d1c0409 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_uttp_t.cc +@@ -51,8 +51,8 @@ Declare_TList_T(EST_Utterance *, EST_UtteranceP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + + Instantiate_TList_T_MIN(EST_Utterance *, EST_UtteranceP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc b/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc +index 6258004..4eca26b 100644 +--- a/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/list_voicemodulep_t.cc +@@ -50,8 +50,8 @@ Declare_TList_T(DiphoneVoiceModule *, DiphoneVoiceModuleP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TList.cc" +-#include "../base_class/EST_TSortable.cc" ++#include "base_class/EST_TList.cc" ++#include "base_class/EST_TSortable.cc" + + Instantiate_TList_T_MIN(DiphoneVoiceModule *, DiphoneVoiceModuleP) + +diff --git a/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc b/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc +index b243b5b..0915ebc 100644 +--- a/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc ++++ b/src/modules/MultiSyn/inst_tmpl/vector_jccp_t.cc +@@ -50,8 +50,8 @@ Declare_TSimpleVector_T(EST_JoinCostCache*,EST_JoinCostCacheP) + + #if defined(INSTANTIATE_TEMPLATES) + +-#include "../base_class/EST_TSimpleVector.cc" +-#include "../base_class/EST_TVector.cc" ++#include "base_class/EST_TSimpleVector.cc" ++#include "base_class/EST_TVector.cc" + + Instantiate_TVector_T_MIN(EST_JoinCostCache*,EST_JoinCostCacheP) + Instantiate_TSimpleVector(EST_JoinCostCache*) +-- +1.8.3.4 + + +From 2edebb55a8e24107e7cdbac69ed8b1212ea6f4be Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:22:17 -0800 +Subject: Adjust server access list for 127.0.0.1 + +Taken from Debian: 03-security-access_list.diff + +Signed-off-by: Timothy Gu + +diff --git a/lib/festival.scm b/lib/festival.scm +index 77b2292..928016d 100644 +--- a/lib/festival.scm ++++ b/lib/festival.scm +@@ -433,7 +433,7 @@ a newline before they can get a connection. It would be normal + to set this for the particular server task. + [see Server/client API]") + +-(defvar server_access_list '(localhost) ++(defvar server_access_list '("127.0.0.1" "localhost\.localdomain" "localhost") + "server_access_list + If non-nil this is the exhaustive list of machines and domains + from which clients may access the server. This is a list of REGEXs +-- +1.8.3.4 + + +From f91d1bbb19479c4f9c4488f245072a4840cbb72a Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:24:06 -0800 +Subject: Add ALAW support + +Backported from Debian: 04-codec-add-alaw.diff + +Signed-off-by: Timothy Gu + +diff --git a/examples/text2wave.sh b/examples/text2wave.sh +index 7f91200..ed0b1da 100755 +--- a/examples/text2wave.sh ++++ b/examples/text2wave.sh +@@ -50,7 +50,7 @@ + Options + -mode Explicit tts mode. + -o ofile File to save waveform (default is stdout). +- -otype Output waveform type: ulaw, snd, aiff, riff, nist etc. ++ -otype Output waveform type: alaw, ulaw, snd, aiff, riff, nist etc. + (default is riff) + -F Output frequency. + -scale Volume factor +diff --git a/src/modules/diphone/di_io.cc b/src/modules/diphone/di_io.cc +index 8b53ccd..5559a1f 100644 +--- a/src/modules/diphone/di_io.cc ++++ b/src/modules/diphone/di_io.cc +@@ -415,6 +415,16 @@ static void load_signal_file(DIPHONE_DATABASE *db, int i, int mode) + ulaw_to_short(ulaw,db->vox[i]->signal,db->vox[i]->nsamples); + wfree(ulaw); + } ++ else if (db->group_encoding == di_alaw) ++ { ++ unsigned char *alaw = ++ walloc(unsigned char,db->vox[i]->nsamples); ++ db->vox[i]->signal = walloc(short,db->vox[i]->nsamples); ++ fseek(db->gfd,db->gsignalbase+(db->offsets[i]),SEEK_SET); ++ fread(alaw,sizeof(unsigned char),db->vox[i]->nsamples,db->gfd); ++ alaw_to_short(alaw,db->vox[i]->signal,db->vox[i]->nsamples); ++ wfree(alaw); ++ } + else + { + cerr << "Diphone: unknown group type" << endl; +@@ -800,8 +810,13 @@ static void di_group_load_signal(DIPHONE_DATABASE *db) + } + else if (db->group_encoding == di_ulaw) + { +- db->allulawsignal = walloc(unsigned char,totsamples); +- fread(db->allulawsignal,sizeof(unsigned char),totsamples,db->gfd); ++ db->allualawsignal = walloc(unsigned char,totsamples); ++ fread(db->allualawsignal,sizeof(unsigned char),totsamples,db->gfd); ++ } ++ else if (db->group_encoding == di_alaw) ++ { ++ db->allualawsignal = walloc(unsigned char,totsamples); ++ fread(db->allualawsignal,sizeof(unsigned char),totsamples,db->gfd); + } + } + else +@@ -821,7 +836,13 @@ static void di_group_load_signal(DIPHONE_DATABASE *db) + else if (db->group_encoding == di_ulaw) + { + db->vox[i]->signal = walloc(short,samp_counts[i]); +- ulaw_to_short(&db->allulawsignal[sample_offset], ++ ulaw_to_short(&db->allualawsignal[sample_offset], ++ db->vox[i]->signal,samp_counts[i]); ++ } ++ else if (db->group_encoding == di_alaw) ++ { ++ db->vox[i]->signal = walloc(short,samp_counts[i]); ++ alaw_to_short(&db->allualawsignal[sample_offset], + db->vox[i]->signal,samp_counts[i]); + } + else +@@ -838,7 +859,7 @@ static void di_group_load_signal(DIPHONE_DATABASE *db) + sample_offset += samp_counts[i]; + } + if (db->sig_access_type != di_direct) +- if (db->group_encoding == di_ulaw) ++ if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) + fseek(db->gfd,(long)sample_offset,SEEK_CUR); + else + fseek(db->gfd,(long)sample_offset*sizeof(short),SEEK_CUR); +@@ -867,7 +888,7 @@ static void di_group_load_lpc_params(DIPHONE_DATABASE *db) + if (db->swap) + swap_bytes_float(db->allframes,totframes*db->lpc_order); + } +- else if (db->group_encoding == di_ulaw) // its as shorts ++ else if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) // its as shorts + { + db->allframesshort = walloc(short,totframes*db->lpc_order); + fread(db->allframesshort,sizeof(short), +@@ -885,7 +906,7 @@ static void di_group_load_lpc_params(DIPHONE_DATABASE *db) + for (j=0;jlpc[i]->nframes;j++) + db->lpc[i]->f[j] = + &db->allframes[(frame_offset+j)*db->lpc_order]; +- else if (db->group_encoding == di_ulaw) ++ else if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) + { + int fixedpoint = FALSE; + if (siod_get_lval("lpc_fixedpoint",NULL) != NIL) +@@ -1031,6 +1052,13 @@ void di_save_grouped_db(const EST_Pathname &filename, DIPHONE_DATABASE *db) + fwrite(ulaw,sizeof(unsigned char),db->vox[i]->nsamples,fd); + wfree(ulaw); + } ++ else if (db->group_encoding == di_alaw) ++ { ++ unsigned char *alaw = walloc(unsigned char,db->vox[i]->nsamples); ++ short_to_alaw(db->vox[i]->signal,alaw,db->vox[i]->nsamples); ++ fwrite(alaw,sizeof(unsigned char),db->vox[i]->nsamples,fd); ++ wfree(alaw); ++ } + else + { + cerr << "Diphone: unknown group type for dumping" << endl; +@@ -1058,7 +1086,7 @@ void di_save_grouped_db(const EST_Pathname &filename, DIPHONE_DATABASE *db) + for (j=0; jlpc[i]->nframes; j++) + fwrite(db->lpc[i]->f[j],sizeof(float),db->lpc_order,fd); + } +- else if (db->group_encoding == di_ulaw) // saved as shorts ++ else if (db->group_encoding == di_ulaw || db->group_encoding == di_alaw) // saved as shorts + { + short *sh = new short[db->lpc_order]; + +diff --git a/src/modules/diphone/diphone.cc b/src/modules/diphone/diphone.cc +index f6b6768..0a3ea33 100644 +--- a/src/modules/diphone/diphone.cc ++++ b/src/modules/diphone/diphone.cc +@@ -180,6 +180,8 @@ void di_fixed_parameters(DIPHONE_DATABASE *db,LISP params) + db->group_encoding = di_raw; + else if (streq(db->group_encoding_str,"ulaw")) + db->group_encoding = di_ulaw; ++ else if (streq(db->group_encoding_str,"alaw")) ++ db->group_encoding = di_alaw; + else + { + cerr << "Diphone: unknown group encoding" << endl; +@@ -218,7 +220,7 @@ static void delete_diphone_db(DIPHONE_DATABASE *db) + { + wfree(db->indx[0]->diph); // ptr to the whole diphname table + wfree(db->allsignal); +- wfree(db->allulawsignal); ++ wfree(db->allualawsignal); + wfree(db->allframes); + } + for (i=0; i < db->nindex; i++) +@@ -275,7 +277,7 @@ DIPHONE_DATABASE *make_diphone_db(void) + db->alternates_before = NIL; + db->alternates_after = NIL; + db->allsignal = 0; +- db->allulawsignal = 0; ++ db->allualawsignal = 0; + db->offsets = 0; + db->gfd = 0; + db->default_diphone = 0; +diff --git a/src/modules/diphone/diphone.h b/src/modules/diphone/diphone.h +index 737c9a9..723abdc 100644 +--- a/src/modules/diphone/diphone.h ++++ b/src/modules/diphone/diphone.h +@@ -41,7 +41,7 @@ + + enum di_sigaccess_t {di_direct, di_dynamic, di_ondemand}; + enum di_db_type_t {di_pcm, di_lpc}; +-enum di_group_encode_t {di_raw, di_ulaw }; ++enum di_group_encode_t {di_raw, di_ulaw, di_alaw }; + enum di_group_t {di_grouped, di_ungrouped}; + + typedef struct { +@@ -109,7 +109,7 @@ typedef struct DD_STRUCT { + int lpc_pitch_synch; /* True if lpc frames are pitch synchronous */ + + short *allsignal; /* used in group files */ +- unsigned char *allulawsignal; ++ unsigned char *allualawsignal; + float *allframes; + short *allframesshort; + +diff --git a/src/modules/donovan/t2s.h b/src/modules/donovan/t2s.h +index d870e87..19c5767 100644 +--- a/src/modules/donovan/t2s.h ++++ b/src/modules/donovan/t2s.h +@@ -261,10 +261,6 @@ void tags(CONFIG *config, BUFFER *buffer, LING_LIST *ling_list); + /* transcribe.c */ + void transcribe(CONFIG *config, LING_LIST *ling_list); + +-/* ulaw.c */ +-unsigned char linear2ulaw(int sample); +-int ulaw2linear(unsigned char ulawbyte); +- + /* utils.c */ + char **split(char *in); + void tidy_split(char **root); +-- +1.8.3.4 + + +From 166b48d3baf174d83a2b61f069b85aba2f453f4d Mon Sep 17 00:00:00 2001 +From: Sergio Oller +Date: Fri, 26 Dec 2014 23:25:07 -0800 +Subject: Save waves in parts + +Taken from Debian: 05-performance-combine-waves.diff + +Signed-off-by: Timothy Gu + +diff --git a/examples/text2wave.sh b/examples/text2wave.sh +index ed0b1da..d6af881 100755 +--- a/examples/text2wave.sh ++++ b/examples/text2wave.sh +@@ -63,6 +63,8 @@ + (gc-status nil) + + ;;; Default argument values ++(defvar fp nil) ++(defvar totalnumsamples 0) + (defvar outfile "-") + (defvar output_type 'riff) + (defvar frequency nil) ;; default is no frequency modification +@@ -70,6 +72,7 @@ + (defvar mode nil) + (defvar volume "1.0") + (defvar wavefiles nil) ++(defvar an_utt nil) + + ;;; Get options + (define (get_options) +@@ -127,39 +130,40 @@ + (format stderr "%s: %s\n" "text2wave" message) + (text2wave_help)) + +-(define (save_record_wave utt) ++ ++(define (save_record_wave_fp utt) + "Saves the waveform and records its so it can be joined into a + a single waveform at the end." +- (let ((fn (make_tmp_filename))) +- (utt.save.wave utt fn) +- (set! wavefiles (cons fn wavefiles)) +- utt)) +- +-(define (combine_waves) +- "Join all the waves together into the desired output file +-and delete the intermediate ones." +- (let ((wholeutt (utt.synth (Utterance Text "")))) +- (mapcar +- (lambda (d) +- (utt.import.wave wholeutt d t) +- (delete-file d)) +- (reverse wavefiles)) +- (if frequency +- (utt.wave.resample wholeutt (parse-number frequency))) +- (if (not (equal? volume "1.0")) +- (begin +- (utt.wave.rescale wholeutt (parse-number volume)))) +- (utt.save.wave wholeutt outfile output_type) +- )) ++ (if (eq? totalnumsamples 0) ++ (wave.save.header fp (utt.wave utt) output_type nil ++ (list (list "numsamples" 0))) ++ ) ++ (set! totalnumsamples (+ totalnumsamples ++ (get_param 'num_samples (wave.info (utt.wave utt)) 0) ++ ) ++ ) ++ (if frequency ++ (utt.wave.resample utt (parse-number frequency)) ++ ) ++ (if (not (equal? volume "1.0")) ++ (begin ++ (utt.wave.rescale utt (parse-number volume)) ++ ) ++ ) ++ (wave.save.data.fp (utt.wave utt) fp output_type nil) ++ (set! an_utt utt) ++) + + ;;; + ;;; Redefine what happens to utterances during text to speech + ;;; +-(set! tts_hooks (list utt.synth save_record_wave)) ++(set! tts_hooks (list utt.synth save_record_wave_fp)) + + (define (main) + (get_options) + ++ (set! fp (fopen outfile "wb")) ++ + ;; do the synthesis + (mapcar + (lambda (f) +@@ -168,8 +172,12 @@ and delete the intermediate ones." + (tts_file f (tts_find_text_mode f auto-text-mode-alist)))) + text_files) + +- ;; Now put the waveforms together at again +- (combine_waves) ++ ;; Now update the header ++ (fseek fp 0 0) ++ (wave.save.header fp (utt.wave an_utt) output_type nil ++ (list (list "numsamples" totalnumsamples)) ++ ) ++ (fclose fp) + ) + + ;;; Do the work +diff --git a/src/arch/festival/wave.cc b/src/arch/festival/wave.cc +index a44c5e7..aa46d1c 100644 +--- a/src/arch/festival/wave.cc ++++ b/src/arch/festival/wave.cc +@@ -42,6 +42,7 @@ + #include + #include "festival.h" + #include "festivalP.h" ++#include "EST_Wave.h" + + #ifdef WIN32 + #include "winsock2.h" +@@ -101,6 +102,141 @@ static LISP wave_save(LISP lwave,LISP fname,LISP ftype,LISP stype) + return truth; + } + ++static LISP wave_save_data_fp(LISP lwave, LISP lfp, LISP ftype, LISP stype) ++{ ++ EST_Wave *w = wave(lwave); ++ EST_String filetype,sampletype; ++ FILE * fp; ++ ++ fp = get_c_file(lfp, stdout); ++ ++ if (ftype == NIL) ++ { ++ if (ft_get_param("Wavefiletype")) ++ filetype = get_c_string(ft_get_param("Wavefiletype")); ++ else ++ filetype = "nist"; ++ } ++ else ++ filetype = get_c_string(ftype); ++ if (stype == NIL) ++ { ++ if (ft_get_param("Wavesampletype")) ++ sampletype = get_c_string(ft_get_param("Wavesampletype")); ++ else ++ sampletype = "short"; ++ } ++ else ++ sampletype = get_c_string(stype); ++ ++ if (w->save_file_data(fp,filetype,sampletype,EST_NATIVE_BO) != write_ok) ++ { ++ cerr << "utt.save.wave.fp: failed to write wave" << endl; ++ festival_error(); ++ } ++ ++ return truth; ++} ++ ++ ++ ++static LISP wave_save_fp(LISP lwave, LISP lfp, LISP ftype, LISP stype) ++{ ++ EST_Wave *w = wave(lwave); ++ EST_String filetype,sampletype; ++ FILE * fp; ++ ++ fp = get_c_file(lfp, stdout); ++ ++ if (ftype == NIL) ++ { ++ if (ft_get_param("Wavefiletype")) ++ filetype = get_c_string(ft_get_param("Wavefiletype")); ++ else ++ filetype = "nist"; ++ } ++ else ++ filetype = get_c_string(ftype); ++ if (stype == NIL) ++ { ++ if (ft_get_param("Wavesampletype")) ++ sampletype = get_c_string(ft_get_param("Wavesampletype")); ++ else ++ sampletype = "short"; ++ } ++ else ++ sampletype = get_c_string(stype); ++ ++ if (w->save_file(fp,filetype,sampletype,EST_NATIVE_BO) != write_ok) ++ { ++ cerr << "utt.save.wave.data.fp: failed to write wave" << endl; ++ festival_error(); ++ } ++ ++ return truth; ++} ++ ++ ++ ++static LISP wave_save_header_fp(LISP arglist) ++{ ++ LISP lfp = car(arglist); ++ arglist = cdr(arglist); ++ LISP lwave = car(arglist); ++ arglist = cdr(arglist); ++ LISP lftype = car(arglist); ++ arglist = cdr(arglist); ++ LISP lstype = car(arglist); ++ arglist = cdr(arglist); ++ LISP force_values = car(arglist); ++ arglist = cdr(arglist); ++ ++ FILE *fp; ++ fp = get_c_file(lfp, NULL); ++ EST_String ftype, stype; ++ EST_Wave *w = wave(lwave); ++ ++ int num_samples = w->num_samples(); ++ int num_channels = w->num_channels(); ++ int sample_rate = w->sample_rate(); ++ int bo = EST_NATIVE_BO; ++ ++ num_samples = (int) get_param_float("numsamples", force_values, (float) num_samples); ++ num_channels = (int) get_param_float("numchannels", force_values, (float) num_channels); ++ sample_rate = (int) get_param_float("samplerate", force_values, (float) sample_rate); ++ bo = (int) get_param_float("bo", force_values, (float) bo); ++ ++ if (lftype == NIL) ++ { ++ if (ft_get_param("Wavefiletype")) ++ ftype = get_c_string(ft_get_param("Wavefiletype")); ++ else ++ ftype = "nist"; ++ } ++ else ++ ftype = get_c_string(lftype); ++ ++ if (lstype == NIL) ++ { ++ if (ft_get_param("Wavesampletype")) ++ stype = get_c_string(ft_get_param("Wavesampletype")); ++ else ++ stype = "short"; ++ } ++ else ++ stype = get_c_string(lstype); ++ ++ ++ if (wave_io_save_header(fp, num_samples, num_channels, ++ sample_rate, stype, bo, ftype) != write_ok) ++ { ++ cerr << "utt.save.wave.header: failed" << endl; ++ festival_error(); ++ } ++ ++ return truth; ++} ++ + static LISP wave_load(LISP fname,LISP ftype,LISP stype,LISP srate) + { + EST_Wave *w = new EST_Wave; +@@ -594,7 +730,31 @@ static LISP send_sexpr_to_client(LISP l) + void festival_wave_init(void) + { + // declare utterance (wave) specific Lisp functions +- ++ init_lsubr("wave.save.header", wave_save_header_fp, ++ "(wave.save.header FILEPOINTER WAVE FILETYPE SAMPLETYPE OVERRIDEPARAMS)\n\ ++ Write a wave header of format FILETYPE to FILEPOINTER.\n\ ++ Header parameters are read first from WAVE and SAMPLETYPE,\n\ ++ and can be overridden with OVERRIDEPARAMS\n\ ++ OVERRIDEPARAMS = ( (\"numsamples\" 84000)\n\ ++ (\"numchannels\" 1)\n\ ++ (\"samplerate\" 16000)\n\ ++ (\"bo\" 10)\n\ ++ (\"numsamples\" 16000)\n\ ++ )"); ++ init_subr_4("wave.save.fp", wave_save_fp, ++ "(wave.save.fp WAVE FILEPOINTER FILETYPE SAMPLETYPE)\n\ ++ Write WAVE to FILEPOINTER, respecting FILETYPE and SAMPLETYPE if specified\n\ ++ if these last two arguments are unspecified the global parameters\n\ ++ Wavefiletype and Wavesampletype are used. Returns t is successful\n\ ++ and throws an error if not."); ++ init_subr_4("wave.save.data.fp", wave_save_data_fp, ++ "(wave.save.data.fp WAVE FILEPOINTER FILETYPE SAMPLETYPE)\n\ ++ Write WAVE to FILEPOINTER, respecting FILETYPE and SAMPLETYPE if specified\n\ ++ ignoring any file header.\n\ ++ if these last two arguments are unspecified the global parameters\n\ ++ Wavefiletype and Wavesampletype are used. Returns t is successful\n\ ++ and throws an error if not. It can be used with wave.save.header\n\ ++ in order to concatenate several waves."); + init_subr_4("wave.save",wave_save, + "(wave.save WAVE FILENAME FILETYPE SAMPLETYPE)\n\ + Save WAVE in FILENAME, respecting FILETYPE and SAMPLETYPE if specifed\n\ +-- +1.8.3.4 + + +From 3a9c107c997e6301f96cfc9e7060ced0583ded40 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:28:01 -0800 +Subject: Fix memory allocation + +Author: Peter Drysdale + +Backported from Debian: 10-fix-memory-allocations.diff + +Signed-off-by: Timothy Gu + +diff --git a/src/modules/hts_engine/HTS_pstream.c b/src/modules/hts_engine/HTS_pstream.c +index e8cc184..8a3e3b2 100644 +--- a/src/modules/hts_engine/HTS_pstream.c ++++ b/src/modules/hts_engine/HTS_pstream.c +@@ -324,7 +324,7 @@ HTS_Boolean HTS_PStreamSet_create(HTS_PStreamSet * pss, HTS_SStreamSet * sss, do + /* copy dynamic window */ + pst->win_l_width = (int *) HTS_calloc(pst->win_size, sizeof(int)); + pst->win_r_width = (int *) HTS_calloc(pst->win_size, sizeof(int)); +- pst->win_coefficient = (double **) HTS_calloc(pst->win_size, sizeof(double)); ++ pst->win_coefficient = (double **) HTS_calloc(pst->win_size, sizeof(double *)); + for (j = 0; j < pst->win_size; j++) { + pst->win_l_width[j] = HTS_SStreamSet_get_window_left_width(sss, i, j); + pst->win_r_width[j] = HTS_SStreamSet_get_window_right_width(sss, i, j); +diff --git a/src/modules/hts_engine/HTS_sstream.c b/src/modules/hts_engine/HTS_sstream.c +index 95b18ac..6d1f35e 100644 +--- a/src/modules/hts_engine/HTS_sstream.c ++++ b/src/modules/hts_engine/HTS_sstream.c +@@ -293,7 +293,7 @@ HTS_Boolean HTS_SStreamSet_create(HTS_SStreamSet * sss, HTS_ModelSet * ms, HTS_L + sst->win_max_width = HTS_ModelSet_get_window_max_width(ms, i); + sst->win_l_width = (int *) HTS_calloc(sst->win_size, sizeof(int)); + sst->win_r_width = (int *) HTS_calloc(sst->win_size, sizeof(int)); +- sst->win_coefficient = (double **) HTS_calloc(sst->win_size, sizeof(double)); ++ sst->win_coefficient = (double **) HTS_calloc(sst->win_size, sizeof(double *)); + for (j = 0; j < sst->win_size; j++) { + sst->win_l_width[j] = HTS_ModelSet_get_window_left_width(ms, i, j); + sst->win_r_width[j] = HTS_ModelSet_get_window_right_width(ms, i, j); +-- +1.8.3.4 + + +From b9a00a59bd1696379d77a93816ea4a9e0a59a4ab Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:29:34 -0800 +Subject: Replace multiple debug write calls by one + +Backported from Debian: 13-performance-single-cdebug-output.diff + +Signed-off-by: Timothy Gu + +diff --git a/src/modules/UniSyn_diphone/UniSyn_diphone.cc b/src/modules/UniSyn_diphone/UniSyn_diphone.cc +index eaf05ca..8689469 100644 +--- a/src/modules/UniSyn_diphone/UniSyn_diphone.cc ++++ b/src/modules/UniSyn_diphone/UniSyn_diphone.cc +@@ -123,10 +123,10 @@ LISP us_diphone_init(LISP args) + } + else + { +- *cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl; +- *cdebug << "index grouped:" << d_index->grouped << endl; +- *cdebug << "true:" << true << endl; +- *cdebug << "false:" << false << endl; ++ *cdebug << ":" << get_param_str("grouped",args,"") << ":" << endl ++ << "index grouped:" << d_index->grouped << endl ++ << "true:" << true << endl ++ << "false:" << false << endl; + + d_index->coef_dir = get_param_str("coef_dir",args,""); + d_index->sig_dir = get_param_str("sig_dir",args,""); +-- +1.8.3.4 + + +From 9d99721191fac1ae64165b602af13c945c8e6771 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:12:45 -0800 +Subject: Add missing include + + +diff --git a/src/modules/clustergen/mlsa_resynthesis.cc b/src/modules/clustergen/mlsa_resynthesis.cc +index 5fc1baa..e4fba21 100644 +--- a/src/modules/clustergen/mlsa_resynthesis.cc ++++ b/src/modules/clustergen/mlsa_resynthesis.cc +@@ -41,6 +41,7 @@ + Written for HTS Engine API 1.07 (Jan 2013) + */ + ++#include + #include + + #include +-- +1.8.3.4 + + +From 521a9a67840df161b3bc90b82cc9ce802510c13e Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:20:09 -0800 +Subject: Fix use of fgetpos() + + +diff --git a/src/modules/hts_engine/HTS_misc.c b/src/modules/hts_engine/HTS_misc.c +index 97eeee7..7af3c25 100644 +--- a/src/modules/hts_engine/HTS_misc.c ++++ b/src/modules/hts_engine/HTS_misc.c +@@ -245,7 +245,7 @@ size_t HTS_ftell(HTS_File * fp) + } else if (fp->type == HTS_FILE) { + fpos_t pos; + fgetpos((FILE *) fp->pointer, &pos); +-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) ++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__HAIKU__) + return (size_t) pos; + #else + return (size_t) pos.__pos; +-- +1.8.3.4 + + +From 46f3fe1d2273b13f5a327a7d7d03ef8359488ab0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:09:50 -0800 +Subject: Add config/config + +Inspired by Debian patch 01-config_config.diff. + +Signed-off-by: Timothy Gu + +diff --git a/config/config b/config/config +new file mode 100644 +index 0000000..383b149 +--- /dev/null ++++ b/config/config +@@ -0,0 +1,74 @@ ++########################################################-*-mode:Makefile-*- ++## ## ++## Festival: local configuration file ## ++## ## ++########################################################################### ++## ++## Specific config file for local installation ++## ++ ++########################################################################### ++## Which speech tools to use ++ ++EST=$(portPackageLinksDir)/speech_tools$(secondaryArchSuffix)_devel/$(relativeDevelopLibDir)/speech_tools$(secondaryArchSuffix) ++ ++########################################################################### ++## Where the festival tree will be installed. ++## ++## The default is that festival will remain where it is compiled. ++## ++## You may need to set this explicitly if automounter or NFS ++## side effects cause problems ++ ++FESTIVAL_HOME := $(shell (cd $(TOP); pwd)) ++ ++########################################################################### ++## Feature selection. ++## ++## Select modules to include. ++ ++## Non Free PSOLA synthesis. This isn't distributed with festival because ++## of a patent, if you have src/modules/diphone/di_psolaTM.cc you can ++## include this feature. ++# INCLUDE_PSOLA_TM=1 ++ ++## Support for TCL. So that festival may eval TCL commands and TCL may eval ++## festival commands. This was added to support the CSLU toolkit but ++## others may want it too. ++# INCLUDE_TCL=1 ++ ++########################################################################### ++## Take most settings from speech tools. ++ ++include $(EST)/config/system.mak ++include $(EST)/config/config ++ ++########################################################################### ++## Add any extra modules you wish to include ++ ++## These sub modules are *optional* and unless you know what they are ++## you probabaly don't want them or need them. They are typically ++## new code that isn't yet stable yet and being used for research or ++## old code left in for compatibility for some users ++ ++## Experimental UniSyn, metrical tree, phonological structure matching ++## code ++# ALSO_INCLUDE += UniSyn_phonology UniSyn_selection ++## Cluster unit selection code as described in "Building Voices in ++## Festival", again experimental and suitable for research purposes only. ++ALSO_INCLUDE += clunits clustergen hts_engine MultiSyn ++ ++## Old diphone code that will be delete, left in only for some ++## compatibility ++# ALSO_INCLUDE += diphone ++ ++## Other (non-Edinburgh) modules may also be specified here (e.g. OGI code), ++ ++ALSO_INCLUDE += ++ ++########################################################################### ++## ++## Describe your local system below by redefining things defined ++## in config/configs/default.mak. ++ ++ +-- +1.8.3.4 + + +From de3485cabba208df2ad622e7a6bafa07e291c140 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Fri, 26 Dec 2014 23:10:57 -0800 +Subject: config/make_system: Copy system.mak from speech_tools + + +diff --git a/config/make_system.mak b/config/make_system.mak +index 5acf40a..5f81464 100644 +--- a/config/make_system.mak ++++ b/config/make_system.mak +@@ -39,6 +39,5 @@ + ########################################################################### + + system.mak : config +- @echo Check system type >&2 +- @/bin/sh $(TOP)/config/system.sh $(TOP)/config/systems > system.mak ++ cp $(EST)/config/system.mak system.mak + +-- +1.8.3.4 + + +From b329b31eaa2c9532b0b8b08e732a94e3dbe3b5a2 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sat, 27 Dec 2014 11:58:23 -0800 +Subject: Include config in make_system + +Signed-off-by: Timothy Gu + +diff --git a/config/make_system.mak b/config/make_system.mak +index 5f81464..13dbdc4 100644 +--- a/config/make_system.mak ++++ b/config/make_system.mak +@@ -38,6 +38,7 @@ + ## ## + ########################################################################### + ++include $(TOP)/config/config + system.mak : config + cp $(EST)/config/system.mak system.mak + +-- +1.8.3.4 + + +From f0b692b108d3c676cb8c5c4b38b0a1b7fa5c51f0 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sat, 27 Dec 2014 00:03:25 -0800 +Subject: Fix file system layout + +Inspired by Debian patch 20-debian-filesystem-standard.diff + +Signed-off-by: Timothy Gu + +diff --git a/examples/Makefile b/examples/Makefile +index b677cb9..170369f 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -54,8 +54,7 @@ include $(TOP)/config/common_make_rules + + $(ALL) : % : %.sh + rm -f $@ +- @echo "#!/bin/sh" >$@ +- @echo "\"true\" ; exec "$(FESTIVAL_HOME)/bin/festival --script '$$0 $$*' >>$@ ++ @echo "#!$(binDir)/festival --script" >$@ + cat $< >>$@ + chmod +x $@ + +diff --git a/examples/text2wave.sh b/examples/text2wave.sh +index d6af881..cf62ef7 100755 +--- a/examples/text2wave.sh ++++ b/examples/text2wave.sh +@@ -40,7 +40,7 @@ + + ;;; Because this is a --script type file I has to explicitly + ;;; load the initfiles: init.scm and user's .festivalrc +-(load (path-append libdir "init.scm")) ++(load (path-append datadir "init.scm")) + + ;;; Process command line arguments + (define (text2wave_help) +diff --git a/lib/festival.scm b/lib/festival.scm.in +similarity index 99% +rename from lib/festival.scm +rename to lib/festival.scm.in +index 928016d..69d2796 100644 +--- a/lib/festival.scm ++++ b/lib/festival.scm.in +@@ -552,13 +552,13 @@ Doing stuff + (define (intro) + "(intro) + Synthesize an introduction to the Festival Speech Synthesis System." +- (tts (path-append libdir "../examples/intro.text") nil)) ++ (tts (path-append datadir "@DOCDIR@/examples/intro.text") nil)) + + (define (intro-spanish) + "(intro-spanish) + Synthesize an introduction to the Festival Speech Synthesis System + in spanish. Spanish voice must already be selected for this." +- (tts (path-append libdir "../examples/spintro.text") nil)) ++ (tts (path-append datadir "@DOCDIR@/examples/spintro.text") nil)) + + (define (na_play FILENAME) + "(play_wave FILENAME) +diff --git a/lib/init.scm b/lib/init.scm +index 90bccb7..42b9b68 100644 +--- a/lib/init.scm ++++ b/lib/init.scm +@@ -36,7 +36,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + + ;;; Basic siod library (need this before load_library or require works) +-(load (path-append libdir "siod.scm")) ++(load (path-append datadir "siod.scm")) + + (defvar home-directory (or (getenv "HOME") "/") + "home-directory +diff --git a/lib/lexicons.scm b/lib/lexicons.scm.in +similarity index 98% +rename from lib/lexicons.scm +rename to lib/lexicons.scm.in +index 574c8fa..66dba14 100644 +--- a/lib/lexicons.scm ++++ b/lib/lexicons.scm.in +@@ -42,10 +42,10 @@ + ;;; you should set lexdir in sitevars.scm + + (defvar lexdir +- (if (probe_file (path-append libdir "dicts")) +- (path-append libdir "dicts/") ++ (if (probe_file (path-append datadir "dicts")) ++ (path-append datadir "dicts/") + ;; else we'll guess we're in the CSTR filespace +- (path-as-directory "/projects/festival/lib/dicts/")) ++ (path-as-directory "@DATADIR@/dicts/")) + "lexdir + The directory where the lexicon(s) are, by default.") + +diff --git a/lib/phrase.scm b/lib/phrase.scm +index bbabba6..e0a82c3 100644 +--- a/lib/phrase.scm ++++ b/lib/phrase.scm +@@ -93,7 +93,7 @@ in Token return punc, otherwise 0." + + (require 'pos) ;; for part of speech map + +-(defvar pbreak_ngram_dir libdir ++(defvar pbreak_ngram_dir datadir + "pbreak_ngram_dir + The directory containing the ngram models for predicting phrase + breaks. By default this is the standard library directory.") +diff --git a/lib/soleml-mode.scm b/lib/soleml-mode.scm +index 9856fb2..27b7279 100644 +--- a/lib/soleml-mode.scm ++++ b/lib/soleml-mode.scm +@@ -330,7 +330,7 @@ Flatten alist arguments." + (list 'exit_func soleml_exit_func) + '(analysis_type xxml) + (list 'filter +- (format nil "%s -D %s " sgml_parse_progname libdir)))) ++ (format nil "%s -D %s " sgml_parse_progname datadir)))) + tts_text_modes)) + + (provide 'soleml-mode) +diff --git a/lib/voices.scm b/lib/voices.scm.in +similarity index 99% +rename from lib/voices.scm +rename to lib/voices.scm.in +index 168d842..df50b15 100644 +--- a/lib/voices.scm ++++ b/lib/voices.scm.in +@@ -42,7 +42,7 @@ + ;; The path to search for voices is created from the load-path with + ;; an extra list of directories appended. + +-(defvar system-voice-path '( ) ++(defvar system-voice-path '("@DATADIR@/voices") + "system-voice-path + Additional directory not near the load path where voices can be + found, this can be redefined in lib/sitevars.scm if desired.") +diff --git a/src/arch/festival/Makefile b/src/arch/festival/Makefile +index fe49726..1b5eafe 100644 +--- a/src/arch/festival/Makefile ++++ b/src/arch/festival/Makefile +@@ -62,6 +62,6 @@ LOCAL_DEFINES += $(FESTIVAL_DEFINES) + LOCAL_INCLUDES += $(FESTIVAL_INCLUDES) + + festival.o: festival.cc +- $(CXX_COMMAND_TEMPLATES) -DFTNAME='$(PROJECT_NAME)' -DFTLIBDIRC='$(FTLIBDIR)' -DFTVERSION='$(PROJECT_VERSION)' -DFTSTATE='$(PROJECT_STATE)' -DFTDATE='$(PROJECT_DATE)' -DFTOSTYPE=\"$(SYSTEM_TYPE)\" festival.cc ++ $(CXX_COMMAND_TEMPLATES) -DFTNAME='$(PROJECT_NAME)' -DFTVERSION='$(PROJECT_VERSION)' -DFTSTATE='$(PROJECT_STATE)' -DFTDATE='$(PROJECT_DATE)' -DFTOSTYPEC='$(SYSTEM_TYPE)' festival.cc + + +diff --git a/src/arch/festival/festival.cc b/src/arch/festival/festival.cc.in +similarity index 97% +rename from src/arch/festival/festival.cc +rename to src/arch/festival/festival.cc.in +index 59abcdd..bea032c 100644 +--- a/src/arch/festival/festival.cc ++++ b/src/arch/festival/festival.cc.in +@@ -60,6 +60,9 @@ void festival_load_default_files(void); + #define STRINGIZE(S) _S_S_S(S) + + const char *festival_version = STRINGIZE(FTVERSION) ":" STRINGIZE(FTSTATE) " " STRINGIZE(FTDATE); ++const char *festival_libdir = "@LIBDIR@"; ++const char *festival_datadir = "@DATADIR@"; ++const char *festival_sysconfdir = "/boot/home/config/settings"; + + // Allow the path to be passed in without quotes because Windoze command line + // is stupid +@@ -79,7 +82,6 @@ const char *festival_version = STRINGIZE(FTVERSION) ":" STRINGIZE(FTSTATE) " " + #define FTOSTYPE "" + #endif + +-const char *festival_libdir = FTLIBDIR; + ostream *cdebug; + static int festival_server_port = 1314; + static EST_StrList sub_copyrights; +@@ -307,7 +309,7 @@ void festival_load_default_files(void) + EST_String userinitfile, home_str, initfile; + + // Load library init first +- initfile = (EST_String)EST_Pathname(festival_libdir).as_directory() + ++ initfile = (EST_String)EST_Pathname(festival_datadir).as_directory() + + "init.scm"; + if (access((const char *)initfile,R_OK) == 0) + vload(initfile,FALSE); +@@ -323,6 +325,8 @@ void festival_lisp_vars(void) + int major,minor,subminor; + + siod_set_lval("libdir",strintern(festival_libdir)); ++ siod_set_lval("datadir",strintern(festival_datadir)); ++ siod_set_lval("sysconfdir",strintern(festival_sysconfdir)); + if (!streq(FTOSTYPE,"")) + siod_set_lval("*ostype*",cintern(FTOSTYPE)); + siod_set_lval("festival_version", +@@ -356,6 +360,7 @@ void festival_lisp_vars(void) + if (mplayer_supported) + proclaim_module("mplayeraudio"); + ++#if 0 /* /usr/lib/festival/etc/machine -- ??? */ + // Add etc-dir path and machine specific directory etc/$OSTYPE + char *etcdir = walloc(char,strlen(festival_libdir)+strlen("etc/")+ + strlen(FTOSTYPE)+3); +@@ -376,6 +381,7 @@ void festival_lisp_vars(void) + + wfree(etcdir); + wfree(etcdircommon); ++#endif + return; + } + +diff --git a/src/include/festival.h b/src/include/festival.h +index e03c432..c11d5b8 100644 +--- a/src/include/festival.h ++++ b/src/include/festival.h +@@ -138,6 +138,7 @@ const EST_String utt_type(EST_Utterance &utt); + void add_item_features(EST_Item *s,LISP features); + + extern const char *festival_libdir; ++extern const char *festival_datadir; + + // Module specific LISP/etc definitions + void festival_init_modules(void); +diff --git a/src/main/festival_main.cc b/src/main/festival_main.cc +index f1af602..d12e984 100644 +--- a/src/main/festival_main.cc ++++ b/src/main/festival_main.cc +@@ -88,6 +88,8 @@ static void festival_main(int argc, char **argv) + "In evaluation mode \"filenames\" starting with ( are evaluated inline\n"+ + "Festival Speech Synthesis System: "+ festival_version +"\n"+ + "-q Load no default setup files\n"+ ++ "--datadir \n"+ ++ " Set data directory pathname\n"+ + "--libdir \n"+ + " Set library directory pathname\n"+ + "-b Run in batch mode (no interaction)\n"+ +@@ -127,6 +129,12 @@ static void festival_main(int argc, char **argv) + festival_libdir = wstrdup(al.val("--libdir")); + else if (getenv("FESTLIBDIR") != 0) + festival_libdir = getenv("FESTLIBDIR"); ++ ++ if (al.present("--datadir")) ++ festival_datadir = wstrdup(al.val("--datadir")); ++ else if (getenv("FESTDATADIR") != 0) ++ festival_datadir = getenv("FESTDATADIR"); ++ + if (al.present("--heap")) + heap_size = al.ival("--heap"); + +-- +1.8.3.4 + From f5e2edd0b5055e27807346efa5c334a8361ac741 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 30 Dec 2014 05:44:57 +0000 Subject: [PATCH 174/326] Add Noto Sans fonts for Tai languages --- .../noto_sans_new_tai_lue-1.03.recipe | 39 +++++++++++++++++++ .../noto_sans_tai_le-1.01.recipe | 39 +++++++++++++++++++ .../noto_sans_tai_tham-1.01.recipe | 39 +++++++++++++++++++ .../noto_sans_tai_viet-1.01.recipe | 39 +++++++++++++++++++ 4 files changed, 156 insertions(+) create mode 100644 media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe create mode 100644 media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe create mode 100644 media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe create mode 100644 media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe diff --git a/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe new file mode 100644 index 000000000..a25c90500 --- /dev/null +++ b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe @@ -0,0 +1,39 @@ +LANG_EN="New Tai Lü" +LANG_DL="NewTaiLue" +LANG_LC="new_tai_lue" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="660995d4cae6e4588a069f8d45ec52a96a624e501638a0c2ebd02683b623bced" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe b/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe new file mode 100644 index 000000000..02576510e --- /dev/null +++ b/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tai Le" +LANG_DL="TaiLe" +LANG_LC="tai_le" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="660995d4cae6e4588a069f8d45ec52a96a624e501638a0c2ebd02683b623bced" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe b/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe new file mode 100644 index 000000000..c571b1c52 --- /dev/null +++ b/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tai Tham" +LANG_DL="TaiTham" +LANG_LC="tai_tham" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="48baf29fb8dd8b4aad004dea67a91eadc449399317ac32439ccf4e6ab9e00975" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} diff --git a/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe b/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe new file mode 100644 index 000000000..1134618ae --- /dev/null +++ b/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe @@ -0,0 +1,39 @@ +LANG_EN="Tai Viet" +LANG_DL="TaiViet" +LANG_LC="tai_viet" + +SUMMARY="The Noto Sans font for $LANG_EN" +DESCRIPTION=" +The Noto font family attempts to create a uniform look for all languages on \ +Earth. This package contains the Noto Sans fonts for $LANG_EN. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" +CHECKSUM_SHA256="573b069d4221f3cf294b3af15094606e22fc9c624c3dbac2b1e4656ca8f3f5c2" +LICENSE="Apache v2" +COPYRIGHT="2013 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans_${LANG_LC}=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 73f5993ec3a132100367bef941c1f6c2203e823b Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Mon, 29 Dec 2014 19:56:01 +0100 Subject: [PATCH 175/326] Add recipe for vwget --- haiku-apps/vwget/vwget-20141229.recipe | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 haiku-apps/vwget/vwget-20141229.recipe diff --git a/haiku-apps/vwget/vwget-20141229.recipe b/haiku-apps/vwget/vwget-20141229.recipe new file mode 100644 index 000000000..7c3016bbc --- /dev/null +++ b/haiku-apps/vwget/vwget-20141229.recipe @@ -0,0 +1,40 @@ +SUMMARY="A visual version for GNU's wget." +DESCRIPTION="VWGet is a visual frontend for GNU wget. You can both run it from \ +the command line, passing the same arguments you would pass to wget or launch \ +it as a normal app and select the URL and destination in the GUI." +HOMEPAGE="https://github.com/HaikuArchives/VWGet" +SRC_URI="git+https://github.com/HaikuArchives/VWGet.git#29ff74d068526c01edf7e1c0ef887a8f4fac252f" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1999 Santiago Lema" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + vwget = $portVersion + app:VWGet = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/VWGet $appsDir + addAppDeskbarSymlink $appsDir/VWGet +} From 8798d65569160bb56757c768e93b297228e69b71 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 05:12:46 +0000 Subject: [PATCH 176/326] Add Lato fonts Initial work based on that of: alvin_ Signed-off-by: Timothy Gu --- .../lato_fonts/lato_fonts-2.010.recipe | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 media-fonts/lato_fonts/lato_fonts-2.010.recipe diff --git a/media-fonts/lato_fonts/lato_fonts-2.010.recipe b/media-fonts/lato_fonts/lato_fonts-2.010.recipe new file mode 100644 index 000000000..d675526ad --- /dev/null +++ b/media-fonts/lato_fonts/lato_fonts-2.010.recipe @@ -0,0 +1,38 @@ +SUMMARY="The Lato font family" +DESCRIPTION="Lato is a sans-serif typeface family designed in the Summer 2010 \ +by Warsaw-based designer Łukasz Dziedzic (“Lato” means “Summer” in Polish). \ +In December 2010 the Lato family was published under the open-source Open Font \ +License by his foundry tyPoland, with support from Google. Lato consists of \ +nine weights (plus corresponding italics), including a beautiful hairline \ +style." +HOMEPAGE="http://www.latofonts.com/lato-free-fonts/" +SRC_URI="http://www.latofonts.com/download/Lato2OFL.zip" +CHECKSUM_SHA256="367c730f64f4d1731e4d3ef7da2dd27635999e4a2f7cab24cfdcaf42488644a4" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2010-2014 Łukasz Dziedzic , with Reserved \ +Font Name Lato" +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + lato_fonts=$portVersion + " +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="Lato2OFL" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p $FONTDIR + + cd *.ttf $FONTDIR +} + From ca41cb21330974a4bb172f7f768c2ecbeada185a Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 28 Dec 2014 04:09:01 +0000 Subject: [PATCH 177/326] Add a recipe for burp --- app-backup/burp/burp-1.4.28.recipe | 85 +++ app-backup/burp/licenses/GNU AGPL v3 | 662 +++++++++++++++++++ app-backup/burp/patches/burp-1.4.28.patchset | 55 ++ 3 files changed, 802 insertions(+) create mode 100644 app-backup/burp/burp-1.4.28.recipe create mode 100644 app-backup/burp/licenses/GNU AGPL v3 create mode 100644 app-backup/burp/patches/burp-1.4.28.patchset diff --git a/app-backup/burp/burp-1.4.28.recipe b/app-backup/burp/burp-1.4.28.recipe new file mode 100644 index 000000000..34aa753fa --- /dev/null +++ b/app-backup/burp/burp-1.4.28.recipe @@ -0,0 +1,85 @@ +SUMMARY="A tool to make and restore backups over a network" +DESCRIPTION="Burp aims to be a better Bacula and is a network backup and \ +restore software. It relies on librsync for compression of network \ +communication and of the backups itself. Burp provides both a client and a \ +server and supports Windows's Volume Shadow Copy Services." + +HOMEPAGE="http://burp.grke.org" + +SRC_URI="http://sourceforge.net/projects/burp/files/burp-1.4.28/burp-1.4.28.tar.bz2" +CHECKSUM_SHA256="01c41c07805ebe8c882d7cb9f294e779b6decbe2eb2c81fd65d8fb2b174e18f0" +REVISION="1" +SOURCE_DIR="burp" + +ARCHITECTURES="x86_gcc2 ?x86 ?ppc" + +LICENSE="GNU AGPL v3" +COPYRIGHT=" + 2011-2014 Graham Keeling + 2005-2010 Troy D. Hanson + " + +REQUIRES=" + haiku + lib:libssl + lib:libz + lib:librsync + lib:libncurses + lib:libpopt + " + +BUILD_REQUIRES=" + haiku_devel + devel:libssl + devel:libz + devel:librsync + devel:libncurses + devel:libpopt + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + cmd:gawk + cmd:sed + " + +PROVIDES=" + burp = $portVersion + cmd:burp_ca + cmd:burp + cmd:bedup + cmd:vss_strip + " + +PATCHES=" + burp-1.4.28.patchset + " + +GLOBAL_WRITABLE_FILES=" + settings/burp/CA.cnf auto-merge + settings/burp/autoupgrade/server/win32/script auto-merge + settings/burp/autoupgrade/server/win64/script auto-merge + settings/burp/burp-server.conf auto-merge + settings/burp/burp.conf auto-merge + settings/burp/clientconfdir/incexc/example auto-merge + settings/burp/clientconfdir/testclient auto-merge + settings/burp/notify_script auto-merge + settings/burp/ssl_extra_checks_script auto-merge + settings/burp/summary_script auto-merge + settings/burp/timer_script auto-merge + " + +BUILD() +{ + runConfigure --omit-dirs sysconfdir\ + ./configure --sysconfdir $settingsDir/burp + make $jobArgs +} + +escapedSharedStateDir=$(echo $sharedStateDir | sed -e 's/\//\\\//g') +INSTALL() +{ + sed -i "s/\$(DESTDIR)\/var\//$escapedSharedStateDir\//g" Makefile + make install +} diff --git a/app-backup/burp/licenses/GNU AGPL v3 b/app-backup/burp/licenses/GNU AGPL v3 new file mode 100644 index 000000000..ac8619dcb --- /dev/null +++ b/app-backup/burp/licenses/GNU AGPL v3 @@ -0,0 +1,662 @@ + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/app-backup/burp/patches/burp-1.4.28.patchset b/app-backup/burp/patches/burp-1.4.28.patchset new file mode 100644 index 000000000..523285595 --- /dev/null +++ b/app-backup/burp/patches/burp-1.4.28.patchset @@ -0,0 +1,55 @@ +From f13db3e8ee38ea212dd1d7502d0604726021f44f Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Fri, 26 Dec 2014 00:07:56 +0000 +Subject: [PATCH] Update to the interface of librsync v.1.0.0 + +Librsync has moved away from MD4 for signatures, but to maintain +compatibility with non-Haiku versions, we hang on to it. +--- + src/backup_phase2_server.c | 2 +- + src/backup_phase4_server.c | 2 +- + src/rs_buf.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/backup_phase2_server.c b/src/backup_phase2_server.c +index 6e78515..747a369 100644 +--- a/src/backup_phase2_server.c ++++ b/src/backup_phase2_server.c +@@ -483,7 +483,7 @@ static int process_changed_file(struct sbuf *cb, struct sbuf *p1b, const char *c + free(curpath); + + blocklen=get_librsync_block_len(cb->endfile); +- if(!(p1b->sigjob=rs_sig_begin(blocklen, RS_DEFAULT_STRONG_LEN))) ++ if(!(p1b->sigjob=rs_sig_begin(blocklen, 8, RS_MD4_SIG_MAGIC))) + { + logp("could not start signature job.\n"); + return -1; +diff --git a/src/backup_phase4_server.c b/src/backup_phase4_server.c +index ead92b3..f1b5a84 100644 +--- a/src/backup_phase4_server.c ++++ b/src/backup_phase4_server.c +@@ -38,7 +38,7 @@ static int make_rev_sig(const char *dst, const char *sig, const char *endfile, i + } + result=rs_sig_gzfile(dstfp, dstzp, sigp, + get_librsync_block_len(endfile), +- RS_DEFAULT_STRONG_LEN, NULL, cntr); ++ 8, NULL, cntr); + gzclose_fp(&dstzp); + close_fp(&dstfp); + if(close_fp(&sigp)) +diff --git a/src/rs_buf.c b/src/rs_buf.c +index 78f65b2..0a3c33a 100644 +--- a/src/rs_buf.c ++++ b/src/rs_buf.c +@@ -497,7 +497,7 @@ rs_result rs_sig_gzfile(FILE *old_file, gzFile old_zfile, FILE *sig_file, size_t + rs_job_t *job; + rs_result r; + +- job = rs_sig_begin(new_block_len, strong_len); ++ job = rs_sig_begin(new_block_len, strong_len, RS_MD4_SIG_MAGIC); + r = rs_whole_gzrun(job, old_file, old_zfile, sig_file, NULL, cntr); + /* + if (stats) +-- +1.8.3.4 + From 6bc03df35725975c2cbbc80fd689b9ba9969051e Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 29 Dec 2014 01:31:01 +0000 Subject: [PATCH 178/326] Add x265 port --- media-libs/x265/patches/x265-1.4.patchset | 112 ++++++++++++++++++++++ media-libs/x265/x265-1.4.recipe | 83 ++++++++++++++++ 2 files changed, 195 insertions(+) create mode 100644 media-libs/x265/patches/x265-1.4.patchset create mode 100644 media-libs/x265/x265-1.4.recipe diff --git a/media-libs/x265/patches/x265-1.4.patchset b/media-libs/x265/patches/x265-1.4.patchset new file mode 100644 index 000000000..b73a74db7 --- /dev/null +++ b/media-libs/x265/patches/x265-1.4.patchset @@ -0,0 +1,112 @@ +From 8387d94e949e524f936c9c7ecb86b8663c603351 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 28 Dec 2014 07:11:55 +0000 +Subject: Check if threading library needs to be linked separately + + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index ba63f81..e43be21 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -56,7 +56,8 @@ else() + endif() + + if(UNIX) +- SET(PLATFORM_LIBS pthread) ++ find_package(Threads) ++ SET(PLATFORM_LIBS ${CMAKE_THREAD_LIBS_INIT}) + find_library(LIBRT rt) + if(LIBRT) + set(PLATFORM_LIBS ${PLATFORM_LIBS} rt) +-- +1.8.3.4 + + +From 592de1f1cd5666ae9cc64715833dfd16130a9c0b Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 28 Dec 2014 07:13:56 +0000 +Subject: Add an option to adjust headers installation path + + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index e43be21..b78d12b 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -166,6 +166,7 @@ endif() + # Build options + set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries") + set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") ++set(INCLUDE_INSTALL_DIR include CACHE STRING "Install location of headers") + + if(X64) + # NOTE: We only officially support 16bit-per-pixel compiles of x265 +@@ -251,7 +252,8 @@ endif() + install(TARGETS x265-static + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) +-install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include) ++install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" ++ DESTINATION "${INCLUDE_INSTALL_DIR}") + + if(CMAKE_RC_COMPILER) + # The resource compiler does not need CFLAGS or macro defines. It +-- +1.8.3.4 + + +From ccb172d336c00fa95b1d99407da86be0b970b3bb Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 28 Dec 2014 07:14:34 +0000 +Subject: Add Haiku version of adjusting thread priority + + +diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp +index 8a2ab9d..70b1289 100644 +--- a/source/common/threadpool.cpp ++++ b/source/common/threadpool.cpp +@@ -32,6 +32,8 @@ + #if MACOS + #include + #include ++#elif defined(__HAIKU__) ++#include + #endif + + namespace x265 { +@@ -141,6 +143,9 @@ void PoolThread::threadMain() + { + #if _WIN32 + SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL); ++#elif defined(__HAIKU__) ++ __attribute__((unused)) status_t ++ val = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY); + #else + __attribute__((unused)) int val = nice(10); + #endif +-- +1.8.3.4 + + +From ae89f461c037e2981add0a1b161b81afd5104e30 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Mon, 29 Dec 2014 04:43:42 +0000 +Subject: checkasm-a: Explicitly use PLT relocation for libc symbols + +Fixes linking with PIC (default for all compilation) on Haiku. + +diff --git a/source/test/checkasm-a.asm b/source/test/checkasm-a.asm +index f7b9837..d0d622a 100644 +--- a/source/test/checkasm-a.asm ++++ b/source/test/checkasm-a.asm +@@ -153,7 +153,7 @@ cglobal checkasm_call, 2,15,16,max_args*8+8 + jz .ok + mov r9, rax + lea r0, [error_message] +- call puts ++ call puts wrt ..plt + mov r1, [rsp+max_args*8] + mov dword [r1], 0 + mov rax, r9 +-- +1.8.3.4 + diff --git a/media-libs/x265/x265-1.4.recipe b/media-libs/x265/x265-1.4.recipe new file mode 100644 index 000000000..ba56ec558 --- /dev/null +++ b/media-libs/x265/x265-1.4.recipe @@ -0,0 +1,83 @@ +SUMMARY="H.265/HEVC video encoder" +DESCRIPTION="x265 is a full-fledged video encoder for the HEVC video format \ +(also known as High Efficiency Video Coding, ISO/IEC 23008-2, MPEG-H Part 2, \ +and ITU-T H.265). HEVC is a direct successor to the earlier H.264/MPEG-4 AVC \ +video compression standard, aiming to achieve the same video quality at half \ +the bit rate. x265 is a free software project implementing that standard." + +HOMEPAGE="http://x265.org/" +LICENSE="GNU GPL v2" +COPYRIGHT="2013-2014 x265 Project" +SRC_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2" +CHECKSUM_SHA256="e818cacd6a963d49813dbe6c041888311a237da95896e604b4c91b2ddfac83a5" +REVISION="1" +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +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" +fi + +# BitBucket sucks +SOURCE_DIR='multicoreware-x265-5e604833c5aa' + +PROVIDES=" + x265$secondaryArchSuffix = $portVersion + cmd:x265 = $portVersion + lib:libx265$secondaryArchSuffix = 35 + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:yasm + " + +PATCHES="x265-$portVersion.patchset" + +BUILD() +{ + # Can't put this in SOURCE_DIR as cmake uses a file in the root + # directory to find out the version of x265 + cd source + + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix \ + -DLIB_INSTALL_DIR:PATH=$relativeLibDir \ + -DBIN_INSTALL_DIR:PATH=bin \ + -DINCLUDE_INSTALL_DIR:PATH=$relativeIncludeDir + make $jobArgs VERBOSE=1 +} + +INSTALL() +{ + cd source + make install + + prepareInstalledDevelLibs libx265 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + x265${secondaryArchSuffix}_devel = $portVersion + devel:libx265$secondaryArchSuffix = 35 + " +REQUIRES_devel=" + x265$secondaryArchSuffix == $portVersion base + " From 7b382b007c83c1150a856e31fc16f07fc68f2422 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 31 Dec 2014 20:37:34 -0800 Subject: [PATCH 179/326] angband: Fix lint warning --- games-roguelike/angband/angband-3.5.0.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/games-roguelike/angband/angband-3.5.0.recipe b/games-roguelike/angband/angband-3.5.0.recipe index 284f26501..5d45af3ae 100644 --- a/games-roguelike/angband/angband-3.5.0.recipe +++ b/games-roguelike/angband/angband-3.5.0.recipe @@ -5,7 +5,7 @@ Angband is a free, single-player dungeon exploration game. You play an \ adventurer: seeking riches, fighting monsters, and preparing for a final \ battle with Morgoth, the Lord of Darkness. " -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -102,6 +102,7 @@ BUILD_PREREQUIRES=" cmd:make " +PATCHES="angband-${portVersion}.patchset" BUILD() { autoconf From a749101d30c42fa889afdfd96a5ed11f660c92d3 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 00:42:35 -0800 Subject: [PATCH 180/326] Fix almp3 recipe --- media-libs/almp3/almp3-2.0.4.recipe | 78 +++++++-- media-libs/almp3/patches/almp3-2.0.4.patch | 50 ------ media-libs/almp3/patches/almp3-2.0.4.patchset | 165 ++++++++++++++++++ 3 files changed, 224 insertions(+), 69 deletions(-) delete mode 100644 media-libs/almp3/patches/almp3-2.0.4.patch create mode 100644 media-libs/almp3/patches/almp3-2.0.4.patchset diff --git a/media-libs/almp3/almp3-2.0.4.recipe b/media-libs/almp3/almp3-2.0.4.recipe index 7e5cfe81a..b3347967a 100644 --- a/media-libs/almp3/almp3-2.0.4.recipe +++ b/media-libs/almp3/almp3-2.0.4.recipe @@ -1,28 +1,68 @@ -DESCRIPTION="AllegroMP3 is an Allegro wrapper for the mpglib MP3 decoder part of mpg123" +SUMMARY="Allegro wrapper for the mpglib MP3 decoder" +DESCRIPTION='AllegroMP3 (or "almp3" for short) is a wrapper for the MP3 \ +decoder in mpg123 that allows using it in Allegro. It uses an internal copy of \ +mpg123 that is optimized for the x86 platform in SIMD assembly.' HOMEPAGE="http://icculus.org/~eviltypeguy/pkg/almp3/" -SRC_URI="http://icculus.org/~eviltypeguy/pkg/almp3/almp3-2.0.4.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="media-libs/allegro >= 4.4" -CHECKSUM_MD5="8fe1517750acf23c07442b31447791a8" +SRC_URI="http://icculus.org/~eviltypeguy/pkg/almp3/almp3-$portVersion.tar.bz2" +CHECKSUM_SHA256='149af1a5ee06b5d7d5a52152db0e35ad6de8dfdd9d281fdac52728ef5d438d70' +LICENSE='GNU LGPL v2.1' +COPYRIGHT='2001-2005 Javier Gonzalez' + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +REVISION='2' + +PROVIDES=" + almp3$secondaryArchSuffix = $portVersion + lib:libalmp3$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + almp3${secondaryArchSuffix}_devel = $portVersion + devel:libalmp3$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku${secondaryArchSuffix} + lib:liballeg${secondaryArchSuffix} >= 4.4 + " + +BUILD_PREREQUIRES=" + cmd:gcc${secondaryArchSuffix} + cmd:install + cmd:ld${secondaryArchSuffix} + cmd:make + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:liballeg${secondaryArchSuffix} >= 4.4 + " + +SOURCE_DIR='almp3' + +PATCHES="almp3-$portVersion.patchset" BUILD() { - cd almp3 - mkdir -p obj/haiku/dynamic - mkdir -p obj/haiku/static - mkdir -p lib/haiku - make TARGET=HAIKU_STATIC - make TARGET=HAIKU_SHARED + make $jobArgs TARGET=HAIKU_STATIC + make $jobArgs TARGET=HAIKU_DYNAMIC } INSTALL() { - cd almp3 - - make install prefix=/boot/common \ - INSTALL="install -c" \ - INSTALL_INFO="install-info" + make install TARGET=HAIKU_STATIC \ + includedir="$includeDir" \ + docdir="$docDir" \ + libdir="$libDir" \ + INSTALL="install -c" + make install TARGET=HAIKU_DYNAMIC \ + includedir="$includeDir" \ + docdir="$docDir" \ + libdir="$libDir" \ + INSTALL="install -c" + + prepareInstalledDevelLib libalmp3 + packageEntries devel \ + "$developDir" } -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2001-2003 Javier Gonzalez" diff --git a/media-libs/almp3/patches/almp3-2.0.4.patch b/media-libs/almp3/patches/almp3-2.0.4.patch deleted file mode 100644 index ee80c22cd..000000000 --- a/media-libs/almp3/patches/almp3-2.0.4.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urN almp3/Makefile almp3-haiku/Makefile ---- almp3/Makefile 2005-07-26 02:36:11.066846720 +0000 -+++ almp3-haiku/Makefile 2010-06-08 08:16:15.839909376 +0000 -@@ -7,7 +7,7 @@ - #TARGET=MINGW32_STATIC - #TARGET=MINGW32_DLL - #TARGET=LINUX_STATIC --TARGET=SOLARIS_DYNAMIC -+#TARGET=SOLARIS_DYNAMIC - - prefix = /opt/BCallegro - exec_prefix = ${prefix} -@@ -60,6 +60,19 @@ - endif - - -+# HAIKU_STATIC -+ifeq ($(TARGET),HAIKU_STATIC) -+TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math -+OBJDIR=obj/haiku/static -+LIBDEST=lib/libalmp3.a -+endif -+ -+# HAIKU_SHARED -+ifeq ($(TARGET),HAIKU_SHARED) -+TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math -+OBJDIR=obj/haiku/dynamic -+LIBDEST=lib/libalmp3.so -+endif - - # LINUX_STATIC - ifeq ($(TARGET),LINUX_STATIC) -@@ -106,7 +119,6 @@ - endif - endif - -- - # compiling of the library - %.o: %.c - $(CC) -c $(CFLAGS) $< -o $(OBJDIR)/$@ -@@ -118,7 +130,8 @@ - $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/almp3/AUTHORS.txt - $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/almp3/COPYING.txt - $(INSTALL_DATA) -D include/almp3.h $(DESTDIR)$(includedir)/almp3.h -- $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/libalmp3.so -+ $(INSTALL) -m 755 -D lib/libalmp3.so $(DESTDIR)$(libdir)/libalmp3.so -+ $(INSTALL) -m 755 -D lib/libalmp3.a $(DESTDIR)$(libdir)/libalmp3.a - - clean: - rm -f $(OBJECTS2) $(LIBDEST) $(LIBIMP) diff --git a/media-libs/almp3/patches/almp3-2.0.4.patchset b/media-libs/almp3/patches/almp3-2.0.4.patchset new file mode 100644 index 000000000..93d6cee07 --- /dev/null +++ b/media-libs/almp3/patches/almp3-2.0.4.patchset @@ -0,0 +1,165 @@ +From 4bceec3bc45e00d53904c01167a2703d2f5242ac Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 31 Dec 2014 23:17:09 -0800 +Subject: Fix lvalues + +Casts are not lvalues. + +diff --git a/src/almp3.c b/src/almp3.c +index 0757ca9..e10a693 100644 +--- a/src/almp3.c ++++ b/src/almp3.c +@@ -319,6 +319,7 @@ ALMP3_MP3 *almp3_create_mp3(void *data, int data_len) { + int ret; + char test_outbuf[8192]; + int test_size, framebytes; ++ char **data_ptr = (char **)&data; + + /* test for ID3v1 and if exists, skip it */ + if (memcmp((void *)&p[data_len - 128], "TAG", 3) == 0) { +@@ -330,7 +331,7 @@ ALMP3_MP3 *almp3_create_mp3(void *data, int data_len) { + + /* test for ID3v2 and if exists, skip it */ + data_start_skipped = almp3_get_id3v2_skip_bytes(p); +- (char *)data += data_start_skipped; ++ *data_ptr += data_start_skipped; + data_len -= data_start_skipped; + + /* test the next 16 * MAXFRAMESIZE bytes after ID3v2 until we find one valid frame */ +@@ -378,7 +379,7 @@ ALMP3_MP3 *almp3_create_mp3(void *data, int data_len) { + + data_start_skipped += skipbytes; + data_len -= skipbytes; +- (char *)data += skipbytes; ++ *data_ptr += skipbytes; + } + + /* must be layer III or II */ +-- +1.8.3.4 + + +From 500c50db231aa5bba5bfbd4029215d1a82f7a76f Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Wed, 31 Dec 2014 23:16:56 -0800 +Subject: Add makefile rules for Haiku and make obj and lib dir before building + + +diff --git a/Makefile b/Makefile +index 508570f..43f3654 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,7 @@ + #TARGET=MINGW32_STATIC + #TARGET=MINGW32_DLL + #TARGET=LINUX_STATIC +-TARGET=SOLARIS_DYNAMIC ++#TARGET=SOLARIS_DYNAMIC + + prefix = /opt/BCallegro + exec_prefix = ${prefix} +@@ -60,6 +60,19 @@ ALMP3_DLL_EXPORTS=1 + endif + + ++# HAIKU_STATIC ++ifeq ($(TARGET),HAIKU_STATIC) ++TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math ++OBJDIR=obj/haiku/static ++LIBDEST=lib/haiku/libalmp3.a ++endif ++ ++# HAIKU_DYNAMIC ++ifeq ($(TARGET),HAIKU_DYNAMIC) ++TARGETFLAGS=-Wall -O2 -march=pentium -fomit-frame-pointer -finline-functions -ffast-math -shared ++OBJDIR=obj/haiku/dynamic ++LIBDEST=lib/haiku/libalmp3.so ++endif + + # LINUX_STATIC + ifeq ($(TARGET),LINUX_STATIC) +@@ -90,6 +103,11 @@ OBJECTS2=$(addprefix $(OBJDIR)/,$(OBJECTS)) + + # making of the library + ++$(LIBDEST): $(dir $(LIBDEST)) ++ ++$(dir $(LIBDEST)): ++ mkdir -p $@ ++ + # MINGW32_DLL + ifeq ($(TARGET),MINGW32_DLL) + $(LIBDEST): $(OBJECTS) +@@ -97,9 +115,9 @@ $(LIBDEST): $(OBJECTS) + + # others + else +-ifeq ($(TARGET),SOLARIS_DYNAMIC) ++ifeq ($(findstring _DYNAMIC,$(TARGET)),_DYNAMIC) + $(LIBDEST): $(OBJECTS) +- $(CC) -o $@ $(OBJECTS2) $(LFLAGS) $(CFLAGS) -lalleg-4.2.0 ++ $(CC) -o $@ $(OBJECTS2) $(LFLAGS) $(CFLAGS) -lalleg + else + $(LIBDEST): $(OBJECTS) + ar rs $(LIBDEST) $(OBJECTS2) +@@ -108,9 +126,12 @@ endif + + + # compiling of the library +-%.o: %.c ++%.o: %.c $(OBJDIR) + $(CC) -c $(CFLAGS) $< -o $(OBJDIR)/$@ + ++$(OBJDIR): ++ mkdir -p $@ ++ + install: + $(INSTALL_DATA) -D README.txt $(DESTDIR)$(docdir)/almp3/README.txt + $(INSTALL_DATA) -D CHANGES.txt $(DESTDIR)$(docdir)/almp3/CHANGES.txt +@@ -118,7 +139,11 @@ install: + $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/almp3/AUTHORS.txt + $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/almp3/COPYING.txt + $(INSTALL_DATA) -D include/almp3.h $(DESTDIR)$(includedir)/almp3.h +- $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/libalmp3.so ++ifeq ($(findstring _DYNAMIC,$(TARGET)),_DYNAMIC) ++ $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/$(notdir $(LIBDEST)) ++else ++ $(INSTALL) -m 644 -D $(LIBDEST) $(DESTDIR)$(libdir)/$(notdir $(LIBDEST)) ++endif + + clean: + rm -f $(OBJECTS2) $(LIBDEST) $(LIBIMP) +-- +1.8.3.4 + + +From 801ceeecb0770d2d6378fcf79339982474d15038 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Thu, 1 Jan 2015 00:38:16 -0800 +Subject: Assume docdir already covers the specific package name + + +diff --git a/Makefile b/Makefile +index 43f3654..32a43bd 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,11 +133,11 @@ $(OBJDIR): + mkdir -p $@ + + install: +- $(INSTALL_DATA) -D README.txt $(DESTDIR)$(docdir)/almp3/README.txt +- $(INSTALL_DATA) -D CHANGES.txt $(DESTDIR)$(docdir)/almp3/CHANGES.txt +- $(INSTALL_DATA) -D docs/ALMP3.txt $(DESTDIR)$(docdir)/almp3/ALMP3.txt +- $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/almp3/AUTHORS.txt +- $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/almp3/COPYING.txt ++ $(INSTALL_DATA) -D README.txt $(DESTDIR)$(docdir)/README.txt ++ $(INSTALL_DATA) -D CHANGES.txt $(DESTDIR)$(docdir)/CHANGES.txt ++ $(INSTALL_DATA) -D docs/ALMP3.txt $(DESTDIR)$(docdir)/ALMP3.txt ++ $(INSTALL_DATA) -D docs/AUTHORS.txt $(DESTDIR)$(docdir)/AUTHORS.txt ++ $(INSTALL_DATA) -D docs/COPYING.txt $(DESTDIR)$(docdir)/COPYING.txt + $(INSTALL_DATA) -D include/almp3.h $(DESTDIR)$(includedir)/almp3.h + ifeq ($(findstring _DYNAMIC,$(TARGET)),_DYNAMIC) + $(INSTALL) -m 755 -D $(LIBDEST) $(DESTDIR)$(libdir)/$(notdir $(LIBDEST)) +-- +1.8.3.4 + From e1f5fcc5ce1b53723b04211cd2efb13cefeb0fc6 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 00:48:59 -0800 Subject: [PATCH 181/326] Remove aplayer-4.0.1 - It's the old bep format - It fails lint - There is a new recipe available --- haiku-apps/aplayer/aplayer-4.0.1.recipe | 26 ------------------------- 1 file changed, 26 deletions(-) delete mode 100644 haiku-apps/aplayer/aplayer-4.0.1.recipe diff --git a/haiku-apps/aplayer/aplayer-4.0.1.recipe b/haiku-apps/aplayer/aplayer-4.0.1.recipe deleted file mode 100644 index 632910dbf..000000000 --- a/haiku-apps/aplayer/aplayer-4.0.1.recipe +++ /dev/null @@ -1,26 +0,0 @@ -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" -SRC_URI="svn://pulkomandy.tk/APlayer/trunk/" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="" - -BUILD() -{ - cd aplayer-4.0.1/Master - make -} - -INSTALL() -{ - mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer - cp -a APlayer ${DESTDIR}/`finddir B_APPS_DIRECTORY`/APlayer -} - -LICENSE="Artistic Licence" -COPYRIGHT="1994-2002 Polycode - 2011-2012 Adrien Destugues - " From 3b728a2c419bc80860561f348c88ad5e56fde902 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 00:50:35 -0800 Subject: [PATCH 182/326] Remove apache-2.2.* - It's the old bep format - It fails lint - There is a new recipe available --- www-servers/apache/apache-2.2.17.recipe | 35 -------------- www-servers/apache/apache-2.2.22.recipe | 35 -------------- .../apache/patches/apache-2.2.17.patch | 48 ------------------- .../apache/patches/apache-2.2.22.patch | 48 ------------------- 4 files changed, 166 deletions(-) delete mode 100644 www-servers/apache/apache-2.2.17.recipe delete mode 100644 www-servers/apache/apache-2.2.22.recipe delete mode 100644 www-servers/apache/patches/apache-2.2.17.patch delete mode 100644 www-servers/apache/patches/apache-2.2.22.patch diff --git a/www-servers/apache/apache-2.2.17.recipe b/www-servers/apache/apache-2.2.17.recipe deleted file mode 100644 index 03f0586e4..000000000 --- a/www-servers/apache/apache-2.2.17.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org" -SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.17.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4 2 - dev-libs/apr-utils >= 1.3.9" -CHECKSUM_MD5="66d8e107f85acc039fd5e624e85728a9" -BUILD() -{ - cd httpd-2.2.17 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL() -{ - cd httpd-2.2.17 - make install -} - -TEST() -{ - cd httpd-2.2.17 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2009 The Apache Software Foundation." diff --git a/www-servers/apache/apache-2.2.22.recipe b/www-servers/apache/apache-2.2.22.recipe deleted file mode 100644 index 24d867e0e..000000000 --- a/www-servers/apache/apache-2.2.22.recipe +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION="The Apache Web Server." -HOMEPAGE="http://httpd.apache.org" -SRC_URI="http://apache.osuosl.org//httpd/httpd-2.2.22.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4 2 - dev-libs/apr-utils >= 1.3.9" -CHECKSUM_MD5="d77fa5af23df96a8af68ea8114fa6ce1" -BUILD() -{ - cd httpd-2.2.22 - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --sbindir=`finddir B_COMMON_BIN_DIRECTORY` \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` - make -} - -INSTALL() -{ - cd httpd-2.2.22 - make install -} - -TEST() -{ - cd httpd-2.2.22 - make test -} - -LICENSE="Apache v2" -COPYRIGHT="2012 The Apache Software Foundation." diff --git a/www-servers/apache/patches/apache-2.2.17.patch b/www-servers/apache/patches/apache-2.2.17.patch deleted file mode 100644 index 53697699a..000000000 --- a/www-servers/apache/patches/apache-2.2.17.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN httpd-2.2.17/server/mpm_common.c httpd-2.2.17-haiku/server/mpm_common.c ---- httpd-2.2.17/server/mpm_common.c 2010-10-07 16:56:54.055836672 +0000 -+++ httpd-2.2.17-haiku/server/mpm_common.c 2011-02-05 10:58:12.295436288 +0000 -@@ -950,7 +950,7 @@ - - static const char *dash_k_arg; - --static int send_signal(pid_t pid, int sig) -+static int _send_signal(pid_t pid, int sig) - { - if (kill(pid, sig) < 0) { - ap_log_error(APLOG_MARK, APLOG_STARTUP, errno, NULL, -@@ -1007,7 +1007,7 @@ - printf("%s\n", status); - } - else { -- send_signal(otherpid, SIGTERM); -+ _send_signal(otherpid, SIGTERM); - } - return 1; - } -@@ -1017,7 +1017,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, SIGHUP); -+ *exit_status = _send_signal(otherpid, SIGHUP); - return 1; - } - } -@@ -1027,7 +1027,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL); - return 1; - } - } -@@ -1038,7 +1038,7 @@ - printf("%s\n", status); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL_STOP); - } - #else - printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n"); diff --git a/www-servers/apache/patches/apache-2.2.22.patch b/www-servers/apache/patches/apache-2.2.22.patch deleted file mode 100644 index d615f7fc3..000000000 --- a/www-servers/apache/patches/apache-2.2.22.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN httpd-2.2.22/server/mpm_common.c httpd-2.2.22-haiku/server/mpm_common.c ---- httpd-2.2.22/server/mpm_common.c 2010-10-07 16:56:54.055836672 +0000 -+++ httpd-2.2.22-haiku/server/mpm_common.c 2011-02-05 10:58:12.295436288 +0000 -@@ -950,7 +950,7 @@ - - static const char *dash_k_arg; - --static int send_signal(pid_t pid, int sig) -+static int _send_signal(pid_t pid, int sig) - { - if (kill(pid, sig) < 0) { - ap_log_error(APLOG_MARK, APLOG_STARTUP, errno, NULL, -@@ -1007,7 +1007,7 @@ - printf("%s\n", status); - } - else { -- send_signal(otherpid, SIGTERM); -+ _send_signal(otherpid, SIGTERM); - } - return 1; - } -@@ -1017,7 +1017,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, SIGHUP); -+ *exit_status = _send_signal(otherpid, SIGHUP); - return 1; - } - } -@@ -1027,7 +1027,7 @@ - printf("httpd not running, trying to start\n"); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL); - return 1; - } - } -@@ -1038,7 +1038,7 @@ - printf("%s\n", status); - } - else { -- *exit_status = send_signal(otherpid, AP_SIG_GRACEFUL_STOP); -+ *exit_status = _send_signal(otherpid, AP_SIG_GRACEFUL_STOP); - } - #else - printf("httpd MPM \"" MPM_NAME "\" does not support graceful-stop\n"); From c974e8040e660637ac904941b565333df85bb761 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 1 Jan 2015 01:25:12 -0800 Subject: [PATCH 183/326] Fix lint test for anthy --- app-i18n/anthy/anthy-9100.recipe | 33 ------------- app-i18n/anthy/anthy-9100h.recipe | 80 +++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 33 deletions(-) delete mode 100644 app-i18n/anthy/anthy-9100.recipe create mode 100644 app-i18n/anthy/anthy-9100h.recipe diff --git a/app-i18n/anthy/anthy-9100.recipe b/app-i18n/anthy/anthy-9100.recipe deleted file mode 100644 index 43ec7b3f1..000000000 --- a/app-i18n/anthy/anthy-9100.recipe +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY="Japanese input system" -DESCRIPTION=" -Anthy is a Japanese input method working on X11 and Emacs. \ -It converts hiragana text to mixed kana and kanji. It is implemented as \ -a library and stores private information securely in ~/.anthy/. Thus, \ -Anthy is simple and secure (information is protected from spoofing and snooping). -" -HOMEPAGE="http://anthy.sourceforge.jp/" -SRC_URI="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2Fanthy%2F37536%2Fanthy-9100h.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd anthy-9100h - libtoolize --force --copy --install - aclocal - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd anthy-9100h - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2000-2007 TABATA Yusuke, UGAWA Tomoharu - 2004-2006 YOSHIDA Yuichi - 2000-2007 KMC(Kyoto University Micro Computer Club) - 2001-2002 TAKAI Kosuke, Nobuoka Takahiro" diff --git a/app-i18n/anthy/anthy-9100h.recipe b/app-i18n/anthy/anthy-9100h.recipe new file mode 100644 index 000000000..aff21e1ae --- /dev/null +++ b/app-i18n/anthy/anthy-9100h.recipe @@ -0,0 +1,80 @@ +SUMMARY="Japanese input system" +DESCRIPTION=" +Anthy is a Japanese input method working on X11 and Emacs. \ +It converts hiragana text to mixed kana and kanji. It is implemented as \ +a library and stores private information securely in ~/.anthy/. Thus, \ +Anthy is simple and secure (information is protected from spoofing and snooping). +" +HOMEPAGE="http://anthy.sourceforge.jp/" +SRC_URI="http://sourceforge.jp/frs/redir.php?f=%2Fanthy%2F37536%2Fanthy-9100h.tar.gz" +CHECKSUM_SHA256="d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:sed + " +REQUIRES=" + haiku + " +REQUIRES_devel=" + haiku_devel + anthy == $portVersion base + " +PROVIDES=" + anthy = $portVersion + cmd:anthy_agent = $portVersion + cmd:anthy_dic_tool = $portVersion + cmd:anthy_morphological_analyzer = $portVersion + lib:libanthy = 0.1.0 compat >= 0 + lib:libanthydic = 0.1.0 compat >= 0 + lib:libanthyinput = 0.0.0 compat >= 0 + " +PROVIDES_devel=" + anthy_devel = $portVersion + devel:libanthy = 0.1.0 compat >= 0 + devel:libanthydic = 0.1.0 compat >= 0 + devel:libanthyinput = 0.0.0 compat >= 0 + " +GLOBAL_WRITABLE_FILES=" + settings/anthy-conf auto-merge + " +PATCH() +{ + sed -i 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' configure.ac +} + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs \ + libanthy \ + libanthydic \ + libanthyinput + fixPkgconfig + packageEntries devel \ + $developDir +} +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000-2007 TABATA Yusuke, UGAWA Tomoharu + 2004-2006 YOSHIDA Yuichi + 2000-2007 KMC(Kyoto University Micro Computer Club) + 2001-2002 TAKAI Kosuke, Nobuoka Takahiro" From b8a721d51b1bfa42306fc0cf1ce9bde9b660a480 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Fri, 2 Jan 2015 09:58:28 +0300 Subject: [PATCH 184/326] SimplyVorbis: fix install() --- haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe index 8b5fe4b83..2c36255c9 100644 --- a/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe +++ b/haiku-apps/simplyvorbis/simplyvorbis-0.1.recipe @@ -10,11 +10,11 @@ ArmyKnife (which does have its uses). Pop in a CD, select the songs you want, an hit 'Go'. Period. It can even make playlists for you if you like. Your music isn't \ limited by copy protection (DRM) either, so you can have all the flexibility of Fair Use." HOMEPAGE="https://github.com/HaikuArchives/SimplyVorbis" -SRC_URI="git+https://github.com/HaikuArchives/SimplyVorbis.git#63290af1f2cda8e5e31393780ee96a16132b4dba" +SRC_URI="git+https://github.com/HaikuArchives/SimplyVorbis.git#ecd4b2dd31f3ec578f16c9a1c3a95e281958a248" CHECKSUM_SHA256="" LICENSE="SimplyVorbis" COPYRIGHT="2007 Darkwyrm" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2" @@ -44,10 +44,13 @@ BUILD_PREREQUIRES=" BUILD() { - make + make $jobArgs OBJ_DIR=objects } INSTALL() { - make install -} \ No newline at end of file + mkdir -p $appsDir + cp objects/SimplyVorbis $appsDir + + addAppDeskbarSymlink $appsDir/SimplyVorbis +} From 27dd4c7e09ba18116d795b66660152ce4faa9841 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Fri, 2 Jan 2015 14:12:46 +0100 Subject: [PATCH 185/326] Updated to new QuickLaunch 0.9.8 release. --- .../quicklaunch/quicklaunch-0.9.8.recipe | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe new file mode 100644 index 000000000..118f873ba --- /dev/null +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.8.recipe @@ -0,0 +1,57 @@ +SUMMARY="A tool to quickly start any installed application" +DESCRIPTION=" +QuickLaunch is a small launcher tool that helps you to quickly start any \ +installed application (as long as it has an app-signature). Simply start \ +to enter the name of an application and QuickLaunch will find all programs \ +matching these initial letters and show them in a list. +You choose an app from that list with the CursorUp/Down keys and launch it \ +by hitting RETURN. ESC quits QuickLaunch. + +It's recommended to set a key combo to start QuickLaunch with Haiku's \ +Shortcuts preferences. +" +HOMEPAGE="http://sourceforge.net/projects/quicklaunch-h/" +SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#b34dd3f1087111b3fc0645182b8719a29da8de22" +LICENSE="MIT" +COPYRIGHT="2014 Humdinger" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + quicklaunch = $portVersion + app:QuickLaunch = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +USER_SETTINGS_FILES="settings/QuickLaunch_settings" + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + quicklaunchDir=$appsDir/QuickLaunch + mkdir -p $quicklaunchDir + + cp -af objects/QuickLaunch $quicklaunchDir + cp -af ReadMe.html $quicklaunchDir + cp -r images $quicklaunchDir + + chmod +x Add\ to\ Deskbar.sh + cp -af Add\ to\ Deskbar.sh $quicklaunchDir + + addAppDeskbarSymlink $quicklaunchDir/QuickLaunch +} From 6ad8617d98b2d70163bc53f51b1bce070f53d7fc Mon Sep 17 00:00:00 2001 From: skykinetic Date: Fri, 2 Jan 2015 22:33:03 +0800 Subject: [PATCH 186/326] AESAddon: Added incomplete recipe --- haiku-apps/aesaddon/aesaddon-0.3.1.recipe | 42 +++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 haiku-apps/aesaddon/aesaddon-0.3.1.recipe diff --git a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe new file mode 100644 index 000000000..3f9f0f70e --- /dev/null +++ b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe @@ -0,0 +1,42 @@ +SUMMARY="A 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 encryption. It works only as a \ + Tracker add-on. + " +HOMEPAGE="https://web.archive.org/web/20100420135939/http://dev.osdrawer.net/projects/aesaddon" +SRC_URI="git://github.com/HaikuArchives/AESAddOn#b0db611c85762508d346d1db7cfa5608acefa008" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="1999-2013 Haikuware" + +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + aesaddon = $portVersion + app:AESAddOn = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " + +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:g++ + " +BUILD() { + cd src + make $jobArgs +} + +INSTALL() { + cd src + make install INSTALL_DIR=$addOnsDir/Tracker +} From 6ac15bdbf88faef6f7ef3338be02f14eed6d1030 Mon Sep 17 00:00:00 2001 From: skykinetic Date: Fri, 2 Jan 2015 23:24:20 +0800 Subject: [PATCH 187/326] AESAddOn: Updated recipe to match source update --- haiku-apps/aesaddon/aesaddon-0.3.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe index 3f9f0f70e..ab113e20d 100644 --- a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe +++ b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe @@ -5,7 +5,7 @@ DESCRIPTION=" Tracker add-on. " HOMEPAGE="https://web.archive.org/web/20100420135939/http://dev.osdrawer.net/projects/aesaddon" -SRC_URI="git://github.com/HaikuArchives/AESAddOn#b0db611c85762508d346d1db7cfa5608acefa008" +SRC_URI="git://github.com/HaikuArchives/AESAddOn#78dd4c50634a97bbe04bd68479cedc114a14cb4d" REVISION="1" LICENSE="MIT" COPYRIGHT="1999-2013 Haikuware" From 3f734ffe5b2ca44c3962e55f6de92426e9279e40 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 3 Jan 2015 23:07:53 +0100 Subject: [PATCH 188/326] Add app2png recipe --- dev-util/app2png/app2png-1.0.0.recipe | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 dev-util/app2png/app2png-1.0.0.recipe diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe new file mode 100644 index 000000000..0000fc138 --- /dev/null +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -0,0 +1,41 @@ +SUMMARY="Turn legacy BeOS app icons into PNGs." +DESCRIPTION="\ +With app2png, you can extract attribute-based icons from BeOS apps and save \ +them into PNG files. These PNG icons can then be used to recreate the icon as \ +a vector, or for use on a site." + +HOMEPAGE="https://github.com/HaikuArchives/app2png" +SRC_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + app2png = $portVersion + app:app2png = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $binDir + cp -a objects/app2png $binDir +} From 914b935b4c74ee7a9747fd1683f4b7b8e1e13a01 Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sat, 3 Jan 2015 23:57:06 +0000 Subject: [PATCH 189/326] Added luarocks-2.2.0 recipe file --- dev-lua/luarocks/luarocks-2.2.0.recipe | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 dev-lua/luarocks/luarocks-2.2.0.recipe diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe new file mode 100644 index 000000000..c7ded971c --- /dev/null +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="a deployment and management system for Lua modules." +DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +HOMEPAGE="http://luarocks.org" +SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" +SOURCE_DIR=$portVersionedName +REVISION="2" +CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279c" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +PROVIDES=" + cmd:luarocks = $portVersion + " +REQUIRES=" + haiku + lua + lib:liblua + " +BUILD_REQUIRES=" + lua_devel + devel:liblua + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:lua + cmd:luac + cmd:gcc + cmd:ld + cmd:make + cmd:sed + cmd:wget + cmd:md5sum + " + +BUILD() +{ + echo "PREFIX = $prefix" + ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + make build +} +INSTALL() +{ + make install +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 Kepler Project" From c6c8d6d9a8af6bd0513a4df8ab9ac48712f4b33b Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 00:51:52 +0000 Subject: [PATCH 190/326] Removed redundant requires --- dev-lua/luarocks/luarocks-2.2.0.recipe | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index c7ded971c..41af7eff5 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -9,20 +9,17 @@ CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279 ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" cmd:luarocks = $portVersion + cmd:luarocks_admin = $portVersion " REQUIRES=" haiku lua - lib:liblua " BUILD_REQUIRES=" lua_devel - devel:liblua " BUILD_PREREQUIRES=" haiku_devel - cmd:lua - cmd:luac cmd:gcc cmd:ld cmd:make @@ -33,7 +30,6 @@ BUILD_PREREQUIRES=" BUILD() { - echo "PREFIX = $prefix" ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib make build } From ea7131bc81cc362c1344046b164740f733688eca Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 04:17:50 +0000 Subject: [PATCH 191/326] Addition of env variables --- dev-lua/luarocks/luarocks-2.2.0.recipe | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index 41af7eff5..06f16e7ae 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -1,5 +1,8 @@ SUMMARY="a deployment and management system for Lua modules." -DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +DESCRIPTION=" +LuaRocks allows you to install modules as self-contained packages \ +called rocks, which also contain version dependency information. +" HOMEPAGE="http://luarocks.org" SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" SOURCE_DIR=$portVersionedName @@ -14,12 +17,16 @@ PROVIDES=" REQUIRES=" haiku lua + lib:liblua " BUILD_REQUIRES=" lua_devel + devel:liblua " BUILD_PREREQUIRES=" haiku_devel + cmd:lua + cmd:luac cmd:gcc cmd:ld cmd:make @@ -30,7 +37,7 @@ BUILD_PREREQUIRES=" BUILD() { - ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + ./configure --prefix=$prefix --with-lua=$binDir --with-lua-include=$includeDir --with-lua-lib=$libDir make build } INSTALL() From 4c494f443714a26cc6abe20c1391ed708940c2d2 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 4 Jan 2015 08:58:53 +0100 Subject: [PATCH 192/326] Fix policy error, small changes in SUMMARY and DESCRIPTION. --- dev-util/app2png/app2png-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe index 0000fc138..a55fdbf09 100644 --- a/dev-util/app2png/app2png-1.0.0.recipe +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -1,8 +1,8 @@ -SUMMARY="Turn legacy BeOS app icons into PNGs." +SUMMARY="Turn legacy BeOS application icons into PNGs" DESCRIPTION="\ -With app2png, you can extract attribute-based icons from BeOS apps and save \ -them into PNG files. These PNG icons can then be used to recreate the icon as \ -a vector, or for use on a site." +With app2png, you can extract attribute-based bitmap icons from BeOS apps and \ +save them into PNG files. These PNG icons can then be used to recreate the \ +icon as a vector, or for use on a website." HOMEPAGE="https://github.com/HaikuArchives/app2png" SRC_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412" @@ -14,7 +14,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" app2png = $portVersion - app:app2png = $portVersion + cmd:app2png = $portVersion " REQUIRES=" haiku From df0dd25df8fc80870979b4d91cea4d1724c71ae4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 14:47:51 +0000 Subject: [PATCH 193/326] Add a new font, Clear Sans --- media-fonts/clear_sans/clear_sans-1.00.recipe | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media-fonts/clear_sans/clear_sans-1.00.recipe diff --git a/media-fonts/clear_sans/clear_sans-1.00.recipe b/media-fonts/clear_sans/clear_sans-1.00.recipe new file mode 100644 index 000000000..8275af4b2 --- /dev/null +++ b/media-fonts/clear_sans/clear_sans-1.00.recipe @@ -0,0 +1,35 @@ +SUMMARY="The Clear Sans font" +DESCRIPTION="Clear Sans has been recognized as a versatile OpenType font for \ +screen, print, and Web. Clear Sans was designed with on-screen legibility \ +in mind. It strikes a balance between contemporary, professional, and stylish \ +expression and thoroughly functional purpose. It has a sophisticated and elegant \ +personality at all sizes, and its thoughtful design becomes even more evident at \ +the thin weight." +HOMEPAGE="https://01.org/clear-sans" +SRC_URI="https://01.org/sites/default/files/downloads/clear-sans/clearsans-1.00.zip" +CHECKSUM_SHA256="41809a296870dd7b4753d6532b4093821d61f9806281e6c053ccb11083ad1190" +LICENSE="Apache v2" +COPYRIGHT="2013 Intel" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="clear_sans = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + cp TTF/* ${FONTDIR} +} From 7e06c7fb756e470608f72834c06e74d89e54e4ac Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 16:08:24 +0000 Subject: [PATCH 194/326] Add a new font, Noto Sans --- media-fonts/noto_sans/noto_sans-1.00.recipe | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media-fonts/noto_sans/noto_sans-1.00.recipe diff --git a/media-fonts/noto_sans/noto_sans-1.00.recipe b/media-fonts/noto_sans/noto_sans-1.00.recipe new file mode 100644 index 000000000..8524dbb6b --- /dev/null +++ b/media-fonts/noto_sans/noto_sans-1.00.recipe @@ -0,0 +1,35 @@ +SUMMARY="The Noto Sans font" +DESCRIPTION="Noto's goal is providing a beautiful reading experience for everyone \ +and for all languages. With visual harmony when multiple languages share a page. With \ +multiple styles and weights. Freely available to all. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans-hinted.zip" +CHECKSUM_SHA256="e954b37fb20e858a48bb1da513d120ae26afa1189b10922d46486ff06967d074" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_sans=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From 29f76b45133240b73426b80b14cbfbd4fec0bef6 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 16:08:30 +0000 Subject: [PATCH 195/326] Add a new font, Noto Serif --- media-fonts/noto_serif/noto_serif-1.00.recipe | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 media-fonts/noto_serif/noto_serif-1.00.recipe diff --git a/media-fonts/noto_serif/noto_serif-1.00.recipe b/media-fonts/noto_serif/noto_serif-1.00.recipe new file mode 100644 index 000000000..4271f7a0c --- /dev/null +++ b/media-fonts/noto_serif/noto_serif-1.00.recipe @@ -0,0 +1,35 @@ +SUMMARY="The Noto Serif font" +DESCRIPTION="Noto's goal is providing a beautiful reading experience for everyone \ +and for all languages. With visual harmony when multiple languages share a page. With \ +multiple styles and weights. Freely available to all. +" +HOMEPAGE="https://www.google.com/get/noto/" +SRC_URI="https://www.google.com/get/noto/pkgs/NotoSerif-hinted.zip" +CHECKSUM_SHA256="3d23e8c04fdcfacfc9c2ea3abae0afbdd441cfbc3721b8b674e9d22fa92b97aa" +LICENSE="Apache v2" +COPYRIGHT="2012 Google Inc." +REVISION="1" +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes +PROVIDES=" + noto_serif=$portVersion + " +REQUIRES=" " +BUILD_REQUIRES=" " +BUILD_PREREQUIRES=" + coreutils + " +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + + cp *.ttf ${FONTDIR} +} From bcee20e5014019b0b43af537e15c58813a12c66c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 19:47:06 +0000 Subject: [PATCH 196/326] coreutils: apply gcc2 patchset only for gcc2. --- sys-apps/coreutils/coreutils-8.22.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index ed3431192..171811315 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -26,8 +26,12 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES=" coreutils-$portVersion.patchset - coreutils-$portVersion.gcc2.patchset " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES+=" + coreutils-$portVersion.gcc2.patchset + " +fi PROVIDES=" coreutils = $portVersion compat >= 8 From c6c3199ac48cd297727b5c1f0b4ab8fb472944b8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 20:40:53 +0000 Subject: [PATCH 197/326] soxr: disable visibility hidden for gcc2. --- media-libs/soxr/soxr-0.1.1.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media-libs/soxr/soxr-0.1.1.recipe b/media-libs/soxr/soxr-0.1.1.recipe index e211c4fff..db35739bd 100644 --- a/media-libs/soxr/soxr-0.1.1.recipe +++ b/media-libs/soxr/soxr-0.1.1.recipe @@ -41,13 +41,17 @@ PATCHES="soxr-${portVersion}.patchset" BUILD() { + if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + visibilityArgs="-DVISIBILITY_HIDDEN=OFF" + fi cmake . \ -DCMAKE_INSTALL_PREFIX=$prefix \ -DBUILD_TESTS=OFF \ -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$libDir \ -DINCLUDE_INSTALL_DIR=$includeDir \ - -DDOC_INSTALL_DIR=$docDir + -DDOC_INSTALL_DIR=$docDir \ + $visibilityArgs make $jobArgs } From 7231d5c134991859f12a3403ce3ea600621396df Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 22:23:07 +0000 Subject: [PATCH 198/326] libebml & libmatroska: bump version. * switch to autotools. --- dev-libs/libebml/libebml-1.0.0.recipe | 25 ------- ...ebml-1.3.0.recipe => libebml-1.3.1.recipe} | 46 +++++++------ .../libebml/patches/libebml-0.7.8-haiku.diff | 21 ------ dev-libs/libebml/patches/libebml-1.0.0.patch | 67 ------------------- .../libebml/patches/libebml-1.3.1.patchset | 22 ++++++ .../libmatroska/libmatroska-1.0.0.recipe | 25 ------- ...-1.4.1.recipe => libmatroska-1.4.2.recipe} | 48 ++++++------- .../patches/libmatroska-1.0.0.patch | 47 ------------- .../patches/libmatroska-1.4.2.patchset | 22 ++++++ 9 files changed, 94 insertions(+), 229 deletions(-) delete mode 100644 dev-libs/libebml/libebml-1.0.0.recipe rename dev-libs/libebml/{libebml-1.3.0.recipe => libebml-1.3.1.recipe} (53%) delete mode 100644 dev-libs/libebml/patches/libebml-0.7.8-haiku.diff delete mode 100644 dev-libs/libebml/patches/libebml-1.0.0.patch create mode 100644 dev-libs/libebml/patches/libebml-1.3.1.patchset delete mode 100644 media-libs/libmatroska/libmatroska-1.0.0.recipe rename media-libs/libmatroska/{libmatroska-1.4.1.recipe => libmatroska-1.4.2.recipe} (55%) delete mode 100644 media-libs/libmatroska/patches/libmatroska-1.0.0.patch create mode 100644 media-libs/libmatroska/patches/libmatroska-1.4.2.patchset diff --git a/dev-libs/libebml/libebml-1.0.0.recipe b/dev-libs/libebml/libebml-1.0.0.recipe deleted file mode 100644 index 4c79fea0c..000000000 --- a/dev-libs/libebml/libebml-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03" -BUILD() -{ - cd libebml-1.0.0/make/linux - make -} - -INSTALL() -{ - cd libebml-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.1.recipe similarity index 53% rename from dev-libs/libebml/libebml-1.3.0.recipe rename to dev-libs/libebml/libebml-1.3.1.recipe index 3957bf4ce..7afdcadcf 100644 --- a/dev-libs/libebml/libebml-1.3.0.recipe +++ b/dev-libs/libebml/libebml-1.3.1.recipe @@ -1,64 +1,68 @@ SUMMARY="libebml is a C++ library to parse EBML content (read/write)." DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.0.tar.bz2" -CHECKSUM_SHA256="83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" - +SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2" +CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" libebml$secondaryArchSuffix = $portVersion - lib:libebml$secondaryArchSuffix = 4 + lib:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES=" haiku${secondaryArchSuffix} + lib:libstdc++${secondaryArchSuffix} " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libebml-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/ebml,g" make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile - sed -i 's/\(#elif defined(__BEOS__)\)/\1 || defined(__HAIKU__)/g' \ - ebml/c/libebml_t.h -} - BUILD() { - cd make/linux + autoreconf -f -i + runConfigure ./configure make $jobArgs } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libebml + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libebml${secondaryArchSuffix}_devel = $portVersion - devel:libebml$secondaryArchSuffix = 4 + devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES_devel=" libebml$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff b/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff deleted file mode 100644 index 8bccf378a..000000000 --- a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libebml-0.7.8/ebml/c/libebml_t.h libebml-0.7.8-haiku/ebml/c/libebml_t.h ---- libebml-0.7.8/ebml/c/libebml_t.h 2009-03-01 02:10:48.000000000 +0000 -+++ libebml-0.7.8-haiku/ebml/c/libebml_t.h 2009-03-01 02:06:42.000000000 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include diff --git a/dev-libs/libebml/patches/libebml-1.0.0.patch b/dev-libs/libebml/patches/libebml-1.0.0.patch deleted file mode 100644 index 034937173..000000000 --- a/dev-libs/libebml/patches/libebml-1.0.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h ---- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000 -+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined (__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include -diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-destdir/make/linux/Makefile ---- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.060817408 +0000 -+++ libebml-1.0.0-destdir/make/linux/Makefile 2010-09-22 12:58:40.962854912 +0000 -@@ -13,6 +13,9 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+# Haiku wants the libs and headers in /boot/common -+else ifeq (Haiku,$(shell uname -s)) -+prefix=/boot/common - else - prefix=/usr/local - endif -@@ -122,23 +125,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - - ifneq ($(wildcard .depend),) diff --git a/dev-libs/libebml/patches/libebml-1.3.1.patchset b/dev-libs/libebml/patches/libebml-1.3.1.patchset new file mode 100644 index 000000000..2297479ad --- /dev/null +++ b/dev-libs/libebml/patches/libebml-1.3.1.patchset @@ -0,0 +1,22 @@ +From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:37:55 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index 9b10ee8..3e11510 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + diff --git a/media-libs/libmatroska/libmatroska-1.0.0.recipe b/media-libs/libmatroska/libmatroska-1.0.0.recipe deleted file mode 100644 index 4db5ffdc4..000000000 --- a/media-libs/libmatroska/libmatroska-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libebml >= 1.0.0" -CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de" -BUILD() -{ - cd libmatroska-1.0.0/make/linux - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libmatroska-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.2.recipe similarity index 55% rename from media-libs/libmatroska/libmatroska-1.4.1.recipe rename to media-libs/libmatroska/libmatroska-1.4.2.recipe index ed79ef7aa..9e194de10 100644 --- a/media-libs/libmatroska/libmatroska-1.4.1.recipe +++ b/media-libs/libmatroska/libmatroska-1.4.2.recipe @@ -1,67 +1,69 @@ SUMMARY="libmatroska is a C++ libary to parse Matroska files." DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.1.tar.bz2" -CHECKSUM_SHA256="086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" - +SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2" +CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libmatroska$secondaryArchSuffix = $portVersion - lib:libmatroska$secondaryArchSuffix = 6 + lib:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES=" haiku${secondaryArchSuffix} lib:libebml$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libmatroska-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi BUILD_REQUIRES=" devel:libebml$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/matroska,g" \ - make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile -} - BUILD() { - cd make/linux - make $jobArgs \ - LIBEBML_INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir \ - LIBEBML_LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + autoreconf -f -i + runConfigure ./configure + make $jobArgs + } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libmatroska + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libmatroska${secondaryArchSuffix}_devel = $portVersion - devel:libmatroska$secondaryArchSuffix = 6 + devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES_devel=" libmatroska$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch b/media-libs/libmatroska/patches/libmatroska-1.0.0.patch deleted file mode 100644 index 65d5f2861..000000000 --- a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN libmatroska-1.0.0/make/linux/Makefile libmatroska-1.0.0-haiku/make/linux/Makefile ---- libmatroska-1.0.0/make/linux/Makefile 2010-06-04 08:46:29.017825792 +0000 -+++ libmatroska-1.0.0-haiku/make/linux/Makefile 2010-09-27 01:57:28.436994048 +0000 -@@ -13,6 +13,10 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+endif -+# Haiku wants the libs and headers in /boot/common -+ifeq (Haiku,$(shell uname -s)) -+prefix:=$(shell finddir B_COMMON_DIRECTORY) - else - prefix=/usr/local - endif -@@ -153,23 +157,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - ifneq ($(wildcard .depend),) - include .depend diff --git a/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset new file mode 100644 index 000000000..829b0f7a4 --- /dev/null +++ b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset @@ -0,0 +1,22 @@ +From caa315a5ba5ff2053d6e6c429c83017fdc13e567 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:54:48 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index f3b881d..063a480 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + From 2d5912391cd90e0440b066e206669a7e1b8959de Mon Sep 17 00:00:00 2001 From: skykinetic Date: Mon, 5 Jan 2015 21:42:19 +0800 Subject: [PATCH 199/326] Rectified errors in recipe and reflect that add-on not functioning --- haiku-apps/aesaddon/aesaddon-0.3.1.recipe | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe index ab113e20d..d4135b995 100644 --- a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe +++ b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe @@ -1,24 +1,22 @@ SUMMARY="A 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 encryption. It works only as a \ - Tracker add-on. - " -HOMEPAGE="https://web.archive.org/web/20100420135939/http://dev.osdrawer.net/projects/aesaddon" +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" SRC_URI="git://github.com/HaikuArchives/AESAddOn#78dd4c50634a97bbe04bd68479cedc114a14cb4d" REVISION="1" LICENSE="MIT" -COPYRIGHT="1999-2013 Haikuware" +COPYRIGHT="2003 Jason Grenier" -ARCHITECTURES="x86_gcc2 ?x86" +ARCHITECTURES="!x86_gcc2 ?x86" +#Resulting Tracker add-on doesn't seem to be working. PROVIDES=" - aesaddon = $portVersion - app:AESAddOn = $portVersion - " - + aesaddon = $portVersion + app:AESAddOn = $portVersion + " REQUIRES=" - haiku + haiku " BUILD_REQUIRES=" @@ -26,17 +24,19 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - makefile_engine - cmd:make - cmd:gcc - cmd:g++ - " -BUILD() { + makefile_engine + cmd:make + cmd:gcc + cmd:g++ + " +BUILD() +{ cd src make $jobArgs } -INSTALL() { +INSTALL() +{ cd src make install INSTALL_DIR=$addOnsDir/Tracker } From 1c16ca85a089639d941e3dd05307d57336731f5b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 4 Jan 2015 20:15:53 +0100 Subject: [PATCH 200/326] Add fceux recipe --- games-emulation/fceux/fceux-2.2.2.recipe | 62 ++++++++ .../fceux/patches/fceux-2.2.2.patch | 143 ++++++++++++++++++ 2 files changed, 205 insertions(+) create mode 100644 games-emulation/fceux/fceux-2.2.2.recipe create mode 100644 games-emulation/fceux/patches/fceux-2.2.2.patch diff --git a/games-emulation/fceux/fceux-2.2.2.recipe b/games-emulation/fceux/fceux-2.2.2.recipe new file mode 100644 index 000000000..d5dc7e893 --- /dev/null +++ b/games-emulation/fceux/fceux-2.2.2.recipe @@ -0,0 +1,62 @@ +SUMMARY="NES/Famicom emulator" +DESCRIPTION="FCEUX is an emulator for the NES and Famicom, based on FCE Ultra \ +which is based on FCE. It combines many different changes of FCE Ultra, like \ +support for a lot of the different hardware of NES Cartridges, rerecording \ +bult-in and a high level of portability." +HOMEPAGE="http://fceux.com/web/" +COPYRIGHT="1998-2014 tamentis & zamaz" +SRC_URI="http://sourceforge.net/projects/fceultra/files/Source%20Code/2.2.2%20src/fceux-2.2.2.src.tar.gz" +CHECKSUM_SHA256="804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1" +REVISION="1" +LICENSE="GNU GPL v2" + +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" + +PATCHES="fceux-$portVersion.patch" + +PROVIDES=" + fceux$secondaryArchSuffix = $portVersion + cmd:fceux$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + glu$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl$secondaryArchSuffix + devel:libgl${secondaryArchSuffix} + glu${secondaryArchSuffix}_devel + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:scons + cmd:g++$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + scons OPENGL=1 GTK=0 LUA=0 $jobArgs +} + +INSTALL() +{ + mkdir -p $binDir $manDir/man6 + cp bin/fceux $binDir + cp documentation/fceux.6 $manDir/man6 +} diff --git a/games-emulation/fceux/patches/fceux-2.2.2.patch b/games-emulation/fceux/patches/fceux-2.2.2.patch new file mode 100644 index 000000000..fb5c85109 --- /dev/null +++ b/games-emulation/fceux/patches/fceux-2.2.2.patch @@ -0,0 +1,143 @@ +From d960b6ab8ec3d9e25916d6c09c22febe55a716e9 Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sun, 4 Jan 2015 19:33:38 +0100 +Subject: Fix Haiku build + + +diff --git a/SConstruct b/SConstruct +index 4d5b446..a6fb618 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -33,7 +33,7 @@ opts.AddVariables( + AddOption('--prefix', dest='prefix', type='string', nargs=1, action='store', metavar='DIR', help='installation prefix') + + prefix = GetOption('prefix') +-env = Environment(options = opts) ++env = Environment(options = opts, ENV=os.environ) + + if env['RELEASE']: + env.Append(CPPDEFINES=["PUBLIC_RELEASE"]) +@@ -46,23 +46,6 @@ if platform.system == "ppc": + # Default compiler flags: + env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare']) + +-if os.environ.has_key('PLATFORM'): +- env.Replace(PLATFORM = os.environ['PLATFORM']) +-if os.environ.has_key('CC'): +- env.Replace(CC = os.environ['CC']) +-if os.environ.has_key('CXX'): +- env.Replace(CXX = os.environ['CXX']) +-if os.environ.has_key('WINDRES'): +- env.Replace(WINDRES = os.environ['WINDRES']) +-if os.environ.has_key('CFLAGS'): +- env.Append(CCFLAGS = os.environ['CFLAGS'].split()) +-if os.environ.has_key('CXXFLAGS'): +- env.Append(CXXFLAGS = os.environ['CXXFLAGS'].split()) +-if os.environ.has_key('CPPFLAGS'): +- env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split()) +-if os.environ.has_key('LDFLAGS'): +- env.Append(LINKFLAGS = os.environ['LDFLAGS'].split()) +- + print "platform: ", env['PLATFORM'] + + # compile with clang +@@ -187,7 +170,6 @@ else: + + Export('env') + fceux = SConscript('src/SConscript') +-env.Program(target="fceux-net-server", source=["fceux-server/server.cpp", "fceux-server/md5.cpp", "fceux-server/throttle.cpp"]) + + # Installation rules + if prefix == None: +@@ -200,9 +182,6 @@ if env['PLATFORM'] == 'win32': + fceux_src = 'src/fceux' + exe_suffix + fceux_dst = 'bin/fceux' + exe_suffix + +-fceux_net_server_src = 'fceux-net-server' + exe_suffix +-fceux_net_server_dst = 'bin/fceux-net-server' + exe_suffix +- + auxlib_src = 'src/auxlib.lua' + auxlib_dst = 'bin/auxlib.lua' + auxlib_inst_dst = prefix + '/share/fceux/auxlib.lua' +@@ -212,13 +191,10 @@ fceux_h_dst = 'bin/fceux.chm' + + env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)]) + env.Command(fceux_dst, fceux_src, [Copy(fceux_dst, fceux_src)]) +-env.Command(fceux_net_server_dst, fceux_net_server_src, [Copy(fceux_net_server_dst, fceux_net_server_src)]) + env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst, auxlib_src)]) + + man_src = 'documentation/fceux.6' +-man_net_src = 'documentation/fceux-net-server.6' + man_dst = prefix + '/share/man/man6/fceux.6' +-man_net_dst = prefix + '/share/man/man6/fceux-net-server.6' + + share_src = 'output/' + share_dst = prefix + '/share/fceux/' +@@ -230,12 +206,24 @@ desktop_src = 'fceux.desktop' + desktop_dst = prefix + '/share/applications/' + + env.Install(prefix + "/bin/", fceux) +-env.Install(prefix + "/bin/", "fceux-net-server") + # TODO: Where to put auxlib on "scons install?" + env.Alias('install', env.Command(auxlib_inst_dst, auxlib_src, [Copy(auxlib_inst_dst, auxlib_src)])) + env.Alias('install', env.Command(share_dst, share_src, [Copy(share_dst, share_src)])) + env.Alias('install', env.Command(man_dst, man_src, [Copy(man_dst, man_src)])) +-env.Alias('install', env.Command(man_net_dst, man_net_src, [Copy(man_net_dst, man_net_src)])) + env.Alias('install', env.Command(image_dst, image_src, [Copy(image_dst, image_src)])) + env.Alias('install', env.Command(desktop_dst, desktop_src, [Copy(desktop_dst, desktop_src)])) + env.Alias('install', (prefix + "/bin/")) ++ ++ ++if env['PLATFORM'] != 'haiku': ++ env.Program(target="fceux-net-server", source=["fceux-server/server.cpp", "fceux-server/md5.cpp", "fceux-server/throttle.cpp"]) ++ ++ fceux_net_server_src = 'fceux-net-server' + exe_suffix ++ fceux_net_server_dst = 'bin/fceux-net-server' + exe_suffix ++ env.Command(fceux_net_server_dst, fceux_net_server_src, [Copy(fceux_net_server_dst, fceux_net_server_src)]) ++ ++ env.Install(prefix + "/bin/", "fceux-net-server") ++ ++ man_net_src = 'documentation/fceux-net-server.6' ++ man_net_dst = prefix + '/share/man/man6/fceux-net-server.6' ++ env.Alias('install', env.Command(man_net_dst, man_net_src, [Copy(man_net_dst, man_net_src)])) +diff --git a/src/drivers/sdl/SConscript b/src/drivers/sdl/SConscript +index 7a53b07..8f62c40 100644 +--- a/src/drivers/sdl/SConscript ++++ b/src/drivers/sdl/SConscript +@@ -4,7 +4,10 @@ Import('env') + config_string = 'pkg-config --cflags --libs x11' + if env['PLATFORM'] == 'darwin': + config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string +-env.ParseConfig(config_string) ++ ++if env['PLATFORM'] != 'haiku': ++ env.ParseConfig(config_string) ++ + Export('env') + + source_list = Split( +@@ -26,5 +29,8 @@ if 'GL' in env['LIBS']: + if env['GTK'] or env['GTK3']: + source_list.append('gui.cpp') + ++if env['PLATFORM'] == 'haiku': ++ env.Append(LIBS = ['network']) ++ + source_list = ['drivers/sdl/' + source for source in source_list] + Return('source_list') +diff --git a/src/utils/ioapi.cpp b/src/utils/ioapi.cpp +index c2b536f..0363efd 100644 +--- a/src/utils/ioapi.cpp ++++ b/src/utils/ioapi.cpp +@@ -14,7 +14,7 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + +-#if defined(__APPLE__) || defined(IOAPI_NO_64) ++#if defined(__APPLE__) || defined(__HAIKU__) || defined(IOAPI_NO_64) + // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions + #define FOPEN_FUNC(filename, mode) fopen(filename, mode) + #define FTELLO_FUNC(stream) ftello(stream) +-- +1.8.3.4 + From d45a09a11323591f9384eb53d99e9961f6b533da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Mon, 5 Jan 2015 17:33:59 +0000 Subject: [PATCH 201/326] Added PATCHES to openjpeg recipe. --- media-libs/openjpeg/openjpeg-2.1.0.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe index da1512036..a8eb98d21 100644 --- a/media-libs/openjpeg/openjpeg-2.1.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe @@ -30,6 +30,8 @@ else fi SECONDARY_ARCHITECTURES="x86" +PATCHES="openjpeg-2.1.0.patchset" + PROVIDES=" openjpeg$secondaryArchSuffix = $portVersion cmd:opj_decompress = $portVersion From 9640636c8d8dce829af8fe98e6aacd4c7d159072 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 18:08:33 +0000 Subject: [PATCH 202/326] cabextract: Fix recipe and let it build on x86_gcc2 --- app-arch/cabextract/cabextract-1.4.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app-arch/cabextract/cabextract-1.4.recipe b/app-arch/cabextract/cabextract-1.4.recipe index 44e8aefec..915004c2d 100644 --- a/app-arch/cabextract/cabextract-1.4.recipe +++ b/app-arch/cabextract/cabextract-1.4.recipe @@ -11,7 +11,7 @@ COPYRIGHT="2000-2011 Stuart Caie" SRC_URI="http://www.cabextract.org.uk/cabextract-1.4.tar.gz" CHECKSUM_SHA256="f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e" REVISION="1" -ARCHITECTURES="x86 ?x86_gcc2 x86_64" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" cabextract = $portVersion @@ -30,6 +30,8 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:awk + cmd:sed + cmd:grep " BUILD() From d52ce461a662886d335947e26b1cf4e241c48dc7 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 4 Jan 2015 18:08:38 +0000 Subject: [PATCH 203/326] Add a set of Microsoft fonts --- media-fonts/msttcorefonts/licenses/MSttfEULA | 94 +++++++++++++++++++ .../msttcorefonts/msttcorefonts-1.0.recipe | 75 +++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 media-fonts/msttcorefonts/licenses/MSttfEULA create mode 100644 media-fonts/msttcorefonts/msttcorefonts-1.0.recipe diff --git a/media-fonts/msttcorefonts/licenses/MSttfEULA b/media-fonts/msttcorefonts/licenses/MSttfEULA new file mode 100644 index 000000000..f836a0035 --- /dev/null +++ b/media-fonts/msttcorefonts/licenses/MSttfEULA @@ -0,0 +1,94 @@ +Microsoft TrueType Fonts +END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE +--------------------------------------------------- + +IMPORTANT - READ CAREFULLY: This Microsoft End-User License Agreement +("EULA") is a legal agreement between you (either an individual or a single +entity) and Microsoft Corporation for the Microsoft software accompanying +this EULA, which includes computer software and may include associated +media, printed materials, and "on-line" or electronic documentation +("SOFTWARE PRODUCT" or "SOFTWARE"). By exercising your rights to make and +use copies of the SOFTWARE PRODUCT, you agree to be bound by the terms of +this EULA. If you do not agree to the terms of this EULA, you may not use +the SOFTWARE PRODUCT. + +SOFTWARE PRODUCT LICENSE + +The SOFTWARE PRODUCT is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and +treaties. The SOFTWARE PRODUCT is licensed, not sold. + +1. GRANT OF LICENSE. This EULA grants you the following rights: + +· Installation and Use. You may install and use an unlimited number of +copies of the SOFTWARE PRODUCT. + +· Reproduction and Distribution. You may reproduce and distribute an +unlimited number of copies of the SOFTWARE PRODUCT; provided that each copy +shall be a true and complete copy, including all copyright and trademark +notices, and shall be accompanied by a copy of this EULA. Copies of the +SOFTWARE PRODUCT may not be distributed for profit either on a standalone +basis or included as part of your own product. + +2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS. + +· Limitations on Reverse Engineering, Decompilation, and Disassembly. +You may not reverse engineer, decompile, or disassemble the SOFTWARE +PRODUCT, except and only to the extent that such activity is expressly +permitted by applicable law notwithstanding this limitation. + +· Restrictions on Alteration. You may not rename, edit or create any +derivative works from the SOFTWARE PRODUCT, other than subsetting when +embedding them in documents. + +· Software Transfer. You may permanently transfer all of your rights +under this EULA, provided the recipient agrees to the terms of this EULA. + +· Termination. Without prejudice to any other rights, Microsoft may +terminate this EULA if you fail to comply with the terms and conditions of +this EULA. In such event, you must destroy all copies of the SOFTWARE +PRODUCT and all of its component parts. + +3. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT +(including but not limited to any images, text, and "applets" incorporated +into the SOFTWARE PRODUCT), the accompanying printed materials, and any +copies of the SOFTWARE PRODUCT are owned by Microsoft or its suppliers. The +SOFTWARE PRODUCT is protected by copyright laws and international treaty +provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other +copyrighted material. + +4. U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and +documentation are provided with RESTRICTED RIGHTS. Use, duplication, or +disclosure by the Government is subject to restrictions as set forth in +subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer +Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the +Commercial Computer Software-Restricted Rights at 48 CFR 52.227-19, as +applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, +WA 98052-6399. + +LIMITED WARRANTY + +NO WARRANTIES. Microsoft expressly disclaims any warranty for the SOFTWARE +PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as +is" without warranty of any kind, either express or implied, including, +without limitation, the implied warranties or merchantability, fitness for a +particular purpose, or noninfringement. The entire risk arising out of use +or performance of the SOFTWARE PRODUCT remains with you. + +NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Microsoft or its +suppliers be liable for any damages whatsoever (including, without +limitation, damages for loss of business profits, business interruption, +loss of business information, or any other pecuniary loss) arising out of +the use of or inability to use this Microsoft product, even if Microsoft has +been advised of the possibility of such damages. Because some +states/jurisdictions do not allow the exclusion or limitation of liability +for consequential or incidental damages, the above limitation may not apply +to you. + +MISCELLANEOUS If you acquired this product in the United States, this EULA +is governed by the laws of the State of Washington. If this product was +acquired outside the United States, then local laws may apply. Should you +have any questions concerning this EULA, or if you desire to contact +Microsoft for any reason, please contact the Microsoft subsidiary serving +your country, or write: Microsoft Sales Information Center/One Microsoft +Way/Redmond, WA 98052-6399. diff --git a/media-fonts/msttcorefonts/msttcorefonts-1.0.recipe b/media-fonts/msttcorefonts/msttcorefonts-1.0.recipe new file mode 100644 index 000000000..4b67952e5 --- /dev/null +++ b/media-fonts/msttcorefonts/msttcorefonts-1.0.recipe @@ -0,0 +1,75 @@ +SUMMARY="Microsoft's TrueType core fonts" +DESCRIPTION="A smart package of Microsoft's core fonts which were \ +once available from http://www.microsoft.com/typography/fontpack/. +It includes: +Andale Mono +Arial Black +Arial (Bold, Italic, Bold Italic) +Comic Sans MS (Bold) +Courier New (Bold, Italic, Bold Italic) +Georgia (Bold, Italic, Bold Italic) +Impact +Times New Roman (Bold, Italic, Bold Italic) +Trebuchet (Bold, Italic, Bold Italic) +Verdana (Bold, Italic, Bold Italic) +Webdings +" +HOMEPAGE="http://corefonts.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/andale32.exe#noarchive" +SRC_URI_2="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/arial32.exe#noarchive" +SRC_URI_3="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/arialb32.exe#noarchive" +SRC_URI_4="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/comic32.exe#noarchive" +SRC_URI_5="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/courie32.exe#noarchive" +SRC_URI_6="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/georgi32.exe#noarchive" +SRC_URI_7="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/impact32.exe#noarchive" +SRC_URI_8="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/times32.exe#noarchive" +SRC_URI_9="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/trebuc32.exe#noarchive" +SRC_URI_10="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/verdan32.exe#noarchive" +SRC_URI_11="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/wd97vwr32.exe#noarchive" +SRC_URI_12="http://sourceforge.net/projects/corefonts/files/the%20fonts/final/webdin32.exe#noarchive" +CHECKSUM_SHA256="0524fe42951adc3a7eb870e32f0920313c71f170c859b5f770d82b4ee111e970" +CHECKSUM_SHA256_2="85297a4d146e9c87ac6f74822734bdee5f4b2a722d7eaa584b7f2cbf76f478f6" +CHECKSUM_SHA256_3="a425f0ffb6a1a5ede5b979ed6177f4f4f4fdef6ae7c302a7b7720ef332fec0a8" +CHECKSUM_SHA256_4="9c6df3feefde26d4e41d4a4fe5db2a89f9123a772594d7f59afd062625cd204e" +CHECKSUM_SHA256_5="bb511d861655dde879ae552eb86b134d6fae67cb58502e6ff73ec5d9151f3384" +CHECKSUM_SHA256_6="2c2c7dcda6606ea5cf08918fb7cd3f3359e9e84338dc690013f20cd42e930301" +CHECKSUM_SHA256_7="6061ef3b7401d9642f5dfdb5f2b376aa14663f6275e60a51207ad4facf2fccfb" +CHECKSUM_SHA256_8="db56595ec6ef5d3de5c24994f001f03b2a13e37cee27bc25c58f6f43e8f807ab" +CHECKSUM_SHA256_9="5a690d9bb8510be1b8b4fe49f1f2319651fe51bbe54775ddddd8ef0bd07fdac9" +CHECKSUM_SHA256_10="c1cb61255e363166794e47664e2f21af8e3a26cb6346eb8d2ae2fa85dd5aad96" +CHECKSUM_SHA256_11="f61126a6d17b2d126a7f31b142504dce4934f7989c55f1c13c6477b3fe80b3d2" +CHECKSUM_SHA256_12="64595b5abc1080fba8610c5c34fab5863408e806aafe84653ca8575bed17d75a" +LICENSE="MSttfEULA" +COPYRIGHT="Microsoft Corporation" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="msttcorefonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + coreutils + cmd:cabextract + cmd:find + " + +SOURCE_DIR="" + +BUILD() +{ + for i in `ls -d ../sources*`; do + pushd $i + mkdir -p cabcontents + cabextract --lowercase --directory=cabcontents *.exe + popd + done +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + cp `find ../sources* -type f -name \*.ttf` ${FONTDIR} +} From f95ee34651c3a299afa337d4a38db3d78818ef32 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 5 Jan 2015 17:22:34 +0000 Subject: [PATCH 204/326] croscorefonts: fix recipe * Remove checksums as these archives are generated on the fly, and add a comment stating the same. --- media-fonts/croscorefonts/croscorefonts-1.21.0.recipe | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe index 3282e1740..fe877a099 100644 --- a/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe +++ b/media-fonts/croscorefonts/croscorefonts-1.21.0.recipe @@ -3,12 +3,11 @@ DESCRIPTION="Open licensed fonts metrically compatible with MS corefonts.\ Included fonts are Arimo, Cousine and Timo. \ They are also called Chrome OS core fonts." HOMEPAGE="http://en.wikipedia.org/wiki/Croscore_fonts" +# We don't list the checksums below intentionally as these archives are generated +# on the fly. SRC_URI_1="http://www.google.com/fonts/download?kit=32ci3aiii8TFh9L2O_kK1w" -CHECKSUM_SHA256_1="800bbc41f20dce6c7f61dcd54489a8d8db5d701d9918a3a412d430d044eca2bb", SRC_URI_2="http://www.google.com/fonts/download?kit=M2CeFoF86bDfqp_rSFi-T6CWcynf_cDxXwCLxiixG1c" -CHECKSUM_SHA256_2="bc0b9e33073e91d89abe6d780d0cff7a55d1cf05d9f792d5d221af426abb915f" SRC_URI_3="http://www.google.com/fonts/download?kit=2Cuw8DPRXKIbXwFmqbUecA" -CHECKSUM_SHA256_3="89619d3f06b55495e94458eb8fbd69ae7c654db5782b2cecfdaffa2c8b291c1b" SOURCE_DIR="" From 1e2ba88b11d8de96b9dd334ecb92de13c131c9d4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 5 Jan 2015 17:54:55 +0000 Subject: [PATCH 205/326] scheherazade_font: update recipe --- .../scheherazade_font-1.005.recipe | 45 +++++++++++++++---- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index 40681b41d..eac1d2568 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -1,24 +1,51 @@ +SUMMARY="Arabic script font." DESCRIPTION=" -Arabic script font. +Scheherazade, named after the heroine of the classic Arabian Nights tale, \ +is designed in a similar style to traditional typefaces such as Monotype Naskh, \ +extended to cover the full Unicode Arabic repertoire +The goal for this product was to provide a single Unicode-based font family \ +that would contain a comprehensive inventory of glyphs needed for almost any \ +Arabic-based writing system. This font makes use of state-of-the-art font \ +technologies to support complex typographic issues. +This font provides a simplified rendering of Arabic script, using basic \ +connecting glyphs but not including a wide variety of additional ligatures \ +or contextual alternates (only the required lam-alef ligatures). This \ +simplified style is often preferred for clarity, especially in non-Arabic \ +languages, but may be considered unattractive in more traditional and \ +literate communities. +One font from this typeface family is included in this release: + * Scheherazade Regular +This release supports virtually all of the Unicode 5.0 Arabic character \ +repertoire (excluding the Arabic Presentation Forms blocks, which are not \ +recommended for normal use). Font smarts are implemented using OpenType \ +technology. " HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Scheherazade_OT_1_005&filename=ScherazadeRegOT-1.005.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="3c7e7d7f93802162effe2b517af98be0" +CHECKSUM_SHA256="5d621578fb946473492c3bd1f1a59fe55080dd7949e3bf28af01fa4fe2859e8b" +REVISION="3" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2004-2011 SIL International" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="scheherazade_font = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" BUILD() { - echo "No building required." + true } INSTALL() { FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - cp -r *.ttf ${FONTDIR} + cp *.ttf ${FONTDIR} } -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2004-2011 SIL International" From f4b507fd1a54db5a83d3841d542d27fd8e7ed633 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 5 Jan 2015 17:55:26 +0000 Subject: [PATCH 206/326] Add a new font family, Fira Adds fonts: * Fira Sans * Fira Mono --- .../fira_fonts/fira_fonts-3.111.recipe | 36 +++++++ .../licenses/SIL Open Font License v1.1 | 99 +++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 media-fonts/fira_fonts/fira_fonts-3.111.recipe create mode 100644 media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 diff --git a/media-fonts/fira_fonts/fira_fonts-3.111.recipe b/media-fonts/fira_fonts/fira_fonts-3.111.recipe new file mode 100644 index 000000000..227ce6e37 --- /dev/null +++ b/media-fonts/fira_fonts/fira_fonts-3.111.recipe @@ -0,0 +1,36 @@ +SUMMARY="The Fira font" +DESCRIPTION=" +Designed to integrate with the character of Mozilla's Firefox OS, the \ +Fira Sans typeface also aims to cover the legibility needs for a large range of \ +handsets varying in screen quality and rendering. When working with Fira Sans \ +it is recommended that micro font sizes that fall below our guidelines are avoided. +This also includes the Fira Mono typeface. +" +HOMEPAGE="http://www.carrois.com/fira-3-1/" +SRC_URI="http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip" +CHECKSUM_SHA256="3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2014, Mozilla Foundation, Telefonica S.A." +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="fira_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/otfonts + mkdir -p ${FONTDIR} + cp */*/OTF/*.otf ${FONTDIR} +} diff --git a/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 b/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 new file mode 100644 index 000000000..b4a39671e --- /dev/null +++ b/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 @@ -0,0 +1,99 @@ +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Sans. + +Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ +with Reserved Font Name Fira Mono. + +Copyright (c) 2014, Telefonica S.A. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. From dc9380de65db324d8d72f605e94cc1852bcbaf9b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 5 Jan 2015 20:05:06 +0100 Subject: [PATCH 207/326] lmarbles: Add icon, move config file to B_USER_SETTINGS_DIRECTORY --- .../lmarbles/additional-files/lmarbles.rdef | 35 ++++++ games-puzzle/lmarbles/lmarbles-1.0.8.recipe | 15 ++- .../lmarbles/patches/lmarbles-1.0.8.patch | 20 ---- .../lmarbles/patches/lmarbles-1.0.8.patchset | 105 ++++++++++++++++++ 4 files changed, 150 insertions(+), 25 deletions(-) create mode 100644 games-puzzle/lmarbles/additional-files/lmarbles.rdef delete mode 100644 games-puzzle/lmarbles/patches/lmarbles-1.0.8.patch create mode 100644 games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset diff --git a/games-puzzle/lmarbles/additional-files/lmarbles.rdef b/games-puzzle/lmarbles/additional-files/lmarbles.rdef new file mode 100644 index 000000000..22084485e --- /dev/null +++ b/games-puzzle/lmarbles/additional-files/lmarbles.rdef @@ -0,0 +1,35 @@ +resource app_signature "application/x-vnd.lgames.lmarbles"; + +resource vector_icon array { + $"6E63696604020106023D1D3F341202B40EF83D18AC49111A48F914FF00008200" + $"0097FF020116023D20000000000000003D2000494000496000FF4700DD044A82" + $"05010402044030C34530BC3A30304030BC3A30C3454050BC3A50C34550504050" + $"C34550BC3A0204C35CBC8C4BBDE0C295BB37BEBEBC03C084BAFABCF7BD0CBCEF" + $"C04BBC29BEF7BDB6C1A0C18DC0D4BFC7C1DDC354BFCB06033E414F3B48414939" + $"4540463D454649060EEEBFFB0F304E224724512142253F2333203A2530302F28" + $"2D312B3A27342740274331432E43344038433F443AC08DC14E4046434B434745" + $"4A504F4C48C7E4C8D24C5C4D5B4B5D3E55BFD5CC153359110A020100023D6148" + $"2CE9C7B814483D76EE4A84FB4A8D970A020100023C8D1ABC8FEE3CA8493CA55A" + $"48DD5F4A66B20A03010330242001178400040A010100023E6000000000000000" + $"3E6000C380004850000A02010220141A0A030100123E60000000000000003E60" + $"0046A00049300001178300040A000100023E60000000000000003E600046A000" + $"4930000A0201022024200A030100123E60000000000000003E60004910004A08" + $"0001178300040A010100023E60000000000000003E60004910004A08000A0301" + $"00123E60000000000000003E6000C3800044400001178300040A000100023E60" + $"000000000000003E6000C380004440000A030100123E60000000000000003E60" + $"0046A00046E00001178300040A010100023E60000000000000003E600046A000" + $"46E0000A0201022023130A030100123E60000000000000003E600046A000C280" + $"0001178300040A000100023E60000000000000003E600046A000C28000" +}; + +resource app_version { + major = 1, + middle = 0, + minor = 8, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "LMarbles", + long_info = "LMarbles ©2000 Michael Speck" +}; diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe index a5b6c1eaf..41bbeb6cd 100644 --- a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe +++ b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe @@ -9,17 +9,16 @@ and not a time limit. This way you have as much time as you need to think." HOMEPAGE="http://lgames.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/lgames/files/lmarbles/lmarbles-1.0.8.tar.gz" CHECKSUM_SHA256="0e5a16a0116d325589b28f3555ced6a0b486f0fd7632cd3d98bee5cddf213e83" -REVISION="1" +REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2000 Michael Speck" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" - -PATCHES="lmarbles-1.0.8.patch" GLOBAL_WRITABLE_FILES="var/lmarbles.prfs keep-old" +PATCHES="lmarbles-1.0.8.patchset" PROVIDES=" lmarbles = $portVersion - cmd:lmarbles = $portVersion + app:LMarbles = $portVersion " REQUIRES=" @@ -39,6 +38,7 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:ld cmd:libtoolize + cmd:xres " BUILD() @@ -46,10 +46,15 @@ BUILD() libtoolize --force --copy --install runConfigure ./configure make $jobArgs + + addResourcesToBinaries $portDir/additional-files/lmarbles.rdef src/lmarbles } INSTALL() { make install - addAppDeskbarSymlink $binDir/lmarbles LMarbles + mkdir -p $appsDir + mv $binDir/lmarbles $appsDir/LMarbles + addAppDeskbarSymlink $appsDir/LMarbles LMarbles + mimeset -f $appsDir/LMarbles } diff --git a/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patch b/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patch deleted file mode 100644 index 78cb9a50f..000000000 --- a/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lmarbles-1.0.8/configure.org 2009-10-26 20:56:13.000000000 +0100 -+++ lmarbles-1.0.8/configure 2014-07-14 18:31:02.527958016 +0200 -@@ -5154,7 +5154,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" -+LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5208,7 +5208,7 @@ - #define HAVE_LIBM 1 - _ACEOF - -- LIBS="-lm $LIBS" -+ LIBS="$LIBS" - - else - { { echo "$as_me:$LINENO: error: lib math is needed" >&5 diff --git a/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset b/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset new file mode 100644 index 000000000..ae0e5c29e --- /dev/null +++ b/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset @@ -0,0 +1,105 @@ +From 6b5f57906db0f0fd8a15fc60da2a791d9ea2bc36 Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Mon, 5 Jan 2015 17:41:59 +0100 +Subject: Apply original lmarbles patch + + +diff --git a/configure b/configure +index 543fb95..b012313 100755 +--- a/configure ++++ b/configure +@@ -5154,7 +5154,7 @@ if test "${ac_cv_lib_m_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5208,7 +5208,7 @@ if test $ac_cv_lib_m_main = yes; then + #define HAVE_LIBM 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS="$LIBS" + + else + { { echo "$as_me:$LINENO: error: lib math is needed" >&5 +-- +1.8.3.4 + + +From f837403562b62f6aa17a967597fe61e54499a7bb Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Mon, 5 Jan 2015 17:54:53 +0100 +Subject: Have lmarbles use find_directory for config + + +diff --git a/src/cfg.c b/src/cfg.c +index 2831c1b..4d713f5 100644 +--- a/src/cfg.c ++++ b/src/cfg.c +@@ -25,6 +25,10 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#endif ++ + #ifdef _WIN32 + #define MKDIR(d, p) mkdir(d) + #else +@@ -40,14 +44,16 @@ Cfg cfg; + void C_StPth() + { + DIR *dir; +-#ifdef _WIN32 ++#if defined(__HAIKU__) ++ find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, c_pth, sizeof(c_pth) - 1); ++#elif defined(_WIN32) + snprintf( c_pth, sizeof(c_pth)-1, "%s/lgames", (getenv( "HOME" )?getenv( "HOME" ):".") ); + #else + snprintf( c_pth, sizeof(c_pth)-1, "%s/.lgames", getenv( "HOME" ) ); + #endif + /* create .lgames directory if not found */ + if ( (dir = opendir( c_pth )) == 0 ) { +- fprintf( stderr, "Config directory ~/.lgames not found. Creating it.\n" ); ++ fprintf( stderr, "Config directory %s not found. Creating it.\n", c_pth ); + MKDIR( c_pth, S_IRWXU ); + } + else +diff --git a/src/profile.c b/src/profile.c +index 218c856..9ebf47b 100644 +--- a/src/profile.c ++++ b/src/profile.c +@@ -22,6 +22,10 @@ + #include "cfg.h" + #include "file.h" + ++#ifdef __HAIKU__ ++#include ++#endif ++ + // profiles // + DLst prfs; + // string list for the menu // +@@ -38,8 +42,13 @@ void Prf_Ini() + DL_Ini(&prfs); + prfs.flgs = DL_AUTODEL; + prfs.cb = Prf_Del; +- ++#ifdef __HAIKU__ ++ find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, prf_pth, ++ sizeof(prf_pth) - 1); ++ strcat(prf_pth, "/lmarbles.prfs"); ++#else + sprintf(prf_pth, "%s/lmarbles.prfs", PRF_DIR); ++#endif + } + + /* terminate profiles; must be saved first */ +-- +1.8.3.4 + From 2ff27f9c75685dc7d30a5049c3465ef5d2b54358 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Tue, 6 Jan 2015 05:32:13 +0000 Subject: [PATCH 208/326] Cyberdogs SDL. --- .../cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe diff --git a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe new file mode 100644 index 000000000..5ae44429b --- /dev/null +++ b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe @@ -0,0 +1,65 @@ +SUMMARY="Cyberdogs SDL." +DESCRIPTION="DOS arcade game. \ +This also comes with an editor." +HOMEPAGE="https://github.com/lmartinking/cdogs-sdl" +SRC_URI="https://codeload.github.com/lmartinking/cdogs-sdl/zip/master" +SRC_URI_2="https://codeload.github.com/lmartinking/cdogs-sdl-data/zip/master" +SRC_FILENAME="cdogs-sdl-master.zip" +SRC_FILENAME_2="cdogs-sdl-data-master.zip" +CHECKSUM_SHA256="9dca57eb6d73e6ff0bbb97867b2ef1797d1a6899722294951f4f74bcf2c2f1af" +CHECKSUM_SHA256_2="8c71bf2d964f1bc098463abcd795bcd400570bad367fb952206be9e83bcdcb11" +SOURCE_DIR="cdogs-sdl-master" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2008-2010 Lucas Martin-King" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + Cyberdogs_SDL= $portVersion + app:Cyberdogs_SDL= $portVersion + " + +REQUIRES=" + haiku + lib:libsdl + lib:libsdl_mixer + " + +BUILD_REQUIRES=" + haiku_devel + devel:libsdl + devel:libsdl_mixer + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc +" + +PATCH() +{ + sed -i "s|PREFIX\t\t:= /usr/local|PREFIX\t\t:= \$appsDir|" $sourceDir/src/Makefile + sed -i 's|#SYSTEM\t\t:= linux| SYSTEM\t\t:= linux|' $sourceDir/src/Makefile + sed -i 's|I_AM_CONFIGURED := no|I_AM_CONFIGURED:= yes|' $sourceDir/src/Makefile +} + +BUILD() +{ + mkdir -p $sourceDir/data + cd $sourceDir/data + cp -r $sourceDir2/cdogs-sdl-data-master/* $sourceDir/data + cd $sourceDir/src + make cdogs-sdl + make cdogs-sdl-editor + chmod +x install.sh + make install +} + +INSTALL() +{ + mkdir -p $appsDir/Cyberdogs_SDL + cp cdogs-sdl cdogs-sdl-editor $appsDir/Cyberdogs_SDL + cp -r data $appsDir/Cyberdogs_SDL + addAppDeskbarSymlink $appsDir/Cyberdogs_SDL/cdogs-sdl +} From 7108c4cfeee91033db49d8704af2a1282b129a9b Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 6 Jan 2015 17:26:05 +0200 Subject: [PATCH 209/326] Fixed camlp5 --- dev-lang/camlp5/camlp5-6.06.recipe | 26 ---------------- dev-lang/camlp5/camlp5-6.12.recipe | 50 ++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 26 deletions(-) delete mode 100644 dev-lang/camlp5/camlp5-6.06.recipe create mode 100644 dev-lang/camlp5/camlp5-6.12.recipe diff --git a/dev-lang/camlp5/camlp5-6.06.recipe b/dev-lang/camlp5/camlp5-6.06.recipe deleted file mode 100644 index 088012815..000000000 --- a/dev-lang/camlp5/camlp5-6.06.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="Preprocessor-pretty-printer of OCaml" -HOMEPAGE="http://pauillac.inria.fr/~ddr/camlp5/" -SRC_URI="http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.06.tgz" -CHECKSUM_MD5="8de69094d73d24768844a5017a2bd04b" -REVISION="1" -STATUS_HAIKU="untested" -DEPEND="ocaml" -BUILD() -{ - cd camlp5-6.06 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --strict --prefix `finddir B_COMMON_DIRECTORY` \ - --mandir $COMMON_DOCS/man - make world.opt -} - -INSTALL() -{ - cd camlp5-6.06 - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - make install PREFIX=${DESTDIR}`finddir B_COMMON_DIRECTORY` \ - MANDIR=${DESTDIR}$COMMON_DOCS/man - -} -LICENSE="BSD (3-clause)" -COPYRIGHT="2007-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)." diff --git a/dev-lang/camlp5/camlp5-6.12.recipe b/dev-lang/camlp5/camlp5-6.12.recipe new file mode 100644 index 000000000..8013f86ae --- /dev/null +++ b/dev-lang/camlp5/camlp5-6.12.recipe @@ -0,0 +1,50 @@ +SUMMARY="Preprocessor-pretty-printer of OCaml" +DESCRIPTION="Camlp5 is a preprocessor-pretty-printer of OCaml. +It is compatible with OCaml versions from 1.07 to 4.02.0." +HOMEPAGE="http://camlp5.gforge.inria.fr/" +SRC_URI="http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz" +CHECKSUM_SHA256="b716c8b248289205bc76823000bc0b0988517cfcfd9c2eb1a3c43cc2cd7d5c02" +LICENSE="BSD (3-clause)" +COPYRIGHT="2007-2013 Institut National de Recherche en Informatique et en Automatique (INRIA)." +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SOURCE_DIR="camlp5-6.12" + +PROVIDES=" + camlp5 + cmd:camlp5 + cmd:camlp5o + cmd:camlp5o.opt + cmd:camlp5r + cmd:camlp5r.opt + cmd:camlp5sch + cmd:mkcamlp5 + cmd:mkcamlp5.opt + cmd:ocpp5 + " + +REQUIRES=" + haiku + cmd:ocaml +" + +BUILD_PREREQUIRES=" + haiku_devel + cmd:make + cmd:gcc + ocaml + " + +BUILD() +{ + ./configure --strict --prefix $prefix \ + --mandir $manDir + make world.opt +} + +INSTALL() +{ + make install PREFIX=$prefix \ + MANDIR=$manDir +} + From 471d29ccc92c55f60debb7b084420c1a28be20cf Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 6 Jan 2015 17:38:54 +0100 Subject: [PATCH 210/326] Add ColorCode recipe --- games-puzzle/colorcode/colorcode-0.7.2.recipe | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 games-puzzle/colorcode/colorcode-0.7.2.recipe diff --git a/games-puzzle/colorcode/colorcode-0.7.2.recipe b/games-puzzle/colorcode/colorcode-0.7.2.recipe new file mode 100644 index 000000000..ee898101d --- /dev/null +++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe @@ -0,0 +1,61 @@ +SUMMARY="A free advanced MasterMind clone." +DESCRIPTION="ColorCode is a free advanced MasterMind clone with lots of \ +different game variants, from the very easy up to really challenging ones. \ +You can combine any color count from 2-10 with any column count from 2-5 and \ +allow or not pegs of the same color. Or you may select one of the 5 \ +predefined levels of difficulty. ColorCode has also a rather intelligent \ +built in MasterMind solver - so you can let the computer guess for you \ +(nope, he's not cheating - really)." +HOMEPAGE="http://colorcode.laebisch.com/" +SRC_URI="http://colorcode.laebisch.com/download/ColorCode-0.7.2.tar.gz" +CHECKSUM_SHA256="d1c5bf4d65c81de16c4159c2c69c096fc7ff47cca587d7233985e078d63c79aa" +SOURCE_DIR="ColorCode-0.7.2" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2009-2011 Dirk Laebisch" +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=" + colorcode = $portVersion + app:ColorCode = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libqtcore$secondaryArchSuffix < 5 + lib:libqtgui$secondaryArchSuffix < 5 +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libqtcore$secondaryArchSuffix < 5 + devel:libqtgui$secondaryArchSuffix < 5 +" + +BUILD_PREREQUIRES=" + cmd:qmake$secondaryArchSuffix + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix +" + +BUILD() +{ + qmake + make +} + +INSTALL() +{ + mkdir -p $appsDir + cp colorcode $appsDir/ColorCode + addAppDeskbarSymlink $appsDir/ColorCode ColorCode +} From b34ac53c977565c4cbfae30720d46cc9eaca972c Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Tue, 6 Jan 2015 18:05:35 +0100 Subject: [PATCH 211/326] ColorCode: Add icon --- .../colorcode/additional-files/colorcode.rdef | 25 +++++++++++++++++++ games-puzzle/colorcode/colorcode-0.7.2.recipe | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 games-puzzle/colorcode/additional-files/colorcode.rdef diff --git a/games-puzzle/colorcode/additional-files/colorcode.rdef b/games-puzzle/colorcode/additional-files/colorcode.rdef new file mode 100644 index 000000000..506aa6980 --- /dev/null +++ b/games-puzzle/colorcode/additional-files/colorcode.rdef @@ -0,0 +1,25 @@ +resource app_signature "application/x-vnd.colorcode"; + +resource vector_icon array { + $"6E6369660505C60201040200FF5959FFFF06060201140200DAFFEA0200040200" + $"F9FF6EFFFFF95902010402FF6DD0FF0044ADFF060204402262221E222240221E" + $"2262405E1E5E625E5E405E625E1E0204C52128C7A828C2992842BAC542B83D42" + $"BD4CC5213FC2993FC7A83F59BAC559BD4C59B83D0204BA5F27BCE627B7D72727" + $"BA5F27B7D727BCE6BA5F3EB7D73EBCE63E3EBA5F3EBCE63EB7D70204BA5F42BC" + $"E642B7D74227C52127C29927C7A8BA5F59B7D759BCE6593EC5213EC7A83EC299" + $"0204C52142C7A842C2994242C52142C29942C7A8C52159C29959C7A85959C521" + $"59C7A859C2990A042222225E5E5E5E22050A000100000A040102000A03010100" + $"0A010103000A02010400" +}; + +resource app_version { + major = 0, + middle = 7, + minor = 2, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "ColorCode", + long_info = "ColorCode ©2009-2011 Dirk Laebisch" +}; diff --git a/games-puzzle/colorcode/colorcode-0.7.2.recipe b/games-puzzle/colorcode/colorcode-0.7.2.recipe index ee898101d..ee96fb931 100644 --- a/games-puzzle/colorcode/colorcode-0.7.2.recipe +++ b/games-puzzle/colorcode/colorcode-0.7.2.recipe @@ -45,6 +45,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:xres " BUILD() @@ -57,5 +58,9 @@ INSTALL() { mkdir -p $appsDir cp colorcode $appsDir/ColorCode + + addResourcesToBinaries $portDir/additional-files/colorcode.rdef \ + $appsDir/ColorCode + addAppDeskbarSymlink $appsDir/ColorCode ColorCode } From f1bd380c3c53e4b4ab02ed2f3e23aa511d7980ce Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Wed, 7 Jan 2015 01:54:48 +0000 Subject: [PATCH 212/326] Cyberdogs SDL. --- .../cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe | 74 +++++++++++-------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe index 5ae44429b..5750efb07 100644 --- a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe +++ b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe @@ -1,6 +1,8 @@ SUMMARY="Cyberdogs SDL." -DESCRIPTION="DOS arcade game. \ -This also comes with an editor." +DESCRIPTION="DOS third-person shooting game. \ +In this game, you get guns to shoot zombies and cyborgs. \ +For a DOS game, the graphics are pretty good. \ +This also comes with a map editor." HOMEPAGE="https://github.com/lmartinking/cdogs-sdl" SRC_URI="https://codeload.github.com/lmartinking/cdogs-sdl/zip/master" SRC_URI_2="https://codeload.github.com/lmartinking/cdogs-sdl-data/zip/master" @@ -8,58 +10,66 @@ SRC_FILENAME="cdogs-sdl-master.zip" SRC_FILENAME_2="cdogs-sdl-data-master.zip" CHECKSUM_SHA256="9dca57eb6d73e6ff0bbb97867b2ef1797d1a6899722294951f4f74bcf2c2f1af" CHECKSUM_SHA256_2="8c71bf2d964f1bc098463abcd795bcd400570bad367fb952206be9e83bcdcb11" -SOURCE_DIR="cdogs-sdl-master" +SOURCE_DIR="cdogs-sdl-master/src" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2008-2010 Lucas Martin-King" - + ARCHITECTURES="x86 x86_gcc2" - + PROVIDES=" Cyberdogs_SDL= $portVersion app:Cyberdogs_SDL= $portVersion - " - +" + REQUIRES=" - haiku - lib:libsdl - lib:libsdl_mixer - " - + haiku + lib:libsdl + lib:libsdl_mixer +" + BUILD_REQUIRES=" - haiku_devel - devel:libsdl - devel:libsdl_mixer - " + haiku_devel + devel:libsdl + devel:libsdl_mixer +" BUILD_PREREQUIRES=" cmd:make cmd:gcc " - + PATCH() { - sed -i "s|PREFIX\t\t:= /usr/local|PREFIX\t\t:= \$appsDir|" $sourceDir/src/Makefile - sed -i 's|#SYSTEM\t\t:= linux| SYSTEM\t\t:= linux|' $sourceDir/src/Makefile - sed -i 's|I_AM_CONFIGURED := no|I_AM_CONFIGURED:= yes|' $sourceDir/src/Makefile + sed -i "s|PREFIX := /usr/local|PREFIX := $appsDir/cdogs_sdl|" $sourceDir/Makefile + sed -i "s|:= no|:= yes|" $sourceDir/Makefile + sed -i "s|BINDIR := "'$(PREFIX)'"/games/bin|BINDIR := $appsDir/cdogs_sdl|" $sourceDir/Makefile + sed -i "s|DATADIR := "'$(PREFIX)'"/share/games/cdogs-sdl|DATADIR := $appsDir/cdogs_sdl/data|" $sourceDir/Makefile + sed -i "s|DOCDIR := "'$(PREFIX)'"/share/doc/cdogs-sdl|DOCDIR := $appsDir/cdogs_sdl/docs|" $sourceDir/Makefile + sed -i "s|DATA := ../data|DATA := $appsDir/cdogs_sdl/data|" $sourceDir/Makefile } - + BUILD() -{ +{ + mkdir -p $appsDir/cdogs_sdl/doc/ + mkdir -p $appsDir/cdogs_sdl/data mkdir -p $sourceDir/data + mkdir -p $settingsDir/cdogs cd $sourceDir/data cp -r $sourceDir2/cdogs-sdl-data-master/* $sourceDir/data - cd $sourceDir/src - make cdogs-sdl - make cdogs-sdl-editor - chmod +x install.sh - make install + cd $sourceDir + cat Makefile + chmod 777 ./install.sh + mkdir -p data + make $jobArgs cdogs-sdl USE_PKGCONFIG=no + make $jobArgs cdogs-sdl-editor USE_PKGCONFIG=no } - + INSTALL() { - mkdir -p $appsDir/Cyberdogs_SDL - cp cdogs-sdl cdogs-sdl-editor $appsDir/Cyberdogs_SDL - cp -r data $appsDir/Cyberdogs_SDL - addAppDeskbarSymlink $appsDir/Cyberdogs_SDL/cdogs-sdl + mkdir -p $appsDir/cdogs_sdl + cp cdogs-sdl $appsDir/cdogs_sdl + cp cdogs-sdl-editor $appsDir/cdogs_sdl + cp -r data/* $appsDir/cdogs_sdl/data + addAppDeskbarSymlink $appsDir/cdogs_sdl/cdogs-sdl Cyberdogs-sdl } From b4c14573246d6daa4e32af4153f02e75a94ab7bd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 7 Jan 2015 03:53:18 +0000 Subject: [PATCH 213/326] cyberdogs_sdl-0.4.1.recipe edited online with Bitbucket removed stray cat Makefile, which was leftover from debugging --- games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe | 1 - 1 file changed, 1 deletion(-) diff --git a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe index 5750efb07..b7ba1b2aa 100644 --- a/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe +++ b/games-arcade/cyberdogs_sdl/cyberdogs_sdl-0.4.1.recipe @@ -58,7 +58,6 @@ BUILD() cd $sourceDir/data cp -r $sourceDir2/cdogs-sdl-data-master/* $sourceDir/data cd $sourceDir - cat Makefile chmod 777 ./install.sh mkdir -p data make $jobArgs cdogs-sdl USE_PKGCONFIG=no From a8eacbc521ce2e95a96ff62133932699f459f6cd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 7 Jan 2015 06:06:28 +0000 Subject: [PATCH 214/326] openjpeg-2.1.0.recipe edited online with Bitbucket Added x86_gcc2 since it will build just fine with gcc2. Moved Patches to be just above BUILD --- media-libs/openjpeg/openjpeg-2.1.0.recipe | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe index a8eb98d21..4129b11a3 100644 --- a/media-libs/openjpeg/openjpeg-2.1.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe @@ -20,17 +20,7 @@ HOMEPAGE="http://www.openjpeg.org/" SRC_URI="http://sourceforge.net/projects/openjpeg.mirror/files/$portVersion/openjpeg-$portVersion.tar.gz" CHECKSUM_SHA256="1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03" 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" - -PATCHES="openjpeg-2.1.0.patchset" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" openjpeg$secondaryArchSuffix = $portVersion @@ -70,6 +60,8 @@ REQUIRES_devel=" openjpeg$secondaryArchSuffix == $portVersion " +PATCHES="openjpeg-2.1.0.patchset" + BUILD() { mkdir -p build From 61f9599424beee3aaf133a8f9759127ca8d6fb7a Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Wed, 7 Jan 2015 16:12:15 +0100 Subject: [PATCH 215/326] Clockwerk: Update to newest git revision, add $jobArgs to build, rewrap description --- haiku-apps/clockwerk/clockwerk-git.recipe | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe index b80fab883..ca74c2402 100644 --- a/haiku-apps/clockwerk/clockwerk-git.recipe +++ b/haiku-apps/clockwerk/clockwerk-git.recipe @@ -1,14 +1,14 @@ SUMMARY="An open source media compositing tool for the Haiku platform" -DESCRIPTION="Clockwerk is an Open Source media compositing tool for the -Haiku platform. It has been in development from Jan 2006 to July 2008 -by Mindwork (www.mindwork.de) as one of the main in-house components of -an application suit to realize distributed multimedia playback on +DESCRIPTION="Clockwerk is an Open Source media compositing tool for the \ +Haiku platform. It has been in development from Jan 2006 to July 2008 \ +by Mindwork (www.mindwork.de) as one of the main in-house components of \ +an application suit to realize distributed multimedia playback on \ Haiku client machines." HOMEPAGE="https://github.com/stippi/Clockwerk" -SRC_URI="git+https://github.com/stippi/Clockwerk.git#8c3a33e" +SRC_URI="git+https://github.com/stippi/Clockwerk.git#6eab4202c857c7dc6f21b6e3262cff0b503acb0e" -REVISION="1" +REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT=" @@ -42,7 +42,7 @@ USER_SETTINGS_FILES=" BUILD() { - jam -q + jam -q $jobArgs } INSTALL() From 8b0760aa95f60caf5832ffc11c697c1ce694c27e Mon Sep 17 00:00:00 2001 From: umccullough Date: Wed, 7 Jan 2015 16:15:05 +0000 Subject: [PATCH 216/326] Minor typo in description --- haiku-apps/clockwerk/clockwerk-git.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe index ca74c2402..e495b09b8 100644 --- a/haiku-apps/clockwerk/clockwerk-git.recipe +++ b/haiku-apps/clockwerk/clockwerk-git.recipe @@ -2,7 +2,7 @@ SUMMARY="An open source media compositing tool for the Haiku platform" DESCRIPTION="Clockwerk is an Open Source media compositing tool for the \ Haiku platform. It has been in development from Jan 2006 to July 2008 \ by Mindwork (www.mindwork.de) as one of the main in-house components of \ -an application suit to realize distributed multimedia playback on \ +an application suite to realize distributed multimedia playback on \ Haiku client machines." HOMEPAGE="https://github.com/stippi/Clockwerk" From 6ed36d5d34b1a7b692da05e6dd1c4d5fd12d8c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 7 Jan 2015 16:22:43 +0000 Subject: [PATCH 217/326] Premake 4.3 --- dev-util/premake/patches/premake-4.3.patch | 37 ------------- dev-util/premake/patches/premake-4.3.patchset | 54 +++++++++++++++++++ dev-util/premake/premake-4.3.recipe | 54 +++++++++++++++---- 3 files changed, 98 insertions(+), 47 deletions(-) delete mode 100644 dev-util/premake/patches/premake-4.3.patch create mode 100644 dev-util/premake/patches/premake-4.3.patchset diff --git a/dev-util/premake/patches/premake-4.3.patch b/dev-util/premake/patches/premake-4.3.patch deleted file mode 100644 index e02982f80..000000000 --- a/dev-util/premake/patches/premake-4.3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur premake-4.3/build/gmake.unix/Premake4.make premake-4.3-haiku/build/gmake.unix/Premake4.make ---- premake-4.3/build/gmake.unix/Premake4.make 2010-11-16 11:29:14.028311552 +0000 -+++ premake-4.3-haiku/build/gmake.unix/Premake4.make 2012-12-27 23:50:16.043253760 +0000 -@@ -28,8 +28,8 @@ - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os - CXXFLAGS += $(CFLAGS) -- LDFLAGS += -s -rdynamic -- LIBS += -lm -ldl -+ LDFLAGS += -s -+ LIBS += - RESFLAGS += $(DEFINES) $(INCLUDES) - LDDEPS += - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) -diff -Naur premake-4.3/src/host/lua-5.1.4/src/luaconf.h premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h ---- premake-4.3/src/host/lua-5.1.4/src/luaconf.h 2010-11-16 11:29:12.042991616 +0000 -+++ premake-4.3-haiku/src/host/lua-5.1.4/src/luaconf.h 2012-12-27 23:50:16.050331648 +0000 -@@ -55,7 +55,6 @@ - #define LUA_USE_MKSTEMP - #define LUA_USE_ISATTY - #define LUA_USE_POPEN --#define LUA_USE_ULONGJMP - #endif - - -diff -Naur premake-4.3/src/host/premake.h premake-4.3-haiku/src/host/premake.h ---- premake-4.3/src/host/premake.h 2010-11-16 11:29:12.047185920 +0000 -+++ premake-4.3-haiku/src/host/premake.h 2012-12-27 23:50:16.052166656 +0000 -@@ -12,7 +12,7 @@ - - /* Identify the current platform I'm not sure how to reliably detect - * Windows but since it is the most common I use it as the default */ --#if defined(__linux__) -+#if defined(__linux__) || defined(__HAIKU__) - #define PLATFORM_LINUX (1) - #define PLATFORM_STRING "linux" - #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) diff --git a/dev-util/premake/patches/premake-4.3.patchset b/dev-util/premake/patches/premake-4.3.patchset new file mode 100644 index 000000000..75f9cdc9e --- /dev/null +++ b/dev-util/premake/patches/premake-4.3.patchset @@ -0,0 +1,54 @@ +From 24fb42f5d8c5e23290a9e22d577174a6151f4a6e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Wed, 7 Jan 2015 16:17:46 +0000 +Subject: Fixing Premake4 + + +diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make +index bbc159b..7cb8ce5 100644 +--- a/build/gmake.unix/Premake4.make ++++ b/build/gmake.unix/Premake4.make +@@ -28,8 +28,8 @@ ifeq ($(config),release) + CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) + CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os + CXXFLAGS += $(CFLAGS) +- LDFLAGS += -s -rdynamic +- LIBS += -lm -ldl ++ LDFLAGS += -s ++ LIBS += -lbe -lroot -ltracker + RESFLAGS += $(DEFINES) $(INCLUDES) + LDDEPS += + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) +diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h +index e2cb261..b702731 100644 +--- a/src/host/lua-5.1.4/src/luaconf.h ++++ b/src/host/lua-5.1.4/src/luaconf.h +@@ -55,8 +55,10 @@ + #define LUA_USE_MKSTEMP + #define LUA_USE_ISATTY + #define LUA_USE_POPEN ++#ifndef __HAIKU__ + #define LUA_USE_ULONGJMP + #endif ++#endif + + + /* +diff --git a/src/host/premake.h b/src/host/premake.h +index 4358b18..72371e1 100644 +--- a/src/host/premake.h ++++ b/src/host/premake.h +@@ -24,6 +24,9 @@ + #elif defined(__sun__) && defined(__svr4__) + #define PLATFORM_SOLARIS (1) + #define PLATFORM_STRING "solaris" ++#elif defined(__HAIKU__) ++#define PLATFORM_LINUX (1) ++#define PLATFORM_STRING "haiku" + #else + #define PLATFORM_WINDOWS (1) + #define PLATFORM_STRING "windows" +-- +1.8.3.4 + diff --git a/dev-util/premake/premake-4.3.recipe b/dev-util/premake/premake-4.3.recipe index d01ce86be..eef25d8d6 100644 --- a/dev-util/premake/premake-4.3.recipe +++ b/dev-util/premake/premake-4.3.recipe @@ -1,23 +1,57 @@ -DESCRIPTION="Powerfully simple build configuration" +SUMMARY="Powerfully simple build configuration" +DESCRIPTION=" +Describe your software project with a full-featured scripting language and \ +let Premake write the build scripts for you. With one file your project can \ +support both IDE-addicted Windows coders and Linux command-line junkies! +" HOMEPAGE="http://industriousone.com/premake" SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.3/premake-4.3-src.zip/download" -CHECKSUM_MD5="8cfafee76f9665c93b2e9ad15b015eb7" +CHECKSUM_SHA256="36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="BSD (2-clause)" +COPYRIGHT="2012 Industrious One, LLC" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + premake4$secondaryArchSuffix = $portVersion + cmd:premake4$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make +" + +SOURCE_DIR="premake-4.3" + +PATCHES="premake-4.3.patchset" BUILD() { - cd premake-4.3/build/gmake.unix + cd build/gmake.unix make config=release } INSTALL() { - cd premake-4.3/bin/release - mkdir -p $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` - install -m 0755 premake4 $DESTDIR`finddir B_COMMON_BIN_DIRECTORY` + cd bin/release + mkdir -p $binDir + install -m 0755 premake4 $binDir } -LICENSE="BSD (2-clause)" -COPYRIGHT="2012 Industrious One, LLC" From c5618f7be60bbae670254fe8575ffff1e213de76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 8 Jan 2015 00:30:59 +0000 Subject: [PATCH 218/326] Added recipe for GraphicsMagick --- .../graphicsmagick-1.3.20.recipe | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe new file mode 100644 index 000000000..bf15a63c5 --- /dev/null +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe @@ -0,0 +1,75 @@ +SUMMARY="Collection of image processing tools" +HOMEPAGE="http://graphicsmagick.org" +COPYRIGHT="Copyright (C) 2002-2015 GraphicsMagick Group" +LICENSE="MIT" +SRC_URI="http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.20/GraphicsMagick-1.3.20.tar.gz" +CHECKSUM_SHA256="0f7463318f5d9a4b429655dd43642a7a93dae561360637093182fbf5ac4fdc88" +REVISION="1" +ARCHITECTURES="x86_gcc2" +SECONDARY_ARCHITECTURES="x86" +SOURCE_DIR="GraphicsMagick-1.3.20" + +PROVIDES="graphicsmagick$secondaryArchSuffix + cmd:gm$secondaryArchSuffix + cmd:GraphicsMagick++_config$secondaryArchSuffix + cmd:GraphicsMagick_config$secondaryArchSuffix + cmd:GraphicsMagickWand_config$secondaryArchSuffix +" +REQUIRES=" + haiku$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:liblcms2$secondaryArchSuffix + lib:libwebp$secondaryArchSuffix +" +BUILD_REQUIRES=" + devel:libtiff$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:liblcms2$secondaryArchSuffix + devel:libwebp$secondaryArchSuffix +" +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:awk +" + +PROVIDES_devel=" + graphicsmagick${secondaryArchSuffix}_devel + devel:libGraphicsMagick++$secondaryArchSuffix + devel:libGraphicsMagick$secondaryArchSuffix + devel:libGraphicsMagickWand$secondaryArchSuffix +" + +REQUIRES_devel=" + graphicsmagick$secondaryArchSuffix +" + + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libGraphicsMagick++ libGraphicsMagickWand libGraphicsMagick + packageEntries devel $developDir +} + +DESCRIPTION="GraphicsMagick provides a set of command-line applications to manipulate +image files. It is a fork of the ImageMagick project and therefore offers +a similar set of features, but puts a larger emphasis on stability. +The tools support a large variety of image formats from the widely used +jpeg, tiff, bmp or xpm to special-purpose formats such as fits or image +formats found on some photo CDs. They can convert between formats, +concatenate several images into one, annotate and distort them, create +thumbnails or manipulate the colormap." + From 86a20974e4447287a0eb8596d1ea166d54522ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 8 Jan 2015 01:56:04 +0000 Subject: [PATCH 219/326] Fixed description for GraphicsMagick --- .../graphicsmagick/graphicsmagick-1.3.20.recipe | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe index bf15a63c5..03295e29a 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe @@ -64,12 +64,13 @@ INSTALL() packageEntries devel $developDir } -DESCRIPTION="GraphicsMagick provides a set of command-line applications to manipulate -image files. It is a fork of the ImageMagick project and therefore offers +DESCRIPTION="GraphicsMagick provides a set of command-line applications to manipulate\ +image files. It is a fork of the ImageMagick project and therefore offers\ a similar set of features, but puts a larger emphasis on stability. -The tools support a large variety of image formats from the widely used -jpeg, tiff, bmp or xpm to special-purpose formats such as fits or image -formats found on some photo CDs. They can convert between formats, -concatenate several images into one, annotate and distort them, create + +The tools support a large variety of image formats from the widely used\ +jpeg, tiff, bmp or xpm to special-purpose formats such as fits or image\ +formats found on some photo CDs. They can convert between formats,\ +concatenate several images into one, annotate and distort them, create\ thumbnails or manipulate the colormap." From 57240cc6eb7dc0dd88b18f9584e2beed87222f98 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 6 Jan 2015 19:10:15 +0000 Subject: [PATCH 220/326] Add a new font, Open Sans --- media-fonts/open_sans/open_sans-1.0.recipe | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 media-fonts/open_sans/open_sans-1.0.recipe diff --git a/media-fonts/open_sans/open_sans-1.0.recipe b/media-fonts/open_sans/open_sans-1.0.recipe new file mode 100644 index 000000000..c87863ebe --- /dev/null +++ b/media-fonts/open_sans/open_sans-1.0.recipe @@ -0,0 +1,36 @@ +SUMMARY="The Open Sans font" +DESCRIPTION="Open Sans is a humanist sans serif typeface designed by Steve Matteson, \ +Type Director of Ascender Corp. Open Sans was designed with an upright stress, \ +open forms and a neutral, yet friendly appearance. It was optimized for print, web, \ +and mobile interfaces, and has excellent legibility characteristics in its letterforms." +HOMEPAGE="http://www.google.com/fonts/specimen/Open+Sans" +# From Google fonts, +# http://www.google.com/fonts#UsePlace:use/Collection:Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800 +# Leave out the checksum here as the file is generated on the fly. +SRC_URI="http://www.google.com/fonts/download?kit=3hvsV99qyKCBS55e5pvb3ltkqrIMaAZWyLYEoB48lSQ" +SRC_FILENAME="open-sans.zip" +LICENSE="Apache v2" +COPYRIGHT="2010-2011 Google Corporation" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="open_sans = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + cp *.ttf ${FONTDIR} +} From 6f5ce9dd1f40a12fff7fe35fdd3d2650158425fc Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Tue, 6 Jan 2015 19:10:24 +0000 Subject: [PATCH 221/326] Add a new font, Source Sans Pro --- .../source_sans_pro-1.0.recipe | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 media-fonts/source_sans_pro/source_sans_pro-1.0.recipe diff --git a/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe b/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe new file mode 100644 index 000000000..e6e741429 --- /dev/null +++ b/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe @@ -0,0 +1,47 @@ +SUMMARY="The Source Sans Pro Font" +DESCRIPTION=" +Source Sans Pro was designed by Paul D. Hunt under the guidance of Robert Slimbach. \ +It is Adobe's first open source typeface family, conceived primarily as a typeface \ +for user interfaces. Source Sans Pro draws inspiration from the clarity and legibility \ +of twentieth-century American gothic typeface designs. Distilling the best \ +archetypical qualities of these models, Paul followed a rational design approach by \ +simplifying glyph shapes by paring them to their essential form. However, in order \ +to more easily differentiate similar letter shapes (such as uppercase I and lowercase L), \ +some additional details have been added. Besides providing such explicitly \ +clarity in short text strings, another fundamental design consideration was to create \ +a typeface that reads well in extended settings. This can be seen in the general \ +proportions: Source Sans Pro has been designed with a more generous width than many \ +other comparable gothics, and its shorter majuscule letters, combined with minuscule \ +letters with longer extenders, create a more pleasant reading texture in longer text passages. +" +HOMEPAGE="https://store1.adobe.com/cfusion/store/html/index.cfm?event=displayFontPackage&code=1959" +# From Google fonts, +# http://www.google.com/fonts#UsePlace:use/Collection:Source+Sans+Pro:200,300,400,600,700,900,200italic,300italic,400italic,600italic,700italic,900italic +# Leave out the checksum here as the file is generated on the fly. +SRC_URI="http://www.google.com/fonts/download?kit=oSlYq_wYbrV5L-loA5QUynXmVIqD4Rma_X5NukQ7EX0" +SRC_FILENAME="Source_Sans_Pro.zip" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2010, 2012, 2014 Adobe Systems Incorporated" +REVISION="1" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="source_sans_pro = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=$fontsDir/ttfonts + mkdir -p ${FONTDIR} + cp *.ttf ${FONTDIR} +} From 6bad1e9e5a29da9b0750c43d84f5aac6c73fa5fc Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 05:02:08 +0000 Subject: [PATCH 222/326] x_series_fonts: Update recipe --- .../x_series_fonts/x_series_fonts-2.0.recipe | 211 ++++++++---------- 1 file changed, 89 insertions(+), 122 deletions(-) diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index 7a4a295ab..360c1d816 100644 --- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -1,137 +1,104 @@ +SUMMARY="The X Series 2 Fonts" DESCRIPTION=" X Series 2 fonts are built on freely available fonts and extended to support \ Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \ (Ottoman) and modern Turkish (Roman). " HOMEPAGE="http://wiki.irmug.com/index.php/X_Series_2" -SRC_URI="http://irmug.com/downloads/dl.php?id=21" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="1e45723ebad5e748d4b5f6f28074833f" +REVISION="3" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2009 Irmug" +SRC_URI="http://irmug.com/downloads/dl.php?id=1" +SRC_FILENAME="Kayhan.zip" +SRC_URI_2="http://irmug.com/downloads/dl.php?id=2" +SRC_FILENAME_2="Khoramshahr.zip" +SRC_URI_3="http://irmug.com/downloads/dl.php?id=3" +SRC_FILENAME_3="Niloofar.zip" +SRC_URI_4="http://irmug.com/downloads/dl.php?id=4" +SRC_FILENAME_4="Paatch.zip" +SRC_URI_5="http://irmug.com/downloads/dl.php?id=5" +SRC_FILENAME_5="Riyaz.zip" +SRC_URI_6="http://irmug.com/downloads/dl.php?id=6" +SRC_FILENAME_6="Roya.zip" +SRC_URI_7="http://irmug.com/downloads/dl.php?id=7" +SRC_FILENAME_7="Shafigh.zip" +SRC_URI_8="http://irmug.com/downloads/dl.php?id=8" +SRC_FILENAME_8="Shafigh Uzbek.zip" +SRC_URI_9="http://irmug.com/downloads/dl.php?id=9" +SRC_FILENAME_9="Shafigh Kurd.zip" +SRC_URI_10="http://irmug.com/downloads/dl.php?id=10" +SRC_FILENAME_10="Shiraz.zip" +SRC_URI_11="http://irmug.com/downloads/dl.php?id=11" +SRC_FILENAME_11="Sols.zip" +SRC_URI_12="http://irmug.com/downloads/dl.php?id=12" +SRC_FILENAME_12="Tabriz.zip" +SRC_URI_13="http://irmug.com/downloads/dl.php?id=13" +SRC_FILENAME_13="Titre.zip" +SRC_URI_14="http://irmug.com/downloads/dl.php?id=14" +SRC_FILENAME_14="Traffic.zip" +SRC_URI_15="http://irmug.com/downloads/dl.php?id=15" +SRC_FILENAME_15="Vahid.zip" +SRC_URI_16="http://irmug.com/downloads/dl.php?id=16" +SRC_FILENAME_16="Vosta.zip" +SRC_URI_17="http://irmug.com/downloads/dl.php?id=17" +SRC_FILENAME_17="Yagut.zip" +SRC_URI_18="http://irmug.com/downloads/dl.php?id=18" +SRC_FILENAME_18="Yas.zip" +SRC_URI_19="http://irmug.com/downloads/dl.php?id=19" +SRC_FILENAME_19="Yekan.zip" +SRC_URI_20="http://irmug.com/downloads/dl.php?id=20" +SRC_FILENAME_20="Yermook.zip" +SRC_URI_21="http://irmug.com/downloads/dl.php?id=21" +SRC_FILENAME_21="Zar.zip" +SRC_URI_22="http://irmug.com/downloads/dl.php?id=22" +SRC_FILENAME_22="Ziba.zip" +CHECKSUM_SHA256="c82d5a89278f528141b93eab350adfe4cda2d1433d6efb539cfa46134ccaf07f" +CHECKSUM_SHA256_2="de514505ee0b45167bf2816b8f426b307f2d6252e9658917117de6df7eaa8bab" +CHECKSUM_SHA256_3="3575302c74b55e6992c0a64b7d4a193c0dc8a95fe8ea62d06959ce4586bf90a6" +CHECKSUM_SHA256_4="6db9f506f2e427c731a2bb6538c4c3e579ac145b682cebe7d7651f7f72c837f9" +CHECKSUM_SHA256_5="85fa5bc42bec3976af3731756b533fdb7339375c57b2cb10b262c5f788c53826" +CHECKSUM_SHA256_6="26658db74a08855f793e15acec7940d1d7b2da84a7e3ed064c1458a7a412751e" +CHECKSUM_SHA256_7="9ca90be08cefa52aa48e7ab42d0b2bcce39cd612507ff565c4dab7456a8dcdfc" +CHECKSUM_SHA256_8="ae7fd73e1b9394961d98493cdd3d791011025aeacd0de4e12d2e6eb4032ff549" +CHECKSUM_SHA256_9="06dccdee05a8a4fe4869a8ff6dd1acb008f50c9e2a24eee3eab577b2cb81d8b0" +CHECKSUM_SHA256_10="6d0d6b35684e04431a4ff632985549b7d6c6a064a2e4ba3e98237040a2cb9198" +CHECKSUM_SHA256_11="009efb2f958ee1b78253c784c6fa4f07a0d1f7277a1b2530a664c021cb2b55e5" +CHECKSUM_SHA256_12="59b6314928ced07b67607aa67c756074764cf0fd91fe99f96e46f512cfb413a5" +CHECKSUM_SHA256_13="8ea816bc857aa3a17293726997c4a37132d5f5570ed1eeb459793950d8e70bb4" +CHECKSUM_SHA256_14="9f280efbfa42144a8d9cc9aa9bb4994b739281050b214ddd4bd86b1d425768d7" +CHECKSUM_SHA256_15="88bdf86e2b2d53cb2e6b2319f36ad13324c4804547f758f425dc042d7077c102" +CHECKSUM_SHA256_16="86727d4cee40812fb45e3741d68ca75725806d21db272c0850f70821a70f1169" +CHECKSUM_SHA256_17="6175494252e997fac2ab8f7a1b85bf3cc522cf0bc7be7e001a9f7ba1db906766" +CHECKSUM_SHA256_18="8d1d5462a1c902c074b18708b6eddfed2a11f0f7aacc126170ae3f61560e6661" +CHECKSUM_SHA256_19="b23e2f7c2a1e4a8b63850d7e9e804ff533ce5968f86ea5df57f850a5cf58785c" +CHECKSUM_SHA256_20="c86f8e8255a178434e937c19d8cf3f36de688d59c9cf471923df18795eead06f" +CHECKSUM_SHA256_21="a44aada3f79583c5eacc7f927414e692d523d7c84e2b6b0e3b7a06747cf41aa9" +CHECKSUM_SHA256_22="fdbf29bdcd5b7b1b34c5fd8da654d29291d824c65058c9796225af08c003dd77" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="x_series_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + coreutils + cmd:find +" + +SOURCE_DIR="" + BUILD() { - cd Zar + true } INSTALL() { FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - wget http://irmug.com/downloads/dl.php?id=21 - unzip -o Zar.zip - cd Zar - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=3 - unzip -o Niloofar.zip - cd Niloofar - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=2 - unzip -o Khoramshahr.zip - cd Khoramshahr - cp -f *.ttf ${FONTDIR}/ - - wget http://www.irmug.com/downloads/dl.php?id=1 - unzip -o Kayhan.zip - cd Kayhan - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=17 - unzip -o Yagut.zip - cd Yagut - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=5 - unzip -o Riyaz.zip - cd Riyaz - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=6 - unzip -o Roya.zip - cd Roya - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=7 - unzip -o Shafigh.zip - cd Shafigh - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=9 - unzip -o "Shafigh Kurd.zip" - cd "Shafigh Kurd" - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=8 - unzip -o "Shafigh Uzbek.zip" - cd "Shafigh Uzbek" - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=10 - unzip -o Shiraz.zip - cd Shiraz - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=11 - unzip -o Sols.zip - cd Sols - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=12 - unzip -o Tabriz.zip - cd Tabriz - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=13 - unzip -o Titre.zip - cd Titre - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=14 - unzip -o Traffic.zip - cd Traffic - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=4 - unzip -o Paatch.zip - cd Paatch - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=15 - unzip -o Vahid.zip - cd Vahid - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=16 - unzip -o Vosta.zip - cd Vosta - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=19 - unzip -o Yekan.zip - cd Yekan - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=20 - unzip -o Yermook.zip - cd Yermook - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=18 - unzip -o Yas.zip - cd Yas - cp -f *.ttf ${FONTDIR}/ - - wget http://irmug.com/downloads/dl.php?id=22 - unzip -o Ziba.zip - cd Ziba - cp -f *.ttf ${FONTDIR}/ - - - - + # http://askubuntu.com/questions/343727/filenames-with-spaces-breaking-for-loop-find-command + find ../sources* -type f -name '*.ttf' -print0 | while IFS= read -r -d '' file; do + cp "`printf '%s' "$file"`" ${FONTDIR} + done } - -LICENSE="GNU GPL v2" -#COPYRIGHT="" From 8788d59d5c85e829b037938eb91e8110de382349 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:05:53 +0000 Subject: [PATCH 223/326] humor_sans: Add '#noarchive' to the download URL * Because ttf isn't an archive which can be extracted. --- media-fonts/humor_sans/humor_sans-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe index bcd270a35..09acdbf75 100644 --- a/media-fonts/humor_sans/humor_sans-1.0.recipe +++ b/media-fonts/humor_sans/humor_sans-1.0.recipe @@ -4,7 +4,7 @@ A sans-serif typeface in the style of xkcd. Xkcd is a popular webcomics with \ focus on computer science or everything else. " HOMEPAGE="http://antiyawn.com/uploads/humorsans.html" -SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf" +SRC_URI="http://antiyawn.com/uploads/Humor-Sans-1.0.ttf#noarchive" CHECKSUM_SHA256="2ded6a27448c9ed30aaff177744e2bcf1e52e0aab018b2a8be64565df633318f" LICENSE="SIL Open Font License v1.1" COPYRIGHT="2009, Michael Ciuffo, with Reserved Font Name Humor-Sans" From c41c21ac49ad29b50afe16170b5239a2c622a538 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:16:16 +0000 Subject: [PATCH 224/326] inconsolata: Update recipe * Convert to .recipe format * Move extra downloads from INSTALL() to SRC_URI_$n --- .../inconsolata/inconsolata-1.0.recipe | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/media-fonts/inconsolata/inconsolata-1.0.recipe b/media-fonts/inconsolata/inconsolata-1.0.recipe index eceb5c6c1..0014f34a9 100644 --- a/media-fonts/inconsolata/inconsolata-1.0.recipe +++ b/media-fonts/inconsolata/inconsolata-1.0.recipe @@ -1,26 +1,41 @@ -DESCRIPTION="Inconsolata Programmer's font" +SUMMARY="Inconsolata Programmer's font" +DESCRIPTION="Inconsolata is a monospace font, designed for code listings \ +and the like, in print. There are a great many 'programmer fonts,' designed \ +primarily for use on the screen, but in most cases do not have the attention \ +to detail for high resolution rendering." HOMEPAGE="http://www.levien.com/type/myfonts/inconsolata.html" SRC_URI="http://media.nodnod.net/Inconsolata-dz.otf.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="8510443343f43382566511e73abc06f8" +CHECKSUM_SHA256="002fed4b8c1e5417c03f9b55e009acc682da08b13cdbf8f601f52efaf5324d58" +SRC_URI_2="http://levien.com/type/myfonts/Inconsolata.otf#noarchive" +CHECKSUM_SHA256_2="1561e616c414a1b82d6e6dfbd18e5726fd65028913ade191e5fa38b6ec375a1a" +SRC_URI_3="http://www.cosmix.org/software/files/InconsolataHellenic.zip" +CHECKSUM_SHA256_3="415f6cd9badb1eefa90be8b10e6316e87f9824856b5e407213334bf5a77873e7" +REVISION="3" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2006 Raph Levien + 2009 David Zhou + 2010-2012 Dimosthenis Kaponis +" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="inconsolata = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + BUILD() { - echo "No building required." + true } INSTALL() { FONTDIR=${fontsDir}/otfonts mkdir -p ${FONTDIR} - wget http://levien.com/type/myfonts/Inconsolata.otf - wget http://www.cosmix.org/software/files/InconsolataHellenic.zip - unzip -o InconsolataHellenic.zip cp -r *.otf ${FONTDIR}/ } -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2006 Raph Levien - 2009 David Zhou - 2010-2012 Dimosthenis Kaponis" From 0dc1532af7d80fb5acaea01f554204ba459682a0 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:28:50 +0000 Subject: [PATCH 225/326] arabeyes_fonts: minor build fix --- media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index 16566f291..f50060d91 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -23,7 +23,7 @@ BUILD_PREREQUIRES=" coreutils " -SOURCE_DIR="ae_fonts1-1.1/" +SOURCE_DIR="ae_fonts1-1.1" BUILD() { From c542edee64bbcc9e4e9f6fa852bf170948db88d0 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:29:01 +0000 Subject: [PATCH 226/326] kacst_fonts: update recipe --- .../kacst_fonts/kacst_fonts-5.0.recipe | 54 ++++++++++++------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe index 0bef51cbe..15e927a4d 100644 --- a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe +++ b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe @@ -1,25 +1,41 @@ -DESCRIPTION="KACST Arabic Truetype Fonts" +SUMMARY="KACST Arabic Truetype Fonts" +DESCRIPTION=" +KacstOne font is part of KACST fonts, which are free fonts donated by \ +King Abdulaziz City For Science And Technology (KACST) under GPL. \ + +Arabeyes version of KacstOne is modified for better visibility and \ +readability on the screen, the font is optimized for 10pt size under \ +100dpi. Special attention was given to diacritical marks (tashkil or \ +harakat) and dots to make sure they are visible and easily distinguishable. +" HOMEPAGE="http://www.arabeyes.org/project.php?proj=Khotot" SRC_URI="http://sourceforge.net/projects/arabeyes/files/latest/download?source=files" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="0a7ad4538d3b97adfbefa4c5cf8c2660" -BUILD() -{ - cd kacst_one_5.0 -} - -INSTALL() -{ - cd kacst_one_5.0 - FONTDIR=${fontsDir}/ttfonts - mkdir -p ${FONTDIR} - cp KacstOne-Bold.ttf ${FONTDIR}/ - cp KacstOne.ttf ${FONTDIR}/ -} - +CHECKSUM_SHA256="1b016f49f99de16a65dcd990f229e729e6c4c6df02b23409771f6e27b69186a7" +REVISION="3" LICENSE="GNU GPL v2" COPYRIGHT="2004 KACST 2002,2003,2005,2008,2009 Free Software Foundation 2009-2011 Kahled Hosny (Arabeyes additions)" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="kacst_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="kacst_one_5.0" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=${fontsDir}/ttfonts + mkdir -p ${FONTDIR} + cp KacstOne-Bold.ttf ${FONTDIR}/ + cp KacstOne.ttf ${FONTDIR}/ +} From 9377925698e5a2b0192aa8386f32dc550ac2473d Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:34:37 +0000 Subject: [PATCH 227/326] lateef_font: update recipe --- .../lateef_font/lateef_font-1.001.recipe | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/media-fonts/lateef_font/lateef_font-1.001.recipe b/media-fonts/lateef_font/lateef_font-1.001.recipe index 69b0ac8e9..694e98ea7 100644 --- a/media-fonts/lateef_font/lateef_font-1.001.recipe +++ b/media-fonts/lateef_font/lateef_font-1.001.recipe @@ -1,13 +1,40 @@ -DESCRIPTION="Arabic font" +SUMMARY="Arabic font" +DESCRIPTION=" +Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi \ +mystic and poet. It is intended to be an appropriate style for use \ +in Sindhi and other languages of the South Asian region. +This font provides a simplified rendering of Arabic script, using basic \ +connecting glyphs but not including a wide variety of additional ligatures \ +or contextual alternates (only the required lam-alef ligatures). This \ +simplified style is often preferred for clarity, especially in non-Arabic \ +languages, but may be considered unattractive in more traditional and \ +literate communities. +One font from this typeface family is included in this release: + * Lateef Regular +This release supports virtually all of the Unicode 5.0 Arabic character \ +repertoire (excluding the Arabic Presentation Forms blocks, which are not \ +recommended for normal use). Font smarts are implemented using OpenType \ +technology." HOMEPAGE="http://scripts.sil.org/ArabicFonts_Download" SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=Lateef_OT_1_001&filename=LateefRegOT_1.001.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="c060ab84ab33ae8f991103258b8e7f22" +CHECKSUM_SHA256="ca3f84555007975d69c18f3d958f6a1a1c79c5b550c13d168d600e07efac1c09" +REVISION="3" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2004-2008 SIL International" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="lateef_font = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + BUILD() { - echo "No building required." + true } INSTALL() @@ -17,5 +44,3 @@ INSTALL() cp -r *.ttf ${FONTDIR} } -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2004-2008 SIL International" From ec92fae23b411cb2e7268030e7f7541f5450f26e Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:35:33 +0000 Subject: [PATCH 228/326] lato_fonts: typo fix * Copy the font correctly --- media-fonts/lato_fonts/lato_fonts-2.010.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/lato_fonts/lato_fonts-2.010.recipe b/media-fonts/lato_fonts/lato_fonts-2.010.recipe index d675526ad..4c4583be8 100644 --- a/media-fonts/lato_fonts/lato_fonts-2.010.recipe +++ b/media-fonts/lato_fonts/lato_fonts-2.010.recipe @@ -33,6 +33,6 @@ INSTALL() FONTDIR=$fontsDir/ttfonts mkdir -p $FONTDIR - cd *.ttf $FONTDIR + cp *.ttf $FONTDIR } From 9e42187865f1f241f05a97983eafd0a9c0119f1a Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 17:51:31 +0000 Subject: [PATCH 229/326] mplus: Fix source location --- media-fonts/mplus/mplus-2.2.4.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/mplus/mplus-2.2.4.recipe b/media-fonts/mplus/mplus-2.2.4.recipe index df9750fd0..d939cfc44 100644 --- a/media-fonts/mplus/mplus-2.2.4.recipe +++ b/media-fonts/mplus/mplus-2.2.4.recipe @@ -3,7 +3,7 @@ DESCRIPTION="M+ FONTS are Japanese font families designed by Coji Morishita. The 'M' stands for 'Minimum', while the plus sign means above minimum." HOMEPAGE="mplus-fonts.sourceforge.jp" SRC_URI="http://jaist.dl.sourceforge.jp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz" -SOURCE_DIR="." +SOURCE_DIR="" CHECKSUM_SHA256="7862e113e04986646117267c4baee30aea163d43a382c14693f15287f16bbf25" LICENSE="GNU GPL v2" COPYRIGHT="2002-2008 M+ Fonts Project" From 467c0539231ce5ee15649efd7043d60acc972e23 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 18:38:10 +0000 Subject: [PATCH 230/326] noto_sans_new_tai_lue: update checksum --- .../noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe index a25c90500..048a1b681 100644 --- a/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe +++ b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe @@ -9,7 +9,7 @@ Earth. This package contains the Noto Sans fonts for $LANG_EN. " HOMEPAGE="https://www.google.com/get/noto/" SRC_URI="https://www.google.com/get/noto/pkgs/NotoSans${LANG_DL}-unhinted.zip" -CHECKSUM_SHA256="660995d4cae6e4588a069f8d45ec52a96a624e501638a0c2ebd02683b623bced" +CHECKSUM_SHA256="922b5e02623a678b20b7f811a8589238b7b7f97e66704dcb866533f9c6d37476" LICENSE="Apache v2" COPYRIGHT="2012 Google Inc." REVISION="1" From f73de8fe47da3831d416264607d45bcae57fde58 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 18:41:25 +0000 Subject: [PATCH 231/326] symbola: update checksum --- media-fonts/symbola/symbola-7.18.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-fonts/symbola/symbola-7.18.recipe b/media-fonts/symbola/symbola-7.18.recipe index ffa56b1af..091f041a9 100644 --- a/media-fonts/symbola/symbola-7.18.recipe +++ b/media-fonts/symbola/symbola-7.18.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Basic Latin, Greek, Cyrillic, and many Symbol blocks of The \ Unicode Standard, Version 7.0" HOMEPAGE="http://users.teilar.gr/~g1951d" SRC_URI="http://users.teilar.gr/~g1951d/Symbola.zip" -CHECKSUM_SHA256="4e98df630002a95da59970916cab05a2229874066871f12f2ad0b547b9c260b6" +CHECKSUM_SHA256="ad66a618d21b81f0c64a262efd8046c425326e958983552dde6965e73a7bf6bc" LICENSE="Public Domain" COPYRIGHT="None" REVISION="1" From e8092f53cebe0df6a7f3d5fbf083dd1a141a23ab Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 7 Jan 2015 18:58:24 +0000 Subject: [PATCH 232/326] unifont: Optimise recipe * Don't download the source for 4 precompiled binaries, grab them directly. --- media-fonts/unifont/unifont-7.0.06.recipe | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/media-fonts/unifont/unifont-7.0.06.recipe b/media-fonts/unifont/unifont-7.0.06.recipe index 6bb3fb79b..dd1ab2d41 100644 --- a/media-fonts/unifont/unifont-7.0.06.recipe +++ b/media-fonts/unifont/unifont-7.0.06.recipe @@ -4,7 +4,14 @@ The GNU Unifont by Roman Czyborra is a free bitmap font that covers the \ Unicode Basic Multilingual Plane (BMP), \ using an intermediate bitmapped font format." HOMEPAGE="http://unifoundry.com" -SRC_URI="http://unifoundry.com/pub/unifont-7.0.06.tar.gz" +SRC_URI="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont-7.0.06.ttf#noarchive" +CHECKSUM_SHA256="a7a49189502d01033cc4028048f10706c665952341f2d5831d4477c8b301b362" +SRC_URI_2="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont_upper-7.0.06.ttf#noarchive" +CHECKSUM_SHA256_2="8cf9b9870860a3aec239d6ee43387a3ba8c3b8302d4b8d73bca8a419a7deb01d" +SRC_URI_3="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont_csur-7.0.06.ttf#noarchive" +CHECKSUM_SHA256_3="ddf4b3632f7cda10d53c6f62e198db7989524cfd7131af2591ad50dc1aa31f06" +SRC_URI_4="http://unifoundry.com/pub/unifont-7.0.06/font-builds/unifont_upper_csur-7.0.06.ttf#noarchive" +CHECKSUM_SHA256_4="0e1841505d1be6636cf6d5e60cc4ff09b56784e29f2728060231b26d74ab7551" SOURCE_DIR="" LICENSE="GNU GPL v2" COPYRIGHT="Unifoundry" @@ -27,5 +34,5 @@ INSTALL() FONTDIR=$fontsDir/ttfonts mkdir -p ${FONTDIR} - cp unifont-7.0.06/font/precompiled/*.ttf ${FONTDIR} + cp ../sources*/*.ttf ${FONTDIR} } From f81fc38eea0b9c61e22f09bc31ffada9e55581e8 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 04:11:50 +0000 Subject: [PATCH 233/326] liberation_fonts: Add a new recipe for a binary version. * The liberation_fonts recipe builds the font from source, and relies on fontforge to do so, which is currently (at the time of this commit) marked as broken. * It also needs to be updated to the new recipe format. * Since RedHat also provides an archive with precompiled fonts, add a new package 'liberation_fonts_ttf' which uses that. --- .../liberation_fonts_ttf-2.00.1.recipe | 37 +++++++++++++++++++ .../licenses/Liberation Exceptions | 19 ++++++++++ 2 files changed, 56 insertions(+) create mode 100644 media-fonts/liberation_fonts_ttf/liberation_fonts_ttf-2.00.1.recipe create mode 100644 media-fonts/liberation_fonts_ttf/licenses/Liberation Exceptions diff --git a/media-fonts/liberation_fonts_ttf/liberation_fonts_ttf-2.00.1.recipe b/media-fonts/liberation_fonts_ttf/liberation_fonts_ttf-2.00.1.recipe new file mode 100644 index 000000000..bf13d9590 --- /dev/null +++ b/media-fonts/liberation_fonts_ttf/liberation_fonts_ttf-2.00.1.recipe @@ -0,0 +1,37 @@ +SUMMARY="The Liberation Fonts" +DESCRIPTION="\ +The Liberation(tm) Fonts is a font family which aims at metric compatibility \ +with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. +" +HOMEPAGE="https://fedorahosted.org/liberation-fonts" +SRC_URI="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-2.00.1.tar.gz" +CHECKSUM_SHA256="7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504" +REVISION="3" +LICENSE="GNU GPL v2 + Liberation Exceptions" +COPYRIGHT="2007-2010 Red Hat, Inc." + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="liberation_fonts_ttf = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + coreutils +" + + +SOURCE_DIR="liberation-fonts-ttf-2.00.1" + +BUILD() +{ + true +} + +INSTALL() +{ + FONTDIR=${fontsDir}/ttfonts + mkdir -p ${FONTDIR} + cp -a *.ttf ${FONTDIR} +} diff --git a/media-fonts/liberation_fonts_ttf/licenses/Liberation Exceptions b/media-fonts/liberation_fonts_ttf/licenses/Liberation Exceptions new file mode 100644 index 000000000..07d539216 --- /dev/null +++ b/media-fonts/liberation_fonts_ttf/licenses/Liberation Exceptions @@ -0,0 +1,19 @@ +LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY +LIBERATION FONT SOFTWARE + +This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement. + + 1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions: + + (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. + + (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it. + + 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. + + 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. + + 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. + + 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply. +Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc. From ee41e1f117b074ce2bfc41831072e2de3782ad68 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 04:18:00 +0000 Subject: [PATCH 234/326] ukijorgfonts: update recipe --- .../ukijorgfonts/ukijorgfonts-1.0.recipe | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe index 318ea6621..6e489a916 100644 --- a/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe +++ b/media-fonts/ukijorgfonts/ukijorgfonts-1.0.recipe @@ -1,13 +1,27 @@ +SUMMARY="Uyghur Unicode fonts" DESCRIPTION="Uyghur Computer Science Association font project" HOMEPAGE="http://www.ukij.org/fonts/" SRC_URI="http://ukijorgfonts.googlecode.com/files/ukijorgfonts.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="e50ed1b90f96cad12e31f8769bd598dc" +CHECKSUM_SHA256="31fa76566d93fcebab9360147dc6c3f73bfb48a621fbe777dc30c4eff124ca36" +REVISION="3" +LICENSE="SIL Open Font License v1.1 + GNU LGPL v2 + GNU GPL v2" +COPYRIGHT="2004-2011 Uyghur Computer Science Association" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="ukijorgfonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + BUILD() { - echo "Nothing to be done. To install this font, run haikuporter with -i option" + true } INSTALL() @@ -16,8 +30,3 @@ INSTALL() mkdir -p ${FONTDIR} cp *.ttf ${FONTDIR} } - -LICENSE="SIL Open Font License v1.1 - GNU LGPL v2 - GNU GPL v2" -COPYRIGHT="2004-2011 Uyghur Computer Science Association" From 6d02ee2039f632d5a35d66a930eb155abe0b07ab Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 04:57:04 +0000 Subject: [PATCH 235/326] nanumfont: update recipe --- media-fonts/nanumfont/nanumfont-2.0.recipe | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/media-fonts/nanumfont/nanumfont-2.0.recipe b/media-fonts/nanumfont/nanumfont-2.0.recipe index a9af8355a..ddfdf8d6e 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.recipe +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -1,23 +1,32 @@ +SUMMARY="The Nanum font" DESCRIPTION=" Korean monospace font distributed by NHN. " HOMEPAGE="http://dev.naver.com/projects/nanumfont" SRC_URI="http://dev.naver.com/frs/download.php/441/NanumGothicCoding-2.0.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6214a5844454c96faeac9a60539c7daf" +CHECKSUM_SHA256="177317f060e305fa1dca079d453584d9ca7880153c992b188128c6b3b75ece2a" +REVISION="3" +LICENSE="SIL Open Font License v1.1" +COPYRIGHT="2009 NHN Corp." + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="nanumfont = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + BUILD() { - echo "No building required." + true } INSTALL() { FONTDIR=${fontsDir}/ttfonts mkdir -p ${FONTDIR} - cp -r *.ttf ${FONTDIR}/ + cp *.ttf ${FONTDIR} } - -LICENSE="SIL Open Font License v1.1" -COPYRIGHT="2009 NHN Corp." From 049785062cf4757ca321b98ef589cc9fcead5369 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 05:07:15 +0000 Subject: [PATCH 236/326] nafees_*: update recipe and URL * Update to the new format, and fix the homepage and download URLs for nafees_nastaleeq and nafees_riqa --- .../nafees_nastaleeq-1.02.recipe | 30 +++++++++++------ .../nafees_riqa/nafees_riqa-1.00.recipe | 32 ++++++++++++------- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe index bb1201e85..cdd4100db 100644 --- a/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe +++ b/media-fonts/nafees_nastaleeq/nafees_nastaleeq-1.02.recipe @@ -1,16 +1,28 @@ -DESCRIPTION=" +SUMMARY="The Nafees Nastaleed font" +DESCRIPTION="\ Urdu language font developed according to calligraphic rules, following the \ style of one of the finest calligraphers of Pakistan (Nafees Raqam). " -HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesNastaleeq.html" -SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="34ca164ce011b682522431fc332c0cb6" +HOMEPAGE="http://cle.org,pk/software/localization/Fonts/nafeesNastaleeq.html" +SRC_URI="http://cle.org.pk/Downloads/localization/fonts/NafeesNastaleeq/Nafees_Nastaleeq_v1.02.zip" +CHECKSUM_SHA256="3de26b7e9477f5e58f6e6478a61a1fc3889f533c1b8424d0d14fbc4b4e2b33c0" +REVISION="3" +LICENSE="CRULP" +COPYRIGHT="2004 Center for Research in Urdu Language Processing" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="nafees_nastaleeq = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + BUILD() { - echo "Nothing to be done. To install this font, run haikuporter with -i option" + true } INSTALL() @@ -20,5 +32,3 @@ INSTALL() cp "Nafees Nastaleeq v1.02.ttf" ${FONTDIR} } -LICENSE="CRULP" -COPYRIGHT="2004 Center for Research in Urdu Language Processing" diff --git a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe index bcd18aa0c..9dfd3a523 100644 --- a/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe +++ b/media-fonts/nafees_riqa/nafees_riqa-1.00.recipe @@ -1,15 +1,27 @@ -DESCRIPTION=" -Open Type Font for writng Urdu in Riqa script based on Unicode standard. +SUMMARY="The Nafees Riqa font" +DESCRIPTION="\ +True Type Font for writng Urdu in Riqa script based on Unicode standard. " -HOMEPAGE="http://www.crulp.org/software/localization/Fonts/nafeesRiqa.html" -SRC_URI="http://www.crulp.org/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip" -REVISION="2" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="504c6ada41a408575a120daf2a110b6f" +HOMEPAGE="http://cle.org.pk/software/localization/Fonts/nafeesRiqa.html" +SRC_URI="http://cle.org.pk/Downloads/localization/fonts/NafeesRiqa/Nafees_Riqa_v1.0.zip" +CHECKSUM_SHA256="11b567f9bddd8233973edd4abb912dc29644c96a4925bd01f1c948e575d531d2" +REVISION="3" +LICENSE="CRULP" +COPYRIGHT="2004 Center for Research in Urdu Language Processing" + +ARCHITECTURES="any" +DISABLE_SOURCE_PACKAGE=yes + +PROVIDES="nafees_riqa = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES="coreutils" + +SOURCE_DIR="" + BUILD() { - echo "Nothing to be done. To install this font, run haikuporter with -i option" + true } INSTALL() @@ -19,5 +31,3 @@ INSTALL() cp "Nafees Riqa v1.0.ttf" ${FONTDIR} } -LICENSE="CRULP" -COPYRIGHT="2004 Center for Research in Urdu Language Processing" From 37160a2e3bc47f01c2a8bef8639df4ffb59b41cf Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 05:13:58 +0000 Subject: [PATCH 237/326] liberation_fonts: Update recipe (broken) * This builds the fonts from source, and relies on fontforge for that (which is currently marked as broken) * Either way, update the recipe the the latest version of the source as well as the new format TODO: Add fontforge dependency, properly. --- .../liberation_fonts-1.06.0.20100721.recipe | 27 -------------- .../liberation_fonts-2.00.1.recipe | 37 +++++++++++++++++++ 2 files changed, 37 insertions(+), 27 deletions(-) delete mode 100644 media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe create mode 100644 media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe diff --git a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe b/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe deleted file mode 100644 index a6f4c14a4..000000000 --- a/media-fonts/liberation_fonts/liberation_fonts-1.06.0.20100721.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION=" -The Liberation(tm) Fonts is a font family which aims at metric compatibility \ -with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. -" -HOMEPAGE="https://fedorahosted.org/liberation-fonts" -SRC_URI="http://ports-space.haiku-files.org/media-fonts/source/liberation-fonts-1.06.0.20100721.tar.gz" -REVISION="2" -STATUS_HAIKU="broken" -DEPEND="fontforge" -CHECKSUM_MD5="2f45bd873ab48cf0c3a00fbd350c0e80" -BUILD() -{ - cd liberation-fonts-1.06.0.20100721 - make -} - -INSTALL() -{ - cd liberation-fonts-1.06.0.20100721 - FONTDIR=${fontsDir}/ttfonts - mkdir -p ${FONTDIR} - cp -a *.ttf ${FONTDIR}/. -} - -LICENSE="GNU GPL v2 - Liberation Exceptions" -COPYRIGHT="2007-2010 Red Hat, Inc." diff --git a/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe b/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe new file mode 100644 index 000000000..8a92678d4 --- /dev/null +++ b/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe @@ -0,0 +1,37 @@ +SUMMARY="The Liberation Fonts" +DESCRIPTION=" +The Liberation(tm) Fonts is a font family which aims at metric compatibility \ +with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. +" +HOMEPAGE="https://fedorahosted.org/liberation-fonts" +SRC_URI="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-2.00.1.tar.gz" +CHECKSUM_SHA256="7acbc612c3665292d2d94fd38fe7cd88d826281d31f8c209af92702bdaf6b9fa" +REVISION="3" +LICENSE="GNU GPL v2 + Liberation Exceptions" +COPYRIGHT="2007-2010 Red Hat, Inc." + +ARCHITECTURES="any" + +PROVIDES="liberation_fonts = $portVersion" +REQUIRES="" +BUILD_REQUIRES="" +BUILD_PREREQUIRES=" + cmd:make + coreutils +" + + +SOURCE_DIR="liberation-fonts-2.00.1" + +BUILD() +{ + make $jobArgs +} + +INSTALL() +{ + FONTDIR=${fontsDir}/ttfonts + mkdir -p ${FONTDIR} + cp -a *.ttf ${FONTDIR} +} From d8ea175e92be093c349f726441e04949f6d97330 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 05:24:38 +0000 Subject: [PATCH 238/326] fonts: remove own copy of "SIL Open Font License v1.1" * They are now included in Haiku --- .../licenses/SIL Open Font License v1.1 | 86 ---------------- .../licenses/SIL Open Font License v1.1 | 86 ---------------- .../licenses/SIL Open Font License v1.1 | 91 ----------------- .../licenses/SIL Open Font License v1.1 | 99 ------------------- .../licenses/SIL Open Font License v1.1 | 91 ----------------- .../licenses/SIL Open Font License v1.1 | 91 ----------------- .../licenses/SIL Open Font License v1.1 | 91 ----------------- .../licenses/SIL Open Font License v1.1 | 91 ----------------- 8 files changed, 726 deletions(-) delete mode 100644 media-fonts/anonymous_pro/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/cantarell/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/courier_prime/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/lateef_font/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/nanumfont/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 delete mode 100644 media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 diff --git a/media-fonts/anonymous_pro/licenses/SIL Open Font License v1.1 b/media-fonts/anonymous_pro/licenses/SIL Open Font License v1.1 deleted file mode 100644 index ad1f9ac76..000000000 --- a/media-fonts/anonymous_pro/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,86 +0,0 @@ ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/cantarell/licenses/SIL Open Font License v1.1 b/media-fonts/cantarell/licenses/SIL Open Font License v1.1 deleted file mode 100644 index ad1f9ac76..000000000 --- a/media-fonts/cantarell/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,86 +0,0 @@ ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 b/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 deleted file mode 100644 index 075d1aefb..000000000 --- a/media-fonts/courier_prime/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 b/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 deleted file mode 100644 index b4a39671e..000000000 --- a/media-fonts/fira_fonts/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,99 +0,0 @@ -Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ -with Reserved Font Name Fira Sans. - -Copyright (c) 2014, Mozilla Foundation https://mozilla.org/ -with Reserved Font Name Fira Mono. - -Copyright (c) 2014, Telefonica S.A. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 b/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 deleted file mode 100644 index 075d1aefb..000000000 --- a/media-fonts/lateef_font/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/nanumfont/licenses/SIL Open Font License v1.1 b/media-fonts/nanumfont/licenses/SIL Open Font License v1.1 deleted file mode 100644 index 075d1aefb..000000000 --- a/media-fonts/nanumfont/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 b/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 deleted file mode 100644 index 075d1aefb..000000000 --- a/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 b/media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 deleted file mode 100644 index 075d1aefb..000000000 --- a/media-fonts/ukijorgfonts/licenses/SIL Open Font License v1.1 +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. From 9a44cdd74bd83bfa7b7327009df5bba8927dc341 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 05:44:00 +0000 Subject: [PATCH 239/326] fonts: prevent blank line in DESCRIPTION in HaikuDepot --- media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe | 2 +- media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe | 2 +- media-fonts/cantarell/cantarell-0.0.16.recipe | 2 +- media-fonts/cardo/cardo-1.04.recipe | 2 +- media-fonts/droid/droid-113.recipe | 2 +- media-fonts/droid/droid-4.3_r2.2.recipe | 2 +- media-fonts/fira_fonts/fira_fonts-3.111.recipe | 2 +- media-fonts/humor_sans/humor_sans-1.0.recipe | 2 +- media-fonts/kacst_fonts/kacst_fonts-5.0.recipe | 2 +- media-fonts/lateef_font/lateef_font-1.001.recipe | 2 +- media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe | 2 +- media-fonts/lohit/lohit-2.3.8.recipe | 2 +- media-fonts/nanumfont/nanumfont-2.0.recipe | 2 +- media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe | 2 +- media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe | 2 +- .../noto_sans_devanagari/noto_sans_devanagari-1.05.recipe | 2 +- media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe | 2 +- media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe | 2 +- media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe | 2 +- media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe | 2 +- media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe | 2 +- .../noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe | 2 +- media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe | 2 +- media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe | 2 +- media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe | 2 +- media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe | 2 +- media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe | 2 +- media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe | 2 +- media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe | 2 +- media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe | 2 +- media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe | 2 +- media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe | 2 +- media-fonts/roboto/roboto-1.2.recipe | 2 +- media-fonts/scheherazade_font/scheherazade_font-1.005.recipe | 2 +- media-fonts/source_sans_pro/source_sans_pro-1.0.recipe | 2 +- media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe | 2 +- media-fonts/vollkorn/vollkorn-2.1.recipe | 2 +- media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe | 2 +- media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe | 2 +- media-fonts/x_series_fonts/x_series_fonts-2.0.recipe | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe index b14cb74d3..e0b9a2541 100644 --- a/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe +++ b/media-fonts/anonymous_pro/anonymous_pro-1.002.001.recipe @@ -1,5 +1,5 @@ SUMMARY="The Anonymous Pro Font Family" -DESCRIPTION=" +DESCRIPTION="\ Anonymous Pro is a family of fixed-width fonts. It was designed especially for \ coding - characers that could be mistaken for one another (e. g. O and 0) have \ distinct shapes. It supports most of the Latin-based Western and Central \ diff --git a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe index f50060d91..4aa8c476a 100644 --- a/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe +++ b/media-fonts/arabeyes_fonts/arabeyes_fonts-1.1.recipe @@ -1,5 +1,5 @@ SUMMARY="Arabeyes Arabic TrueType fonts" -DESCRIPTION=" +DESCRIPTION="\ Arabeyes is a Meta project that is aimed at fully supporting the Arabic \ language in the Unix/Linux environment. It is designed to be a central \ location to standardize the Arabization process. Arabeyes relies on voluntary \ diff --git a/media-fonts/cantarell/cantarell-0.0.16.recipe b/media-fonts/cantarell/cantarell-0.0.16.recipe index d235ee43f..475518d8f 100644 --- a/media-fonts/cantarell/cantarell-0.0.16.recipe +++ b/media-fonts/cantarell/cantarell-0.0.16.recipe @@ -1,5 +1,5 @@ SUMMARY="The Cantarell Font Family" -DESCRIPTION=" +DESCRIPTION="\ The Cantarell font family is a contemporary humanistic sans serif. It was \ designed by Dave Crossland for on-screen reading - in particular for reading \ web pages on the author's HTC mobile phone. Since 2010 it's the default \ diff --git a/media-fonts/cardo/cardo-1.04.recipe b/media-fonts/cardo/cardo-1.04.recipe index 87b719f3a..b1a3033ab 100644 --- a/media-fonts/cardo/cardo-1.04.recipe +++ b/media-fonts/cardo/cardo-1.04.recipe @@ -1,5 +1,5 @@ SUMMARY="Font for classicists, medievalists and linguists" -DESCRIPTION=" +DESCRIPTION="\ Cardo is a large Unicode font specifically designed for the needs of \ classicists, Biblical scholars, medievalists, and linguists. Since it may be \ used to prepare materials for publication, it also contains features that are \ diff --git a/media-fonts/droid/droid-113.recipe b/media-fonts/droid/droid-113.recipe index 06ba3babd..25ba091ce 100644 --- a/media-fonts/droid/droid-113.recipe +++ b/media-fonts/droid/droid-113.recipe @@ -1,5 +1,5 @@ SUMMARY="Font family from Google's Android project" -DESCRIPTION=" +DESCRIPTION="\ The Droid family of fonts was designed by Ascender's Steve Matteson beginning \ in the fall of 2006. The goal was to provide optimal quality and reading \ comfort on a mobile handset. The Droid fonts were optimized for use in \ diff --git a/media-fonts/droid/droid-4.3_r2.2.recipe b/media-fonts/droid/droid-4.3_r2.2.recipe index 3923c917d..84280017a 100644 --- a/media-fonts/droid/droid-4.3_r2.2.recipe +++ b/media-fonts/droid/droid-4.3_r2.2.recipe @@ -1,5 +1,5 @@ SUMMARY="Font family from Google's Android project" -DESCRIPTION=" +DESCRIPTION="\ The Droid family of fonts was designed by Ascender's Steve Matteson beginning \ in the fall of 2006. The goal was to provide optimal quality and reading \ comfort on a mobile handset. The Droid fonts were optimized for use in \ diff --git a/media-fonts/fira_fonts/fira_fonts-3.111.recipe b/media-fonts/fira_fonts/fira_fonts-3.111.recipe index 227ce6e37..85c24c343 100644 --- a/media-fonts/fira_fonts/fira_fonts-3.111.recipe +++ b/media-fonts/fira_fonts/fira_fonts-3.111.recipe @@ -1,5 +1,5 @@ SUMMARY="The Fira font" -DESCRIPTION=" +DESCRIPTION="\ Designed to integrate with the character of Mozilla's Firefox OS, the \ Fira Sans typeface also aims to cover the legibility needs for a large range of \ handsets varying in screen quality and rendering. When working with Fira Sans \ diff --git a/media-fonts/humor_sans/humor_sans-1.0.recipe b/media-fonts/humor_sans/humor_sans-1.0.recipe index 09acdbf75..ab075dd63 100644 --- a/media-fonts/humor_sans/humor_sans-1.0.recipe +++ b/media-fonts/humor_sans/humor_sans-1.0.recipe @@ -1,5 +1,5 @@ SUMMARY="The Humor-Sans font" -DESCRIPTION=" +DESCRIPTION="\ A sans-serif typeface in the style of xkcd. Xkcd is a popular webcomics with \ focus on computer science or everything else. " diff --git a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe index 15e927a4d..52b0b9ed8 100644 --- a/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe +++ b/media-fonts/kacst_fonts/kacst_fonts-5.0.recipe @@ -1,5 +1,5 @@ SUMMARY="KACST Arabic Truetype Fonts" -DESCRIPTION=" +DESCRIPTION="\ KacstOne font is part of KACST fonts, which are free fonts donated by \ King Abdulaziz City For Science And Technology (KACST) under GPL. \ diff --git a/media-fonts/lateef_font/lateef_font-1.001.recipe b/media-fonts/lateef_font/lateef_font-1.001.recipe index 694e98ea7..2681a74e9 100644 --- a/media-fonts/lateef_font/lateef_font-1.001.recipe +++ b/media-fonts/lateef_font/lateef_font-1.001.recipe @@ -1,5 +1,5 @@ SUMMARY="Arabic font" -DESCRIPTION=" +DESCRIPTION="\ Lateef is named after Shah Abdul Lateef Bhitai, the famous Sindhi \ mystic and poet. It is intended to be an appropriate style for use \ in Sindhi and other languages of the South Asian region. diff --git a/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe b/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe index 8a92678d4..fd75845c5 100644 --- a/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe +++ b/media-fonts/liberation_fonts/liberation_fonts-2.00.1.recipe @@ -1,5 +1,5 @@ SUMMARY="The Liberation Fonts" -DESCRIPTION=" +DESCRIPTION="\ The Liberation(tm) Fonts is a font family which aims at metric compatibility \ with Arial, Times New Roman, and Courier New. It is sponsored by Red Hat. " diff --git a/media-fonts/lohit/lohit-2.3.8.recipe b/media-fonts/lohit/lohit-2.3.8.recipe index 9b2b05218..c4466afa5 100644 --- a/media-fonts/lohit/lohit-2.3.8.recipe +++ b/media-fonts/lohit/lohit-2.3.8.recipe @@ -1,5 +1,5 @@ SUMMARY="The Lohit family of Indic fonts" -DESCRIPTION=" +DESCRIPTION="\ Lohit, which means 'red' in Sanskrit, is a family of Indic fonts. It was first \ released by Red Hat in 2004 but now it's developed by Fedora Project. The \ font family currently supports 21 Indian languages: Assamese, Bengali, \ diff --git a/media-fonts/nanumfont/nanumfont-2.0.recipe b/media-fonts/nanumfont/nanumfont-2.0.recipe index ddfdf8d6e..fc05515c7 100644 --- a/media-fonts/nanumfont/nanumfont-2.0.recipe +++ b/media-fonts/nanumfont/nanumfont-2.0.recipe @@ -1,5 +1,5 @@ SUMMARY="The Nanum font" -DESCRIPTION=" +DESCRIPTION="\ Korean monospace font distributed by NHN. " HOMEPAGE="http://dev.naver.com/projects/nanumfont" diff --git a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe index 20d8d280f..67c757e6a 100644 --- a/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe +++ b/media-fonts/noto_sans_bengali/noto_sans_bengali-1.02.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="bengali" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe index c3d9dba0a..21d445274 100644 --- a/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe +++ b/media-fonts/noto_sans_cjk/noto_sans_cjk-1.001.recipe @@ -3,7 +3,7 @@ LANG_DL="CJK" LANG_LC="cjk" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe index f4fbba9cc..8123f943c 100644 --- a/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe +++ b/media-fonts/noto_sans_devanagari/noto_sans_devanagari-1.05.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="devanagari" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe index 04621f266..9413c65d4 100644 --- a/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe +++ b/media-fonts/noto_sans_gujarati/noto_sans_gujarati-1.02.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="gujarati" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe index bde6c207a..372779e29 100644 --- a/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe +++ b/media-fonts/noto_sans_gurmukhi/noto_sans_gurmukhi-1.01.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="gurmukhi" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe b/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe index ee0480345..ab9e539dd 100644 --- a/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe +++ b/media-fonts/noto_sans_khmer/noto_sans_khmer-1.00.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="khmer" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe b/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe index fd7880646..c3b7431bf 100644 --- a/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe +++ b/media-fonts/noto_sans_lao/noto_sans_lao-1.00.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="lao" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe b/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe index 674a82363..aa72f806b 100644 --- a/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe +++ b/media-fonts/noto_sans_myanmar/noto_sans_myanmar-1.05.recipe @@ -6,7 +6,7 @@ LANG_DL="${LANG_EN}" LANG_LC="myanmar" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe index 048a1b681..0bc4ff0aa 100644 --- a/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe +++ b/media-fonts/noto_sans_new_tai_lue/noto_sans_new_tai_lue-1.03.recipe @@ -3,7 +3,7 @@ LANG_DL="NewTaiLue" LANG_LC="new_tai_lue" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe index e28dbef76..726bd5211 100644 --- a/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe +++ b/media-fonts/noto_sans_sinhala/noto_sans_sinhala-1.01.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="sinhala" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe b/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe index 02576510e..683526510 100644 --- a/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe +++ b/media-fonts/noto_sans_tai_le/noto_sans_tai_le-1.01.recipe @@ -3,7 +3,7 @@ LANG_DL="TaiLe" LANG_LC="tai_le" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe b/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe index c571b1c52..098b32e80 100644 --- a/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe +++ b/media-fonts/noto_sans_tai_tham/noto_sans_tai_tham-1.01.recipe @@ -3,7 +3,7 @@ LANG_DL="TaiTham" LANG_LC="tai_tham" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe b/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe index 1134618ae..53c9c4086 100644 --- a/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe +++ b/media-fonts/noto_sans_tai_viet/noto_sans_tai_viet-1.01.recipe @@ -3,7 +3,7 @@ LANG_DL="TaiViet" LANG_LC="tai_viet" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe index 7047fe32a..38c60433e 100644 --- a/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe +++ b/media-fonts/noto_sans_tamil/noto_sans_tamil-1.04.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="tamil" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe index efbe61d73..db7488d55 100644 --- a/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe +++ b/media-fonts/noto_sans_telugu/noto_sans_telugu-1.02.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="telugu" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe b/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe index a095a9e2d..d8bb24a96 100644 --- a/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe +++ b/media-fonts/noto_sans_thai/noto_sans_thai-1.02.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="thai" SUMMARY="The Noto Sans font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Sans fonts for $LANG_EN. " diff --git a/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe b/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe index 587cd7a6e..dc15da9ff 100644 --- a/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe +++ b/media-fonts/noto_serif_khmer/noto_serif_khmer-1.00.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="khmer" SUMMARY="The Noto Serif font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Serif fonts for $LANG_EN. " diff --git a/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe b/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe index fbd13e23a..32ac8280a 100644 --- a/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe +++ b/media-fonts/noto_serif_lao/noto_serif_lao-1.00.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="lao" SUMMARY="The Noto Serif font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Serif fonts for $LANG_EN. " diff --git a/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe b/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe index 0a5dbd591..f808afb90 100644 --- a/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe +++ b/media-fonts/noto_serif_thai/noto_serif_thai-1.02.recipe @@ -3,7 +3,7 @@ LANG_DL="${LANG_EN}" LANG_LC="thai" SUMMARY="The Noto Serif font for $LANG_EN" -DESCRIPTION=" +DESCRIPTION="\ The Noto font family attempts to create a uniform look for all languages on \ Earth. This package contains the Noto Serif fonts for $LANG_EN. " diff --git a/media-fonts/roboto/roboto-1.2.recipe b/media-fonts/roboto/roboto-1.2.recipe index 48d6d934b..bc25ebc7a 100644 --- a/media-fonts/roboto/roboto-1.2.recipe +++ b/media-fonts/roboto/roboto-1.2.recipe @@ -1,5 +1,5 @@ SUMMARY="The Android Roboto font" -DESCRIPTION=" +DESCRIPTION="\ The Android design language relies on traditional typographic tools such as \ scale, space, rhythm, and alignment with an underlying grid. Successful \ deployment of these tools is essential to help users quickly understand a \ diff --git a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe index eac1d2568..f1735ed5f 100644 --- a/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe +++ b/media-fonts/scheherazade_font/scheherazade_font-1.005.recipe @@ -1,5 +1,5 @@ SUMMARY="Arabic script font." -DESCRIPTION=" +DESCRIPTION="\ Scheherazade, named after the heroine of the classic Arabian Nights tale, \ is designed in a similar style to traditional typefaces such as Monotype Naskh, \ extended to cover the full Unicode Arabic repertoire diff --git a/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe b/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe index e6e741429..f27f54055 100644 --- a/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe +++ b/media-fonts/source_sans_pro/source_sans_pro-1.0.recipe @@ -1,5 +1,5 @@ SUMMARY="The Source Sans Pro Font" -DESCRIPTION=" +DESCRIPTION="\ Source Sans Pro was designed by Paul D. Hunt under the guidance of Robert Slimbach. \ It is Adobe's first open source typeface family, conceived primarily as a typeface \ for user interfaces. Source Sans Pro draws inspiration from the clarity and legibility \ diff --git a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe index 7a71b61fd..6252d172f 100644 --- a/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe +++ b/media-fonts/ubuntu_font_family/ubuntu_font_family-0.80.recipe @@ -1,5 +1,5 @@ SUMMARY="Font family from Ubuntu operating system" -DESCRIPTION=" +DESCRIPTION="\ The Ubuntu Font Family belongs to sans-serif typeface. It's set as default \ font for the current releases of Ubuntu, one of the most popular Linux-based \ operating systems. It was designed by Dalton Maag in 2010 and now it covers \ diff --git a/media-fonts/vollkorn/vollkorn-2.1.recipe b/media-fonts/vollkorn/vollkorn-2.1.recipe index 8a30610d4..794544cec 100644 --- a/media-fonts/vollkorn/vollkorn-2.1.recipe +++ b/media-fonts/vollkorn/vollkorn-2.1.recipe @@ -1,5 +1,5 @@ SUMMARY="The typeface for bread and butter use" -DESCRIPTION=" +DESCRIPTION="\ Vollkorn means wholemeal in German. The Vollkorn typeface is free and healthy \ typeface for bread and butter use. It intends to be a quiet, modest and well \ working text face. It might be used. It might be used as body type as well as \ diff --git a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe index c1c5747ec..220215887 100644 --- a/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe +++ b/media-fonts/wqy_microhei/wqy_microhei-0.2.0~beta.recipe @@ -1,5 +1,5 @@ SUMMARY="A droid derived Sans-Serif style CJK font" -DESCRIPTION=" +DESCRIPTION="\ A droid derived Sans-Serif style CJK font. " HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" diff --git a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe index 11b106ba3..cffdbca1a 100644 --- a/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe +++ b/media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe @@ -1,5 +1,5 @@ SUMMARY="WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font" -DESCRIPTION=" +DESCRIPTION="\ WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font. " HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home" diff --git a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe index 360c1d816..73a641e3c 100644 --- a/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe +++ b/media-fonts/x_series_fonts/x_series_fonts-2.0.recipe @@ -1,5 +1,5 @@ SUMMARY="The X Series 2 Fonts" -DESCRIPTION=" +DESCRIPTION="\ X Series 2 fonts are built on freely available fonts and extended to support \ Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish \ (Ottoman) and modern Turkish (Roman). From 96b8a98ca779042cd0d62adcd75a93f183adda1d Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 8 Jan 2015 09:50:37 +0100 Subject: [PATCH 240/326] Add recipe for Sequitur --- haiku-apps/sequitur/sequitur-20140717.recipe | 54 ++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 haiku-apps/sequitur/sequitur-20140717.recipe diff --git a/haiku-apps/sequitur/sequitur-20140717.recipe b/haiku-apps/sequitur/sequitur-20140717.recipe new file mode 100644 index 000000000..18aa73cc8 --- /dev/null +++ b/haiku-apps/sequitur/sequitur-20140717.recipe @@ -0,0 +1,54 @@ +SUMMARY="An advanced MIDI sequencer for Haiku" +DESCRIPTION="Sequitur is a BeOS-native MIDI sequencer with a MIDI processing \ +add-on architecture. It allows you to record, compose, store, and play back \ +music from your computer. Sequitur is designed for people who like to tinker \ +with their music. It facilitates rapid, dynamic, and radical processing of your \ +performance." + +HOMEPAGE="https://github.com/HaikuArchives/Sequitur" +SRC_URI="git+https://github.com/HaikuArchives/Sequitur#dd5083155a9e1323327132b014766ca502458bbd" +REVISION="1" +LICENSE="Public Domain" +COPYRIGHT="2001 Eric Hackborn" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + sequitur = $portVersion + app:Sequitur = $portVersion + " +REQUIRES=" + haiku + lib:libpng + lib:libz + " +BUILD_REQUIRES=" + haiku_devel + devel:libpng + devel:libz + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + cd Sequitur + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/Sequitur/lib + mkdir -p $addOnsDir/Sequitur + + cd Sequitur + cp -a lib/libAmKernel.so $appsDir/Sequitur/lib + cp -arL add-ons $addOnsDir/Sequitur + cp -a Sequitur $appsDir/Sequitur + + addAppDeskbarSymlink $appsDir/Sequitur/Sequitur +} From 876a6e143eaf0d7c94048da93e5773023a70ea75 Mon Sep 17 00:00:00 2001 From: skykinetic Date: Thu, 8 Jan 2015 22:07:16 +0800 Subject: [PATCH 241/326] Minor edit --- haiku-apps/aesaddon/aesaddon-0.3.1.recipe | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe index d4135b995..3a98be134 100644 --- a/haiku-apps/aesaddon/aesaddon-0.3.1.recipe +++ b/haiku-apps/aesaddon/aesaddon-0.3.1.recipe @@ -1,6 +1,5 @@ SUMMARY="A Tracker add-on to encrypt files using AES cipher." -DESCRIPTION=" -AESAddOn is a Tracker add-on which adds the functionality of encrypting files \ +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" SRC_URI="git://github.com/HaikuArchives/AESAddOn#78dd4c50634a97bbe04bd68479cedc114a14cb4d" From 70760f71492d686aa34073bbd5898140577ef717 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Thu, 8 Jan 2015 16:17:34 +0100 Subject: [PATCH 242/326] Added "Quick HowTo". Small changes to summary, description, copyright --- haiku-apps/clockwerk/clockwerk-git.recipe | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/haiku-apps/clockwerk/clockwerk-git.recipe b/haiku-apps/clockwerk/clockwerk-git.recipe index e495b09b8..ff734ffb3 100644 --- a/haiku-apps/clockwerk/clockwerk-git.recipe +++ b/haiku-apps/clockwerk/clockwerk-git.recipe @@ -1,6 +1,6 @@ -SUMMARY="An open source media compositing tool for the Haiku platform" -DESCRIPTION="Clockwerk is an Open Source media compositing tool for the \ -Haiku platform. It has been in development from Jan 2006 to July 2008 \ +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 \ 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." @@ -8,12 +8,12 @@ Haiku client machines." HOMEPAGE="https://github.com/stippi/Clockwerk" SRC_URI="git+https://github.com/stippi/Clockwerk.git#6eab4202c857c7dc6f21b6e3262cff0b503acb0e" -REVISION="2" +REVISION="3" LICENSE="GNU GPL v2" COPYRIGHT=" - 2001-2009 Stephan Aßmus - 2000-2006 Ingo Weinhold + 2001-2009 Stephan Aßmus + 2000-2006 Ingo Weinhold " ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -47,12 +47,12 @@ BUILD() INSTALL() { - mkdir -p $appsDir + mkdir -p $appsDir/Clockwerk jam fulldistro - + cp "Quick HowTo" $appsDir/Clockwerk cd generated/distro-haiku-with-libs - cp Clockwerk $appsDir + cp Clockwerk $appsDir/Clockwerk - addAppDeskbarSymlink $appsDir/Clockwerk + addAppDeskbarSymlink $appsDir/Clockwerk/Clockwerk } From 6fb47f6a907639dd4d876dcb3b6c8e24d3f8f2ca Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 8 Jan 2015 17:33:26 +0100 Subject: [PATCH 243/326] sequitur: Update the recipe Changed the summary, added feature list to description, added the docs and examples to the package and moved the add-ons to $appsDir. --- haiku-apps/sequitur/sequitur-20140717.recipe | 27 +++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/haiku-apps/sequitur/sequitur-20140717.recipe b/haiku-apps/sequitur/sequitur-20140717.recipe index 18aa73cc8..44b6581d2 100644 --- a/haiku-apps/sequitur/sequitur-20140717.recipe +++ b/haiku-apps/sequitur/sequitur-20140717.recipe @@ -1,10 +1,26 @@ -SUMMARY="An advanced MIDI sequencer for Haiku" +SUMMARY="An advanced MIDI sequencer" DESCRIPTION="Sequitur is a BeOS-native MIDI sequencer with a MIDI processing \ add-on architecture. It allows you to record, compose, store, and play back \ music from your computer. Sequitur is designed for people who like to tinker \ with their music. It facilitates rapid, dynamic, and radical processing of your \ -performance." +performance. +Features: + +* An add-on architecture for processing MIDI and performing MIDI effects. \ +Change a track's velocity, apply echo, add chorus, change it's key signature, \ +etc. All the tools to write your own add-ons are included. +* MIDI processing is integrated with editing: Paint with echo effects, paint \ +chords in key, etc. +* Easily rearrange songs with familiar phrase operations. +* Customize your interface with skinning. +* Achieve special effects with tool properties: Turn on gradual delete and \ +slowly rub out MIDI events. +* Full support of Be's advanced MIDI services in R5: All R5-compatible \ +software is automatically available. +* Record, edit, and playback note, program change, control change, and pitch \ +bend MIDI data. +* Read and write standard MIDI files." HOMEPAGE="https://github.com/HaikuArchives/Sequitur" SRC_URI="git+https://github.com/HaikuArchives/Sequitur#dd5083155a9e1323327132b014766ca502458bbd" REVISION="1" @@ -43,12 +59,15 @@ BUILD() INSTALL() { mkdir -p $appsDir/Sequitur/lib - mkdir -p $addOnsDir/Sequitur + mkdir -p $dataDir/Sequitur + mkdir -p $docDir cd Sequitur cp -a lib/libAmKernel.so $appsDir/Sequitur/lib - cp -arL add-ons $addOnsDir/Sequitur + cp -arL add-ons $appsDir/Sequitur cp -a Sequitur $appsDir/Sequitur + cp -ar Examples $dataDir/Sequitur + cp -ar docs/* $docDir addAppDeskbarSymlink $appsDir/Sequitur/Sequitur } From 15531ec250025d1fd1067a08c5d54f5c89d7252e Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 8 Jan 2015 18:17:27 +0000 Subject: [PATCH 244/326] torrentor: Fix installation * Build fix: https://github.com/Prodito/Torrentor/pull/6 --- haiku-apps/torrentor/torrentor-0.0.5.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe index fae73c6d6..0139971b5 100644 --- a/haiku-apps/torrentor/torrentor-0.0.5.recipe +++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe @@ -52,12 +52,13 @@ BUILD_PREREQUIRES=" BUILD() { - jam + export NDEBUG=1 + jam $jobArgs } INSTALL() # just trying compile, code below doesn't have to work well { mkdir -p $appsDir/Torrentor - cp Torrentor $appsDir/Torrentor/ + cp build/Release/Torrentor $appsDir/Torrentor/ addAppDeskbarSymlink $appsDir/Torrentor/Torrentor } From 2b722b18a569018a482f381b7b76e3e4cf09c85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 8 Jan 2015 18:40:55 +0000 Subject: [PATCH 245/326] Fixed Premake 4.4 --- dev-util/premake/patches/premake-4.3.patchset | 54 ------------------- .../patches/premake-4.4-beta5.patchset | 39 ++++++++++++++ ...ke-4.3.recipe => premake-4.4.beta5.recipe} | 9 ++-- 3 files changed, 44 insertions(+), 58 deletions(-) delete mode 100644 dev-util/premake/patches/premake-4.3.patchset create mode 100644 dev-util/premake/patches/premake-4.4-beta5.patchset rename dev-util/premake/{premake-4.3.recipe => premake-4.4.beta5.recipe} (85%) diff --git a/dev-util/premake/patches/premake-4.3.patchset b/dev-util/premake/patches/premake-4.3.patchset deleted file mode 100644 index 75f9cdc9e..000000000 --- a/dev-util/premake/patches/premake-4.3.patchset +++ /dev/null @@ -1,54 +0,0 @@ -From 24fb42f5d8c5e23290a9e22d577174a6151f4a6e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Wed, 7 Jan 2015 16:17:46 +0000 -Subject: Fixing Premake4 - - -diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make -index bbc159b..7cb8ce5 100644 ---- a/build/gmake.unix/Premake4.make -+++ b/build/gmake.unix/Premake4.make -@@ -28,8 +28,8 @@ ifeq ($(config),release) - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) - CFLAGS += $(CPPFLAGS) $(ARCH) -Wall -Os - CXXFLAGS += $(CFLAGS) -- LDFLAGS += -s -rdynamic -- LIBS += -lm -ldl -+ LDFLAGS += -s -+ LIBS += -lbe -lroot -ltracker - RESFLAGS += $(DEFINES) $(INCLUDES) - LDDEPS += - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS) -diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h -index e2cb261..b702731 100644 ---- a/src/host/lua-5.1.4/src/luaconf.h -+++ b/src/host/lua-5.1.4/src/luaconf.h -@@ -55,8 +55,10 @@ - #define LUA_USE_MKSTEMP - #define LUA_USE_ISATTY - #define LUA_USE_POPEN -+#ifndef __HAIKU__ - #define LUA_USE_ULONGJMP - #endif -+#endif - - - /* -diff --git a/src/host/premake.h b/src/host/premake.h -index 4358b18..72371e1 100644 ---- a/src/host/premake.h -+++ b/src/host/premake.h -@@ -24,6 +24,9 @@ - #elif defined(__sun__) && defined(__svr4__) - #define PLATFORM_SOLARIS (1) - #define PLATFORM_STRING "solaris" -+#elif defined(__HAIKU__) -+#define PLATFORM_LINUX (1) -+#define PLATFORM_STRING "haiku" - #else - #define PLATFORM_WINDOWS (1) - #define PLATFORM_STRING "windows" --- -1.8.3.4 - diff --git a/dev-util/premake/patches/premake-4.4-beta5.patchset b/dev-util/premake/patches/premake-4.4-beta5.patchset new file mode 100644 index 000000000..9c3b851de --- /dev/null +++ b/dev-util/premake/patches/premake-4.4-beta5.patchset @@ -0,0 +1,39 @@ +From 0621b3e542f32146cea8177b128665e0aa7d44b9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Thu, 8 Jan 2015 18:10:54 +0000 +Subject: Finxing Haiku build + + +diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make +index 5b8e979..314879c 100644 +--- a/build/gmake.unix/Premake4.make ++++ b/build/gmake.unix/Premake4.make +@@ -29,9 +29,9 @@ ifeq ($(config),release) + ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os + ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) + ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) +- ALL_LDFLAGS += $(LDFLAGS) -L. -s -rdynamic ++ ALL_LDFLAGS += $(LDFLAGS) -L. -s + LDDEPS += +- LIBS += $(LDDEPS) -lm -ldl ++ LIBS += $(LDDEPS) + LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) + define PREBUILDCMDS + endef +diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h +index e2cb261..e2c6418 100644 +--- a/src/host/lua-5.1.4/src/luaconf.h ++++ b/src/host/lua-5.1.4/src/luaconf.h +@@ -55,7 +55,7 @@ + #define LUA_USE_MKSTEMP + #define LUA_USE_ISATTY + #define LUA_USE_POPEN +-#define LUA_USE_ULONGJMP ++/* #define LUA_USE_ULONGJMP */ + #endif + + +-- +1.8.3.4 + diff --git a/dev-util/premake/premake-4.3.recipe b/dev-util/premake/premake-4.4.beta5.recipe similarity index 85% rename from dev-util/premake/premake-4.3.recipe rename to dev-util/premake/premake-4.4.beta5.recipe index eef25d8d6..cf13a4684 100644 --- a/dev-util/premake/premake-4.3.recipe +++ b/dev-util/premake/premake-4.4.beta5.recipe @@ -5,8 +5,8 @@ let Premake write the build scripts for you. With one file your project can \ support both IDE-addicted Windows coders and Linux command-line junkies! " HOMEPAGE="http://industriousone.com/premake" -SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.3/premake-4.3-src.zip/download" -CHECKSUM_SHA256="36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780" +SRC_URI="http://sourceforge.net/projects/premake/files/Premake/4.4/premake-4.4-beta5-src.zip" +CHECKSUM_SHA256="0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161" REVISION="1" LICENSE="BSD (2-clause)" COPYRIGHT="2012 Industrious One, LLC" @@ -20,6 +20,7 @@ fi SECONDARY_ARCHITECTURES="x86" PROVIDES=" + premake premake4$secondaryArchSuffix = $portVersion cmd:premake4$secondaryArchSuffix = $portVersion " @@ -38,9 +39,9 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="premake-4.3" +SOURCE_DIR="premake-4.4-beta5" -PATCHES="premake-4.3.patchset" +PATCHES="premake-4.4-beta5.patchset" BUILD() { From 6c343795e082c405a60a199e45195d747af45dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 8 Jan 2015 19:10:07 +0000 Subject: [PATCH 246/326] Using SED for patches --- .../patches/premake-4.4-beta5.patchset | 39 ------------------- dev-util/premake/premake-4.4.beta5.recipe | 7 +++- 2 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 dev-util/premake/patches/premake-4.4-beta5.patchset diff --git a/dev-util/premake/patches/premake-4.4-beta5.patchset b/dev-util/premake/patches/premake-4.4-beta5.patchset deleted file mode 100644 index 9c3b851de..000000000 --- a/dev-util/premake/patches/premake-4.4-beta5.patchset +++ /dev/null @@ -1,39 +0,0 @@ -From 0621b3e542f32146cea8177b128665e0aa7d44b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Thu, 8 Jan 2015 18:10:54 +0000 -Subject: Finxing Haiku build - - -diff --git a/build/gmake.unix/Premake4.make b/build/gmake.unix/Premake4.make -index 5b8e979..314879c 100644 ---- a/build/gmake.unix/Premake4.make -+++ b/build/gmake.unix/Premake4.make -@@ -29,9 +29,9 @@ ifeq ($(config),release) - ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os - ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS) - ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) -- ALL_LDFLAGS += $(LDFLAGS) -L. -s -rdynamic -+ ALL_LDFLAGS += $(LDFLAGS) -L. -s - LDDEPS += -- LIBS += $(LDDEPS) -lm -ldl -+ LIBS += $(LDDEPS) - LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS) - define PREBUILDCMDS - endef -diff --git a/src/host/lua-5.1.4/src/luaconf.h b/src/host/lua-5.1.4/src/luaconf.h -index e2cb261..e2c6418 100644 ---- a/src/host/lua-5.1.4/src/luaconf.h -+++ b/src/host/lua-5.1.4/src/luaconf.h -@@ -55,7 +55,7 @@ - #define LUA_USE_MKSTEMP - #define LUA_USE_ISATTY - #define LUA_USE_POPEN --#define LUA_USE_ULONGJMP -+/* #define LUA_USE_ULONGJMP */ - #endif - - --- -1.8.3.4 - diff --git a/dev-util/premake/premake-4.4.beta5.recipe b/dev-util/premake/premake-4.4.beta5.recipe index cf13a4684..995f7d6ae 100644 --- a/dev-util/premake/premake-4.4.beta5.recipe +++ b/dev-util/premake/premake-4.4.beta5.recipe @@ -41,7 +41,12 @@ BUILD_PREREQUIRES=" SOURCE_DIR="premake-4.4-beta5" -PATCHES="premake-4.4-beta5.patchset" +PATCH() +{ + sed -i '/#define LUA_USE_ULONGJMP/d' src/host/lua-5.1.4/src/luaconf.h + sed -i '/-lm/d' build/gmake.unix/Premake4.make + sed -i 's/-rdynamic//g' build/gmake.unix/Premake4.make +} BUILD() { From cc1872182eb9704427cb7ed5b1a2db9b502617bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Thu, 8 Jan 2015 19:18:30 +0000 Subject: [PATCH 247/326] Fix lines for HaikuDepot --- dev-util/premake/premake-4.4.beta5.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/premake/premake-4.4.beta5.recipe b/dev-util/premake/premake-4.4.beta5.recipe index 995f7d6ae..0fb50e685 100644 --- a/dev-util/premake/premake-4.4.beta5.recipe +++ b/dev-util/premake/premake-4.4.beta5.recipe @@ -1,5 +1,5 @@ SUMMARY="Powerfully simple build configuration" -DESCRIPTION=" +DESCRIPTION="\ Describe your software project with a full-featured scripting language and \ let Premake write the build scripts for you. With one file your project can \ support both IDE-addicted Windows coders and Linux command-line junkies! From 6638866bfdb6a874adff0dae8c26003abd86fa4d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 8 Jan 2015 14:30:43 -0500 Subject: [PATCH 248/326] Dockbert: remove patch (it was upstreamed). --- haiku-apps/dockbert/dockbert-1.0.2b1.recipe | 13 ++- .../patches/dockbert-1.0.2b1.patchset | 99 ------------------- 2 files changed, 6 insertions(+), 106 deletions(-) delete mode 100644 haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index a90b59b49..4673fa2cb 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -5,11 +5,12 @@ may have shortcuts organized in \"tabs\", a tab of the running apps and some \ other general eyecandy. " HOMEPAGE="https://github.com/HaikuArchives/DockBert" -SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d" +SRC_URI="https://github.com/HaikuArchives/DockBert/archive/722161cf8646b18eee2d00208fa649a0ebfe8d00.zip" +CHECKSUM_SHA256="704a8cde914b41219e60ef8fc375ab7847cae580b1265f1b9b84cbe294334cce" COPYRIGHT="2005 yellowTAB GmbH" LICENSE="BSD (3-clause)" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -34,18 +35,16 @@ BUILD_PREREQUIRES=" cmd:mkdepend " -PATCHES="dockbert-1.0.2b1.patchset" - BUILD() { - cd trunk + cd source make OBJ_DIR=objects \ BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` } INSTALL() -{ +{ mkdir -p $appsDir - cp -a trunk/objects/Dock $appsDir/Dock + cp -a source/objects/Dock $appsDir/Dock addAppDeskbarSymlink $appsDir/Dock } diff --git a/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset b/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset deleted file mode 100644 index f9355852c..000000000 --- a/haiku-apps/dockbert/patches/dockbert-1.0.2b1.patchset +++ /dev/null @@ -1,99 +0,0 @@ -From c7dd365b426c78ef62bfb1b1b8ba149e9b6a7afb Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 2 Dec 2013 18:12:54 -0700 -Subject: Fix makefile stdc++ libs - - -diff --git a/trunk/Makefile b/trunk/Makefile -index fa6193c..748e5fd 100644 ---- a/trunk/Makefile -+++ b/trunk/Makefile -@@ -60,7 +60,7 @@ RSRCS= dockbert.rsrc - # naming scheme you need to specify the path to the library - # and it's name - # library: my_lib.a entry: my_lib.a or path/my_lib.a --LIBS= be tracker stdc++.r4 locale localestub -+LIBS= be tracker $(STDCPPLIBS) localestub - - # specify additional paths to directories following the standard - # libXXX.so or libXXX.a naming scheme. You can specify full paths --- -1.8.3.4 - -From ba30e33f9dc36ff2a92ed950ccbdc30c0aa1d0f0 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Tue, 28 Oct 2014 23:36:58 +0300 -Subject: [PATCH] Include strings.h - ---- - trunk/InnerPanel.cpp | 1 + - trunk/InnerPanelIcons.cpp | 1 + - trunk/PanelWindow.cpp | 1 + - trunk/PanelWindowView.cpp | 2 ++ - trunk/TrackerMenus.cpp | 1 + - 5 files changed, 6 insertions(+) - -diff --git a/trunk/InnerPanel.cpp b/trunk/InnerPanel.cpp -index 01e56e5..aecc924 100644 ---- a/trunk/InnerPanel.cpp -+++ b/trunk/InnerPanel.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include "PanelWindow.h" - #include "PanelWindowView.h" -diff --git a/trunk/InnerPanelIcons.cpp b/trunk/InnerPanelIcons.cpp -index e22d297..74c47b0 100644 ---- a/trunk/InnerPanelIcons.cpp -+++ b/trunk/InnerPanelIcons.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - - #include "InnerPanelIcons.h" -diff --git a/trunk/PanelWindow.cpp b/trunk/PanelWindow.cpp -index 3905f87..2254d1a 100644 ---- a/trunk/PanelWindow.cpp -+++ b/trunk/PanelWindow.cpp -@@ -25,6 +25,7 @@ - #include "tracker_private.h" - - #include -+#include - #include - - #include -diff --git a/trunk/PanelWindowView.cpp b/trunk/PanelWindowView.cpp -index e620164..5230538 100644 ---- a/trunk/PanelWindowView.cpp -+++ b/trunk/PanelWindowView.cpp -@@ -15,6 +15,8 @@ - #include - #include - -+#include -+ - #include - - //#define USE_WINDOW_SHAPING /* BeOS Dano code*/ -diff --git a/trunk/TrackerMenus.cpp b/trunk/TrackerMenus.cpp -index ff603a4..80445ef 100644 ---- a/trunk/TrackerMenus.cpp -+++ b/trunk/TrackerMenus.cpp -@@ -19,6 +19,7 @@ - - - #include -+#include - - #include "FSUtils.h" - #include "Commands.h" --- -1.8.3.4 - From 096dbceba02fc18a7947d650b0da49bfa5e23faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Thu, 8 Jan 2015 21:08:27 +0000 Subject: [PATCH 249/326] Fixed a few details in GraphicsMagick recipe --- media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe index 03295e29a..f4e5fb666 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe @@ -1,6 +1,6 @@ SUMMARY="Collection of image processing tools" -HOMEPAGE="http://graphicsmagick.org" -COPYRIGHT="Copyright (C) 2002-2015 GraphicsMagick Group" +HOMEPAGE="http://www.graphicsmagick.org" +COPYRIGHT="2002-2014 GraphicsMagick Group" LICENSE="MIT" SRC_URI="http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.20/GraphicsMagick-1.3.20.tar.gz" CHECKSUM_SHA256="0f7463318f5d9a4b429655dd43642a7a93dae561360637093182fbf5ac4fdc88" From cd4626d53b41f2f5b5a493ae992ba5585eeffbc7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 8 Jan 2015 18:43:22 +0000 Subject: [PATCH 250/326] speex: bump version. * speexdsp is splitted in another package. --- .../speex/patches/speex-1.2~rc1.patchset | 52 ------------------- ...ex-1.2~rc1.recipe => speex-1.2~rc2.recipe} | 14 ++--- 2 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 media-libs/speex/patches/speex-1.2~rc1.patchset rename media-libs/speex/{speex-1.2~rc1.recipe => speex-1.2~rc2.recipe} (85%) diff --git a/media-libs/speex/patches/speex-1.2~rc1.patchset b/media-libs/speex/patches/speex-1.2~rc1.patchset deleted file mode 100644 index c979f0257..000000000 --- a/media-libs/speex/patches/speex-1.2~rc1.patchset +++ /dev/null @@ -1,52 +0,0 @@ -From 1342da5851b17b65e2fe12136cd854b47acc7452 Mon Sep 17 00:00:00 2001 -From: Scott McCreary -Date: Sat, 4 Sep 2010 06:59:30 +0000 -Subject: Speex patch to fix typedefs for Haiku build - - -diff --git a/include/speex/speex_types.h b/include/speex/speex_types.h -index 852fed8..217bdfc 100644 ---- a/include/speex/speex_types.h -+++ b/include/speex/speex_types.h -@@ -73,6 +73,15 @@ - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -+#elif defined(__HAIKU__) -+ -+ /* Haiku */ -+# include -+ typedef short spx_int16_t; -+ typedef unsigned short spx_uint16_t; -+ typedef int spx_int32_t; -+ typedef unsigned int spx_uint32_t; -+ - #elif defined (__EMX__) - - /* OS/2 GCC */ --- -1.7.5 - - -From 7ec1c5672675e7d89ab5b6d1d6550f7d04c7e688 Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Tue, 11 Jun 2013 17:15:15 +0200 -Subject: configure.ac: AM_CONFIG_HEADER -> AC_CONFIG_HEADERS - - -diff --git a/configure.ac b/configure.ac -index 057d888..9d0caec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*- - - AC_INIT(libspeex/speex.c) - --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - SPEEX_MAJOR_VERSION=1 - SPEEX_MINOR_VERSION=1 --- -1.7.5 - diff --git a/media-libs/speex/speex-1.2~rc1.recipe b/media-libs/speex/speex-1.2~rc2.recipe similarity index 85% rename from media-libs/speex/speex-1.2~rc1.recipe rename to media-libs/speex/speex-1.2~rc2.recipe index b89de4ea4..c700c792f 100644 --- a/media-libs/speex/speex-1.2~rc1.recipe +++ b/media-libs/speex/speex-1.2~rc2.recipe @@ -18,18 +18,15 @@ COPYRIGHT=" 2003 EpicGames 1992-1994 Jutta Degener, Carsten Bormann " -SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz" -CHECKSUM_SHA256="342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6" -REVISION="3" +SRC_URI="http://downloads.xiph.org/releases/speex/speex-1.2rc2.tar.gz" +CHECKSUM_SHA256="caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="speex-1.2~rc1.patchset" - PROVIDES=" speex$secondaryArchSuffix = $portVersion lib:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 - lib:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " if [ -z "$secondaryArchSuffix" ]; then PROVIDES="$PROVIDES @@ -57,7 +54,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -SOURCE_DIR="speex-1.2rc1" +SOURCE_DIR="speex-1.2rc2" BUILD() { @@ -73,7 +70,7 @@ INSTALL() { make install - prepareInstalledDevelLibs libspeex libspeexdsp + prepareInstalledDevelLibs libspeex fixPkgconfig # devel package @@ -93,7 +90,6 @@ INSTALL() PROVIDES_devel=" speex${secondaryArchSuffix}_devel = $portVersion devel:libspeex$secondaryArchSuffix = 1.5.0 compat >= 1 - devel:libspeexdsp$secondaryArchSuffix = 1.5.0 compat >= 1 " REQUIRES_devel=" speex$secondaryArchSuffix == $portVersion From 5429d682fbf37ca0b38d8f5fb8a356528a05e0dd Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 8 Jan 2015 18:44:58 +0000 Subject: [PATCH 251/326] flex: disable shared libs and nls. * this avoids the installation of a useless libfl.so --- sys-devel/flex/flex-2.5.39.recipe | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe index 73d03a084..a703380ff 100644 --- a/sys-devel/flex/flex-2.5.39.recipe +++ b/sys-devel/flex/flex-2.5.39.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University LICENSE="Flex" SRC_URI="http://sourceforge.net/projects/flex/files/flex-$portVersion.tar.bz2" CHECKSUM_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES="flex-2.5.39.patchset" @@ -34,22 +34,22 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:gcc + cmd:gettext cmd:ld cmd:libtoolize cmd:make cmd:makeinfo + cmd:find " BUILD() { - rm aclocal.m4 - libtoolize --force --copy --install - aclocal -I m4 - autoconf - automake --add-missing --force-missing + rm -f aclocal.m4 + autoreconf -fi runConfigure ./configure \ - --disable-rpath --with-gnu-ld + --disable-rpath --with-gnu-ld --disable-shared \ + --disable-dependency-tracking --disable-nls make $jobArgs } From b0ed18888fabe7794c8fe20e968720ca3ee9332c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 8 Jan 2015 18:45:55 +0000 Subject: [PATCH 252/326] bash: bump version. --- app-shells/bash/{bash-4.3.30.recipe => bash-4.3.33.recipe} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename app-shells/bash/{bash-4.3.30.recipe => bash-4.3.33.recipe} (92%) diff --git a/app-shells/bash/bash-4.3.30.recipe b/app-shells/bash/bash-4.3.33.recipe similarity index 92% rename from app-shells/bash/bash-4.3.30.recipe rename to app-shells/bash/bash-4.3.33.recipe index c7429f196..22461b86a 100644 --- a/app-shells/bash/bash-4.3.30.recipe +++ b/app-shells/bash/bash-4.3.33.recipe @@ -7,7 +7,7 @@ incorporates useful features from the Korn and C shells (ksh and csh). HOMEPAGE="http://www.gnu.org/software/bash/" SRC_URI="https://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz" CHECKSUM_SHA256="afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4" -for i in {001..030}; do +for i in {001..033}; do eval "SRC_URI_$i=\"https://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-$i#noarchive\"" done CHECKSUM_SHA256_001="ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742" @@ -40,6 +40,9 @@ CHECKSUM_SHA256_027="1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f07 CHECKSUM_SHA256_028="e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d" CHECKSUM_SHA256_029="4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292" CHECKSUM_SHA256_030="85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b" +CHECKSUM_SHA256_031="cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d" +CHECKSUM_SHA256_032="889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a" +CHECKSUM_SHA256_033="fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16" PATCHES="bash-kill_by_name.patch" SOURCE_DIR="bash-4.3" REVISION="1" @@ -75,7 +78,7 @@ BUILD_PREREQUIRES=" PATCH() { - for i in {001..030}; do + for i in {001..033}; do patch -p0 < ../../sources-$i/bash43-$i done } From 50fe649c6b8c379fdb3913df6d390d255f1ddd7a Mon Sep 17 00:00:00 2001 From: Nav Date: Fri, 9 Jan 2015 00:44:41 +0200 Subject: [PATCH 253/326] Fixed Sawteeth --- haiku-apps/sawteeth/sawteeth-1.3.recipe | 54 ++++++++++++++++--------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/haiku-apps/sawteeth/sawteeth-1.3.recipe b/haiku-apps/sawteeth/sawteeth-1.3.recipe index 28dc054a4..ae9b8494e 100644 --- a/haiku-apps/sawteeth/sawteeth-1.3.recipe +++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe @@ -1,33 +1,49 @@ +SUMMARY="Soft-synth (with tracker) for BeOS and Haiku" DESCRIPTION=" Sawteeth is a soft-synth (with tracker) for BeOS and Haiku, meant to either \ create cool synthsounds to use in cubase and such, or cute chip-tunes. It uses \ no samples but only generated waveforms. " -HOMEPAGE="http://pulkomandy.tk/projects/sawteeth/wiki" -SRC_URI="svn://pulkomandy.lexinfo.fr/sawteeth/" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +HOMEPAGE="https://github.com/pulkomandy/Sawteeth/" +SRC_URI="git+https://github.com/pulkomandy/Sawteeth#f6fa08f34d" +LICENSE="MIT" +COPYRIGHT="2001 Jonas Norberg" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + sawteeth + app:sawteeth + " + +REQUIRES=" + haiku + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:make + cmd:cmake + cmd:gcc + " +BUILD_REQUIRES=" + haiku_devel + " BUILD() { - cd sawteeth-1.3 cmake . - make + make $jobArgs } INSTALL() { - cd sawteeth-1.3 - SAWTEETH_DIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/Sawteeth - mkdir -p ${SAWTEETH_DIR}/sounds - mkdir -p ${SAWTEETH_DIR}/songs - mkdir -p ${SAWTEETH_DIR}/lib - cp Sawteeth ${SAWTEETH_DIR}/Sawteeth - cp -r sounds ${SAWTEETH_DIR} - cp -r songs ${SAWTEETH_DIR} - cp -r lib ${SAWTEETH_DIR} + SAWTEETH_DIR=${appsDir}/Sawteeth + mkdir -p ${SAWTEETH_DIR}/sounds + mkdir -p ${SAWTEETH_DIR}/songs + mkdir -p ${SAWTEETH_DIR}/lib + cp Sawteeth ${SAWTEETH_DIR}/Sawteeth + cp -r sounds ${SAWTEETH_DIR} + cp -r songs ${SAWTEETH_DIR} + cp -r lib ${SAWTEETH_DIR} } - -LICENSE="MIT" -COPYRIGHT="2001 Jonas Norberg" From 8b9a387b0d8ce17694009073101bcac89b9cbedf Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Fri, 9 Jan 2015 17:47:23 +0100 Subject: [PATCH 254/326] Add recipe for Minesweeper --- .../minesweeper/minesweeper-20150109.recipe | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 haiku-games/minesweeper/minesweeper-20150109.recipe diff --git a/haiku-games/minesweeper/minesweeper-20150109.recipe b/haiku-games/minesweeper/minesweeper-20150109.recipe new file mode 100644 index 000000000..074755295 --- /dev/null +++ b/haiku-games/minesweeper/minesweeper-20150109.recipe @@ -0,0 +1,41 @@ +SUMMARY="A Windows Minesweeper clone" +DESCRIPTION="Minesweeper is a clone of the original Windows minesweeper game. \ +It supports different board sizes and best time saving." +HOMEPAGE="https://github.com/HaikuArchives/Minesweeper" +SRC_URI="git+https://github.com/HaikuArchives/Minesweeper#e75ea9e3816d56548824c0fcaba6ffa8b20b89f8" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2013 Tri-Edge AI" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + minesweeper = $portVersion + app:minesweeper = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +USER_SETTINGS_FILES="settings/Minesweeper_settings" + +BUILD() +{ + make -C src $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a src/objects/Minesweeper $appsDir + addAppDeskbarSymlink $appsDir/Minesweeper +} From 0e073967cbbd60c84ac16fa987e4ca2a3869656f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 9 Jan 2015 18:27:52 +0000 Subject: [PATCH 255/326] Entropia Engine++ --- games-engines/eepp/eepp-hg.recipe | 89 +++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 games-engines/eepp/eepp-hg.recipe diff --git a/games-engines/eepp/eepp-hg.recipe b/games-engines/eepp/eepp-hg.recipe new file mode 100644 index 000000000..da8e07b9c --- /dev/null +++ b/games-engines/eepp/eepp-hg.recipe @@ -0,0 +1,89 @@ +SUMMARY="A C++ 2D game engine designed for an easy cross-platform game development" +DESCRIPTION=" +Entropia Engine++ is a C++ 2D game engine designed for an easy \ +cross-platform game development. +" +HOMEPAGE="http://bitbucket.org/SpartanJ/eepp" +SRC_URI="hg+http://bitbucket.org/SpartanJ/eepp#7318464094366388344fe30e58f521c6b46781b6" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2011-2014 Martín Lucas Golini" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + eepp$secondaryArchSuffix = $portVersion + lib:libeepp$secondaryArchSuffix = $portVersion + lib:libeepp_debug$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsdl2$secondaryArchSuffix + lib:libopenal$secondaryArchSuffix + soil2$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl2$secondaryArchSuffix + devel:libopenal$secondaryArchSuffix + soil2${secondaryArchSuffix}_devel + devel:libgl$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:premake4$secondaryArchSuffix + cmd:make + cmd:hg +" + +SOURCE_DIR="" + +BUILD() +{ + cd src/eepp/helper + rm -rf SOIL2 + hg clone http://bitbucket.org/SpartanJ/soil2 SOIL2 -r 5ebbd585ec79022bf94db977c0e56eae374e7156 + sed -i '/targetname "soil2"/a \ + \ + configuration "haiku" \ + buildoptions{ "-march=native" }' SOIL2/premake4.lua + cd ../../.. + premake4 gmake --os=haiku + cd make/haiku + make +} + +INSTALL() +{ + mkdir -p $includeDir + mkdir -p $developLibDir + mkdir -p $libDir + cp -r include/* $includeDir/ + cp libs/haiku/lib*.a $developLibDir/ + cp libs/haiku/lib*.so $libDir/ + + prepareInstalledDevelLibs libeepp-debug + packageEntries devel $developDir +} + +PROVIDES_devel=" + eepp${secondaryArchSuffix}_devel = $portVersion + devel:libeepp$secondaryArchSuffix = $portVersion + devel:libeepp_debug$secondaryArchSuffix = $portVersion + devel:libeepp_main$secondaryArchSuffix = $portVersion + devel:libeepp_static_debug$secondaryArchSuffix = $portVersion +" + +REQUIRES_devel=" + eepp$secondaryArchSuffix == $portVersion +" From c99a1ff4036f4de2ae668b97df938f0b35d0c532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 9 Jan 2015 18:31:39 +0000 Subject: [PATCH 256/326] Remove SOIL2 dependency --- games-engines/eepp/eepp-hg.recipe | 2 -- 1 file changed, 2 deletions(-) diff --git a/games-engines/eepp/eepp-hg.recipe b/games-engines/eepp/eepp-hg.recipe index da8e07b9c..3995d8571 100644 --- a/games-engines/eepp/eepp-hg.recipe +++ b/games-engines/eepp/eepp-hg.recipe @@ -22,7 +22,6 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libsdl2$secondaryArchSuffix lib:libopenal$secondaryArchSuffix - soil2$secondaryArchSuffix lib:libgl$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -32,7 +31,6 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl2$secondaryArchSuffix devel:libopenal$secondaryArchSuffix - soil2${secondaryArchSuffix}_devel devel:libgl$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix From d636a7ba8457de2ec0f6cd0ad6c127c880130de2 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Sat, 10 Jan 2015 01:19:24 +0000 Subject: [PATCH 257/326] Abe recipe. For some reason, the game itself crashes upon launch. --- games-kids/abe/abe-1.1.recipe | 66 +++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 games-kids/abe/abe-1.1.recipe diff --git a/games-kids/abe/abe-1.1.recipe b/games-kids/abe/abe-1.1.recipe new file mode 100644 index 000000000..f63def4e8 --- /dev/null +++ b/games-kids/abe/abe-1.1.recipe @@ -0,0 +1,66 @@ +SUMMARY="Abe's Amazing Adventure!!" +DESCRIPTION="This is a very simple platformer game for children. \ +It's a worthwhile adventure, no doubt. Find treasures as you go! \ +In addition, this game also comes with a Map Editor. +" +HOMEPAGE="http://abe.sourceforge.net/" +SRC_URI="http://superb-dca3.dl.sourceforge.net/project/abe/abe/abe-1.1/abe-1.1.tar.gz" +CHECKSUM_SHA256="dfc4ea74c04c92175abc5c9d65cfa6aad218209854d87d87758878e303b677f7" +SOURCE_DIR="abe-1.1" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2013 Gabor Torok" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + Abe= $portVersion + app:Abe= $portVersion + " + +REQUIRES=" + haiku + lib:libsdl + lib:libsdl_mixer + " + +BUILD_REQUIRES=" + haiku_devel + devel:libsdl + devel:libsdl_mixer + " + +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:make + cmd:gcc + cmd:aclocal + cmd:automake + cmd:autoconf +" + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in +} + +BUILD() +{ +libtoolize --force --copy --install +aclocal -I $sourceDir +autoconf +./autogen.sh +runConfigure ./configure +make $jobArgs +} + +INSTALL() +{ + make install + mkdir -p $appsDir/Abe + cd src + cp abe $appsDir/Abe + cd $sourceDir + cp -r maps savegame sounds images devcpp dist $appsDir/Abe + addAppDeskbarSymlink $appsDir/Abe/abe +} From a1314e012e919925ba8137748b846dc4ef9fc6d2 Mon Sep 17 00:00:00 2001 From: Alex Striff Date: Sat, 10 Jan 2015 05:50:41 +0000 Subject: [PATCH 258/326] finished mtdev recipe --- sys-libs/mtdev/mtdev-1.1.5.recipe | 60 +++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 sys-libs/mtdev/mtdev-1.1.5.recipe diff --git a/sys-libs/mtdev/mtdev-1.1.5.recipe b/sys-libs/mtdev/mtdev-1.1.5.recipe new file mode 100644 index 000000000..cc4d2964f --- /dev/null +++ b/sys-libs/mtdev/mtdev-1.1.5.recipe @@ -0,0 +1,60 @@ +SUMMARY="A Multitouch Protocol Translation Library." +DESCRIPTION="MTDev is a stand-alone library which transforms all variants of \ +kernel MT events to the slotted type B protocol. The events put into \ +mtdev may be from any MT device, specifically type A without contact \ +tracking, type A with contact tracking, or type B with contact tracking." +HOMEPAGE="http://bitmath.org/code/mtdev/" +SRC_URI="http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2" +CHECKSUM_SHA256="6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f" +REVISION="1" +LICENSE="MIT" +COPYRIGHT=" + 2010 Kenrik Rydberg + 2010 Canonical Ltd. + " + +ARCHITECTURES="!x86 !x86_gcc2" +SECONDARY_ARCHITECTURES="!x86 !x86_gcc2" + +PROVIDES=" + mtdev$secondaryArchSuffix = $portVersion + lib:libmtdev$secondaryArchSuffix = 1.0.0 compat >= 1 + " + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:pkg_config$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + cmd:make + cmd:awk + " + +BUILD() +{ + runConfigure ./configure \ + --disable-static + + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libmtdev + packageEntries devel $developDir +} + +# ----- Devel Package ----------------------------------------------------- + +PROVIDES_devel=" + mtdev${secondaryArchSuffix}_devel = $portVersion + devel:libmtdev$secondaryArchSuffix = 1.0.0 compat >= 1 +" + +REQUIRES_devel=" + mtdev${secondaryArchSuffix} == $portVersion base +" From d35e1d05bca3cb0385d9b5efac2612dc0baf45e3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 10 Jan 2015 13:31:06 +0000 Subject: [PATCH 259/326] openssl: add recipe for version 1.0.0p * clean old version --- .../openssl/{openssl-1.0.0n.recipe => openssl-1.0.0p.recipe} | 2 +- .../{openssl-1.0.0n.patchset => openssl-1.0.0p.patchset} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev-libs/openssl/{openssl-1.0.0n.recipe => openssl-1.0.0p.recipe} (97%) rename dev-libs/openssl/patches/{openssl-1.0.0n.patchset => openssl-1.0.0p.patchset} (100%) diff --git a/dev-libs/openssl/openssl-1.0.0n.recipe b/dev-libs/openssl/openssl-1.0.0p.recipe similarity index 97% rename from dev-libs/openssl/openssl-1.0.0n.recipe rename to dev-libs/openssl/openssl-1.0.0p.recipe index 1f9f93725..2fc4ccd1b 100644 --- a/dev-libs/openssl/openssl-1.0.0n.recipe +++ b/dev-libs/openssl/openssl-1.0.0p.recipe @@ -15,7 +15,7 @@ conditions. " HOMEPAGE="http://www.openssl.org/" SRC_URI="http://www.openssl.org/source/openssl-$portVersion.tar.gz" -CHECKSUM_SHA256="3895eb5b1c2ba079406d081340d9e1dc064f4fbf4d0f41d53cefd154adef2aa2" +CHECKSUM_SHA256="b745d11f19531620a2e7402167d54845d253f2da3e523c2d0950595aef104fc8" LICENSE="OpenSSL" COPYRIGHT=" 1995-1998 Eric Young diff --git a/dev-libs/openssl/patches/openssl-1.0.0n.patchset b/dev-libs/openssl/patches/openssl-1.0.0p.patchset similarity index 100% rename from dev-libs/openssl/patches/openssl-1.0.0n.patchset rename to dev-libs/openssl/patches/openssl-1.0.0p.patchset From 66e7186ff3de52ad90b7fec0511a4badf8ac71c0 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 09:59:47 +0000 Subject: [PATCH 260/326] Add a game, CriticalMass --- .../criticalmass/criticalmass-2.2.recipe | 51 +++++++++++++++++++ .../criticalmass/licenses/CriticalMass | 2 + 2 files changed, 53 insertions(+) create mode 100644 haiku-games/criticalmass/criticalmass-2.2.recipe create mode 100644 haiku-games/criticalmass/licenses/CriticalMass diff --git a/haiku-games/criticalmass/criticalmass-2.2.recipe b/haiku-games/criticalmass/criticalmass-2.2.recipe new file mode 100644 index 000000000..460b3d278 --- /dev/null +++ b/haiku-games/criticalmass/criticalmass-2.2.recipe @@ -0,0 +1,51 @@ +SUMMARY="A game of chain reactions taking place in a nuclear reactor" +DESCRIPTION="\ +CriticalMass is a strategy game where your goal is to keep the reaction \ +under control by carefully placing protons and creating chain reactions. \ +It can be played with a friend or against the computer, \ +with different AI levels. +" +HOMEPAGE="https://github.com/pulkomandy/critical-mass" +SRC_URI="git+https://github.com/pulkomandy/critical-mass#f597cad218830451f2ec7f5985bef23020bf28ec" +REVISION="1" +LICENSE="CriticalMass" +COPYRIGHT=" + 1998 Hamish Carr + 2011-2012 Adrien Destugues + " + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + criticalmass = $portVersion + app:criticalmass = $portVersion + " +REQUIRES=" + haiku + lib:libGL + " +BUILD_REQUIRES=" + haiku_devel + devel:libgl + devel:libglu + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:gcc + cmd:make + " + +BUILD() +{ + cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix -Wno-dev + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + mkdir -p $documentationDir/criticalmass + cp -a Sources/CriticalMass $appsDir + cp -r Documentation/* $documentationDir/criticalmass + addAppDeskbarSymlink $appsDir/CriticalMass +} diff --git a/haiku-games/criticalmass/licenses/CriticalMass b/haiku-games/criticalmass/licenses/CriticalMass new file mode 100644 index 000000000..67532d133 --- /dev/null +++ b/haiku-games/criticalmass/licenses/CriticalMass @@ -0,0 +1,2 @@ +"Nobody sent money when I said it was shareware, so I shan't bother anymore. Consider it freeware. I.e. you can play it, distribute it, throw it in the garbage can, whatever, so long as authorship is acknowledged." +- Hamish Carr From e661525172fbadb4846c428d55906ad69708e360 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Sat, 10 Jan 2015 16:25:53 +0100 Subject: [PATCH 261/326] minesweeper: bump version --- haiku-games/minesweeper/minesweeper-20150109.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-games/minesweeper/minesweeper-20150109.recipe b/haiku-games/minesweeper/minesweeper-20150109.recipe index 074755295..c3903247b 100644 --- a/haiku-games/minesweeper/minesweeper-20150109.recipe +++ b/haiku-games/minesweeper/minesweeper-20150109.recipe @@ -2,8 +2,8 @@ SUMMARY="A Windows Minesweeper clone" DESCRIPTION="Minesweeper is a clone of the original Windows minesweeper game. \ It supports different board sizes and best time saving." HOMEPAGE="https://github.com/HaikuArchives/Minesweeper" -SRC_URI="git+https://github.com/HaikuArchives/Minesweeper#e75ea9e3816d56548824c0fcaba6ffa8b20b89f8" -REVISION="1" +SRC_URI="git+https://github.com/HaikuArchives/Minesweeper#1b4a293c63b69aad02fb40293bbfdd0f334030e2" +REVISION="2" LICENSE="MIT" COPYRIGHT="2013 Tri-Edge AI" From 63475f1f9c6361c3fbb1b92c7adb65913585b9ed Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 10 Jan 2015 16:41:30 +0000 Subject: [PATCH 262/326] freetype: bump version --- .../freetype/{freetype-2.5.3.recipe => freetype-2.5.5.recipe} | 4 ++-- .../{freetype-2.5.3.patchset => freetype-2.5.5.patchset} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename media-libs/freetype/{freetype-2.5.3.recipe => freetype-2.5.5.recipe} (96%) rename media-libs/freetype/patches/{freetype-2.5.3.patchset => freetype-2.5.5.patchset} (100%) diff --git a/media-libs/freetype/freetype-2.5.3.recipe b/media-libs/freetype/freetype-2.5.5.recipe similarity index 96% rename from media-libs/freetype/freetype-2.5.3.recipe rename to media-libs/freetype/freetype-2.5.5.recipe index 23113d9d4..7f176fff4 100644 --- a/media-libs/freetype/freetype-2.5.3.recipe +++ b/media-libs/freetype/freetype-2.5.5.recipe @@ -8,8 +8,8 @@ HOMEPAGE="http://www.freetype.org" LICENSE="FreeType" COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2" -CHECKSUM_SHA256="c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" -REVISION="5" +CHECKSUM_SHA256="387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/media-libs/freetype/patches/freetype-2.5.3.patchset b/media-libs/freetype/patches/freetype-2.5.5.patchset similarity index 100% rename from media-libs/freetype/patches/freetype-2.5.3.patchset rename to media-libs/freetype/patches/freetype-2.5.5.patchset From 1be671af86f3270a9808bae2ce5104b5f38af3d4 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 15:43:07 +0000 Subject: [PATCH 263/326] Add a new Haiku App, DeskNotes Needs some fixes, merge requested upstream: https://gitorious.org/desknotes/desknotes/merge_requests/1 --- haiku-apps/desknotes/desknotes-1.1.recipe | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 haiku-apps/desknotes/desknotes-1.1.recipe diff --git a/haiku-apps/desknotes/desknotes-1.1.recipe b/haiku-apps/desknotes/desknotes-1.1.recipe new file mode 100644 index 000000000..4825b0176 --- /dev/null +++ b/haiku-apps/desknotes/desknotes-1.1.recipe @@ -0,0 +1,47 @@ +SUMMARY="A simple note replicant-capable program" +DESCRIPTION=" +With DeskNotes, you can now leave little notes all over your desktop \ +reminding you of things to do. The main difference between DeskNotes and \ +other Note utilities for Haiku, is that DeskNotes is designed to be used \ +as a replicant. This means that when you tear a note from the DeskNotes \ +application onto your desktop, it stays there! You don't have to save it \ +before rebooting, or fiddle with your bootscript. +" + +HOMEPAGE="https://github.com/HaikuArchives/DeskNotes" +SRC_URI="git+https://github.com/HaikuArchives/DeskNotes#93f0654745e3dc317152bdfc49ae8b6d23bf443b" +REVISION="1" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000 Colin Stewart" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + desknotes = $portVersion + app:desknotes = $portVersion + " +REQUIRES=" + haiku + lib:libstdc++ + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/DeskNotes $appsDir + addAppDeskbarSymlink $appsDir/DeskNotes +} From 27664ce04ad127c872ec94315105ee20a15f02d8 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 18:16:42 +0000 Subject: [PATCH 264/326] Add a Haiku app, PonpokoDiff --- .../ponpokodiff/ponpokodiff-0.2.0.recipe | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe diff --git a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe new file mode 100644 index 000000000..ab87b14b5 --- /dev/null +++ b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe @@ -0,0 +1,44 @@ +SUMMARY="A GUI-based diff application" +DESCRIPTION=" +PonpokoDiff is a graphical file comparison utility. \ +It can compare two files and show its differences graphically. \ +Currently, the comparison of folders is not supported. \ +You can also use it as an extenal diff command of Subversion (--diff-cmd). +" + +HOMEPAGE="https://code.google.com/p/ponpokodiff/" +SRC_URI="git+https://github.com/HaikuArchives/PonpokoDiff#f68f59d8f359ddbaeec89e2c8a72da93142c139d" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2008 PonpokoDiff Project Contributors" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + ponpokodiff = $portVersion + app:ponpokodiff = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/PonpokoDiff $appsDir + addAppDeskbarSymlink $appsDir/PonpokoDiff +} From 7ac67f5b85d4629438eb1461540a052661004a68 Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sat, 3 Jan 2015 23:57:06 +0000 Subject: [PATCH 265/326] Added luarocks-2.2.0 recipe file --- dev-lua/luarocks/luarocks-2.2.0.recipe | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 dev-lua/luarocks/luarocks-2.2.0.recipe diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe new file mode 100644 index 000000000..c7ded971c --- /dev/null +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -0,0 +1,46 @@ +SUMMARY="a deployment and management system for Lua modules." +DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +HOMEPAGE="http://luarocks.org" +SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" +SOURCE_DIR=$portVersionedName +REVISION="2" +CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279c" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +PROVIDES=" + cmd:luarocks = $portVersion + " +REQUIRES=" + haiku + lua + lib:liblua + " +BUILD_REQUIRES=" + lua_devel + devel:liblua + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:lua + cmd:luac + cmd:gcc + cmd:ld + cmd:make + cmd:sed + cmd:wget + cmd:md5sum + " + +BUILD() +{ + echo "PREFIX = $prefix" + ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + make build +} +INSTALL() +{ + make install +} + +LICENSE="MIT" +COPYRIGHT="2007-2014 Kepler Project" From 3378a37fcf7dcfe45c5d0dc8e6f8f6a9dd590eab Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 00:51:52 +0000 Subject: [PATCH 266/326] Removed redundant requires --- dev-lua/luarocks/luarocks-2.2.0.recipe | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index c7ded971c..41af7eff5 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -9,20 +9,17 @@ CHECKSUM_SHA256="9b1a4ec7b103e2fb90a7ba8589d7e0c8523a3d6d54ac469b0bbc144292b9279 ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" cmd:luarocks = $portVersion + cmd:luarocks_admin = $portVersion " REQUIRES=" haiku lua - lib:liblua " BUILD_REQUIRES=" lua_devel - devel:liblua " BUILD_PREREQUIRES=" haiku_devel - cmd:lua - cmd:luac cmd:gcc cmd:ld cmd:make @@ -33,7 +30,6 @@ BUILD_PREREQUIRES=" BUILD() { - echo "PREFIX = $prefix" ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib make build } From 3996f4c8aab6b558e1d3d2bae098b7cb693745aa Mon Sep 17 00:00:00 2001 From: Haoyuan Sun Date: Sun, 4 Jan 2015 04:17:50 +0000 Subject: [PATCH 267/326] Addition of env variables --- dev-lua/luarocks/luarocks-2.2.0.recipe | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-lua/luarocks/luarocks-2.2.0.recipe b/dev-lua/luarocks/luarocks-2.2.0.recipe index 41af7eff5..06f16e7ae 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.recipe +++ b/dev-lua/luarocks/luarocks-2.2.0.recipe @@ -1,5 +1,8 @@ SUMMARY="a deployment and management system for Lua modules." -DESCRIPTION="LuaRocks allows you to install modules as self-contained packages called rocks, which also contain version dependency information." +DESCRIPTION=" +LuaRocks allows you to install modules as self-contained packages \ +called rocks, which also contain version dependency information. +" HOMEPAGE="http://luarocks.org" SRC_URI="http://luarocks.org/releases/luarocks-2.2.0.tar.gz" SOURCE_DIR=$portVersionedName @@ -14,12 +17,16 @@ PROVIDES=" REQUIRES=" haiku lua + lib:liblua " BUILD_REQUIRES=" lua_devel + devel:liblua " BUILD_PREREQUIRES=" haiku_devel + cmd:lua + cmd:luac cmd:gcc cmd:ld cmd:make @@ -30,7 +37,7 @@ BUILD_PREREQUIRES=" BUILD() { - ./configure --prefix=$prefix --with-lua=/bin --with-lua-include=/system/develop/headers --with-lua-lib=/system/develop/lib + ./configure --prefix=$prefix --with-lua=$binDir --with-lua-include=$includeDir --with-lua-lib=$libDir make build } INSTALL() From 4cd900b183af13eba7d74db725bc1110228c0734 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Sun, 4 Jan 2015 08:58:53 +0100 Subject: [PATCH 268/326] Fix policy error, small changes in SUMMARY and DESCRIPTION. --- dev-util/app2png/app2png-1.0.0.recipe | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/app2png/app2png-1.0.0.recipe b/dev-util/app2png/app2png-1.0.0.recipe index 0000fc138..a55fdbf09 100644 --- a/dev-util/app2png/app2png-1.0.0.recipe +++ b/dev-util/app2png/app2png-1.0.0.recipe @@ -1,8 +1,8 @@ -SUMMARY="Turn legacy BeOS app icons into PNGs." +SUMMARY="Turn legacy BeOS application icons into PNGs" DESCRIPTION="\ -With app2png, you can extract attribute-based icons from BeOS apps and save \ -them into PNG files. These PNG icons can then be used to recreate the icon as \ -a vector, or for use on a site." +With app2png, you can extract attribute-based bitmap icons from BeOS apps and \ +save them into PNG files. These PNG icons can then be used to recreate the \ +icon as a vector, or for use on a website." HOMEPAGE="https://github.com/HaikuArchives/app2png" SRC_URI="git+https://github.com/HaikuArchives/app2png#17c36271a80a822ac0dfec66527e61f21230a412" @@ -14,7 +14,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" app2png = $portVersion - app:app2png = $portVersion + cmd:app2png = $portVersion " REQUIRES=" haiku From b4fdcc7ace5415d2021fc71cfb1ecee835357252 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 19:47:06 +0000 Subject: [PATCH 269/326] coreutils: apply gcc2 patchset only for gcc2. --- sys-apps/coreutils/coreutils-8.22.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys-apps/coreutils/coreutils-8.22.recipe b/sys-apps/coreutils/coreutils-8.22.recipe index ed3431192..171811315 100644 --- a/sys-apps/coreutils/coreutils-8.22.recipe +++ b/sys-apps/coreutils/coreutils-8.22.recipe @@ -26,8 +26,12 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES=" coreutils-$portVersion.patchset - coreutils-$portVersion.gcc2.patchset " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES+=" + coreutils-$portVersion.gcc2.patchset + " +fi PROVIDES=" coreutils = $portVersion compat >= 8 From dbe32bbea551eddc3ad37c6783bfa22eea7fc22e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 20:40:53 +0000 Subject: [PATCH 270/326] soxr: disable visibility hidden for gcc2. --- media-libs/soxr/soxr-0.1.1.recipe | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media-libs/soxr/soxr-0.1.1.recipe b/media-libs/soxr/soxr-0.1.1.recipe index e211c4fff..db35739bd 100644 --- a/media-libs/soxr/soxr-0.1.1.recipe +++ b/media-libs/soxr/soxr-0.1.1.recipe @@ -41,13 +41,17 @@ PATCHES="soxr-${portVersion}.patchset" BUILD() { + if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + visibilityArgs="-DVISIBILITY_HIDDEN=OFF" + fi cmake . \ -DCMAKE_INSTALL_PREFIX=$prefix \ -DBUILD_TESTS=OFF \ -DBIN_INSTALL_DIR=$binDir \ -DLIB_INSTALL_DIR=$libDir \ -DINCLUDE_INSTALL_DIR=$includeDir \ - -DDOC_INSTALL_DIR=$docDir + -DDOC_INSTALL_DIR=$docDir \ + $visibilityArgs make $jobArgs } From 9da1fbc6183de1cca420da1d4b1a65d3145e267a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 4 Jan 2015 22:23:07 +0000 Subject: [PATCH 271/326] libebml & libmatroska: bump version. * switch to autotools. --- dev-libs/libebml/libebml-1.0.0.recipe | 25 ------- ...ebml-1.3.0.recipe => libebml-1.3.1.recipe} | 46 +++++++------ .../libebml/patches/libebml-0.7.8-haiku.diff | 21 ------ dev-libs/libebml/patches/libebml-1.0.0.patch | 67 ------------------- .../libebml/patches/libebml-1.3.1.patchset | 22 ++++++ .../libmatroska/libmatroska-1.0.0.recipe | 25 ------- ...-1.4.1.recipe => libmatroska-1.4.2.recipe} | 48 ++++++------- .../patches/libmatroska-1.0.0.patch | 47 ------------- .../patches/libmatroska-1.4.2.patchset | 22 ++++++ 9 files changed, 94 insertions(+), 229 deletions(-) delete mode 100644 dev-libs/libebml/libebml-1.0.0.recipe rename dev-libs/libebml/{libebml-1.3.0.recipe => libebml-1.3.1.recipe} (53%) delete mode 100644 dev-libs/libebml/patches/libebml-0.7.8-haiku.diff delete mode 100644 dev-libs/libebml/patches/libebml-1.0.0.patch create mode 100644 dev-libs/libebml/patches/libebml-1.3.1.patchset delete mode 100644 media-libs/libmatroska/libmatroska-1.0.0.recipe rename media-libs/libmatroska/{libmatroska-1.4.1.recipe => libmatroska-1.4.2.recipe} (55%) delete mode 100644 media-libs/libmatroska/patches/libmatroska-1.0.0.patch create mode 100644 media-libs/libmatroska/patches/libmatroska-1.4.2.patchset diff --git a/dev-libs/libebml/libebml-1.0.0.recipe b/dev-libs/libebml/libebml-1.0.0.recipe deleted file mode 100644 index 4c79fea0c..000000000 --- a/dev-libs/libebml/libebml-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="6d438f03d8928d83a2d120ed02705f03" -BUILD() -{ - cd libebml-1.0.0/make/linux - make -} - -INSTALL() -{ - cd libebml-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/dev-libs/libebml/libebml-1.3.0.recipe b/dev-libs/libebml/libebml-1.3.1.recipe similarity index 53% rename from dev-libs/libebml/libebml-1.3.0.recipe rename to dev-libs/libebml/libebml-1.3.1.recipe index 3957bf4ce..7afdcadcf 100644 --- a/dev-libs/libebml/libebml-1.3.0.recipe +++ b/dev-libs/libebml/libebml-1.3.1.recipe @@ -1,64 +1,68 @@ SUMMARY="libebml is a C++ library to parse EBML content (read/write)." DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.0.tar.bz2" -CHECKSUM_SHA256="83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" - +SRC_URI="http://dl.matroska.org/downloads/libebml/libebml-1.3.1.tar.bz2" +CHECKSUM_SHA256="195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" libebml$secondaryArchSuffix = $portVersion - lib:libebml$secondaryArchSuffix = 4 + lib:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES=" haiku${secondaryArchSuffix} + lib:libstdc++${secondaryArchSuffix} " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libebml-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi + BUILD_REQUIRES=" " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/ebml,g" make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile - sed -i 's/\(#elif defined(__BEOS__)\)/\1 || defined(__HAIKU__)/g' \ - ebml/c/libebml_t.h -} - BUILD() { - cd make/linux + autoreconf -f -i + runConfigure ./configure make $jobArgs } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libebml + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libebml${secondaryArchSuffix}_devel = $portVersion - devel:libebml$secondaryArchSuffix = 4 + devel:libebml$secondaryArchSuffix = 4.0.0 compat >= 4 " REQUIRES_devel=" libebml$secondaryArchSuffix == $portVersion base diff --git a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff b/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff deleted file mode 100644 index 8bccf378a..000000000 --- a/dev-libs/libebml/patches/libebml-0.7.8-haiku.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN libebml-0.7.8/ebml/c/libebml_t.h libebml-0.7.8-haiku/ebml/c/libebml_t.h ---- libebml-0.7.8/ebml/c/libebml_t.h 2009-03-01 02:10:48.000000000 +0000 -+++ libebml-0.7.8-haiku/ebml/c/libebml_t.h 2009-03-01 02:06:42.000000000 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include diff --git a/dev-libs/libebml/patches/libebml-1.0.0.patch b/dev-libs/libebml/patches/libebml-1.0.0.patch deleted file mode 100644 index 034937173..000000000 --- a/dev-libs/libebml/patches/libebml-1.0.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN libebml-1.0.0/ebml/c/libebml_t.h libebml-1.0.0-haiku/ebml/c/libebml_t.h ---- libebml-1.0.0/ebml/c/libebml_t.h 2010-03-23 11:58:36.007077888 +0000 -+++ libebml-1.0.0-haiku/ebml/c/libebml_t.h 2010-06-30 15:54:51.796131328 +0000 -@@ -72,7 +72,7 @@ - typedef uint16_t uint16; - typedef uint8_t uint8; - # endif // __GNUC__ --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - #include - #elif defined(DJGPP) /* SL : DJGPP doesn't support POSIX types ???? */ - typedef signed long long int64; -@@ -98,7 +98,7 @@ - typedef uint32_t uint32; - typedef uint16_t uint16; - typedef uint8_t uint8; --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined (__HAIKU__) - # include - #else // anything else (Linux, BSD, ...) - # include -diff -urN libebml-1.0.0/make/linux/Makefile libebml-1.0.0-destdir/make/linux/Makefile ---- libebml-1.0.0/make/linux/Makefile 2010-06-04 08:44:54.060817408 +0000 -+++ libebml-1.0.0-destdir/make/linux/Makefile 2010-09-22 12:58:40.962854912 +0000 -@@ -13,6 +13,9 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+# Haiku wants the libs and headers in /boot/common -+else ifeq (Haiku,$(shell uname -s)) -+prefix=/boot/common - else - prefix=/usr/local - endif -@@ -122,23 +125,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - - ifneq ($(wildcard .depend),) diff --git a/dev-libs/libebml/patches/libebml-1.3.1.patchset b/dev-libs/libebml/patches/libebml-1.3.1.patchset new file mode 100644 index 000000000..2297479ad --- /dev/null +++ b/dev-libs/libebml/patches/libebml-1.3.1.patchset @@ -0,0 +1,22 @@ +From dfad87a8cda696eba7c4a96ab898705978a0cec0 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:37:55 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index 9b10ee8..3e11510 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + diff --git a/media-libs/libmatroska/libmatroska-1.0.0.recipe b/media-libs/libmatroska/libmatroska-1.0.0.recipe deleted file mode 100644 index 4db5ffdc4..000000000 --- a/media-libs/libmatroska/libmatroska-1.0.0.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." -HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.0.0.tar.bz2" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libebml >= 1.0.0" -CHECKSUM_MD5="4efcf3945b17a6f0320cf1aaa326a4de" -BUILD() -{ - cd libmatroska-1.0.0/make/linux - make PREFIX=/boot/common -} - -INSTALL() -{ - cd libmatroska-1.0.0/make/linux - if [ -n ${DESTDIR} ];then - make install DESTDIR="${DESTDIR}" - else - make install - fi -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2005-2009 CoreCodec, Inc." diff --git a/media-libs/libmatroska/libmatroska-1.4.1.recipe b/media-libs/libmatroska/libmatroska-1.4.2.recipe similarity index 55% rename from media-libs/libmatroska/libmatroska-1.4.1.recipe rename to media-libs/libmatroska/libmatroska-1.4.2.recipe index ed79ef7aa..9e194de10 100644 --- a/media-libs/libmatroska/libmatroska-1.4.1.recipe +++ b/media-libs/libmatroska/libmatroska-1.4.2.recipe @@ -1,67 +1,69 @@ SUMMARY="libmatroska is a C++ libary to parse Matroska files." DESCRIPTION="libmatroska is a C++ libary to parse Matroska files." HOMEPAGE="http://www.matroska.org/" -SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.1.tar.bz2" -CHECKSUM_SHA256="086f21873e925679babdabf793c3bb85c353d0cd79423543a3355e08e8a4efb7" - +SRC_URI="http://dl.matroska.org/downloads/libmatroska/libmatroska-$portVersion.tar.bz2" +CHECKSUM_SHA256="bea10320f1f1fd121bbd7db9ffc77b2518e8269f00903549c5425478bbf8393f" REVISION="1" - LICENSE="GNU LGPL v2.1" COPYRIGHT="2005-2013 CoreCodec, Inc." -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libmatroska$secondaryArchSuffix = $portVersion - lib:libmatroska$secondaryArchSuffix = 6 + lib:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES=" haiku${secondaryArchSuffix} lib:libebml$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES=" + libmatroska-$portVersion.patchset + " +else + REQUIRES+=" + lib:libgcc_s${secondaryArchSuffix} + " +fi BUILD_REQUIRES=" devel:libebml$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel + cmd:aclocal + cmd:autoconf + cmd:automake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtool cmd:make - cmd:sed " -PATCH() -{ - sed -i 's/^ifeq (BeOS/ifeq (Haiku/g' make/linux/Makefile - sed -i "s,/boot/home/config,$prefix,g" make/linux/Makefile - sed -i "s,^\(libdir\)=\(.*\)$,\1=$libDir,g" make/linux/Makefile - sed -i "s,^\(includedir\)=\(.*\)$,\1=$includeDir/matroska,g" \ - make/linux/Makefile - sed -i 's/-Wextra//g' make/linux/Makefile -} - BUILD() { - cd make/linux - make $jobArgs \ - LIBEBML_INCLUDE_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeIncludeDir \ - LIBEBML_LIB_DIR=`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir + autoreconf -f -i + runConfigure ./configure + make $jobArgs + } INSTALL() { - cd make/linux make install prepareInstalledDevelLibs libmatroska + fixPkgconfig packageEntries devel $developDir } PROVIDES_devel=" libmatroska${secondaryArchSuffix}_devel = $portVersion - devel:libmatroska$secondaryArchSuffix = 6 + devel:libmatroska$secondaryArchSuffix = 6.0.0 compat >= 6 " REQUIRES_devel=" libmatroska$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch b/media-libs/libmatroska/patches/libmatroska-1.0.0.patch deleted file mode 100644 index 65d5f2861..000000000 --- a/media-libs/libmatroska/patches/libmatroska-1.0.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -urN libmatroska-1.0.0/make/linux/Makefile libmatroska-1.0.0-haiku/make/linux/Makefile ---- libmatroska-1.0.0/make/linux/Makefile 2010-06-04 08:46:29.017825792 +0000 -+++ libmatroska-1.0.0-haiku/make/linux/Makefile 2010-09-27 01:57:28.436994048 +0000 -@@ -13,6 +13,10 @@ - # BeOS wants the libs and headers in /boot/home/config - ifeq (BeOS,$(shell uname -s)) - prefix=/boot/home/config -+endif -+# Haiku wants the libs and headers in /boot/common -+ifeq (Haiku,$(shell uname -s)) -+prefix:=$(shell finddir B_COMMON_DIRECTORY) - else - prefix=/usr/local - endif -@@ -153,23 +157,23 @@ - endif - - install_headers: -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) - for i in $(INCLUDE_DIR)/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ - done -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c - for i in $(INCLUDE_DIR)/c/*.h; do \ -- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ -+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ - done - - install_staticlib: $(LIBRARY) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) - - install_sharedlib: $(LIBRARY_SO) -- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) -- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) -- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) -+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) -+ ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) - - ifneq ($(wildcard .depend),) - include .depend diff --git a/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset new file mode 100644 index 000000000..829b0f7a4 --- /dev/null +++ b/media-libs/libmatroska/patches/libmatroska-1.4.2.patchset @@ -0,0 +1,22 @@ +From caa315a5ba5ff2053d6e6c429c83017fdc13e567 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 4 Jan 2015 21:54:48 +0000 +Subject: gcc2 fix + + +diff --git a/Makefile.am b/Makefile.am +index f3b881d..063a480 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,7 +3,7 @@ + ACLOCAL_AMFLAGS = -I m4 + + AM_CPPFLAGS = -I${top_srcdir} +-AM_CXXFLAGS = -Wall -Wextra -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) ++AM_CXXFLAGS = -Wall -Wno-unknown-pragmas -Wshadow $(EBML_CFLAGS) + if ENABLE_DEBUG + AM_CPPFLAGS += -DDEBUG + AM_CXXFLAGS += -g +-- +1.8.3.4 + From c5bd380fcf18fce172416abc0408575a3733e074 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Mon, 5 Jan 2015 00:08:18 +0000 Subject: [PATCH 272/326] Add bookmarkconverter recipe --- .../bookmarkconverter-0.4.3.recipe | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe diff --git a/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe new file mode 100644 index 000000000..23785cc6e --- /dev/null +++ b/haiku-apps/bookmarkconverter/bookmarkconverter-0.4.3.recipe @@ -0,0 +1,50 @@ +SUMMARY="A tool to convert browser bookmarks" +DESCRIPTION="This tool converts bookmarks between QupZilla and WebPositive. \ +It can also convert WebPositive bookmarks to HTML and Chrome as intermediate \ +formats." + +HOMEPAGE="http://github.com/HaikuArchives/BookmarkConverter" + +gitRevision="9f80b05d0afd07fb732f352b92a3e831077d005a" +SRC_URI="https://github.com/HaikuArchives/BookmarkConverter/archive/$gitRevision.zip" +CHECKSUM_SHA256="fcd74f4f71f9f399b6c5bf824486a898ad99aeef237e674da7c0928d3cafce1e" +SOURCE_DIR="BookmarkConverter-$gitRevision" + +REVISION="1" +LICENSE="MIT" +COPYRIGHT=" + 2015 Markus Himmel + " + +ARCHITECTURES="x86_gcc2 ?x86 ?ppc" + +PROVIDES=" + bookmarkconverter = $portVersion + cmd:bookmarkconverter = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + makefile_engine + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + " + +BUILD() +{ + mkdir -p bin + make TARGET_DIR=bin +} + +INSTALL() +{ + mkdir -p $binDir + cp bin/bookmarkconverter $binDir/bookmarkconverter +} From 82cff02bad43a47e9849d50428bf1938d469b91e Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Jan 2015 13:53:14 -0500 Subject: [PATCH 273/326] hyperstudio: create recipe. --- .../hyperstudio/hyperstudio-1.1_git.recipe | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe diff --git a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe new file mode 100644 index 000000000..b89c7b327 --- /dev/null +++ b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe @@ -0,0 +1,49 @@ +SUMMARY="Multitrack audio recording and editing suite." +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="2007 Pier Luigi Fiorini" +srcrev="59b31f0bdc3f0e49feb7d9892faa67222ffb3f95" +SRC_URI="https://github.com/HaikuArchives/HyperStudio/archive/$srcrev.tar.gz" +CHECKSUM_SHA256="03c2a7fc68d2a95bce9c873bf6d8a32494370861a23dc8e2689285e7e201a4c9" +SOURCE_DIR="HyperStudio-$srcrev" + +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + hyperstudio = $portVersion + app:HyperStudio = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:awk + cmd:jam + cmd:ld + " + +BUILD() +{ + ./configure + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a generated/distro-haiku-$(getarch | sed s/_/-/)-release/HyperStudio $appsDir + cp -a generated/distro-haiku-$(getarch | sed s/_/-/)-release/HyperStudioRecorder $appsDir + + addAppDeskbarSymlink $appsDir/HyperStudio + addAppDeskbarSymlink $appsDir/HyperStudioRecorder +} From 2e87c7b8dd8076d8c3a40702ec51ae592a633a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Sat, 10 Jan 2015 19:13:09 +0000 Subject: [PATCH 274/326] Minor change to GraphicsMagick recipe --- media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe index f4e5fb666..dfbe842ee 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe @@ -10,10 +10,10 @@ SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="GraphicsMagick-1.3.20" PROVIDES="graphicsmagick$secondaryArchSuffix - cmd:gm$secondaryArchSuffix - cmd:GraphicsMagick++_config$secondaryArchSuffix - cmd:GraphicsMagick_config$secondaryArchSuffix - cmd:GraphicsMagickWand_config$secondaryArchSuffix + cmd:gm$secondaryArchSuffix + cmd:GraphicsMagick++_config$secondaryArchSuffix + cmd:GraphicsMagick_config$secondaryArchSuffix + cmd:GraphicsMagickWand_config$secondaryArchSuffix " REQUIRES=" haiku$secondaryArchSuffix From d8df8ecee2cd549f3a28f6bab391d7f16c52fe80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Sat, 10 Jan 2015 20:45:00 +0000 Subject: [PATCH 275/326] Added $portVersion to GraphicsMagick recipe --- media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe index dfbe842ee..93140d80c 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.20.recipe @@ -9,7 +9,7 @@ ARCHITECTURES="x86_gcc2" SECONDARY_ARCHITECTURES="x86" SOURCE_DIR="GraphicsMagick-1.3.20" -PROVIDES="graphicsmagick$secondaryArchSuffix +PROVIDES="graphicsmagick$secondaryArchSuffix = $portVersion cmd:gm$secondaryArchSuffix cmd:GraphicsMagick++_config$secondaryArchSuffix cmd:GraphicsMagick_config$secondaryArchSuffix @@ -47,7 +47,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - graphicsmagick$secondaryArchSuffix + graphicsmagick$secondaryArchSuffix == $portVersion " From a7a207154cb520c30d1adeadd85a4ccbc14400d6 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Jan 2015 14:46:07 -0500 Subject: [PATCH 276/326] doxygen: 1.7.6.1, delete old recipes. --- app-doc/doxygen/doxygen-1.6.3.recipe | 70 ------ app-doc/doxygen/doxygen-1.7.4.recipe | 42 ---- app-doc/doxygen/doxygen-1.7.6.1.recipe | 66 ++++++ .../doxygen/patches/doxygen-1.6.3.patchset | 177 -------------- app-doc/doxygen/patches/doxygen-1.7.4.patch | 158 ------------- app-doc/doxygen/patches/doxygen-1.7.6.1.patch | 216 ++++++++++++++++++ 6 files changed, 282 insertions(+), 447 deletions(-) delete mode 100644 app-doc/doxygen/doxygen-1.6.3.recipe delete mode 100644 app-doc/doxygen/doxygen-1.7.4.recipe create mode 100644 app-doc/doxygen/doxygen-1.7.6.1.recipe delete mode 100644 app-doc/doxygen/patches/doxygen-1.6.3.patchset delete mode 100644 app-doc/doxygen/patches/doxygen-1.7.4.patch create mode 100644 app-doc/doxygen/patches/doxygen-1.7.6.1.patch diff --git a/app-doc/doxygen/doxygen-1.6.3.recipe b/app-doc/doxygen/doxygen-1.6.3.recipe deleted file mode 100644 index 785467d1e..000000000 --- a/app-doc/doxygen/doxygen-1.6.3.recipe +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY="Generate documentation from source code" -DESCRIPTION=" -Doxygen is the de facto standard tool for generating documentation from \ -annotated C++ sources, but it also supports other popular programming \ -languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \ -Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. -Doxygen can help you in three ways: -1. It can generate an on-line documentation browser (in HTML) and/or an \ -off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \ -files. There is also support for generating output in RTF (MS-Word), \ -PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ -documentation is extracted directly from the sources, which makes it much \ -easier to keep the documentation consistent with the source code. -2. You can configure doxygen to extract the code structure from undocumented \ -source files. This is very useful to quickly find your way in large source \ -distributions. Doxygen can also visualize the relations between the various \ -elements by means of include dependency graphs, inheritance diagrams, and \ -collaboration diagrams, which are all generated automatically. -3. You can also use doxygen for creating normal documentation (as I did for \ -the doxygen user manual and web-site). -" -HOMEPAGE="http://www.doxygen.org" -COPYRIGHT="1997-2010 Dimitri van Heesch" -LICENSE="GNU GPL v2" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.6.3.src.tar.gz" -CHECKSUM_SHA256="a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492" -REVISION="4" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PATCHES="doxygen-1.6.3.patchset" - -PROVIDES=" - doxygen = $portVersion compat >= 1.6 - cmd:doxygen = $portVersion compat >= 1.6 - cmd:doxytag = $portVersion compat >= 1.6 - " -REQUIRES=" - haiku - lib:libiconv - " -BUILD_REQUIRES=" - devel:libiconv - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:bison - cmd:flex - cmd:gcc - cmd:ld - cmd:make - cmd:perl - cmd:sed - " - - -PATCH() -{ - sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in -} - -BUILD() -{ - ./configure --prefix $prefix --docdir $docDir - make $jobArgs -} - -INSTALL() -{ - make install -} diff --git a/app-doc/doxygen/doxygen-1.7.4.recipe b/app-doc/doxygen/doxygen-1.7.4.recipe deleted file mode 100644 index f7b4d4df7..000000000 --- a/app-doc/doxygen/doxygen-1.7.4.recipe +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY="Generate documentation from source code" -DESCRIPTION=" -Doxygen is the de facto standard tool for generating documentation from \ -annotated C++ sources, but it also supports other popular programming \ -languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \ -Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. -Doxygen can help you in three ways: -1. It can generate an on-line documentation browser (in HTML) and/or an \ -off-line reference manual (in $\mbox{\LaTeX}$) from a set of documented source \ -files. There is also support for generating output in RTF (MS-Word), \ -PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ -documentation is extracted directly from the sources, which makes it much \ -easier to keep the documentation consistent with the source code. -2. You can configure doxygen to extract the code structure from undocumented \ -source files. This is very useful to quickly find your way in large source \ -distributions. Doxygen can also visualize the relations between the various \ -elements by means of include dependency graphs, inheritance diagrams, and \ -collaboration diagrams, which are all generated automatically. -3. You can also use doxygen for creating normal documentation (as I did for \ -the doxygen user manual and web-site). -" -HOMEPAGE="http://www.doxygen.org" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-1.7.4.src.tar.gz" -CHECKSUM_MD5="ff908759ff7cd9464424b04ae6c68e48" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd doxygen-1.7.4 - sed -i 's/MAN1DIR = man\/man1/MAN1DIR = documentation\/man\/man1/' Makefile.in - ./configure --prefix `finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd doxygen-1.7.4 - make install -} -LICENSE="GNU GPL v2" -COPYRIGHT="1997-2011 Dimitri van Heesch" diff --git a/app-doc/doxygen/doxygen-1.7.6.1.recipe b/app-doc/doxygen/doxygen-1.7.6.1.recipe new file mode 100644 index 000000000..49a3b86d0 --- /dev/null +++ b/app-doc/doxygen/doxygen-1.7.6.1.recipe @@ -0,0 +1,66 @@ +SUMMARY="Generate documentation from source code" +DESCRIPTION=" +Doxygen is the de facto standard tool for generating documentation from \ +annotated C++ sources, but it also supports other popular programming \ +languages such as C, Objective-C, C#, PHP, Java, Python, IDL (Corba and \ +Microsoft flavors), Fortran, VHDL, Tcl, and to some extent D. +Doxygen can: + * generate an on-line documentation browser (in HTML) and/or an \ +off-line reference manual (in LaTeX) from a set of documented source \ +files. There is also support for generating output in RTF (MS-Word), \ +PostScript, hyperlinked PDF, compressed HTML, and Unix man pages. The \ +documentation is extracted directly from the sources, which makes it much \ +easier to keep the documentation consistent with the source code. + * extract the code structure from undocumented source files. This is \ +very useful to quickly find your way in large source distributions. \ +Doxygen can also visualize the relations between the various elements \ +by means of include dependency graphs, inheritance diagrams, and \ +collaboration diagrams, which are all generated automatically." +HOMEPAGE="http://www.doxygen.org" +COPYRIGHT="1997-2011 Dimitri van Heesch" +LICENSE="GNU GPL v2" +SRC_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-$portVersion.src.tar.gz" +CHECKSUM_SHA256="0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd" +PATCHES="doxygen-$portVersion.patch" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + doxygen = $portVersion compat >= 1.7 + cmd:doxygen = $portVersion compat >= 1.7 + cmd:doxytag = $portVersion compat >= 1.7 + " +REQUIRES=" + haiku + lib:libiconv + " +BUILD_REQUIRES=" + devel:libiconv + " +BUILD_PREREQUIRES=" + haiku_devel + cmd:bison + cmd:flex + cmd:gcc + cmd:ld + cmd:make + cmd:perl + cmd:sed + " + +PATCH() +{ + sed -i "s,MAN1DIR = man/man1,MAN1DIR = $relativeManDir/man1," Makefile.in +} + +BUILD() +{ + # not an autotools configure + ./configure --prefix $prefix --docdir $docDir + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/app-doc/doxygen/patches/doxygen-1.6.3.patchset b/app-doc/doxygen/patches/doxygen-1.6.3.patchset deleted file mode 100644 index 68b9cf3e8..000000000 --- a/app-doc/doxygen/patches/doxygen-1.6.3.patchset +++ /dev/null @@ -1,177 +0,0 @@ -From 9612cfcd716d5924547e90229bd6e3cb51c950e9 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Wed, 21 Aug 2013 12:02:33 +0200 -Subject: add support for Haiku - - -diff --git a/Makefile.in b/Makefile.in -index 781d359..9cd43eb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -2,7 +2,7 @@ - # cd qtools ; $(MAKE) - # cd src ; $(MAKE) - --DESTDIR = -+#DESTDIR = - - clean: FORCE - cd examples ; $(MAKE) clean -diff --git a/PLATFORMS b/PLATFORMS -index c358a1d..18c4ed5 100644 ---- a/PLATFORMS -+++ b/PLATFORMS -@@ -4,6 +4,7 @@ beos-g++ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff --git a/configure b/configure -index c0db1c6..d631e47 100755 ---- a/configure -+++ b/configure -@@ -180,6 +180,9 @@ if test -z "$f_platform"; then - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff --git a/qtools/qglobal.h b/qtools/qglobal.h -index 700cb80..259446d 100644 ---- a/qtools/qglobal.h -+++ b/qtools/qglobal.h -@@ -150,6 +150,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in -index cc93820..c8a8d50 100644 ---- a/src/doxygen.pro.in -+++ b/src/doxygen.pro.in -@@ -19,6 +19,7 @@ CONFIG = console warn_on $extraopts - HEADERS = doxygen.h - SOURCES = main.cpp - unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t -new file mode 100644 -index 0000000..867725e ---- /dev/null -+++ b/tmake/lib/haiku-g++/app.t -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t -new file mode 100644 -index 0000000..2523b2f ---- /dev/null -+++ b/tmake/lib/haiku-g++/lib.t -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t -new file mode 100644 -index 0000000..5e888af ---- /dev/null -+++ b/tmake/lib/haiku-g++/subdirs.t -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf -new file mode 100644 -index 0000000..23a2738 ---- /dev/null -+++ b/tmake/lib/haiku-g++/tmake.conf -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f --- -1.8.3.4 - - -From 2e7199416501ace72e5ab2a548cc07ab25ef910e Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Wed, 21 Aug 2013 12:21:09 +0200 -Subject: qvaluestack.h: fix gcc 4 build - - -diff --git a/qtools/qvaluestack.h b/qtools/qvaluestack.h -index 3fb61fd..7438fcb 100644 ---- a/qtools/qvaluestack.h -+++ b/qtools/qvaluestack.h -@@ -49,7 +49,7 @@ class Q_EXPORT QValueStack : public QValueList - public: - QValueStack() {} - ~QValueStack() {} -- void push( const T& d ) { append(d); } -+ void push( const T& d ) { this->append(d); } - T pop() - { - T elem( this->last() ); --- -1.8.3.4 - diff --git a/app-doc/doxygen/patches/doxygen-1.7.4.patch b/app-doc/doxygen/patches/doxygen-1.7.4.patch deleted file mode 100644 index d51095cc2..000000000 --- a/app-doc/doxygen/patches/doxygen-1.7.4.patch +++ /dev/null @@ -1,158 +0,0 @@ -diff -up doxygen-1.7.4/Makefile.in.orig doxygen-1.7.4/Makefile.in ---- doxygen-1.7.4/Makefile.in.orig 2009-08-20 13:41:13.056098816 -0600 -+++ doxygen-1.7.4/Makefile.in 2011-05-14 12:14:04.776208384 -0600 -@@ -2,7 +2,7 @@ - # cd qtools ; $(MAKE) - # cd src ; $(MAKE) - --DESTDIR = -+#DESTDIR = - - clean: FORCE - cd examples ; $(MAKE) clean -diff -up doxygen-1.7.4/PLATFORMS.orig doxygen-1.7.4/PLATFORMS ---- doxygen-1.7.4/PLATFORMS.orig 2007-11-24 09:12:35.056360960 -0700 -+++ doxygen-1.7.4/PLATFORMS 2011-05-14 12:14:04.777519104 -0600 -@@ -4,6 +4,7 @@ beos-g++ - dgux-g++ - freebsd-g++ - gnu-g++ -+haiku-g++ - hpux-acc - hpux-cc - hpux-g++ -diff -up doxygen-1.7.4/configure.orig doxygen-1.7.4/configure ---- doxygen-1.7.4/configure.orig 2011-03-28 07:12:47.055050240 -0600 -+++ doxygen-1.7.4/configure 2011-05-14 12:14:04.783548416 -0600 -@@ -180,6 +180,9 @@ if test -z "$f_platform"; then - f_insttool=/usr/bin/install - fi - ;; -+ Haiku:*) -+ f_platform=haiku-g++ -+ ;; - HP-UX:*) - f_platform=hpux-g++ - if test "$f_insttool" = NO; then -diff -up doxygen-1.7.4/qtools/qglobal.h.orig doxygen-1.7.4/qtools/qglobal.h ---- doxygen-1.7.4/qtools/qglobal.h.orig 2010-06-09 03:49:13.006553600 -0600 -+++ doxygen-1.7.4/qtools/qglobal.h 2011-05-14 12:14:04.784859136 -0600 -@@ -150,6 +150,8 @@ - #define _OS_CYGWIN_ - #elif defined(__BEOS__) - #define _OS_BEOS_ -+#elif defined(__HAIKU__) -+#define _OS_HAIKU_ - #elif defined(__MINT__) - #define _OS_MINT_ - #else -diff -up doxygen-1.7.4/qtools/qthread_unix.cpp.orig doxygen-1.7.4/qtools/qthread_unix.cpp ---- doxygen-1.7.4/qtools/qthread_unix.cpp.orig 2010-05-15 09:48:47.012058624 -0600 -+++ doxygen-1.7.4/qtools/qthread_unix.cpp 2011-05-14 12:14:04.785645568 -0600 -@@ -123,7 +123,7 @@ void QThread::start() - pthread_attr_t attr; - pthread_attr_init(&attr); - pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); -- pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); -+ //pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); - if (d->stackSize>0) - { - #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0>0) -diff -up doxygen-1.7.4/src/doxygen.cpp.orig doxygen-1.7.4/src/doxygen.cpp ---- doxygen-1.7.4/src/doxygen.cpp.orig 2011-03-22 15:56:58.029360128 -0600 -+++ doxygen-1.7.4/src/doxygen.cpp 2011-05-14 12:14:04.802684928 -0600 -@@ -9465,7 +9465,7 @@ void readConfiguration(int argc, char ** - { - if (optind+4parse(df)) - { - err("error opening or reading configuration file %s!\n",argv[optind+4]); -diff -up doxygen-1.7.4/src/doxygen.pro.in.orig doxygen-1.7.4/src/doxygen.pro.in ---- doxygen-1.7.4/src/doxygen.pro.in.orig 2011-01-03 13:14:46.046661632 -0700 -+++ doxygen-1.7.4/src/doxygen.pro.in 2011-05-14 12:15:50.176947200 -0600 -@@ -18,7 +18,8 @@ TEMPLATE = app.t - CONFIG = console warn_on $extraopts - HEADERS = doxygen.h - SOURCES = main.cpp --unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread -+unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -+haiku-g++:LIBS += -L/boot/common/lib -liconv - win32:INCLUDEPATH += . - win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread - win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/app.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/app.t ---- doxygen-1.7.4/tmake/lib/haiku-g++/app.t.orig 2011-05-14 12:14:04.823132160 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/app.t 2011-05-14 12:14:04.818937856 -0600 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/app.t"); -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/lib.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/lib.t ---- doxygen-1.7.4/tmake/lib/haiku-g++/lib.t.orig 2011-05-14 12:14:04.828375040 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/lib.t 2011-05-14 12:14:04.827326464 -0600 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/lib.t"); -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t.orig doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t ---- doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t.orig 2011-05-14 12:14:04.830210048 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/subdirs.t 2011-05-14 12:14:04.828899328 -0600 -@@ -0,0 +1,2 @@ -+#! Use the common Unix template -+#$ IncludeTemplate("../unix/subdirs.t"); -diff -up doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf.orig doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf ---- doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf.orig 2011-05-14 12:14:04.832045056 -0600 -+++ doxygen-1.7.4/tmake/lib/haiku-g++/tmake.conf 2011-05-14 12:14:04.830734336 -0600 -@@ -0,0 +1,51 @@ -+# -+# -+# -+# tmake configuration for haiku-g++ -+# -+ -+TEMPLATE = app -+CONFIG = qt warn_on release -+ -+TMAKE_CC = gcc -+TMAKE_CFLAGS = -+TMAKE_CFLAGS_WARN_ON = -Wall -W -+TMAKE_CFLAGS_WARN_OFF = -+TMAKE_CFLAGS_RELEASE = -+TMAKE_CFLAGS_DEBUG = -g -+TMAKE_CFLAGS_SHLIB = -fPIC -+TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -+ -+TMAKE_CXX = g++ -+TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -+TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON -+TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF -+TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE -+TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG -+TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB -+TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC -+ -+TMAKE_INCDIR = -+TMAKE_LIBDIR = -+TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_LIBDIR_QT = $(QTDIR)/lib -+ -+TMAKE_LINK = g++ -+TMAKE_LINK_SHLIB = g++ -+TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib -+TMAKE_LFLAGS_RELEASE = -+TMAKE_LFLAGS_DEBUG = -+TMAKE_LFLAGS_SHLIB = -shared -+TMAKE_LFLAGS_SONAME = -Wl,-soname, -+ -+TMAKE_LIBS = -+TMAKE_LIBS_QT = -lqt -+TMAKE_LIBS_QT_MT = -lqt-mt -+ -+TMAKE_MOC = moc -+ -+TMAKE_AR = ar cqs -+TMAKE_RANLIB = -+ -+TMAKE_TAR = tar -cf -+TMAKE_GZIP = gzip -9f diff --git a/app-doc/doxygen/patches/doxygen-1.7.6.1.patch b/app-doc/doxygen/patches/doxygen-1.7.6.1.patch new file mode 100644 index 000000000..61ffcac7f --- /dev/null +++ b/app-doc/doxygen/patches/doxygen-1.7.6.1.patch @@ -0,0 +1,216 @@ +From 9309a5412ccb754634cca91ce1f43fd30ed4e0ce Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Sat, 10 Jan 2015 20:13:41 -0500 +Subject: [PATCH] Modifications so Doxygen works on Haiku. + +--- + PLATFORMS | 1 + + configure | 3 +++ + qtools/qglobal.h | 6 +++-- + qtools/qthread_unix.cpp | 2 +- + src/doxygen.cpp | 2 +- + src/doxygen.pro.in | 11 ++++----- + tmake/lib/haiku-g++/app.t | 2 ++ + tmake/lib/haiku-g++/lib.t | 2 ++ + tmake/lib/haiku-g++/subdirs.t | 2 ++ + tmake/lib/haiku-g++/tmake.conf | 51 ++++++++++++++++++++++++++++++++++++++++++ + 10 files changed, 73 insertions(+), 9 deletions(-) + create mode 100644 tmake/lib/haiku-g++/app.t + create mode 100644 tmake/lib/haiku-g++/lib.t + create mode 100644 tmake/lib/haiku-g++/subdirs.t + create mode 100644 tmake/lib/haiku-g++/tmake.conf + +diff --git a/PLATFORMS b/PLATFORMS +index c358a1d..18c4ed5 100644 +--- a/PLATFORMS ++++ b/PLATFORMS +@@ -4,6 +4,7 @@ beos-g++ + dgux-g++ + freebsd-g++ + gnu-g++ ++haiku-g++ + hpux-acc + hpux-cc + hpux-g++ +diff --git a/configure b/configure +index 07b0ef0..a4625e2 100755 +--- a/configure ++++ b/configure +@@ -180,6 +180,9 @@ if test -z "$f_platform"; then + f_insttool=/usr/bin/install + fi + ;; ++ Haiku:*) ++ f_platform=haiku-g++ ++ ;; + HP-UX:*) + f_platform=hpux-g++ + if test "$f_insttool" = NO; then +diff --git a/qtools/qglobal.h b/qtools/qglobal.h +index 352d985..20601e3 100644 +--- a/qtools/qglobal.h ++++ b/qtools/qglobal.h +@@ -1,5 +1,5 @@ + /**************************************************************************** +-** ++** + ** + ** Global type declarations and definitions + ** +@@ -153,6 +153,8 @@ + #define _OS_CYGWIN_ + #elif defined(__BEOS__) + #define _OS_BEOS_ ++#elif defined(__HAIKU__) ++#define _OS_HAIKU_ + #elif defined(__MINT__) + #define _OS_MINT_ + #else +@@ -295,7 +297,7 @@ + #define _CC_V2002 + #else + #define _CC_V1998 +-#endif ++#endif + #endif + + #ifndef Q_PACKED +diff --git a/qtools/qthread_unix.cpp b/qtools/qthread_unix.cpp +index 5a7b788..0d4fd6e 100644 +--- a/qtools/qthread_unix.cpp ++++ b/qtools/qthread_unix.cpp +@@ -124,7 +124,7 @@ void QThread::start() + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_DETACHED); +- pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); ++ //pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); + if (d->stackSize>0) + { + #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0>0) +diff --git a/src/doxygen.cpp b/src/doxygen.cpp +index b790410..117e639 100644 +--- a/src/doxygen.cpp ++++ b/src/doxygen.cpp +@@ -9566,7 +9566,7 @@ void readConfiguration(int argc, char **argv) + { + if (optind+4parse(df)) + { + err("error opening or reading configuration file %s!\n",argv[optind+4]); +diff --git a/src/doxygen.pro.in b/src/doxygen.pro.in +index afdf242..bb64792 100644 +--- a/src/doxygen.pro.in ++++ b/src/doxygen.pro.in +@@ -4,8 +4,8 @@ + # Copyright (C) 1997-2011 by Dimitri van Heesch. + # + # Permission to use, copy, modify, and distribute this software and its +-# documentation under the terms of the GNU General Public License is hereby +-# granted. No representations are made about the suitability of this software ++# documentation under the terms of the GNU General Public License is hereby ++# granted. No representations are made about the suitability of this software + # for any purpose. It is provided "as is" without express or implied warranty. + # See the GNU General Public License for more details. + # +@@ -16,9 +16,10 @@ + + TEMPLATE = app.t + CONFIG = console warn_on $extraopts +-HEADERS = doxygen.h +-SOURCES = main.cpp +-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread ++HEADERS = doxygen.h ++SOURCES = main.cpp ++unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 ++haiku-g++:LIBS += -liconv + win32:INCLUDEPATH += . + win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 -lpthread + win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib +diff --git a/tmake/lib/haiku-g++/app.t b/tmake/lib/haiku-g++/app.t +new file mode 100644 +index 0000000..867725e +--- /dev/null ++++ b/tmake/lib/haiku-g++/app.t +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/app.t"); +diff --git a/tmake/lib/haiku-g++/lib.t b/tmake/lib/haiku-g++/lib.t +new file mode 100644 +index 0000000..2523b2f +--- /dev/null ++++ b/tmake/lib/haiku-g++/lib.t +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/lib.t"); +diff --git a/tmake/lib/haiku-g++/subdirs.t b/tmake/lib/haiku-g++/subdirs.t +new file mode 100644 +index 0000000..5e888af +--- /dev/null ++++ b/tmake/lib/haiku-g++/subdirs.t +@@ -0,0 +1,2 @@ ++#! Use the common Unix template ++#$ IncludeTemplate("../unix/subdirs.t"); +diff --git a/tmake/lib/haiku-g++/tmake.conf b/tmake/lib/haiku-g++/tmake.conf +new file mode 100644 +index 0000000..3b8c103 +--- /dev/null ++++ b/tmake/lib/haiku-g++/tmake.conf +@@ -0,0 +1,51 @@ ++# ++# ++# ++# tmake configuration for haiku-g++ ++# ++ ++TEMPLATE = app ++CONFIG = qt warn_on release ++ ++TMAKE_CC = gcc ++TMAKE_CFLAGS = ++TMAKE_CFLAGS_WARN_ON = -Wall -W ++TMAKE_CFLAGS_WARN_OFF = ++TMAKE_CFLAGS_RELEASE = ++TMAKE_CFLAGS_DEBUG = -g ++TMAKE_CFLAGS_SHLIB = -fPIC ++TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses ++ ++TMAKE_CXX = g++ ++TMAKE_CXXFLAGS = $$TMAKE_CFLAGS ++TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON ++TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF ++TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE ++TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG ++TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB ++TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC ++ ++TMAKE_INCDIR = ++TMAKE_LIBDIR = ++TMAKE_INCDIR_QT = $(QTDIR)/include ++TMAKE_LIBDIR_QT = $(QTDIR)/lib ++ ++TMAKE_LINK = g++ ++TMAKE_LINK_SHLIB = g++ ++TMAKE_LFLAGS = -Wl,-rpath=/lib:$(QTDIR)/lib ++TMAKE_LFLAGS_RELEASE = ++TMAKE_LFLAGS_DEBUG = ++TMAKE_LFLAGS_SHLIB = -shared ++TMAKE_LFLAGS_SONAME = -Wl,-soname, ++ ++TMAKE_LIBS = ++TMAKE_LIBS_QT = -lqt ++TMAKE_LIBS_QT_MT = -lqt-mt ++ ++TMAKE_MOC = moc ++ ++TMAKE_AR = ar cqs ++TMAKE_RANLIB = ++ ++TMAKE_TAR = tar -cf ++TMAKE_GZIP = gzip -9f +-- +1.8.3.4 + From f3985b83afd2fb0c55e236cf1e3c8b5fc4ec8454 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 17:17:13 +0000 Subject: [PATCH 277/326] torrentor: switch to HaikuArchives --- haiku-apps/torrentor/torrentor-0.0.5.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/haiku-apps/torrentor/torrentor-0.0.5.recipe b/haiku-apps/torrentor/torrentor-0.0.5.recipe index 0139971b5..434c1d0f8 100644 --- a/haiku-apps/torrentor/torrentor-0.0.5.recipe +++ b/haiku-apps/torrentor/torrentor-0.0.5.recipe @@ -5,11 +5,11 @@ downloading files. Users are not downloading data directly from \ server, but they are sending to and receiving it from themselves. " SUMMARY="Torrentor is a torrent client for the haiku operating system." -HOMEPAGE="https://github.com/Prodito/Torrentor" -SRC_URI="git+https://github.com/Prodito/Torrentor.git#c1fa0cb62963ec3c4980d99fb12e203789d9ab1a" +HOMEPAGE="https://github.com/HaikuArchives/Torrentor" +SRC_URI="git+https://github.com/HaikuArchives/Torrentor.git#a04c10fba39c8ba39ffb8ef16c5e67d217231ac6" COPYRIGHT="2012 Guido Pola" LICENSE="MIT" -REVISION="1" +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 From d7ac69f8dd1eb200236d1eb0f632a9a9f545a78d Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 11 Jan 2015 13:05:38 +0100 Subject: [PATCH 278/326] Add libHTTP recipe --- net-libs/libhttp/libhttp-0.9.mod.recipe | 61 +++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 net-libs/libhttp/libhttp-0.9.mod.recipe diff --git a/net-libs/libhttp/libhttp-0.9.mod.recipe b/net-libs/libhttp/libhttp-0.9.mod.recipe new file mode 100644 index 000000000..c2e6d6ce4 --- /dev/null +++ b/net-libs/libhttp/libhttp-0.9.mod.recipe @@ -0,0 +1,61 @@ +SUMMARY="An HTTP protocol handler" +DESCRIPTION="libHTTP is a helper library used by RobinHood to simplify \ +HTTP and other protocols. It is a legacy library and shouldn't be used in new \ +code anymore." +HOMEPAGE="https://github.com/HaikuArchives/libHTTP" +SRC_URI="https://github.com/HaikuArchives/libHTTP/archive/4a94696b445d88bc48c070ca3e9276e2e942059a.tar.gz" +CHECKSUM_SHA256="34185c19a76d4c35730795e1b5c115bee749508f3fd2bded25bba69a7ad68c62" +SOURCE_DIR="libHTTP-4a94696b445d88bc48c070ca3e9276e2e942059a" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1999 Joe Kloss +2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libhttp$secondaryArchSuffix = $portVersion + lib:libHTTP$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + libhttp${secondaryArchSuffix}_devel = $portVersion + devel:libHTTP$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + libhttp$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $libDir + mkdir -p $includeDir/libHTTP + + cp -a objects/libHTTP.so $libDir + cp -R headers/* $includeDir/libHTTP + + prepareInstalledDevelLibs \ + libHTTP + packageEntries devel \ + $developDir +} From d161275d82f99d64d64c14dc462a34ad91f8acc4 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 11 Jan 2015 13:34:12 +0100 Subject: [PATCH 279/326] Add RobinHood recipe --- www-servers/robinhood/robinhood-1.2.recipe | 64 ++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 www-servers/robinhood/robinhood-1.2.recipe diff --git a/www-servers/robinhood/robinhood-1.2.recipe b/www-servers/robinhood/robinhood-1.2.recipe new file mode 100644 index 000000000..38bd5493b --- /dev/null +++ b/www-servers/robinhood/robinhood-1.2.recipe @@ -0,0 +1,64 @@ +SUMMARY="A Haiku-native HTTP/1.1 server" +DESCRIPTION="RobinHood is a native web server containing many features like \ +authentication, virtual hosts, virtual folders, CGI, SSI, Ranges, and much more\ +!" +HOMEPAGE="https://haikuarchives.github.io/RobinHood/" +SRC_URI="https://github.com/HaikuArchives/RobinHood/archive/a1a81cddf007bd81d53c3b9d5fc23197c0da554d.tar.gz" +CHECKSUM_SHA256="37e297cf2c73907ec7694fa697c7ac765f6c068aac2effc24e4b89a7e770c556" +SOURCE_DIR="RobinHood-a1a81cddf007bd81d53c3b9d5fc23197c0da554d" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1999-2001 The Robin Hood Development Team +2015 Puck Meerburg" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + robinhood = $portVersion + app:RHConsole = $portVersion + app:RobinHoudini = $portVersion + cmd:rhdaemon = $portVersion + cmd:rhlog = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + libhttp$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + libhttp${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + cd source + make $jobArgs + cd ../RobinHoudini + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + cd source + make install + cd server + mkdir -p $binDir $appsDir $addOnsDir + cp rhdaemon $binDir + cp RHLog $binDir/rhlog + cp RHConsole $appsDir + cp -r robin_hood_modules $addOnsDir + addAppDeskbarSymlink $appsDir/RHConsole Robin\ Hood + cd ../../RobinHoudini + cp objects/RHoudini $appsDir/RobinHoudini + mkdir -p $dataDir/deskbar/menu/Desktop\ applets + symlinkRelative -s $appsDir/RobinHoudini \ + $dataDir/deskbar/menu/Desktop\ applets/Robin\ Houdini +} From 6903c9fe1ff8a1f99c6ef4ab67527ea32c270b54 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 11 Jan 2015 15:03:54 +0200 Subject: [PATCH 280/326] Removed the unneeded haiku_devel requirement in BUILD_REQUIRES --- haiku-apps/sawteeth/sawteeth-1.3.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/haiku-apps/sawteeth/sawteeth-1.3.recipe b/haiku-apps/sawteeth/sawteeth-1.3.recipe index ae9b8494e..6a410535b 100644 --- a/haiku-apps/sawteeth/sawteeth-1.3.recipe +++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe @@ -26,9 +26,7 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:gcc " -BUILD_REQUIRES=" - haiku_devel - " +BUILD_REQUIRES="" BUILD() { From 9b7eb2e3ca3fe736b110afbd85c578f90e1e92ae Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Sun, 11 Jan 2015 17:58:59 +0100 Subject: [PATCH 281/326] minesweeper: bump version --- haiku-games/minesweeper/minesweeper-20150109.recipe | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/haiku-games/minesweeper/minesweeper-20150109.recipe b/haiku-games/minesweeper/minesweeper-20150109.recipe index c3903247b..333bb2dca 100644 --- a/haiku-games/minesweeper/minesweeper-20150109.recipe +++ b/haiku-games/minesweeper/minesweeper-20150109.recipe @@ -2,10 +2,13 @@ SUMMARY="A Windows Minesweeper clone" DESCRIPTION="Minesweeper is a clone of the original Windows minesweeper game. \ It supports different board sizes and best time saving." HOMEPAGE="https://github.com/HaikuArchives/Minesweeper" -SRC_URI="git+https://github.com/HaikuArchives/Minesweeper#1b4a293c63b69aad02fb40293bbfdd0f334030e2" -REVISION="2" +SRC_URI="git+https://github.com/HaikuArchives/Minesweeper#702046e61588c953e759f7792930c5acc258359a" +REVISION="3" LICENSE="MIT" -COPYRIGHT="2013 Tri-Edge AI" +COPYRIGHT=" + 2013 Tri-Edge AI + 2015 Josef Gajdusek + " ARCHITECTURES="x86_gcc2 x86 x86_64" From d3fb83731d657ebf4daa0e354912eea9e655da55 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 15:43:07 +0000 Subject: [PATCH 282/326] Add a new Haiku App, DeskNotes Needs some fixes, merge requested upstream: https://gitorious.org/desknotes/desknotes/merge_requests/1 --- haiku-apps/desknotes/desknotes-1.1.recipe | 47 +++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 haiku-apps/desknotes/desknotes-1.1.recipe diff --git a/haiku-apps/desknotes/desknotes-1.1.recipe b/haiku-apps/desknotes/desknotes-1.1.recipe new file mode 100644 index 000000000..4825b0176 --- /dev/null +++ b/haiku-apps/desknotes/desknotes-1.1.recipe @@ -0,0 +1,47 @@ +SUMMARY="A simple note replicant-capable program" +DESCRIPTION=" +With DeskNotes, you can now leave little notes all over your desktop \ +reminding you of things to do. The main difference between DeskNotes and \ +other Note utilities for Haiku, is that DeskNotes is designed to be used \ +as a replicant. This means that when you tear a note from the DeskNotes \ +application onto your desktop, it stays there! You don't have to save it \ +before rebooting, or fiddle with your bootscript. +" + +HOMEPAGE="https://github.com/HaikuArchives/DeskNotes" +SRC_URI="git+https://github.com/HaikuArchives/DeskNotes#93f0654745e3dc317152bdfc49ae8b6d23bf443b" +REVISION="1" +LICENSE="BSD (3-clause)" +COPYRIGHT="2000 Colin Stewart" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + desknotes = $portVersion + app:desknotes = $portVersion + " +REQUIRES=" + haiku + lib:libstdc++ + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/DeskNotes $appsDir + addAppDeskbarSymlink $appsDir/DeskNotes +} From bf19e07f6f94573535fa24cc9b7b54c8e442ef12 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sat, 10 Jan 2015 18:16:42 +0000 Subject: [PATCH 283/326] Add a Haiku app, PonpokoDiff --- .../ponpokodiff/ponpokodiff-0.2.0.recipe | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe diff --git a/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe new file mode 100644 index 000000000..ab87b14b5 --- /dev/null +++ b/haiku-apps/ponpokodiff/ponpokodiff-0.2.0.recipe @@ -0,0 +1,44 @@ +SUMMARY="A GUI-based diff application" +DESCRIPTION=" +PonpokoDiff is a graphical file comparison utility. \ +It can compare two files and show its differences graphically. \ +Currently, the comparison of folders is not supported. \ +You can also use it as an extenal diff command of Subversion (--diff-cmd). +" + +HOMEPAGE="https://code.google.com/p/ponpokodiff/" +SRC_URI="git+https://github.com/HaikuArchives/PonpokoDiff#f68f59d8f359ddbaeec89e2c8a72da93142c139d" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2008 PonpokoDiff Project Contributors" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + ponpokodiff = $portVersion + app:ponpokodiff = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a objects/PonpokoDiff $appsDir + addAppDeskbarSymlink $appsDir/PonpokoDiff +} From 2105a5cbe25085df77ca922cb7f444a38d6e3dcf Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 10 Jan 2015 13:53:14 -0500 Subject: [PATCH 284/326] hyperstudio: create recipe. --- .../hyperstudio/hyperstudio-1.1_git.recipe | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe diff --git a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe new file mode 100644 index 000000000..b89c7b327 --- /dev/null +++ b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe @@ -0,0 +1,49 @@ +SUMMARY="Multitrack audio recording and editing suite." +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="2007 Pier Luigi Fiorini" +srcrev="59b31f0bdc3f0e49feb7d9892faa67222ffb3f95" +SRC_URI="https://github.com/HaikuArchives/HyperStudio/archive/$srcrev.tar.gz" +CHECKSUM_SHA256="03c2a7fc68d2a95bce9c873bf6d8a32494370861a23dc8e2689285e7e201a4c9" +SOURCE_DIR="HyperStudio-$srcrev" + +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + hyperstudio = $portVersion + app:HyperStudio = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:gcc + cmd:awk + cmd:jam + cmd:ld + " + +BUILD() +{ + ./configure + jam -q + # multi-job builds don't work reliably +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a generated/distro-haiku-$(getarch | sed s/_/-/)-release/HyperStudio $appsDir + cp -a generated/distro-haiku-$(getarch | sed s/_/-/)-release/HyperStudioRecorder $appsDir + + addAppDeskbarSymlink $appsDir/HyperStudio + addAppDeskbarSymlink $appsDir/HyperStudioRecorder +} From e6054cb23fffd10796f107ca8e67e1313f278446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Sun, 11 Jan 2015 22:57:59 +0000 Subject: [PATCH 285/326] Fixed and updated freeciv recipe --- games-strategy/freeciv/freeciv-2.4.3.recipe | 23 +++-- games-strategy/freeciv/freeciv-2.4.4.recipe | 107 ++++++++++++++++++++ 2 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 games-strategy/freeciv/freeciv-2.4.4.recipe diff --git a/games-strategy/freeciv/freeciv-2.4.3.recipe b/games-strategy/freeciv/freeciv-2.4.3.recipe index c41b3c8b0..424cae144 100644 --- a/games-strategy/freeciv/freeciv-2.4.3.recipe +++ b/games-strategy/freeciv/freeciv-2.4.3.recipe @@ -25,6 +25,10 @@ else fi SECONDARY_ARCHITECTURES="x86" +GLOBAL_WRITABLE_FILES=" + settings/freeciv/database.lua keep-old + " + PROVIDES=" freeciv$secondaryArchSuffix = $portVersion app:freeciv$secondaryArchSuffix = $portVersion @@ -43,17 +47,14 @@ REQUIRES=" lib:libpng$secondaryArchSuffix lib:libreadline$secondaryArchSuffix lib:libsdl$secondaryArchSuffix - lib:libSDL_image$secondaryArchSuffix - lib:libSDL_mixer$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix lib:libz$secondaryArchSuffix - - lib:libSDL_image_1.2$secondaryArchSuffix - lib:libSDL_mixer_1.2$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix - lib:libGL$secondaryArchSuffix + lib:libgl$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -65,11 +66,11 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libreadline$secondaryArchSuffix devel:libsdl$secondaryArchSuffix - devel:libSDL_image$secondaryArchSuffix - devel:libSDL_mixer$secondaryArchSuffix + devel:libsdl_image$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix devel:libz$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix + devel:libintl$secondaryArchSuffix devel:libssl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix " @@ -88,7 +89,7 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure ./configure --datarootdir=$dataRootDir --datadir=$dataDir make $jobArgs } @@ -99,6 +100,8 @@ INSTALL() mkdir -p $appsDir/freeciv mv $binDir/freeciv-sdl $appsDir/freeciv/freeciv addAppDeskbarSymlink $appsDir/freeciv/freeciv + mv $prefix/share/* $dataRootDir + rm -rf $prefix/share rm -rf $prefix/lib } diff --git a/games-strategy/freeciv/freeciv-2.4.4.recipe b/games-strategy/freeciv/freeciv-2.4.4.recipe new file mode 100644 index 000000000..424cae144 --- /dev/null +++ b/games-strategy/freeciv/freeciv-2.4.4.recipe @@ -0,0 +1,107 @@ +SUMMARY="A free Civilization-like game." +DESCRIPTION=" +Freeciv is a free Civilization-like game, primarily \ +for X under Unix. It has support for multiplayer games locally or \ +over a network, and an AI which gives most people a run for their money. +Freeciv aims to be mostly rule-compatible with Civilization II [tm], \ +published by Sid Meier and Microprose [tm]. A few rules are different \ +where we think it makes more sense, and we have lots and lots of \ +adjustable parameters to make customizing games possible. +Freeciv has been implemented completely independently of Civilization; \ +you do not need to own Civilization to play Freeciv." +HOMEPAGE="http://www.freeciv.org" +COPYRIGHT="2002-2014 The Freeciv Team" +LICENSE="GNU GPL v2" +SRC_URI="http://sourceforge.net/projects/freeciv/files/Freeciv%202.4/$portVersion/freeciv-$portVersion.tar.bz2" +CHECKSUM_SHA256="7f107fe3b09f37934410dc7a64ac1b99a95997ddf53da53933b75d4da79fa899" +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" + +GLOBAL_WRITABLE_FILES=" + settings/freeciv/database.lua keep-old + " + +PROVIDES=" + freeciv$secondaryArchSuffix = $portVersion + app:freeciv$secondaryArchSuffix = $portVersion + cmd:freeciv_manual$secondaryArchSuffix + cmd:freeciv_sdl$secondaryArchSuffix + cmd:freeciv_server$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libfreetype$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:liblzma$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix + lib:libsdl$secondaryArchSuffix + lib:libsdl_image$secondaryArchSuffix + lib:libsdl_mixer$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libfreetype$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:liblzma$secondaryArchSuffix + devel:libpng$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libsdl_image$secondaryArchSuffix + devel:libsdl_mixer$secondaryArchSuffix + devel:libz$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:autoconf + cmd:aclocal + cmd:libtool + cmd:gettext + cmd:find + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + autoreconf -fi + runConfigure ./configure --datarootdir=$dataRootDir --datadir=$dataDir + make $jobArgs +} + +INSTALL() +{ + make install + + mkdir -p $appsDir/freeciv + mv $binDir/freeciv-sdl $appsDir/freeciv/freeciv + addAppDeskbarSymlink $appsDir/freeciv/freeciv + mv $prefix/share/* $dataRootDir + rm -rf $prefix/share + + rm -rf $prefix/lib +} From ba124d91541d03af2d3e8ae44923ac5980cfbd1f Mon Sep 17 00:00:00 2001 From: Richie_Nyhus Date: Mon, 12 Jan 2015 01:06:24 +0000 Subject: [PATCH 286/326] Fix warnings for Snapshot recipe --- haiku-apps/snapshot/snapshot-1.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/snapshot/snapshot-1.0.recipe b/haiku-apps/snapshot/snapshot-1.0.recipe index d04396364..bb8e597ec 100644 --- a/haiku-apps/snapshot/snapshot-1.0.recipe +++ b/haiku-apps/snapshot/snapshot-1.0.recipe @@ -6,11 +6,11 @@ HOMEPAGE="https://github.com/HaikuArchives/SnapShot" SRC_URI="git+https://github.com/HaikuArchives/Snapshot#9ba592336a0d54707b7e5983dce93f8958b61d37 LICENSE="BSD (3-clause)" COPYRIGHT="2000 Jonas Sundström" +REVISION="1" +ARCHITECTURES="x86_gcc2" USER_SETTINGS_FILES="settings/Kirilla/Snapshot/settings" -ARCHITECTURES="x86_gcc2" - PROVIDES=" snapshot = $portVersion addon:snapshot = $portVersion From b33f96fa887a68ec73fb1c9c39a3e478b4a00853 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:20:24 -0800 Subject: [PATCH 287/326] Fix python crash on resource.getrusage --- dev-lang/python/patches/python-2.7.9.patchset | 98 +++++++++++++------ dev-lang/python/python-2.7.9.recipe | 2 +- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset index fafb60a2f..b09445b20 100644 --- a/dev-lang/python/patches/python-2.7.9.patchset +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -1,4 +1,4 @@ -From f7d6b2b6f44a8f9337c9103d298222747d547ebf Mon Sep 17 00:00:00 2001 +From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -79,7 +79,7 @@ index b9f1c6c..7be61d3 100644 # finalize_unix () diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 4aa9334..d06e5e8 100644 +index de7da1d..8180c8e 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -90,7 +90,8 @@ def get_python_inc(plat_specific=0, prefix=None): @@ -497,10 +497,10 @@ index 53a6c3e..6c5f52f 100644 if (PyErr_Occurred()) { Py_DECREF(result); diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 880f311..54b66f7 100644 +index e9e4479..84b6305 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -4868,7 +4868,9 @@ init_socket(void) +@@ -4869,7 +4869,9 @@ init_socket(void) #ifndef __BEOS__ /* We have incomplete socket support. */ PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); @@ -511,7 +511,7 @@ index 880f311..54b66f7 100644 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h -index 8515499..4e33e4f 100644 +index d98e00e..2bfb3dc 100644 --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -47,6 +47,10 @@ typedef int socklen_t; @@ -584,10 +584,10 @@ index c64501e..7df3ad7 100755 elif sys.platform.startswith("atheos"): searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff --git a/configure.ac b/configure.ac -index 54f8c0f..1ea438a 100644 +index 94a215e..41fbd47 100644 --- a/configure.ac +++ b/configure.ac -@@ -883,7 +883,7 @@ if test $enable_shared = "yes"; then +@@ -886,7 +886,7 @@ if test $enable_shared = "yes"; then RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} INSTSONAME="$LDLIBRARY".$SOVERSION ;; @@ -596,7 +596,7 @@ index 54f8c0f..1ea438a 100644 LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -@@ -891,6 +891,9 @@ if test $enable_shared = "yes"; then +@@ -894,6 +894,9 @@ if test $enable_shared = "yes"; then FreeBSD*) SOVERSION=`echo $SOVERSION|cut -d "." -f 1` ;; @@ -606,7 +606,7 @@ index 54f8c0f..1ea438a 100644 esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; -@@ -1006,7 +1009,7 @@ AC_PROG_MKDIR_P +@@ -1009,7 +1012,7 @@ AC_PROG_MKDIR_P AC_SUBST(LN) if test -z "$LN" ; then case $ac_sys_system in @@ -615,7 +615,7 @@ index 54f8c0f..1ea438a 100644 CYGWIN*) LN="ln -s";; atheos*) LN="ln -s";; *) LN=ln;; -@@ -2030,7 +2033,7 @@ then +@@ -2033,7 +2036,7 @@ then BLDSHARED="$LDSHARED" fi ;; @@ -624,7 +624,7 @@ index 54f8c0f..1ea438a 100644 LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; BSD/OS*/4*) -@@ -2102,7 +2105,7 @@ then +@@ -2105,7 +2108,7 @@ then then CCSHARED="-fPIC"; else CCSHARED="+z"; fi;; @@ -633,7 +633,7 @@ index 54f8c0f..1ea438a 100644 BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) -@@ -2134,7 +2137,7 @@ then +@@ -2137,7 +2140,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; @@ -642,7 +642,7 @@ index 54f8c0f..1ea438a 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*) # -u _PyMac_Error is needed to pull in the mac toolbox glue, -@@ -2249,14 +2252,16 @@ case "$ac_sys_system" in +@@ -2252,14 +2255,16 @@ case "$ac_sys_system" in esac # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. @@ -663,7 +663,7 @@ index 54f8c0f..1ea438a 100644 esac AC_MSG_CHECKING(for --with-libs) -@@ -3592,7 +3597,7 @@ fi], +@@ -3595,7 +3600,7 @@ fi], AC_SUBST(LIBM) case $ac_sys_system in Darwin) ;; @@ -673,10 +673,10 @@ index 54f8c0f..1ea438a 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index a46bf35..9fe247f 100644 +index 7868b7b..bc4a1a4 100644 --- a/setup.py +++ b/setup.py -@@ -523,6 +523,12 @@ class PyBuildExt(build_ext): +@@ -525,6 +525,12 @@ class PyBuildExt(build_ext): lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) @@ -689,7 +689,7 @@ index a46bf35..9fe247f 100644 # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: -@@ -551,7 +557,7 @@ class PyBuildExt(build_ext): +@@ -553,7 +559,7 @@ class PyBuildExt(build_ext): # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -698,7 +698,7 @@ index a46bf35..9fe247f 100644 math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -790,15 +796,22 @@ class PyBuildExt(build_ext): +@@ -792,15 +798,22 @@ class PyBuildExt(build_ext): '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] @@ -724,7 +724,7 @@ index a46bf35..9fe247f 100644 ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) -@@ -806,8 +819,8 @@ class PyBuildExt(build_ext): +@@ -808,8 +821,8 @@ class PyBuildExt(build_ext): if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_ssl', ['_ssl.c'], @@ -735,7 +735,7 @@ index a46bf35..9fe247f 100644 libraries = ['ssl', 'crypto'], depends = ['socketmodule.h']), ) else: -@@ -845,8 +858,8 @@ class PyBuildExt(build_ext): +@@ -847,8 +860,8 @@ class PyBuildExt(build_ext): # The _hashlib module wraps optimized implementations # of hash functions from the OpenSSL library. exts.append( Extension('_hashlib', ['_hashopenssl.c'], @@ -746,7 +746,7 @@ index a46bf35..9fe247f 100644 libraries = ['ssl', 'crypto']) ) else: print ("warning: openssl 0x%08x is too old for _hashlib" % -@@ -1325,7 +1338,7 @@ class PyBuildExt(build_ext): +@@ -1327,7 +1340,7 @@ class PyBuildExt(build_ext): missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. @@ -759,14 +759,14 @@ index a46bf35..9fe247f 100644 1.8.3.4 -From 571ed69e1ab40fd11c4a1fdcb6198ff787c5129b Mon Sep 17 00:00:00 2001 +From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path diff --git a/Makefile.pre.in b/Makefile.pre.in -index bcd83bf..f93c10a 100644 +index 7f4ec2f..25a93e5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -105,7 +105,7 @@ BINDIR= @bindir@ @@ -782,7 +782,7 @@ index bcd83bf..f93c10a 100644 1.8.3.4 -From d49a8ee2494391b3a1c50bc652f0838ac036e046 Mon Sep 17 00:00:00 2001 +From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 12:19:13 +0000 Subject: Import missed change from the 2.6.9 patches @@ -814,17 +814,17 @@ index d2e18f1..34d5aee 100644 1.8.3.4 -From a0b72ccfc2f385c3ec9148523d981c7d971e2636 Mon Sep 17 00:00:00 2001 +From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Sep 2014 18:59:44 +0200 Subject: gcc2 fix. diff --git a/Modules/_ctypes/libffi/include/ffi_common.h b/Modules/_ctypes/libffi/include/ffi_common.h -index 650ca69..02a1913 100644 +index 37f5a9e..37b0b25 100644 --- a/Modules/_ctypes/libffi/include/ffi_common.h +++ b/Modules/_ctypes/libffi/include/ffi_common.h -@@ -115,7 +115,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); +@@ -119,7 +119,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); typedef float FLOAT32; @@ -837,17 +837,17 @@ index 650ca69..02a1913 100644 1.8.3.4 -From d50a28e47cbd54263d065f47b2650333d917c2b9 Mon Sep 17 00:00:00 2001 +From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Nov 2014 16:26:28 +0000 Subject: tarfile: let link fail and catch exception. diff --git a/Lib/tarfile.py b/Lib/tarfile.py -index 57ea877..bc3f82c 100644 +index b0d1292..b5952ae 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py -@@ -2242,7 +2242,7 @@ class TarFile(object): +@@ -2261,7 +2261,7 @@ class TarFile(object): (platform limitation), we try to make a copy of the referenced file instead of a link. """ @@ -856,7 +856,7 @@ index 57ea877..bc3f82c 100644 # For systems that support symbolic and hard links. if tarinfo.issym(): if os.path.lexists(targetpath): -@@ -2256,7 +2256,7 @@ class TarFile(object): +@@ -2275,7 +2275,7 @@ class TarFile(object): os.link(tarinfo._link_target, targetpath) else: self._extract_member(self._find_link_target(tarinfo), targetpath) @@ -868,3 +868,39 @@ index 57ea877..bc3f82c 100644 -- 1.8.3.4 + +From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 11 Jan 2015 18:18:22 -0800 +Subject: Fix resource module after the initial haiku patch + + +diff --git a/Modules/resource.c b/Modules/resource.c +index 6c5f52f..73758bb 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -101,6 +101,21 @@ resource_getrusage(PyObject *self, PyObject *args) + PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); + PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); + PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); ++#else ++ PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 5, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 6, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 7, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 8, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 9, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 10, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 11, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 12, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(0)); + #endif + + if (PyErr_Occurred()) { +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe index dc6e40078..a5d00a643 100644 --- a/dev-lang/python/python-2.7.9.recipe +++ b/dev-lang/python/python-2.7.9.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 060f83d1a9f80f31d97337b074f844fe1becbaef Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:43:34 -0800 Subject: [PATCH 288/326] python: Stricter [gs]et_rlimit mode detection There doesn't seem to be a better way, else than configure runtime checks, which is harmful for cross-compilation. --- dev-lang/python/patches/python-2.7.9.patchset | 91 +++++++++++++++++-- dev-lang/python/python-2.7.9.recipe | 2 +- 2 files changed, 86 insertions(+), 7 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset index b09445b20..6d16b8d6a 100644 --- a/dev-lang/python/patches/python-2.7.9.patchset +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -1,4 +1,4 @@ -From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001 +From 87c88af3eef31c978cecf0d96665af0c4109d7e5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -759,7 +759,7 @@ index 7868b7b..bc4a1a4 100644 1.8.3.4 -From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001 +From 6347fda5298f9aa5eca939541924464fcf8a19d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path @@ -782,7 +782,7 @@ index 7f4ec2f..25a93e5 100644 1.8.3.4 -From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001 +From 5e90b750c4bfef1376bb083d48524c41fc5fefa6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 12:19:13 +0000 Subject: Import missed change from the 2.6.9 patches @@ -814,7 +814,7 @@ index d2e18f1..34d5aee 100644 1.8.3.4 -From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001 +From 307d21aa5ea6336db7ec3dd9429436441b61ab8d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Sep 2014 18:59:44 +0200 Subject: gcc2 fix. @@ -837,7 +837,7 @@ index 37f5a9e..37b0b25 100644 1.8.3.4 -From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001 +From b1aabdb8e27c669873ec393344389aa343a6aeab Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Nov 2014 16:26:28 +0000 Subject: tarfile: let link fail and catch exception. @@ -869,7 +869,7 @@ index b0d1292..b5952ae 100644 1.8.3.4 -From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001 +From 5398326cd9e24ca71a025f48ea0079b8d40456ec Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:18:22 -0800 Subject: Fix resource module after the initial haiku patch @@ -904,3 +904,82 @@ index 6c5f52f..73758bb 100644 -- 1.8.3.4 + +From 6d7958a9371618a6b7a53f8de6b71633be2af7c3 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 11 Jan 2015 18:40:43 -0800 +Subject: resource: Fix [gs]et_rlimit() modes detection + +Haiku defines many of them, but they are actually empty stubs that will always +return EINVAL. No better way of doing this. + +diff --git a/Modules/resource.c b/Modules/resource.c +index 73758bb..0c396f6 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -284,19 +284,19 @@ initresource(void) + (PyObject*) &StructRUsageType); + + /* insert constants */ +-#ifdef RLIMIT_CPU ++#if !defined(__HAIKU__) && defined(RLIMIT_CPU) + PyModule_AddIntConstant(m, "RLIMIT_CPU", RLIMIT_CPU); + #endif + +-#ifdef RLIMIT_FSIZE ++#if !defined(__HAIKU__) && defined(RLIMIT_FSIZE) + PyModule_AddIntConstant(m, "RLIMIT_FSIZE", RLIMIT_FSIZE); + #endif + +-#ifdef RLIMIT_DATA ++#if !defined(__HAIKU__) && defined(RLIMIT_DATA) + PyModule_AddIntConstant(m, "RLIMIT_DATA", RLIMIT_DATA); + #endif + +-#ifdef RLIMIT_STACK ++#if !defined(__HAIKU__) && defined(RLIMIT_STACK) + PyModule_AddIntConstant(m, "RLIMIT_STACK", RLIMIT_STACK); + #endif + +@@ -308,31 +308,31 @@ initresource(void) + PyModule_AddIntConstant(m, "RLIMIT_NOFILE", RLIMIT_NOFILE); + #endif + +-#ifdef RLIMIT_OFILE ++#if !defined(__HAIKU__) && defined(RLIMIT_OFILE) + PyModule_AddIntConstant(m, "RLIMIT_OFILE", RLIMIT_OFILE); + #endif + +-#ifdef RLIMIT_VMEM ++#if !defined(__HAIKU__) && defined(RLIMIT_VMEM) + PyModule_AddIntConstant(m, "RLIMIT_VMEM", RLIMIT_VMEM); + #endif + +-#ifdef RLIMIT_AS ++#if !defined(__HAIKU__) && defined(RLIMIT_AS) + PyModule_AddIntConstant(m, "RLIMIT_AS", RLIMIT_AS); + #endif + +-#ifdef RLIMIT_RSS ++#if !defined(__HAIKU__) && defined(RLIMIT_RSS) + PyModule_AddIntConstant(m, "RLIMIT_RSS", RLIMIT_RSS); + #endif + +-#ifdef RLIMIT_NPROC ++#if !defined(__HAIKU__) && defined(RLIMIT_NPROC) + PyModule_AddIntConstant(m, "RLIMIT_NPROC", RLIMIT_NPROC); + #endif + +-#ifdef RLIMIT_MEMLOCK ++#if !defined(__HAIKU__) && defined(RLIMIT_MEMLOCK) + PyModule_AddIntConstant(m, "RLIMIT_MEMLOCK", RLIMIT_MEMLOCK); + #endif + +-#ifdef RLIMIT_SBSIZE ++#if !defined(__HAIKU__) && defined(RLIMIT_SBSIZE) + PyModule_AddIntConstant(m, "RLIMIT_SBSIZE", RLIMIT_SBSIZE); + #endif + +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe index a5d00a643..34a5db8ca 100644 --- a/dev-lang/python/python-2.7.9.recipe +++ b/dev-lang/python/python-2.7.9.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From d83f1a91a60690421c7ca8fbd8dc8aa6bf8cd43c Mon Sep 17 00:00:00 2001 From: Alex Striff Date: Mon, 12 Jan 2015 03:48:40 +0000 Subject: [PATCH 289/326] added recipe for libavlduptree --- .../libavlduptree/libavlduptree-1.0.0.recipe | 84 +++++++++++++++++++ .../patches/libavlduptree-1.0.0.patch | 65 ++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe create mode 100644 haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch diff --git a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe new file mode 100644 index 000000000..c3c910c4c --- /dev/null +++ b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe @@ -0,0 +1,84 @@ +SUMMARY="A set of C subroutines that is useful for indexing a set of key/value \ +pairs." +DESCRIPTION=" +AVLDupTree is a set of C subroutines (not C++, so you can use it in drivers) \ +that is useful for indexing a set of key/value pairs, using the key to find \ +a matching value. The standard AVL balanced binary tree algorithm is \ +enhanced to support multiple values for the same key. It is designed for \ +future use in a file system to support fast attribute indexing and queries, \ +but you can use it for other things. This package also includes the \ +AGMSAVLTest GUI App. It tests the operations on the tree, provided by \ +libavlduptree. +" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2001 Alexander G. M. Smith" +# This is the original homepage, but the domain is up for sale at the time +# of writing this recipe. +# HOMEPAGE="http://achilles.net/~agsmith/" +HOMEPAGE="https://github.com/HaikuArchives/AVLDupTree" +SRC_URI="git+https://github.com/HaikuArchives/AVLDupTree.git#5969ca7e26e65857a9ade8ed6abee2fda7f1e9d9" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="libavlduptree-${portVersion}.patch" + +PROVIDES=" + libavlduptree$secondaryArchSuffix = $portVersion + lib:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1 + cmd:AGMSAVLTest$secondaryArchSuffix + app:AGMSAVLTest + " + +REQUIRES=" + haiku$secondaryArchSuffix + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:ar + cmd:ranlib + cmd:install + " + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:autoconf + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:install + cmd:mkdir + " + +BUILD() +{ + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + mkdir -p $libDir + mkdir -p $binDir + make install PREFIX=$libDir BINDIR=$binDir + addAppDeskbarSymlink $binDir/AGMSAVLTest + + # set up the develop directory correctly + prepareInstalledDevelLibs libavlduptree + + # devel package + packageEntries devel $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libavlduptree${secondaryArchSuffix}_devel = $portVersion + devel:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1 + " + +REQUIRES_devel=" + libavlduptree${secondaryArchSuffix} == $portVersion base + " diff --git a/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch b/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch new file mode 100644 index 000000000..2d54ee78c --- /dev/null +++ b/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch @@ -0,0 +1,65 @@ +diff -Naur AVLDupTree/configure.in AVLDupTree-haiku/configure.in +--- AVLDupTree/configure.in 1970-01-01 00:00:00.000000000 +0000 ++++ AVLDupTree-haiku/configure.in 2015-01-11 18:54:32.475791360 +0000 +@@ -0,0 +1,25 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.69]) ++AC_INIT(AVLDupTree, 1.0.0, https://github.com/HaikuArchives/AVLDupTree/issues) ++AC_CONFIG_SRCDIR([Source/AVLDupTree.c]) ++# AC_CONFIG_HEADERS([config.h]) ++ ++# Checks for programs. ++AC_PROG_CXX ++AC_PROG_CC ++ ++# Checks for libraries. ++ ++# Checks for header files. ++AC_CHECK_HEADERS([OS.h stdlib.h string.h]) ++ ++# Checks for typedefs, structures, and compiler characteristics. ++AC_CHECK_HEADER_STDBOOL ++ ++# Checks for library functions. ++AC_FUNC_MALLOC ++AC_CHECK_FUNCS([memset strerror]) ++ ++AC_OUTPUT +diff -Naur AVLDupTree/Makefile AVLDupTree-haiku/Makefile +--- AVLDupTree/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ AVLDupTree-haiku/Makefile 2015-01-11 23:01:41.289406976 +0000 +@@ -0,0 +1,32 @@ ++CC=gcc ++CFLAGS=-g -O2 -Wall -ISource $(OPTFLAGS) ++ ++SOURCES=$(wildcard Source/*.c) ++OBJECTS=$(patsubst %.c,%.o,$(SOURCES)) ++GUISOURCES=Source/Main.cpp ++GUIEXE=bin/AGMSAVLTest ++ ++TARGET=build/libavlduptree.so ++ ++all: $(TARGET) $(SO_TARGET) ++ ++$(TARGET): build $(OBJECTS) ++ $(CC) -shared -o $(TARGET) $(OBJECTS) ++ ++build: ++ @mkdir -p build ++ @mkdir -p bin ++ ++clean: ++ @rm -rf build $(OBJECTS) $(TESTS) ++ ++install: all $(GUIEXE) ++ install $(TARGET) $(PREFIX) ++ ++$(GUIEXE): CFLAGS += -Wno-multichar ++$(GUIEXE): CFLAGS+= -lbe ++$(GUIEXE): $(SOURCES) $(GUISOURCES) ++ $(CC) $(CFLAGS) $^ -o $@ ++ install $(GUIEXE) $(BINDIR)/ ++ ++.PHONY: all clean install From f93a9505415e2648d5fe67c52f71e69eb98b448f Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Mon, 12 Jan 2015 04:20:52 +0000 Subject: [PATCH 290/326] EggChess --- games-strategy/eggchess/eggchess-1.0.recipe | 52 +++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 games-strategy/eggchess/eggchess-1.0.recipe diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe new file mode 100644 index 000000000..daaf555ce --- /dev/null +++ b/games-strategy/eggchess/eggchess-1.0.recipe @@ -0,0 +1,52 @@ +SUMMARY="Egg Chess" +DESCRIPTION="This game is similar to Tic-Tac-Toe. \ +However, instead of using Xs and Os, you use different egg forms. \ +What's more, YOU CAN ACTUALLY CHANGE A SQUARE WITH SOMETHING ELSE. \ +The first one to get three-in-a-row with the same egg form wins." +HOMEPAGE="http://www.haikuware.com/directory/view-details/development/games/egg-chess-ppc" +SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/master" +CHECKSUM_SHA256="9c0b70ebda96d3acecfdb5fdd7c9e9d411d7b954267d815bc56575577e4987bb" +SOURCE_DIR="EggChess-master" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="Anders Lindström" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + eggchess = $portVersion + app:eggchess= $portVersion + " + +REQUIRES=" + haiku + lib:libsdl + lib:libsdl_mixer + " + +BUILD_REQUIRES=" + haiku_devel + devel:libsdl + devel:libsdl_mixer + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc +" + +BUILD() +{ + cd src + mkdir -p objects + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/EggChess + cd $sourceDir + cp eggchess.x86 $appsDir/EggChess + cp -r gfx docs $appsDir/EggChess + addAppDeskbarSymlink $appsDir/EggChess/eggchess.x86 +} From ece886890e0f942b2642863192ebc19d1d2aa4d1 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Mon, 12 Jan 2015 04:28:59 +0000 Subject: [PATCH 291/326] ~ --- games-strategy/eggchess/eggchess-1.0.recipe | 52 --------------------- 1 file changed, 52 deletions(-) delete mode 100644 games-strategy/eggchess/eggchess-1.0.recipe diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe deleted file mode 100644 index daaf555ce..000000000 --- a/games-strategy/eggchess/eggchess-1.0.recipe +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY="Egg Chess" -DESCRIPTION="This game is similar to Tic-Tac-Toe. \ -However, instead of using Xs and Os, you use different egg forms. \ -What's more, YOU CAN ACTUALLY CHANGE A SQUARE WITH SOMETHING ELSE. \ -The first one to get three-in-a-row with the same egg form wins." -HOMEPAGE="http://www.haikuware.com/directory/view-details/development/games/egg-chess-ppc" -SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/master" -CHECKSUM_SHA256="9c0b70ebda96d3acecfdb5fdd7c9e9d411d7b954267d815bc56575577e4987bb" -SOURCE_DIR="EggChess-master" -REVISION="1" -LICENSE="GNU GPL v2" -COPYRIGHT="Anders Lindström" - -ARCHITECTURES="x86 x86_gcc2" - -PROVIDES=" - eggchess = $portVersion - app:eggchess= $portVersion - " - -REQUIRES=" - haiku - lib:libsdl - lib:libsdl_mixer - " - -BUILD_REQUIRES=" - haiku_devel - devel:libsdl - devel:libsdl_mixer - " - -BUILD_PREREQUIRES=" - cmd:make - cmd:gcc -" - -BUILD() -{ - cd src - mkdir -p objects - make $jobArgs -} - -INSTALL() -{ - mkdir -p $appsDir/EggChess - cd $sourceDir - cp eggchess.x86 $appsDir/EggChess - cp -r gfx docs $appsDir/EggChess - addAppDeskbarSymlink $appsDir/EggChess/eggchess.x86 -} From 69e3f8e5e8937740828765bf164d93e8d1337d23 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Mon, 12 Jan 2015 04:30:01 +0000 Subject: [PATCH 292/326] Egg Chess --- games-strategy/eggchess/eggchess-1.0.recipe | 52 +++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 games-strategy/eggchess/eggchess-1.0.recipe diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe new file mode 100644 index 000000000..daaf555ce --- /dev/null +++ b/games-strategy/eggchess/eggchess-1.0.recipe @@ -0,0 +1,52 @@ +SUMMARY="Egg Chess" +DESCRIPTION="This game is similar to Tic-Tac-Toe. \ +However, instead of using Xs and Os, you use different egg forms. \ +What's more, YOU CAN ACTUALLY CHANGE A SQUARE WITH SOMETHING ELSE. \ +The first one to get three-in-a-row with the same egg form wins." +HOMEPAGE="http://www.haikuware.com/directory/view-details/development/games/egg-chess-ppc" +SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/master" +CHECKSUM_SHA256="9c0b70ebda96d3acecfdb5fdd7c9e9d411d7b954267d815bc56575577e4987bb" +SOURCE_DIR="EggChess-master" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="Anders Lindström" + +ARCHITECTURES="x86 x86_gcc2" + +PROVIDES=" + eggchess = $portVersion + app:eggchess= $portVersion + " + +REQUIRES=" + haiku + lib:libsdl + lib:libsdl_mixer + " + +BUILD_REQUIRES=" + haiku_devel + devel:libsdl + devel:libsdl_mixer + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc +" + +BUILD() +{ + cd src + mkdir -p objects + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/EggChess + cd $sourceDir + cp eggchess.x86 $appsDir/EggChess + cp -r gfx docs $appsDir/EggChess + addAppDeskbarSymlink $appsDir/EggChess/eggchess.x86 +} From 1971004f25c951c01bbdcb8f722fafc30424aefe Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 11 Jan 2015 21:03:55 +0000 Subject: [PATCH 293/326] Add bpg recipe --- media-libs/bpg/bpg-0.9.4.recipe | 78 +++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 media-libs/bpg/bpg-0.9.4.recipe diff --git a/media-libs/bpg/bpg-0.9.4.recipe b/media-libs/bpg/bpg-0.9.4.recipe new file mode 100644 index 000000000..4b6be21e9 --- /dev/null +++ b/media-libs/bpg/bpg-0.9.4.recipe @@ -0,0 +1,78 @@ +SUMMARY="Tools and library for the Better Prortable Graphics format" +DESCRIPTION="BPG is an image format based on the HEVC standard that aims to \ +provide a replacement for the JPEG format with better quality and smaller file\ + size." + +HOMEPAGE="http://bellard.org/bpg/" +LICENSE=" + MIT + GNU LGPL v2.1 + " +COPYRIGHT="2014 Fabrice Bellard" + + +SRC_URI="http://bellard.org/bpg/libbpg-0.9.4.tar.gz" +CHECKSUM_SHA256="9986d66408f36fb678014bfcbb693c0f8358767719bc05797e4af54fa4237c2a" +SOURCE_DIR="libbpg-$portVersion" + +REVISION="1" +ARCHITECTURES="x86 ?x86_64" +# libbpg requires gcc4, so we can only do x86_gcc2 if it's a hybrid +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi + +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + bpg = $portVersion + cmd:bpgenc$secondaryArchSuffix + cmd:bpgdec$secondaryArchSuffix + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libpng$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + " + +PROVIDES_devel=" + libbpg${secondaryArchSuffix}_devel = $portVersion + devel:libbpg$secondaryArchSuffix = $portVersion + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libpng$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + " + +BUILD() +{ + sed -i 's/-lpthread//g' Makefile + sed -i 's/-lm//g' Makefile + sed -i 's/-lrt//g' Makefile + make +} + +INSTALL() +{ + mkdir -p $binDir + + sed -i "s,\$(prefix)/bin,$binDir,g" Makefile + make install + + mkdir -p $libDir + cp libbpg.a $libDir + prepareInstalledDevelLib libbpg + packageEntries devel $developLibDir +} From f1ab2dfe3479c607efca9d66baa9bd4cc1d940cd Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 12 Jan 2015 15:11:55 +0200 Subject: [PATCH 294/326] Updated Box2D recipe and patch --- dev-games/box2d/box2d-2.1.2.recipe | 46 ++++++-- dev-games/box2d/patches/box2d-2.1.2.patch | 121 +++++++++++++++++----- 2 files changed, 129 insertions(+), 38 deletions(-) diff --git a/dev-games/box2d/box2d-2.1.2.recipe b/dev-games/box2d/box2d-2.1.2.recipe index 3740e7c64..8ce79fe03 100644 --- a/dev-games/box2d/box2d-2.1.2.recipe +++ b/dev-games/box2d/box2d-2.1.2.recipe @@ -1,22 +1,46 @@ -DESCRIPTION="Box2d is an open source 2d physics engine for games." +SUMMARY="A 2D Physics Engine for Games" +DESCRIPTION="Box2D is a feature rich 2D rigid body physics engine, written in C++. \ +It has been used in many games, including Crayon Physics Deluxe, \ +winner of the 2008 Independant Game Festival Grand Prize" HOMEPAGE="http://www.box2d.org" SRC_URI="http://box2d.googlecode.com/files/Box2D_v2.1.2.zip" -CHECKSUM_MD5="59d142cd8d4d73e8832c7b67591f590c" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="MIT" +COPYRIGHT="2007-2009 Erin Catto" +CHECKSUM_SHA256="3b351c3e51c6bf78c3e48a2b51260297f3f309fde389c9bfc21ebd484efbba54" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SOURCE_DIR="Box2D_v2.1.2" + +PROVIDES=" + box2d + " + +REQUIRES=" + haiku +" + +PATCHES="box2d-2.1.2.patch" + +BUILD_PREREQUIRES=" + haiku_devel + cmd:make + cmd:cmake + cmd:gcc + devel:libgl + devel:libglu +" + +BUILD_REQUIRES="" + BUILD() { - cd Box2D_v2.1.2/Box2D - cmake . -DOPENGL_INCLUDE_DIR:=/boot/develop/headers/os/opengl/GL \ - -DHAIKU:=TRUE + cd Box2D + cmake . make } INSTALL() { - cd Box2D_v2.1.2/Box2D + cd Box2D make install } -LICENSE="MIT" -COPYRIGHT="2007-2009 Erin Catto" diff --git a/dev-games/box2d/patches/box2d-2.1.2.patch b/dev-games/box2d/patches/box2d-2.1.2.patch index e7bea1e19..8f4a8eb3a 100644 --- a/dev-games/box2d/patches/box2d-2.1.2.patch +++ b/dev-games/box2d/patches/box2d-2.1.2.patch @@ -1,7 +1,8 @@ -diff -urN Box2D_v2.1.2/Box2D/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/CMakeLists.txt ---- Box2D_v2.1.2/Box2D/CMakeLists.txt 2010-04-03 11:10:30.046661632 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/CMakeLists.txt 2010-09-21 12:18:05.000000000 +0000 -@@ -26,7 +26,9 @@ +diff --git a/Box2D/CMakeLists.txt b/Box2D/CMakeLists.txt +index a8ad550..17b3069 100644 +--- a/Box2D/CMakeLists.txt ++++ b/Box2D/CMakeLists.txt +@@ -26,7 +26,9 @@ if(BOX2D_BUILD_EXAMPLES) # Testbed and dependencies. find_package(OpenGL REQUIRED) @@ -11,10 +12,11 @@ diff -urN Box2D_v2.1.2/Box2D/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/CMakeLists. add_subdirectory(glui) add_subdirectory(Testbed) endif(BOX2D_BUILD_EXAMPLES) -diff -urN Box2D_v2.1.2/Box2D/Testbed/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/Testbed/CMakeLists.txt ---- Box2D_v2.1.2/Box2D/Testbed/CMakeLists.txt 2010-04-04 11:07:26.007077888 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/CMakeLists.txt 2010-09-21 13:44:55.000000000 +0000 -@@ -72,10 +72,19 @@ +diff --git a/Box2D/Testbed/CMakeLists.txt b/Box2D/Testbed/CMakeLists.txt +index d1be5c0..ad716e4 100644 +--- a/Box2D/Testbed/CMakeLists.txt ++++ b/Box2D/Testbed/CMakeLists.txt +@@ -72,10 +72,19 @@ add_executable(Testbed ${Testbed_Tests_SRCS} ) @@ -24,27 +26,28 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/Tes - freeglut_static - glui - ${OPENGL_LIBRARIES} -+if(HAIKU) # Haiku has glut, so no need for freeglut +-) ++if(HAIKU) # Haiku has glut, so no need for freeglut + target_link_libraries ( + Testbed + Box2D + glui + ${OPENGL_LIBRARIES} -+) -+else(HAIKU) ++) ++else(HAIKU) + target_link_libraries ( + Testbed + Box2D + freeglut_static + glui + ${OPENGL_LIBRARIES} - ) -+endif(HAIKU) -\ No newline at end of file -diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Render.cpp Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Render.cpp ---- Box2D_v2.1.2/Box2D/Testbed/Framework/Render.cpp 2010-02-01 02:12:46.031719424 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Render.cpp 2010-09-21 11:29:02.000000000 +0000 -@@ -18,7 +18,11 @@ ++) ++endif(HAIKU) +diff --git a/Box2D/Testbed/Framework/Render.cpp b/Box2D/Testbed/Framework/Render.cpp +index 3a6c680..b406367 100644 +--- a/Box2D/Testbed/Framework/Render.cpp ++++ b/Box2D/Testbed/Framework/Render.cpp +@@ -18,12 +18,16 @@ #include "Render.h" @@ -56,9 +59,16 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Render.cpp Box2D_v2.1.2-haiku/Box #include #include -diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Test.cpp Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Test.cpp ---- Box2D_v2.1.2/Box2D/Testbed/Framework/Test.cpp 2010-02-14 12:15:52.031719424 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Test.cpp 2010-09-21 11:28:49.000000000 +0000 + +-#include ++#include + + void DebugDraw::DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color) + { +diff --git a/Box2D/Testbed/Framework/Test.cpp b/Box2D/Testbed/Framework/Test.cpp +index 9e6a935..f43ee39 100644 +--- a/Box2D/Testbed/Framework/Test.cpp ++++ b/Box2D/Testbed/Framework/Test.cpp @@ -19,7 +19,11 @@ #include "Test.h" #include "Render.h" @@ -71,9 +81,10 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Test.cpp Box2D_v2.1.2-haiku/Box2D #include -diff -urN Box2D_v2.1.2/Box2D/Testbed/Tests/TestEntries.cpp Box2D_v2.1.2-haiku/Box2D/Testbed/Tests/TestEntries.cpp ---- Box2D_v2.1.2/Box2D/Testbed/Tests/TestEntries.cpp 2010-04-17 11:18:18.035127296 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/Tests/TestEntries.cpp 2010-09-21 11:30:22.000000000 +0000 +diff --git a/Box2D/Testbed/Tests/TestEntries.cpp b/Box2D/Testbed/Tests/TestEntries.cpp +index e12c102..1ca1db1 100644 +--- a/Box2D/Testbed/Tests/TestEntries.cpp ++++ b/Box2D/Testbed/Tests/TestEntries.cpp @@ -18,7 +18,11 @@ #include "../Framework/Test.h" @@ -86,9 +97,10 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/Tests/TestEntries.cpp Box2D_v2.1.2-haiku/Bo #include #include "ApplyForce.h" -diff -urN Box2D_v2.1.2/Box2D/glui/GL/glui.h Box2D_v2.1.2-haiku/Box2D/glui/GL/glui.h ---- Box2D_v2.1.2/Box2D/glui/GL/glui.h 2010-02-01 02:12:42.030408704 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/glui/GL/glui.h 2010-09-21 11:25:12.000000000 +0000 +diff --git a/Box2D/glui/GL/glui.h b/Box2D/glui/GL/glui.h +index a412a77..66a846e 100644 +--- a/Box2D/glui/GL/glui.h ++++ b/Box2D/glui/GL/glui.h @@ -49,6 +49,8 @@ #ifdef __APPLE__ @@ -98,3 +110,58 @@ diff -urN Box2D_v2.1.2/Box2D/glui/GL/glui.h Box2D_v2.1.2-haiku/Box2D/glui/GL/glu #else #include "../../freeglut/GL/glut.h" //#include +diff --git a/Box2D/glui/algebra3.cpp b/Box2D/glui/algebra3.cpp +index ddc18f4..47f93b3 100644 +--- a/Box2D/glui/algebra3.cpp ++++ b/Box2D/glui/algebra3.cpp +@@ -830,11 +830,7 @@ vec4 operator*(float d, const vec4 &a) + + vec4 operator*(const mat4 &a, const vec4 &v) + { +- #define ROWCOL(i) \ +- a.v[i].n[0]*v.n[VX] + \ +- a.v[i].n[1]*v.n[VY] + \ +- a.v[i].n[2]*v.n[VZ] + \ +- a.v[i].n[3]*v.n[VW] ++ #define ROWCOL(i) a.v[i].n[0]*v.n[VX] + a.v[i].n[1]*v.n[VY] + a.v[i].n[2]*v.n[VZ] + a.v[i].n[3]*v.n[VW] + + return vec4(ROWCOL(0), ROWCOL(1), ROWCOL(2), ROWCOL(3)); + +@@ -1107,8 +1103,7 @@ mat3 operator-(const mat3 &a, const mat3 &b) + + mat3 operator*(const mat3 &a, const mat3 &b) + { +- #define ROWCOL(i, j) \ +- a.v[i].n[0]*b.v[0][j] + a.v[i].n[1]*b.v[1][j] + a.v[i].n[2]*b.v[2][j] ++ #define ROWCOL(i, j) a.v[i].n[0]*b.v[0][j] + a.v[i].n[1]*b.v[1][j] + a.v[i].n[2]*b.v[2][j] + + return mat3( + vec3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2)), +@@ -1413,11 +1408,7 @@ mat4 operator-(const mat4 &a, const mat4 &b) + + mat4 operator*(const mat4 &a, const mat4 &b) + { +- #define ROWCOL(i, j) \ +- a.v[i].n[0]*b.v[0][j] + \ +- a.v[i].n[1]*b.v[1][j] + \ +- a.v[i].n[2]*b.v[2][j] + \ +- a.v[i].n[3]*b.v[3][j] ++ #define ROWCOL(i, j) a.v[i].n[0]*b.v[0][j] + a.v[i].n[1]*b.v[1][j] + a.v[i].n[2]*b.v[2][j] + a.v[i].n[3]*b.v[3][j] + + return mat4( + vec4(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2), ROWCOL(0,3)), +diff --git a/Box2D/glui/glui_internal.h b/Box2D/glui/glui_internal.h +index 20efc6f..8f450e1 100644 +--- a/Box2D/glui/glui_internal.h ++++ b/Box2D/glui/glui_internal.h +@@ -74,8 +74,7 @@ + + /************ check if a 2D point lies within a 2D box ***************/ + #ifndef PT_IN_BOX +-#define PT_IN_BOX( x, y, lo_x, hi_x, lo_y, hi_y ) \ +-( IN_BOUNDS(x,lo_x,hi_x) AND IN_BOUNDS(y,lo_y,hi_y) ) ++#define PT_IN_BOX( x, y, lo_x, hi_x, lo_y, hi_y ) ( IN_BOUNDS(x,lo_x,hi_x) AND IN_BOUNDS(y,lo_y,hi_y) ) + #endif + + /****** check if value lies on proper side of another value *****/ + From 9dafc8d007ebe9dba2ec21c74eb0570cac9e7c77 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 12 Jan 2015 12:12:04 -0500 Subject: [PATCH 295/326] hyperstudio: note Xentronix as holding copyright as well. --- haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe index b89c7b327..2f3990e67 100644 --- a/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe +++ b/haiku-apps/hyperstudio/hyperstudio-1.1_git.recipe @@ -4,13 +4,14 @@ 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="2007 Pier Luigi Fiorini" +COPYRIGHT="2003 Xentronix + 2007 Pier Luigi Fiorini" srcrev="59b31f0bdc3f0e49feb7d9892faa67222ffb3f95" SRC_URI="https://github.com/HaikuArchives/HyperStudio/archive/$srcrev.tar.gz" CHECKSUM_SHA256="03c2a7fc68d2a95bce9c873bf6d8a32494370861a23dc8e2689285e7e201a4c9" SOURCE_DIR="HyperStudio-$srcrev" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" From 66cd06e97fd298699334e0a821ef28ab2239af31 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Mon, 12 Jan 2015 18:02:58 +0000 Subject: [PATCH 296/326] Add a new app, Google Maps Mini --- .../googlemaps_mini-0.1.recipe | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe diff --git a/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe new file mode 100644 index 000000000..e3d3ec346 --- /dev/null +++ b/app-misc/googlemaps_mini/googlemaps_mini-0.1.recipe @@ -0,0 +1,49 @@ +SUMMARY="Google Maps Mini" +DESCRIPTION=" +Qt Widget that allows a user to choose lat/lng from a GoogleMap view, with location search +" + +HOMEPAGE="http://www.haikuware.com/directory/view-details/internet-network/web-browsers/googlemaps-mini" +SRC_URI="git+https://github.com/mgermain-genymobile/GoogleMapQtWidget.git#3fefbef368430deda7bd26e2a875cca3db2126ce" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2013 Morgan Germain" + +ARCHITECTURES="?x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + googlemaps_mini = $portVersion + app:googlemaps_mini = $portVersion + " +REQUIRES=" + haiku${secondaryArchSuffix} + libqt4${secondaryArchSuffix} < 5 + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + libqt4${secondaryArchSuffix}_devel < 5 + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc${secondaryArchSuffix} + cmd:qmake${secondaryArchSuffix} + " + +BUILD() +{ + qmake + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + cp build/mgeGoogleMap $appsDir/GoogleMapsMini + addAppDeskbarSymlink $appsDir/GoogleMapsMini +} From a38db25c397ce80840681126af4b985a0b425f2a Mon Sep 17 00:00:00 2001 From: Humdinger Date: Mon, 12 Jan 2015 19:17:48 +0100 Subject: [PATCH 297/326] Changes in SUMMARY, DESCRIPTION and whitespace. Removed the full-stop and repeating package name in SUMMARY. Removed hard line breaks, broke up some very long paragraphs and use bullet lists where possible. All done by browsing through HaikuDepot. There may be (many) more left in the whole haikuports repo... Included 10 extended desriptions done by soyoye14 for GCI 2014 (https://www.google-melange.com/gci/task/view/google/gci2014/5240373098053632) Removed/insert whitespace where it seems to be the custom in recipes. Sometimes rearranged elements of a recipe (moving license and copyright up, for example). --- app-arch/lha/lha-1.14i.recipe | 12 ++--- app-arch/tar/tar-1.27.1.recipe | 2 +- app-arch/xz_utils/xz_utils-5.0.8.recipe | 11 ++--- app-crypt/gnupg/gnupg-1.4.16.recipe | 3 +- app-editors/vim/vim-7.4.recipe | 12 ++--- app-emulation/qemu/qemu-2.1.2.recipe | 5 +- app-misc/getopt/getopt-1.1.5.recipe | 20 ++++---- app-misc/mc/mc-4.8.13.recipe | 16 ++----- app-misc/strigi/strigi-0.7.5.recipe | 10 ++-- app-office/multitalk/multitalk-1.4.recipe | 18 ++++--- .../docbook_xml_dtd-4.5.recipe | 7 ++- .../docbook_xsl_stylesheets-1.78.1.recipe | 11 +++-- app-text/dos2unix/dos2unix-1.0.1.recipe | 4 +- app-text/mupdf/mupdf-1.6.recipe | 5 +- dev-db/sqlite/sqlite-3.8.7.4.recipe | 2 +- dev-embedded/avrdude/avrdude-6.0.1.recipe | 7 ++- dev-embedded/gcc6809/gcc6809-4.6.1.recipe | 9 ++-- dev-embedded/lwtools/lwtools-4.10.recipe | 24 +++++----- dev-embedded/sdcc/sdcc-3.4.0.recipe | 19 ++++---- dev-embedded/stlink/stlink-1.0.0.recipe | 20 ++++---- dev-embedded/stm32flash/stm32flash-0.3.recipe | 16 +++---- dev-games/physfs/physfs-2.0.3.recipe | 17 +++---- dev-lang/lua/lua-5.2.3.recipe | 23 +++++---- dev-lang/luajit/luajit-2.0.2.recipe | 23 +++++---- dev-lang/openjdk/openjdk-1.7_u80_b02.recipe | 8 ++-- dev-lang/ruby/ruby-2.1.2.recipe | 27 +++++------ dev-lang/yab/yab-1.7.02.recipe | 14 ++---- dev-libs/apr/apr-1.5.0.recipe | 4 +- dev-libs/gmp/gmp-6.0.0.recipe | 7 ++- dev-libs/icu/icu-54.1.recipe | 3 +- dev-libs/libelf/libelf-0.8.13.recipe | 4 +- dev-libs/libffi/libffi-3.2.1.recipe | 13 +++-- dev-libs/libusb/libusb-1.0.19.recipe | 32 ++++++------- dev-libs/lzo/lzo-2.06.recipe | 22 ++++----- dev-libs/mpc/mpc-1.0.2.recipe | 6 +-- dev-libs/mpfr/mpfr-3.1.2.recipe | 9 ++-- dev-libs/popt/popt-1.16.recipe | 12 ++--- dev-libs/tinyxml/tinyxml-2.6.2.recipe | 8 ++-- dev-qt/automoc/automoc-0.9.88.recipe | 7 +-- dev-qt/libattica/libattica-0.4.2.recipe | 7 +-- .../libdbusmenu_qt-0.9.2.recipe | 6 +-- dev-qt/qca2/qca2-2.0.3.recipe | 12 ++--- dev-qt/qjson/qjson-0.8.1.recipe | 12 ++--- .../buildbot_slave-0.8.8.recipe | 6 +-- dev-util/cmake/cmake-3.0.0.recipe | 5 +- dev-util/gyp/gyp-r1948.recipe | 14 ++---- dev-util/intltool/intltool-0.40.6.recipe | 6 +-- dev-util/ninja/ninja-1.5.1.recipe | 7 ++- dev-vcs/cvsps/cvsps-2.2b1.recipe | 13 +++-- dev-vcs/tig/tig-2.0.2.recipe | 9 ++-- .../f1spirit/f1spirit-0.rc9.1615.recipe | 12 ++--- games-arcade/goonies/goonies-1.4.1528.recipe | 34 ++++++------- games-arcade/mog/mog-0.63.1548.recipe | 48 ++++++++++--------- .../roadfighter/roadfighter-1.0.1269.recipe | 14 +++--- .../rocksndiamonds-3.3.1.2.recipe | 25 +++++----- .../slime_volley/slime_volley-2.4.2.recipe | 27 +++++------ .../super_transball-2.1.5.recipe | 22 ++++----- games-arcade/xrick/xrick-021212.recipe | 22 ++++----- games-kids/pipepanic/pipepanic-0.1.3.recipe | 6 +-- .../lbreakout2/lbreakout2-2.6.4.recipe | 21 ++++---- games-puzzle/lgeneral/lgeneral-1.2.3.recipe | 14 +++--- games-puzzle/lmarbles/lmarbles-1.0.8.recipe | 13 ++--- games-puzzle/lpairs/lpairs-1.0.4.recipe | 13 ++--- games-puzzle/ltris/ltris-1.0.19.recipe | 14 +++--- .../mirrormagic/mirrormagic-2.0.2.recipe | 14 ++---- games-puzzle/wizznic/wizznic-0.9.9.recipe | 30 +++++------- games-rpg/flare/flare-0.19.recipe | 5 +- .../freedroidrpg/freedroidrpg-0.15.1.recipe | 45 +++++++++-------- games-simulation/openttd/openttd-1.4.3.recipe | 15 +++--- .../openttd_gfx/openttd_gfx-0.4.7.recipe | 16 +++---- .../openttd_msx/openttd_msx-0.3.1.recipe | 14 +++--- .../openttd_sfx/openttd_sfx-0.2.3.recipe | 14 +++--- games-strategy/vcmi/vcmi-0.94.recipe | 22 ++++----- haiku-apps/a_book/a_book-1.1.recipe | 5 +- haiku-apps/album/album-0.9.3.recipe | 12 ++--- haiku-apps/beae/beae-1.2.recipe | 9 ++-- haiku-apps/beam/beam-1.2alpha.recipe | 16 +++---- haiku-apps/belife/belife-1.0.0.recipe | 9 ++-- haiku-apps/bemines/bemines-1.0b2.recipe | 19 ++++---- haiku-apps/bepdf/bepdf-1.2.0.recipe | 16 +++---- haiku-apps/beshare/beshare-4.recipe | 19 +++----- haiku-apps/capitalbe/capitalbe-1.1.recipe | 5 +- haiku-apps/caya/caya-2013.10.12.recipe | 27 +++++------ haiku-apps/chat/chat-20100903.recipe | 17 +++---- haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe | 11 ++--- haiku-apps/netpulse/netpulse-0.2.3.recipe | 10 ++-- haiku-apps/pe/pe-2.4.5.recipe | 23 ++++----- haiku-apps/substrate/substrate-1.0.recipe | 9 ++-- haiku-apps/sum_it/sum_it-0.2beta.recipe | 10 ++-- haiku-apps/timecop/timecop-0.61.recipe | 17 +++---- haiku-apps/yab_ide/yab_ide-2.2.3.recipe | 16 +++---- haiku-games/bevexed/bevexed-20141224.recipe | 7 +-- haiku-libs/ale/ale-0.9.1.recipe | 3 +- haiku-libs/libsanta/libsanta-3.0.1.recipe | 6 +-- .../vl_gothic/vl_gothic-20141206.recipe | 23 +++++---- media-libs/devil/devil-1.7.8.recipe | 28 +++++------ media-libs/faad2/faad2-2.7.recipe | 18 +++---- media-libs/jasper/jasper-1.900.1.recipe | 10 +--- media-libs/lcms/lcms-2.6.recipe | 4 +- .../libart_lgpl/libart_lgpl-2.3.21.recipe | 13 ++--- media-libs/libwebp/libwebp-0.4.1.recipe | 6 +-- media-libs/openal/openal-1.13.0.recipe | 18 +++---- media-libs/openexr/openexr-2.2.0.recipe | 3 +- media-libs/sdl_net/sdl_net-1.2.8.recipe | 11 ++--- media-libs/sge/sge-030809.recipe | 10 ++-- media-libs/smpeg/smpeg-0.4.5.recipe | 6 +-- media-libs/taglib/taglib-1.9.1.recipe | 16 +++---- .../fluidsynth/fluidsynth-1.1.6.recipe | 17 +++---- media-sound/ocp/ocp-0.1.21_git.recipe | 2 +- net-irc/quassel/quassel-0.10.0.recipe | 27 +++++------ net-libs/hubbub/hubbub-0.3.0.recipe | 2 +- net-libs/libssh2/libssh2-1.4.3.recipe | 2 +- net-libs/neon/neon-0.30.1.recipe | 5 +- net-misc/muscle/muscle-6.00.recipe | 10 ++-- net-print/gutenprint/gutenprint-5.2.10.recipe | 5 +- sys-apps/dbus/dbus-1.8.6.recipe | 6 +-- sys-apps/findutils/findutils-4.4.2.recipe | 8 ++-- sys-apps/gawk/gawk-4.1.0.recipe | 25 +++++----- sys-apps/help2man/help2man-1.46.3.recipe | 3 +- sys-apps/less/less-466.recipe | 7 +-- sys-apps/which/which-2.20.recipe | 17 ++++--- sys-devel/flex/flex-2.5.39.recipe | 8 ++-- sys-devel/gettext/gettext-0.18.1.1.recipe | 5 +- sys-devel/jam/jam-2.5_2012_10_12.recipe | 2 +- sys-devel/libtool/libtool-2.4.2.recipe | 7 ++- sys-devel/libtool/libtool-2.4.recipe | 7 ++- sys-devel/llvm/llvm-3.5.0.recipe | 5 +- sys-libs/libexecinfo/libexecinfo-1.1.recipe | 9 ++-- sys-libs/mesa/mesa-10.2.9.recipe | 30 +++++------- sys-libs/zlib/zlib-1.2.8.recipe | 5 +- x11-libs/pixman/pixman-0.32.6.recipe | 10 ++-- 131 files changed, 742 insertions(+), 943 deletions(-) diff --git a/app-arch/lha/lha-1.14i.recipe b/app-arch/lha/lha-1.14i.recipe index a9cc20ebf..3657382eb 100644 --- a/app-arch/lha/lha-1.14i.recipe +++ b/app-arch/lha/lha-1.14i.recipe @@ -1,11 +1,14 @@ SUMMARY="Archive files using LZSS and Huffman compression (.lzh files)" DESCRIPTION=" -Archive files using LZSS and Huffman compression (.lzh files) +LHA archives are often used on Amiga computers. The compression is rather \ +effective and the unpacking is fast. " LICENSE="lha" -COPYRIGHT="1991, Masaru Oki +COPYRIGHT=" + 1991, Masaru Oki 1993-1995, Nobutaka Watazaki - 2000, Tsugio Okamoto et al." + 2000, Tsugio Okamoto et al. + " HOMEPAGE="http://sourceforge.jp/projects/lha/" SRC_URI="http://jaist.dl.sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz" CHECKSUM_SHA256="b5261e9f98538816aa9e64791f23cb83f1632ecda61f02e54b6749e9ca5e9ee4" @@ -16,17 +19,14 @@ PROVIDES=" lha = $portVersion cmd:lha = $portVersion " - REQUIRES=" haiku lib:libiconv " - BUILD_REQUIRES=" haiku_devel devel:libiconv " - BUILD_PREREQUIRES=" cmd:autoreconf cmd:autoconf diff --git a/app-arch/tar/tar-1.27.1.recipe b/app-arch/tar/tar-1.27.1.recipe index cf4e8b4bb..fc530b901 100644 --- a/app-arch/tar/tar-1.27.1.recipe +++ b/app-arch/tar/tar-1.27.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="Saves and restores files to/from a tape or disk archive." +SUMMARY="Saves and restores files to/from a tape or disk archive" DESCRIPTION=" The Tar program provides the ability to create tar archives, as well as \ various other kinds of manipulation. For example, you can use Tar on \ diff --git a/app-arch/xz_utils/xz_utils-5.0.8.recipe b/app-arch/xz_utils/xz_utils-5.0.8.recipe index d5bf16d25..d6c6f4298 100644 --- a/app-arch/xz_utils/xz_utils-5.0.8.recipe +++ b/app-arch/xz_utils/xz_utils-5.0.8.recipe @@ -1,4 +1,4 @@ -SUMMARY="Free general-purpose data compression software." +SUMMARY="Free general-purpose data compression software" DESCRIPTION="XZ Utils are free general-purpose data compression tools with \ a high compression ratio. They are the successors to LZMA Utils. " @@ -6,9 +6,11 @@ HOMEPAGE="http://tukaani.org/xz/" SRC_URI="http://tukaani.org/xz/xz-$portVersion.tar.bz2" CHECKSUM_SHA256="2286f9d90bb0a0de34cba990df1b10cfad0777f00cb2883def26b8ec1b326bda" SOURCE_DIR="xz-$portVersion" -LICENSE="GNU LGPL v2.1 +LICENSE=" + GNU LGPL v2.1 GNU GPL v2 - GNU GPL v3" + GNU GPL v3 + " COPYRIGHT="2005-2014 Lasse Collin" REVISION="1" ARCHITECTURES="x86 x86_64" @@ -58,11 +60,9 @@ PROVIDES=" cmd:xzmore$commandSuffix = $portVersion compat >= 5 lib:liblzma$secondaryArchSuffix = $portVersion compat >= 5 " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" " BUILD_PREREQUIRES=" @@ -77,7 +77,6 @@ PROVIDES_devel=" xz_utils${secondaryArchSuffix}_devel = $portVersion compat >= 5 devel:liblzma$secondaryArchSuffix = $portVersion compat >= 5 " - REQUIRES_devel=" haiku${secondaryArchSuffix}_devel xz_utils$secondaryArchSuffix == $portVersion base diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe index 9186f8dde..63cd17cd6 100644 --- a/app-crypt/gnupg/gnupg-1.4.16.recipe +++ b/app-crypt/gnupg/gnupg-1.4.16.recipe @@ -1,4 +1,4 @@ -SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard." +SUMMARY="GnuPG is the GNU project's free implementation of the OpenPGP standard" DESCRIPTION=" GnuPG is the GNU project's complete and free implementation of the OpenPGP \ standard as defined by RFC4880 . GnuPG allows to encrypt and sign your data \ @@ -51,6 +51,7 @@ BUILD_PREREQUIRES=" cmd:perl cmd:tar " + PATCHES="gnupg-1.4.16.patchset" BUILD() diff --git a/app-editors/vim/vim-7.4.recipe b/app-editors/vim/vim-7.4.recipe index 0fd8ecb79..307c4efc0 100644 --- a/app-editors/vim/vim-7.4.recipe +++ b/app-editors/vim/vim-7.4.recipe @@ -1,4 +1,4 @@ -SUMMARY="Vim is highly configurable text editor." +SUMMARY="A highly configurable text editor" DESCRIPTION=" Vim is a highly configurable text editor built to enable efficient text \ editing. It is an improved version of the vi editor distributed with most UNIX \ @@ -34,16 +34,16 @@ PROVIDES=" cmd:vimtutor = $portVersion cmd:view = $portVersion cmd:xxd = $portVersion -" + " REQUIRES=" haiku$secondaryArchSuffix lib:libncurses lib:libintl -" + " BUILD_REQUIRES=" ncurses_devel gettext -" + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:make @@ -52,12 +52,12 @@ BUILD_PREREQUIRES=" cmd:find cmd:grep cmd:sed -" + " SOURCE_DIR="vim74" PATCHES=" vim-7.4.patchset -" + " BUILD() { diff --git a/app-emulation/qemu/qemu-2.1.2.recipe b/app-emulation/qemu/qemu-2.1.2.recipe index c8d4a4435..db9659338 100644 --- a/app-emulation/qemu/qemu-2.1.2.recipe +++ b/app-emulation/qemu/qemu-2.1.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="QEMU is a generic and open source machine emulator and virtualizer." +SUMMARY="A generic and open source machine emulator and virtualizer" DESCRIPTION=" QEMU is a generic and open source machine emulator and virtualizer. @@ -52,7 +52,6 @@ PROVIDES=" cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -61,14 +60,12 @@ REQUIRES=" lib:libglib_2.0$secondaryArchSuffix >= 0.38 lib:libpixman_1$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libz$secondaryArchSuffix devel:libfdt$secondaryArchSuffix devel:libglib_2.0$secondaryArchSuffix >= 0.38 devel:libpixman_1${secondaryArchSuffix} " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:awk diff --git a/app-misc/getopt/getopt-1.1.5.recipe b/app-misc/getopt/getopt-1.1.5.recipe index 2583c5f8a..cea4cb20e 100644 --- a/app-misc/getopt/getopt-1.1.5.recipe +++ b/app-misc/getopt/getopt-1.1.5.recipe @@ -1,14 +1,15 @@ -SUMMARY="A program to help shell scripts parse command-line parameters." +SUMMARY="A program to help shell scripts parse command-line parameters" DESCRIPTION=" Getopt(1) is a program to help shell scripts parse command-line parameters. -*It can do anything that the GNU getopt(3) routines can do. -*It can cope with spaces and shell metacharacters within arguments. -*It can parse long parameters. -*It can shuffle parameters, so you can mix options and other parameters on the \ + +* It can do anything that the GNU getopt(3) routines can do. +* It can cope with spaces and shell metacharacters within arguments. +* It can parse long parameters. +* It can shuffle parameters, so you can mix options and other parameters on the \ command-line. -*It can be easily identified as an enhanced getopt(1) from within shell scripts. -*It can report parse errors as coming from the shell script. -*It compiles cleanly with both libc-5 and glibc-2 (libc6). +* It can be easily identified as an enhanced getopt(1) from within shell scripts. +* It can report parse errors as coming from the shell script. +* It compiles cleanly with both libc-5 and glibc-2 (libc6). " HOMEPAGE="http://software.frodo.looijaard.name/getopt/" SRC_URI="http://software.frodo.looijaard.name/getopt/files/getopt-1.1.5.tar.gz" @@ -18,16 +19,13 @@ LICENSE="GNU GPL v2" COPYRIGHT="1997-2012 Frodo Looijaard" ARCHITECTURES="x86 x86_gcc2" - PROVIDES=" getopt = $portVersion cmd:getopt = $portVersion " - REQUIRES=" haiku " - BUILD_REQUIRES="" BUILD_PREREQUIRES=" diff --git a/app-misc/mc/mc-4.8.13.recipe b/app-misc/mc/mc-4.8.13.recipe index 8876e3e43..576f86da4 100644 --- a/app-misc/mc/mc-4.8.13.recipe +++ b/app-misc/mc/mc-4.8.13.recipe @@ -1,21 +1,18 @@ -SUMMARY="Midnight Commander — a powerful file manager." +SUMMARY="A powerful file manager" DESCRIPTION=" GNU Midnight Commander is a text-mode full-screen file manager. It uses a two \ panel interface and a subshell for command execution. It includes an internal \ editor with syntax highlighting and an internal viewer with support for \ binary files. Also included is Virtual Filesystem (VFS), that allows files on \ remote systems (e.g. FTP, SSH servers) and files inside archives to be \ -manipulated like real files." +manipulated like real files. +" HOMEPAGE="http://www.midnight-commander.org" +SRC_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz" +CHECKSUM_SHA256="36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657" COPYRIGHT="2007 MC Team" LICENSE="GNU GPL v2" - -CHECKSUM_SHA256="36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657" - -SRC_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz" - REVISION="1" - ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -30,7 +27,6 @@ PROVIDES=" cmd:mcdiff$secondaryArchSuffix = $portVersion compat >= $portVersion cmd:mcview$secondaryArchSuffix = $portVersion compat >= $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -41,7 +37,6 @@ REQUIRES=" lib:libz$secondaryArchSuffix lib:libglib_2.0$secondaryArchSuffix >= 0.38 " - BUILD_REQUIRES=" devel:libglib_2.0$secondaryArchSuffix >= 0.38 devel:libiconv$secondaryArchSuffix @@ -51,7 +46,6 @@ BUILD_REQUIRES=" devel:libssl$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:awk diff --git a/app-misc/strigi/strigi-0.7.5.recipe b/app-misc/strigi/strigi-0.7.5.recipe index faeed35ef..011451c32 100644 --- a/app-misc/strigi/strigi-0.7.5.recipe +++ b/app-misc/strigi/strigi-0.7.5.recipe @@ -1,10 +1,11 @@ -SUMMARY="Desktop search daemon." +SUMMARY="A Desktop search daemon" DESCRIPTION="Strigi is a desktop search daemon, which is operating \ system-independent and desktop-independent. Strigi's goals are to be fast, \ use a small amount of RAM, and use flexible backends and plug-ins. Like most \ desktop search systems, Strigi can extract information from files, such as \ the length of an audio clip, the contents of a document, or the resolution \ -of a picture; plugins determine what filetypes it is capable of handling." +of a picture; plugins determine what filetypes it is capable of handling. +" HOMEPAGE="http://strigi.sourceforge.net" SRC_URI="http://downloads.sourceforge.net/project/strigi/strigi/strigi-0.7.5.tar.bz2" CHECKSUM_SHA256="111f5e3ede171292302b906418af0175445ca01958d40fb54879f80620b5189b" @@ -35,7 +36,6 @@ PROVIDES=" cmd:strigidaemon cmd:xmlindexer " - REQUIRES=" haiku${secondaryArchSuffix} lib:libz$secondaryArchSuffix @@ -44,7 +44,6 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix cmd:perl " - BUILD_PREREQUIRES=" cmd:cmake cmd:pkg_config$secondaryArchSuffix @@ -52,7 +51,6 @@ BUILD_PREREQUIRES=" cmd:make cmd:g++${secondaryArchSuffix} " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix @@ -60,7 +58,6 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libxml2$secondaryArchSuffix " - PROVIDES_devel=" strigi${secondaryArchSuffix}_devel = $portVersion devel:libstreamanalyzer$secondaryArchSuffix = $portVersion @@ -68,7 +65,6 @@ PROVIDES_devel=" devel:libsearchclient$secondaryArchSuffix = $portVersion devel:libstrigihtmlgui$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" haiku${secondaryArchSuffix}_devel strigi${secondaryArchSuffix} == $portVersion base diff --git a/app-office/multitalk/multitalk-1.4.recipe b/app-office/multitalk/multitalk-1.4.recipe index f66b7d092..0661072a8 100644 --- a/app-office/multitalk/multitalk-1.4.recipe +++ b/app-office/multitalk/multitalk-1.4.recipe @@ -1,13 +1,14 @@ -SUMMARY="A nonlinear presentation software." +SUMMARY="A nonlinear presentation software" DESCRIPTION="MultiTalk is an SDL based presentation program with slides laid \ on a grid instead of linearly. Slides can have any size (bigger or smaller \ than the screen, and you can move in both directions between them. Hyperlinks \ -are also possible." +are also possible. +" LICENSE="GNU GPL v2" COPYRIGHT=" 2006-2008 David Ingram 2010 Johannes Buchner -" + " HOMEPAGE="https://github.com/JohannesBuchner/multitalk" REVISION="1" ARCHITECTURES="x86_gcc2" @@ -20,8 +21,7 @@ PATCHES="multitalk-$portVersion.patchset" PROVIDES=" multitalk = $portVersion cmd:multitalk -" - + " REQUIRES=" haiku sdl_gfx @@ -29,20 +29,18 @@ REQUIRES=" sdl_ttf libsdl lib:libstdc++ -" - + " BUILD_REQUIRES=" devel:sdl_gfx devel:sdl_image devel:sdl_ttf -" - + " BUILD_PREREQUIRES=" haiku_devel cmd:g++ cmd:make cmd:sdl_config -" + " BUILD() { diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe index 93356586d..8f72b740b 100644 --- a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe +++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe @@ -1,4 +1,4 @@ -SUMMARY="Docbook DTD for XML." +SUMMARY="Docbook DTD for XML" DESCRIPTION=" DocBook is an XML vocabulary that lets you create documents in a \ presentation-neutral form that captures the logical structure of your content. @@ -18,16 +18,15 @@ ARCHITECTURES="any" LICENSE="Docbook" COPYRIGHT=" - 19996-2006 HaL Computer Systems Inc., O'Reilly & Associates Inc, + 1996-2006 HaL Computer Systems Inc., O'Reilly & Associates Inc, ArborText Inc, Fujitsu Software Corporation, Norman Walsh, Sun Microsystems Inc. and the Organization for the Advancement of Structured Information Standards (OASIS) -" + " PROVIDES=" docbook_xml_dtd = $portVersion " - BUILD_PREREQUIRES=" cmd:xmlcatalog cmd:find diff --git a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe index d8b23892c..caf763bb6 100644 --- a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe +++ b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe @@ -1,6 +1,9 @@ -SUMMARY="XSL stylesheets for DocBook XML document instances." +SUMMARY="XSL stylesheets for DocBook XML document instances" DESCRIPTION=" -DocBook is an XML vocabulary that lets you create documents in a presentation-neutral form that captures the logical structure of your content. Using free tools along with the DocBook XSL stylesheets, you can publish your content as HTML pages and PDF files, and in many other formats. +DocBook is an XML vocabulary that lets you create documents in a \ +presentation-neutral form that captures the logical structure of your content. \ +Using free tools along with the DocBook XSL stylesheets, you can publish your \ +content as HTML pages and PDF files, and in many other formats. " HOMEPAGE="http://docbook.sourceforge.net" @@ -17,18 +20,18 @@ COPYRIGHT=" 2004-2007 Steve Ball 2005-2008 The DocBook Project 2011-2012 O'Reilly Media -" + " PROVIDES=" docbook_xsl_stylesheets = $portVersion " - BUILD_PREREQUIRES=" cmd:xmlcatalog cmd:find " SOURCE_DIR="docbook-xsl-$portVersion" + BUILD() { true diff --git a/app-text/dos2unix/dos2unix-1.0.1.recipe b/app-text/dos2unix/dos2unix-1.0.1.recipe index 90eb5529e..d33ef3e8f 100644 --- a/app-text/dos2unix/dos2unix-1.0.1.recipe +++ b/app-text/dos2unix/dos2unix-1.0.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="dos2unix and unix2dos end of line file convertors." +SUMMARY="dos2unix and unix2dos end of line file convertors" DESCRIPTION=" DOS/Windows like to put CR/LF at the end of lines whereas UNIX like to have \ just LF. Dos2unix and unix2dos are simple parser/converter command line \ @@ -17,11 +17,9 @@ PROVIDES=" cmd:dos2unix cmd:unix2dos " - REQUIRES=" haiku " - BUILD_PREREQUIRES=" haiku_devel cmd:g++ diff --git a/app-text/mupdf/mupdf-1.6.recipe b/app-text/mupdf/mupdf-1.6.recipe index e77ac34d4..05afe2672 100644 --- a/app-text/mupdf/mupdf-1.6.recipe +++ b/app-text/mupdf/mupdf-1.6.recipe @@ -1,4 +1,4 @@ -SUMMARY="A lightweight XPS and PDF rendering library." +SUMMARY="A lightweight XPS and PDF rendering library" DESCRIPTION=" The renderer in MuPDF is tailored for high quality anti-aliased graphics. It \ renders text with metrics and spacing accurate to within fractions of a pixel \ @@ -33,7 +33,6 @@ PROVIDES=" mupdf$secondaryArchSuffix = $portVersion compat >= 1.1 devel:libmupdf$secondaryArchSuffix = $portVersion compat >= 1.1 " - REQUIRES=" haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -42,7 +41,6 @@ REQUIRES=" openjpeg$secondaryArchSuffix lib:libjbig2dec$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libopenjp2$secondaryArchSuffix devel:libjbig2dec$secondaryArchSuffix @@ -50,7 +48,6 @@ BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:find diff --git a/dev-db/sqlite/sqlite-3.8.7.4.recipe b/dev-db/sqlite/sqlite-3.8.7.4.recipe index 96bd9ea60..a45bd4da3 100644 --- a/dev-db/sqlite/sqlite-3.8.7.4.recipe +++ b/dev-db/sqlite/sqlite-3.8.7.4.recipe @@ -1,4 +1,4 @@ -SUMMARY="An SQL Database Engine in a C Library" +SUMMARY="An SQL Database Engine in a C library" DESCRIPTION=" SQLite is a software library that implements a self-contained, serverless, \ zero-configuration, transactional SQL database engine. diff --git a/dev-embedded/avrdude/avrdude-6.0.1.recipe b/dev-embedded/avrdude/avrdude-6.0.1.recipe index 6220b7fe7..14e3fee36 100644 --- a/dev-embedded/avrdude/avrdude-6.0.1.recipe +++ b/dev-embedded/avrdude/avrdude-6.0.1.recipe @@ -1,6 +1,6 @@ SUMMARY="AVRDUDE - AVR Downloader/UploaDEr" DESCRIPTION=" -AVRDUDE is an utility to download/upload/manipulate the ROM and EEPROM contents +AVRDUDE is an utility to download/upload/manipulate the ROM and EEPROM contents \ of AVR microcontrollers using the in-system programming technique (ISP). " HOMEPAGE="http://www.nongnu.org/avrdude/" @@ -9,7 +9,7 @@ LICENSE=" " COPYRIGHT=" 2003-2013 Brian S. Dean -" + " SRC_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.gz" CHECKSUM_SHA256="c6804668dfa96b23185dfe2e8239089af4e4ae0b11aa7435bebb28c3260ede41" REVISION="2" @@ -24,13 +24,12 @@ PATCHES="avrdude-6.0.1.patch" GLOBAL_WRITABLE_FILES=" settings/avrdude.conf keep-old -" + " PROVIDES=" avrdude$secondaryArchSuffix = $portVersion cmd:avrdude$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix diff --git a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe index 3d2f2d7a3..27c217014 100644 --- a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe +++ b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe @@ -1,6 +1,6 @@ SUMMARY="GCC compiler for Motorola 6809" -DESCRIPTION="This is a version of the GCC compiler for the Motorla 6809. It uses -the lwtools as a backend. Note that there is no C library provided." +DESCRIPTION="This is a version of the GCC compiler for the Motorla 6809. It \ +uses the lwtools as a backend. Note that there is no C library provided." HOMEPAGE="http://lwtools.projects.l-w.ca" SRC_URI="ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/releases/gcc-$portVersion/gcc-$portVersion.tar.bz2" CHECKSUM_SHA256="8eebf51c908151d1f1a3756c8899c5e71572e8469a547ad72a1ef16a08a31b59" @@ -29,12 +29,10 @@ PROVIDES=" cmd:m6809_unknown_gcc$secondaryArchSuffix cmd:m6809_unknown_gcov$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix cmd:m6809_unknown_ld$secondaryArchSuffix -" - + " BUILD_REQUIRES=" devel:libgmp$secondaryArchSuffix devel:libmpfr$secondaryArchSuffix @@ -62,6 +60,7 @@ SOURCE_DIR="gcc-$portVersion" sourceDir=$(pwd) objectsDir=$(pwd)/../${portVersionedName}-obj + BUILD() { rm -rf $objectsDir diff --git a/dev-embedded/lwtools/lwtools-4.10.recipe b/dev-embedded/lwtools/lwtools-4.10.recipe index 381b99710..9418d0a16 100644 --- a/dev-embedded/lwtools/lwtools-4.10.recipe +++ b/dev-embedded/lwtools/lwtools-4.10.recipe @@ -1,12 +1,16 @@ SUMMARY="Cross-development tools for the Motorola 6809" -DESCRIPTION="LWTOOLS is a set of cross-development tools for the Motorola 6809 -and Hitachi 6309 microprocessors. It supports assembling to raw binaries, CoCo -LOADM binaries, and a proprietary object file format for later linking. It also -supports macros and file inclusion among other things." +DESCRIPTION="LWTOOLS is a set of cross-development tools for the Motorola 6809 \ +and Hitachi 6309 microprocessors. It supports assembling to raw binaries, CoCo \ +LOADM binaries, and a proprietary object file format for later linking. It also \ +supports macros and file inclusion among other things. +" +HOMEPAGE="http://lwtools.projects.l-w.ca/" +SRC_URI="$HOMEPAGE/releases/lwtools/lwtools-$portVersion.tar.gz" +CHECKSUM_SHA256="06ee27c597798bbfb064a8d9471e5cd91074ff22fa8eb4f7d276a8809d35622c" REVISION="1" COPYRIGHT="2006-2014 William Astle" LICENSE="GNU GPL v3" -HOMEPAGE="http://lwtools.projects.l-w.ca/" + ARCHITECTURES="" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -14,8 +18,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" -SRC_URI="$HOMEPAGE/releases/lwtools/lwtools-$portVersion.tar.gz" -CHECKSUM_SHA256="06ee27c597798bbfb064a8d9471e5cd91074ff22fa8eb4f7d276a8809d35622c" PROVIDES=" lwtools$secondaryArchSuffix = $portVersion @@ -30,17 +32,15 @@ PROVIDES=" cmd:m6809_unknown_objdump$secondaryArchSuffix cmd:m6809_unknown_ranlib$secondaryArchSuffix cmd:m6809_unknown_strip$secondaryArchSuffix -" - + " REQUIRES=" haiku$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:cc$secondaryArchSuffix cmd:make -" + " BUILD() { diff --git a/dev-embedded/sdcc/sdcc-3.4.0.recipe b/dev-embedded/sdcc/sdcc-3.4.0.recipe index efeed6cc5..a1ec63108 100644 --- a/dev-embedded/sdcc/sdcc-3.4.0.recipe +++ b/dev-embedded/sdcc/sdcc-3.4.0.recipe @@ -1,11 +1,11 @@ -SUMMARY="a retargettable, optimizing ANSI - C compiler suite" +SUMMARY="A retargettable, optimizing ANSI - C compiler suite" DESCRIPTION=" -SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the -Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim -(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based -(hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit -3000A, TLCS-90) and STMicroelectronics STM8. Work is in progress on supporting -the Microchip PIC16 and PIC18 targets. It can be retargeted for other +SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the \ +Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim \ +(formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based \ +(hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit \ +3000A, TLCS-90) and STMicroelectronics STM8. Work is in progress on supporting \ +the Microchip PIC16 and PIC18 targets. It can be retargeted for other \ microprocessors. " HOMEPAGE="http://sdcc.sourceforge.net" @@ -14,7 +14,7 @@ LICENSE=" " COPYRIGHT=" 1999-2013 Sandeep Dutta -" + " SRC_URI="http://sourceforge.net/projects/sdcc/files/sdcc/3.4.0/sdcc-src-3.4.0.tar.bz2" CHECKSUM_SHA256="cf6af862b94d5f259f11afa0a1b86304f3047b3723a9df96f20dba869deb5bf9" REVISION="1" @@ -61,17 +61,14 @@ PROVIDES=" cmd:sz80$secondaryArchSuffix devel:libiberty$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libboost_graph$secondaryArchSuffix devel:libiconv$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix diff --git a/dev-embedded/stlink/stlink-1.0.0.recipe b/dev-embedded/stlink/stlink-1.0.0.recipe index b81e3ff60..43d389d86 100644 --- a/dev-embedded/stlink/stlink-1.0.0.recipe +++ b/dev-embedded/stlink/stlink-1.0.0.recipe @@ -1,7 +1,8 @@ -SUMMARY="stm32 discovery line programmer" -DESCRIPTION="stlink is a cheap adapter used to program and debug STM32 -microcontrollers. This tool allows interfacing the stlink with GDB for easy -programming and debugging of these chips." +SUMMARY="STM32 discovery line programmer" +DESCRIPTION="stlink is a cheap adapter used to program and debug STM32 \ +microcontrollers. This tool allows interfacing the stlink with GDB for easy \ +programming and debugging of these chips. +" HOMEPAGE="https://github.com/texane/stlink" LICENSE="BSD (3-clause)" COPYRIGHT="2011 The Capt'ns Missing Link Authors" @@ -24,17 +25,14 @@ PROVIDES=" cmd:st_info$secondaryArchSuffix cmd:st_term$secondaryArchSuffix cmd:st_util$secondaryArchSuffix -" - + " REQUIRES=" haiku$secondaryArchSuffix lib:libusb_1.0$secondaryArchSuffix -" - + " BUILD_REQUIRES=" devel:libusb_1.0$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:aclocal @@ -42,7 +40,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix -" + " BUILD() { diff --git a/dev-embedded/stm32flash/stm32flash-0.3.recipe b/dev-embedded/stm32flash/stm32flash-0.3.recipe index 500cedf84..02378d703 100644 --- a/dev-embedded/stm32flash/stm32flash-0.3.recipe +++ b/dev-embedded/stm32flash/stm32flash-0.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="Open source cross platform flash program for the STM32 bootloader." +SUMMARY="Cross platform flash program for the STM32 bootloader" DESCRIPTION="Open source flash program for the STM32 ARM processors using \ ST serial bootloader. @@ -23,9 +23,9 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" COPYRIGHT=" -Geoffrey McRae -2012-2014 Tormod Volden -" + Geoffrey McRae + 2012-2014 Tormod Volden + " LICENSE="GNU GPL v2" SRC_URI="https://releases.stm32flash.googlecode.com/git/stm32flash-0.3.tar.gz" @@ -35,17 +35,15 @@ SOURCE_DIR="stm32flash" PROVIDES=" stm32flash$secondaryArchSuffix = $portVersion cmd:stm32flash$secondaryArchSuffix = $portVersion -" - + " REQUIRES=" haiku$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make -" + " BUILD() { diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-2.0.3.recipe index f66506bd2..25c519be8 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-2.0.3.recipe @@ -1,7 +1,13 @@ -SUMMARY="Physfs" +SUMMARY="A library to access multiple forms of archives" DESCRIPTION=" -PhysicsFS is a library to provide abstract access to various archives. -" +Physfs is short for PhysicsFS. It's a C library that provides abstract \ +access to various archives. It is intended for use in video games, and the \ +design was somewhat inspired by Quake 3's file subsystem. The programmer \ +defines a "write directory" on the physical filesystem. No file writing done \ +through the PhysicsFS API can leave that write directory, for security. +PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are \ +available, the user's home directory, where in the real filesystem your \ +program is running, etc." HOMEPAGE="http://icculus.org/physfs" SRC_URI="http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2" CHECKSUM_SHA256="ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69" @@ -18,21 +24,17 @@ PROVIDES=" lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 2.0 " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix " - PATCH() { sed -i "s,DESTINATION include,DESTINATION $relativeIncludeDir," CMakeLists.txt @@ -62,7 +64,6 @@ PROVIDES_devel=" physfs${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 " - REQUIRES_devel=" physfs$secondaryArchSuffix == $portVersion base " diff --git a/dev-lang/lua/lua-5.2.3.recipe b/dev-lang/lua/lua-5.2.3.recipe index 19ced86d0..acd72555b 100644 --- a/dev-lang/lua/lua-5.2.3.recipe +++ b/dev-lang/lua/lua-5.2.3.recipe @@ -1,10 +1,20 @@ -SUMMARY="Lua is a powerful, fast, light-weight, embeddable scripting language." +SUMMARY="A powerful, fast, light-weight, embeddable scripting language" +DESCRIPTION=" +Lua combines simple procedural syntax with powerful data description \ +constructs based on associative arrays and extensible semantics. Lua is \ +dynamically typed, runs by interpreting bytecode for a register-based virtual \ +machine, and has automatic memory management with incremental garbage \ +collection, making it ideal for configuration, scripting, and rapid prototyping. +" HOMEPAGE="http://www.lua.org" SRC_URI="http://www.lua.org/ftp/lua-$portVersion.tar.gz" CHECKSUM_SHA256="13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d" +LICENSE="MIT" +COPYRIGHT="1994-2012, Lua.org, PUC-Rio" REVISION="1" ARCHITECTURES="x86 x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" + PROVIDES=" lua$secondaryArchSuffix = $portVersion compat >= 5.2 cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.2 @@ -12,7 +22,6 @@ PROVIDES=" cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.2 lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.2 " - REQUIRES=" haiku$secondaryArchSuffix " @@ -27,7 +36,6 @@ PROVIDES_devel=" devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.2 devel:liblua52$secondaryArchSuffix = $portVersion compat >= 5.2 " - REQUIRES_devel=" lua$secondaryArchSuffix == $portVersion " @@ -55,12 +63,3 @@ INSTALL() prepareInstalledDevelLib liblua52 packageEntries devel $developDir } -LICENSE="MIT" -COPYRIGHT="1994-2012, Lua.org, PUC-Rio" -DESCRIPTION=" -Lua combines simple procedural syntax with powerful data description \ -constructs based on associative arrays and extensible semantics. Lua is \ -dynamically typed, runs by interpreting bytecode for a register-based virtual \ -machine, and has automatic memory management with incremental garbage \ -collection, making it ideal for configuration, scripting, and rapid prototyping. -" diff --git a/dev-lang/luajit/luajit-2.0.2.recipe b/dev-lang/luajit/luajit-2.0.2.recipe index 1fb575692..88980d3f2 100644 --- a/dev-lang/luajit/luajit-2.0.2.recipe +++ b/dev-lang/luajit/luajit-2.0.2.recipe @@ -1,17 +1,25 @@ -SUMMARY="LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language." +SUMMARY="A Just-In-Time Compiler (JIT) for the Lua programming language" +DESCRIPTION=" +LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language. + +Lua is a powerful, dynamic and light-weight programming language. It may be \ +embedded or used as a general-purpose, stand-alone language. +" HOMEPAGE="http://luajit.org/luajit.html" SRC_URI="http://luajit.org/download/LuaJIT-$portVersion.tar.gz" CHECKSUM_SHA256="c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38" +LICENSE="MIT" +COPYRIGHT="2005-2013, Mike Pall" REVISION="2" ARCHITECTURES="x86 x86_gcc2" SECONDARY_ARCHITECTURES="x86" + PROVIDES=" luajit$secondaryArchSuffix = $portVersion compat >= 5.1 lib:libluajit_5.1$secondaryArchSuffix = $portVersion compat >= 2 cmd:luajit_$portVersion$secondaryArchSuffix cmd:luajit$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix " @@ -25,14 +33,13 @@ PROVIDES_devel=" luajit${secondaryArchSuffix}_devel = $portVersion compat >= 5.1 devel:libluajit_5.1$secondaryArchSuffix = $portVersion compat >= 2 " - REQUIRES_devel=" luajit$secondaryArchSuffix == $portVersion base " PATCHES="luajit-$portVersion.patchset" - SOURCE_DIR="LuaJIT-$portVersion" + BUILD() { # Use amalg target as recommended on luajit homepage to get better performance @@ -56,11 +63,3 @@ INSTALL() packageEntries devel $developDir } -LICENSE="MIT" -COPYRIGHT="2005-2013, Mike Pall" -DESCRIPTION=" -LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language. - -Lua is a powerful, dynamic and light-weight programming language. It may be \ -embedded or used as a general-purpose, stand-alone language. -" diff --git a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe index 0dced0af1..2fec01516 100644 --- a/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe +++ b/dev-lang/openjdk/openjdk-1.7_u80_b02.recipe @@ -1,11 +1,12 @@ -SUMMARY="Open-source implementation of the Java Platform, SE." +SUMMARY="Open-source implementation of the Java Platform, SE" DESCRIPTION="OpenJDK (Open Java Development Kit) is a free and open source \ implementation of the Java Platform, Standard Edition (Java SE). It is the \ result of an effort Sun Microsystems began in 2006. The implementation is \ licensed under the GNU General Public License (GNU GPL) with a linking \ exception. Were it not for the GPL linking exception, components that linked \ to the Java class library would be subject to the terms of the GPL license. \ -OpenJDK is the official Java SE 7 reference implementation." +OpenJDK is the official Java SE 7 reference implementation. +" HOMEPAGE="http://openjdk.java.net/" COPYRIGHT="2012 Oracle and/or its affiliates." LICENSE="GNU GPL v2" @@ -81,21 +82,18 @@ PROVIDES=" cmd:wsimport$secondaryArchSuffix = $portVersion compat >= 1 cmd:xjc$secondaryArchSuffix = $portVersion compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffx lib:libfreetype$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cpio >= 2.10 cmd:make diff --git a/dev-lang/ruby/ruby-2.1.2.recipe b/dev-lang/ruby/ruby-2.1.2.recipe index 71092ca80..a64583a98 100644 --- a/dev-lang/ruby/ruby-2.1.2.recipe +++ b/dev-lang/ruby/ruby-2.1.2.recipe @@ -1,20 +1,23 @@ SUMMARY="A programming language focused on simplicity and productivity" DESCRIPTION=" -Ruby is a dynamic, reflective, object-oriented, general-purpose -programming language. It was designed and developed in the mid-1990s +Ruby is a dynamic, reflective, object-oriented, general-purpose \ +programming language. It was designed and developed in the mid-1990s \ by Yukihiro 'Matz' Matsumoto in Japan. -Ruby embodies syntax inspired by Perl with Smalltalk-like features and -was also influenced by Eiffel and Lisp. It supports multiple -programming paradigms, including functional, object oriented, and -imperative. It also has a dynamic type system and automatic memory -management. Therefore, it is similar in varying degrees to, Smalltalk, -Python, Perl, Lisp, Dylan, and CLU." +Ruby embodies syntax inspired by Perl with Smalltalk-like features and \ +was also influenced by Eiffel and Lisp. It supports multiple \ +programming paradigms, including functional, object oriented, and \ +imperative. It also has a dynamic type system and automatic memory \ +management. Therefore, it is similar in varying degrees to, Smalltalk, \ +Python, Perl, Lisp, Dylan, and CLU. +" HOMEPAGE="http://www.ruby-lang.org" SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.gz" CHECKSUM_SHA256="f22a6447811a81f3c808d1c2a5ce3b5f5f0955c68c9a749182feb425589e6635" -LICENSE="Ruby - BSD (3-clause)" +LICENSE=" + Ruby + BSD (3-clause) + " COPYRIGHT="1993-2014 Yukihiro Matsumoto" REVISION="1" @@ -39,7 +42,6 @@ PROVIDES=" cmd:testrb$secondaryArchSuffix = $portVersion compat >= 2.1 lib:libruby$secondaryArchSuffix = $portVersion compat >= 2.1 " - REQUIRES=" haiku$secondaryArchSuffix lib:libedit$secondaryArchSuffix @@ -49,7 +51,6 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libncursesw$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libedit$secondaryArchSuffix @@ -60,7 +61,6 @@ BUILD_REQUIRES=" devel:libncursesw$secondaryArchSuffix devel:libffi$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix @@ -78,7 +78,6 @@ PROVIDES_devel=" lib:libruby_static$secondaryArchSuffix = $portVersion compat >= 2.1 devel:libruby$secondaryArchSuffix = $portVersion compat >= 2.1 " - REQUIRES_devel=" ruby$secondaryArchSuffix == $portVersion base " diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe index 6c28db0fa..eee45bd0f 100644 --- a/dev-lang/yab/yab-1.7.02.recipe +++ b/dev-lang/yab/yab-1.7.02.recipe @@ -1,4 +1,4 @@ -SUMMARY="extended version of the yabsic programming language" +SUMMARY="Extended version of the yabsic programming language" DESCRIPTION=" yab is an extended version of yabasic, a BASIC programming language, with \ special commands designed for Haiku. @@ -10,14 +10,13 @@ CHECKSUM_RMD160="f62fa02a585d9f6c5ee3eb9b781a06083352bd6f" CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7fdd0738e126b9a2e5d2f8d84fd0c153d9b7702e806cc91c6a97537dda11411e915" SOURCE_DIR="Yab-1.7.3" - REVISION="3" - LICENSE="Artistic" - -COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic) +COPYRIGHT=" + 1995-2006 Marc-Oliver Ihm (yabasic) 2006-2009 Jan Bungeroth (yab improvements) - 2013 Jim Saxton (yab improvements)" + 2013 Jim Saxton (yab improvements) + " ARCHITECTURES="x86_gcc2 x86 ?x86_64" @@ -25,17 +24,14 @@ PROVIDES=" yab = $portVersion compat >=1.7.02 cmd:yab= $portVersion compat >=1.7.02 " - REQUIRES=" haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:bison cmd:flex diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe index 32f103d6c..18b2931c7 100644 --- a/dev-libs/apr/apr-1.5.0.recipe +++ b/dev-libs/apr/apr-1.5.0.recipe @@ -2,7 +2,7 @@ SUMMARY="Apache Portable Runtime Library" HOMEPAGE="http://apr.apache.org/" SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz" CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7" -COPYRIGHT="2012 The Apache Software Foundation." +COPYRIGHT="2012 The Apache Software Foundation" LICENSE="Apache v2" REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -29,7 +29,6 @@ BUILD_PREREQUIRES=" cmd:make " - BUILD() { libtoolize -fci @@ -85,6 +84,7 @@ predictable if not identical behaviour regardless of the platform on which \ their software is built, relieving them of the need to code special-case \ conditions to work around or take advantage of platform-specific deficiencies \ or features. + To give a brief overview, the primary core subsystems of APR 1.x include the \ following: - atomic operations diff --git a/dev-libs/gmp/gmp-6.0.0.recipe b/dev-libs/gmp/gmp-6.0.0.recipe index c322f55b7..79c63f29e 100644 --- a/dev-libs/gmp/gmp-6.0.0.recipe +++ b/dev-libs/gmp/gmp-6.0.0.recipe @@ -5,20 +5,23 @@ arbitrary-precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. There are no practical limits to the precision \ except the ones implied by the available memory in the machine GMP runs on \ (operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \ -64-bit machines). GMP has a rich set of functions, and the functions have a \ +64-bit machines). +GMP has a rich set of functions, and the functions have a \ regular interface. The basic interface is for C but wrappers exist for other \ languages including Ada, C++, C#, OCaml, Perl, PHP, and Python. " HOMEPAGE="http://gmplib.org/" SRC_URI="http://ftp.gnu.org/gnu/gmp/gmp-6.0.0a.tar.xz" CHECKSUM_SHA256="9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764" -LICENSE="GNU GPL v3 +LICENSE=" + GNU GPL v3 GNU LGPL v3 " COPYRIGHT="1991-2014 Free Software Foundation, Inc." REVISION="1" ARCHITECTURES="x86 x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 6.0 lib:libgmp$secondaryArchSuffix = 10.2.0 compat >= 10 " diff --git a/dev-libs/icu/icu-54.1.recipe b/dev-libs/icu/icu-54.1.recipe index f9aaf63ee..da44cc3e0 100644 --- a/dev-libs/icu/icu-54.1.recipe +++ b/dev-libs/icu/icu-54.1.recipe @@ -26,7 +26,7 @@ REQUIRES=" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then REQUIRES+=" lib:libgcc_s$secondaryArchSuffix -" + " fi BUILD_REQUIRES=" " @@ -101,6 +101,7 @@ Java software. ICU is released under a nonrestrictive open source license that is suitable \ for use with both commercial software and with other open source or free \ software. + Here are a few highlights of the services provided by ICU: * Code Page Conversion: Convert text data to or from Unicode and nearly any \ other character set or encoding. ICU's conversion tables are based on charset \ diff --git a/dev-libs/libelf/libelf-0.8.13.recipe b/dev-libs/libelf/libelf-0.8.13.recipe index cb805ffd2..95e37e458 100644 --- a/dev-libs/libelf/libelf-0.8.13.recipe +++ b/dev-libs/libelf/libelf-0.8.13.recipe @@ -1,4 +1,4 @@ -SUMMARY="libelf - ELF object file access library" +SUMMARY="ELF object file access library" DESCRIPTION=" Libelf lets you read, modify or create ELF files in an architecture-independent \ way. The library takes care of size and endian issues, e.g. you can process a \ @@ -25,7 +25,6 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -54,7 +53,6 @@ PROVIDES_devel=" libelf${secondaryArchSuffix}_devel = $portVersion devel:libelf$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" lib:libelf$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libffi/libffi-3.2.1.recipe b/dev-libs/libffi/libffi-3.2.1.recipe index 23d40ca3f..c015acea9 100644 --- a/dev-libs/libffi/libffi-3.2.1.recipe +++ b/dev-libs/libffi/libffi-3.2.1.recipe @@ -1,7 +1,10 @@ -SUMMARY="A portable, high level programming interface." +SUMMARY="A portable, high level programming interface" DESCRIPTION=" -A portable, high level programming interface to various calling conventions. -" +Libffi is a foreign function interface library which gives its user a \ +C programming language interface used to call natively compiled functions. \ +Libffi is typically used as a bridging technology between compiled \ +and interpreted language implementations. It can also be used to \ +implement plugins." HOMEPAGE="http://sourceware.org/libffi" LICENSE="MIT" REVISION="2" @@ -18,14 +21,11 @@ PROVIDES=" libffi$secondaryArchSuffix = $portVersion compat >= 3 lib:libffi$secondaryArchSuffix = 6.0.4 compat >= 6 " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -60,7 +60,6 @@ PROVIDES_devel=" libffi${secondaryArchSuffix}_devel = $portVersion devel:libffi$secondaryArchSuffix = 6.0.4 compat >= 6 " - REQUIRES_devel=" libffi$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/libusb/libusb-1.0.19.recipe b/dev-libs/libusb/libusb-1.0.19.recipe index de73f2e0b..5e0c505f3 100644 --- a/dev-libs/libusb/libusb-1.0.19.recipe +++ b/dev-libs/libusb/libusb-1.0.19.recipe @@ -1,30 +1,30 @@ -SUMMARY="libusb is a library that provides generic access to USB devices." +SUMMARY="A library that provides generic access to USB devices" DESCRIPTION=" -libusb is a library that provides generic access to USB devices. As a library, -it is meant to be used by developers, to facilitate the production of +libusb is a library that provides generic access to USB devices. As a library, \ +it is meant to be used by developers, to facilitate the production of \ applications that communicate with USB hardware. -It is portable: Using a single cross-platform API, it provides access to USB +It is portable: Using a single cross-platform API, it provides access to USB \ devices on Linux, OS X, Windows and OpenBSD. -It is user-mode: No special privilege or elevation is required for the +It is user-mode: No special privilege or elevation is required for the \ application to communicate with a device. -It is version-agnostic: All versions of the USB protocol, from 1.0 to 3.0 +It is version-agnostic: All versions of the USB protocol, from 1.0 to 3.0 \ (latest), are supported. " LICENSE="GNU LGPL v2.1" COPYRIGHT=" -2001 Johannes Erdfelt -2007-2009 Daniel Drake -2010-2012 Peter Stuge -2008-2013 Nathan Hjelm -2009-2013 Pete Batard -2009-2013 Ludovic Rousseau -2010-2012 Michael Plante -2011-2013 Hans de Goede -2012-2013 Martin Pieuchot -2012-2013 Toby Gray +2001 Johannes Erdfelt +2007-2009 Daniel Drake +2010-2012 Peter Stuge +2008-2013 Nathan Hjelm +2009-2013 Pete Batard +2009-2013 Ludovic Rousseau +2010-2012 Michael Plante +2011-2013 Hans de Goede +2012-2013 Martin Pieuchot +2012-2013 Toby Gray " HOMEPAGE="http://libusb.org/" SRC_URI="git+git://github.com/libusb/libusb.git#a447fa4cd517e5393c0f1504b1a35b095aafa334" diff --git a/dev-libs/lzo/lzo-2.06.recipe b/dev-libs/lzo/lzo-2.06.recipe index 3233de18d..8b3c2ed6e 100644 --- a/dev-libs/lzo/lzo-2.06.recipe +++ b/dev-libs/lzo/lzo-2.06.recipe @@ -1,9 +1,9 @@ -SUMMARY="LZO is a portable lossless data compression library written in ANSI C." +SUMMARY="A portable lossless data compression library written in ANSI C" DESCRIPTION=" -LZO is a data compression library which is suitable for data de-/compression in +LZO is a data compression library which is suitable for data de-/compression in \ real-time. This means it favours speed over compression ratio. -LZO is written in ANSI C. Both the source code and the compressed data format +LZO is written in ANSI C. Both the source code and the compressed data format \ are designed to be portable across platforms. LZO implements a number of algorithms with the following features: @@ -11,10 +11,10 @@ LZO implements a number of algorithms with the following features: * Requires no memory for decompression. * Compression is pretty fast. * Requires 64 kB of memory for compression. -* Allows you to dial up extra compression at a speed cost in the compressor. - The speed of the decompressor is not reduced. -* Includes compression levels for generating pre-compressed data which achieve - a quite competitive compression ratio. +* Allows you to dial up extra compression at a speed cost in the compressor. \ +The speed of the decompressor is not reduced. +* Includes compression levels for generating pre-compressed data which achieve \ +a quite competitive compression ratio. * There is also a compression level which needs only 8 kB for compression. * Algorithm is thread safe. * Algorithm is lossless. @@ -24,6 +24,8 @@ HOMEPAGE="http://www.oberhumer.com/opensource/lzo/" SRC_URI="http://www.oberhumer.com/opensource/lzo/download/lzo-2.06.tar.gz" CHECKSUM_SHA256="ff79e6f836d62d3f86ef6ce893ed65d07e638ef4d3cb952963471b4234d43e73" REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1996-2011 Markus F.X.J Oberhumer" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86" @@ -31,11 +33,9 @@ PROVIDES=" lzo$secondaryArchSuffix = $portVersion lib:liblzo2$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -66,10 +66,6 @@ PROVIDES_devel=" lzo${secondaryArchSuffix}_devel = $portVersion devel:liblzo2$secondaryArchSuffix " - REQUIRES_devel=" lzo$secondaryArchSuffix == $portVersion base " - -LICENSE="GNU GPL v2" -COPYRIGHT="1996-2011 Markus F.X.J Oberhumer" diff --git a/dev-libs/mpc/mpc-1.0.2.recipe b/dev-libs/mpc/mpc-1.0.2.recipe index 5d0c80918..7cbb20a8b 100644 --- a/dev-libs/mpc/mpc-1.0.2.recipe +++ b/dev-libs/mpc/mpc-1.0.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="Arithmetics of complex numbers with arbitrarily high precision." +SUMMARY="Arithmetics of complex numbers with arbitrarily high precision" DESCRIPTION="Gnu Mpc is a C library for the arithmetic of complex numbers \ with arbitrarily high precision and correct rounding of the result. It \ extends the principles of the IEEE-754 standard for fixed precision real \ @@ -20,18 +20,15 @@ PROVIDES=" mpc$secondaryArchSuffix = $portVersion lib:libmpc$secondaryArchSuffix = 3.0.0 compat >= 3 " - REQUIRES=" haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix lib:libmpfr$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libgmp$secondaryArchSuffix devel:libmpfr$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:awk @@ -63,7 +60,6 @@ PROVIDES_devel=" mpc${secondaryArchSuffix}_devel = $portVersion devel:libmpc$secondaryArchSuffix = 3.0.0 compat >= 3 " - REQUIRES_devel=" mpc$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/mpfr/mpfr-3.1.2.recipe b/dev-libs/mpfr/mpfr-3.1.2.recipe index cfa7d157c..587245ce2 100644 --- a/dev-libs/mpfr/mpfr-3.1.2.recipe +++ b/dev-libs/mpfr/mpfr-3.1.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="multiple-precision floating-point computations with correct rounding." +SUMMARY="Multiple-precision floating-point computations with correct rounding" DESCRIPTION="The MPFR library is a C library for multiple-precision \ floating-point computations with correct rounding. MPFR has continuously been \ supported by the INRIA and the current main authors come from the Caramel and \ @@ -19,7 +19,8 @@ des Programmes under the number IDDN FR 001 120020 00 R P 2000 000 10800, on \ to make sure MPFR is free for all its users. Unlike the ordinary General \ Public License, the Lesser GPL enables developers of non-free programs to use \ MPFR in their programs. If you have written a new function for MPFR or \ -improved an existing one, please share your work!" +improved an existing one, please share your work! +" LICENSE="GNU LGPL v3" HOMEPAGE="http://www.mpfr.org" COPYRIGHT="2000-2014 INRIA" @@ -34,16 +35,13 @@ PROVIDES=" mpfr$secondaryArchSuffix = $portVersion lib:libmpfr$secondaryArchSuffix = 4.1.2 compat >= 4 " - REQUIRES=" haiku$secondaryArchSuffix lib:libgmp$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libgmp$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:awk @@ -75,7 +73,6 @@ PROVIDES_devel=" mpfr${secondaryArchSuffix}_devel = $portVersion devel:libmpfr$secondaryArchSuffix = 4.1.2 compat >= 4 " - REQUIRES_devel=" mpfr$secondaryArchSuffix == $portVersion base " diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe index c3e996159..b50fc6b0f 100644 --- a/dev-libs/popt/popt-1.16.recipe +++ b/dev-libs/popt/popt-1.16.recipe @@ -2,12 +2,12 @@ SUMMARY="A command line option parsing library" DESCRIPTION=" This is the popt(3) command line option parsing library. While it is similiar \ to getopt(3), it contains a number of enhancements, including: - 1) popt is fully reentrant - 2) popt can parse arbitrary argv[] style arrays while \ -getopt(3) makes this quite difficult - 3) popt allows users to alias command line arguments - 4) popt provides convience functions for parsing strings \ -into argv[] style arrays +- popt is fully reentrant +- popt can parse arbitrary argv[] style arrays while getopt(3) makes this \ +quite difficult +- popt allows users to alias command line arguments +- popt provides convience functions for parsing strings into argv[] style \ +arrays " LICENSE="MIT" COPYRIGHT="1998-2002 Red Hat, Inc." diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.recipe b/dev-libs/tinyxml/tinyxml-2.6.2.recipe index 7aa37a64d..43a21b296 100644 --- a/dev-libs/tinyxml/tinyxml-2.6.2.recipe +++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe @@ -1,8 +1,10 @@ SUMMARY="Small C++ XML Parser" DESCRIPTION=" -TinyXML is a simple, small, C++ XML parser that can be easily integrating into \ -other programs. -" +Tinyxml is a small simple, OS independent XML parser for the C++ language. \ +It is a free open source software. Timyxml was first created to solve the common \ +text I/O file problem. It parses the XML into a DOM-like tree and is able to \ +read and write XML files. It allows you to create your own document mark-ups \ +or even construct an XML document from scratch with C++ objects." HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html" COPYRIGHT="2001-2010 Lee Thomason" LICENSE="Zlib" diff --git a/dev-qt/automoc/automoc-0.9.88.recipe b/dev-qt/automoc/automoc-0.9.88.recipe index 291d2ec24..de8a45034 100644 --- a/dev-qt/automoc/automoc-0.9.88.recipe +++ b/dev-qt/automoc/automoc-0.9.88.recipe @@ -1,4 +1,4 @@ -SUMMARY="Automatically run MOC on Qt source files." +SUMMARY="Automatically run MOC on Qt source files" DESCRIPTION="Developed by KDE, automoc is a tool designed for use with \ CMake that generates lists of files to run MOC on. It's required for \ building KDE." @@ -22,18 +22,15 @@ PROVIDES=" automoc4${secondaryArchSuffix} = $portVersion cmd:automoc4 " - REQUIRES=" haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 " - BUILD_PREREQUIRES=" cmd:cmake cmd:make cmd:g++${secondaryArchSuffix} - " - + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 diff --git a/dev-qt/libattica/libattica-0.4.2.recipe b/dev-qt/libattica/libattica-0.4.2.recipe index d9bdab32b..fec385f73 100644 --- a/dev-qt/libattica/libattica-0.4.2.recipe +++ b/dev-qt/libattica/libattica-0.4.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="A library providing access to Open Collaboration services." +SUMMARY="A library providing access to Open Collaboration services" DESCRIPTION="Attica supports multiple Open Collaboration Service (OCS) \ providers at the same time. With Attica you can easily access services \ rom providers such as openDesktop.org. It implements the freedesktop.org \ @@ -20,21 +20,17 @@ else fi SECONDARY_ARCHITECTURES="x86" - PROVIDES=" libattica$secondaryArchSuffix = $portVersion lib:libattica$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix libqt4$secondaryArchSuffix >= 4.8 " - BUILD_REQUIRES=" libqt4${secondaryArchSuffix}_devel >= 4.8 " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:cmake @@ -47,7 +43,6 @@ PROVIDES_devel=" libattica${secondaryArchSuffix}_devel = $portVersion devel:libattica$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" haiku$secondaryArchSuffix libqt4${secondaryArchSuffix}_devel >= 4.8 diff --git a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe index b6304f7bc..58f35e59f 100644 --- a/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe +++ b/dev-qt/libdbusmenu_qt/libdbusmenu_qt-0.9.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="D-Bus Menu library for Qt." +SUMMARY="D-Bus Menu library for Qt" DESCRIPTION="This library provides a Qt implementation of the DBusMenu \ protocol. The DBusMenu protocol makes it possible for applications to \ export and import their menus over DBus." @@ -22,21 +22,18 @@ PROVIDES=" libdbusmenu_qt${secondaryArchSuffix} = $portVersion lib:libdbusmenu_qt$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 lib:libqjson$secondaryArchSuffix lib:libdbus_1$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:cmake cmd:pkg_config$secondaryArchSuffix cmd:make cmd:g++${secondaryArchSuffix} " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 @@ -48,7 +45,6 @@ PROVIDES_devel=" libdbusmenu_qt${secondaryArchSuffix}_devel = $portVersion devel:libdbusmenu_qt$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" libqt4${secondaryArchSuffix}_devel >= 4.8 libdbusmenu_qt${secondaryArchSuffix} == $portVersion base diff --git a/dev-qt/qca2/qca2-2.0.3.recipe b/dev-qt/qca2/qca2-2.0.3.recipe index a847f86da..d10deae11 100644 --- a/dev-qt/qca2/qca2-2.0.3.recipe +++ b/dev-qt/qca2/qca2-2.0.3.recipe @@ -1,11 +1,12 @@ -SUMMARY="Qt Cryptographic Architecture." +SUMMARY="Qt Cryptographic Architecture" DESCRIPTION="QCA aims to provide a straightforward and cross-platform \ crypto API, using Qt datatypes and conventions. QCA separates the API from \ the implementation, using plugins known as Providers. The advantage of this \ model is to allow applications to avoid linking to or explicitly depending \ on any particular cryptographic library. This allows one to easily change or \ upgrade crypto implementations without even needing to recompile the \ -application!" +application! +" HOMEPAGE="http://delta.affinix.com/qca/" SRC_URI="https://delta.affinix.com/download/qca/2.0/qca-2.0.3.tar.bz2" CHECKSUM_SHA256="8da20c89f390954fdcfcd3c4deef379213ddb5ae9d6b5e0c917d23f5e474895f" @@ -29,30 +30,25 @@ PROVIDES=" cmd:qcatool2$secondaryArchSuffix = $portVersion lib:libqca$secondaryArchSuffix = $portVersion " - PROVIDES_devel=" devel:libqca$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix libqt4$secondaryArchSuffix >= 4.8 ca_root_certificates " - REQUIRES_devel=" haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 qca2$secondaryArchSuffix == $portVersion base " - BUILD_PREREQUIRES=" cmd:which cmd:qmake$secondaryArchSuffix cmd:make cmd:g++$secondaryArchSuffix - " - + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 diff --git a/dev-qt/qjson/qjson-0.8.1.recipe b/dev-qt/qjson/qjson-0.8.1.recipe index b2d416aca..2200a134e 100644 --- a/dev-qt/qjson/qjson-0.8.1.recipe +++ b/dev-qt/qjson/qjson-0.8.1.recipe @@ -1,11 +1,12 @@ -SUMMARY="QJson is a Qt-based library that maps JSON data to QVariant objects." +SUMMARY="A Qt-based library that maps JSON data to QVariant objects" DESCRIPTION="JSON (JavaScript Object Notation) is a lightweight data-\ interchange format. It can represents integer, real number, string, an \ ordered sequence of value, and a collection of name/value pairs. QJson is a Qt-based library that maps JSON data to QVariant objects. \ JSON arrays will be mapped to QVariantList instances, while JSON's objects \ -will be mapped to QVariantMap." +will be mapped to QVariantMap. +" HOMEPAGE="http://qjson.sourceforge.net/" SRC_URI="https://github.com/flavio/qjson/archive/0.8.1.tar.gz" CHECKSUM_SHA256="920c94166cb91b1cf11c7d2745bdbcc8c0ea82411ca7b3732ce0b00ee2d56e98" @@ -26,28 +27,23 @@ PROVIDES=" qjson${secondaryArchSuffix} = $portVersion lib:libqjson$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 " - BUILD_PREREQUIRES=" cmd:cmake cmd:make cmd:g++${secondaryArchSuffix} - " - + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 " - PROVIDES_devel=" qjson${secondaryArchSuffix}_devel = $portVersion devel:libqjson$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" libqt4${secondaryArchSuffix}_devel >= 4.8 qjson${secondaryArchSuffix} == $portVersion base diff --git a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe index ac1a17e92..c5b2c1620 100644 --- a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe +++ b/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe @@ -1,9 +1,9 @@ -SUMMARY="Python-based continuous integration testing framework." +SUMMARY="Python-based continuous integration testing framework" DESCRIPTION=" Buildbot is a continuous integration system designed to automate the \ build/test cycle. By automatically rebuilding and testing the tree each time \ something has changed, build problems are pinpointed quickly, before other \ -developers are inconvenienced by the failure. Features +developers are inconvenienced by the failure. Main features are: * Buildbot is easy to set up, but very extensible and customizable. It \ supports arbitrary build processes, and is not limited to common build \ @@ -41,13 +41,11 @@ PROVIDES=" buildbot_slave = $portVersion cmd:buildslave = $portVersion " - REQUIRES=" haiku cmd:python python_twisted " - BUILD_REQUIRES="" BUILD_PREREQUIRES=" diff --git a/dev-util/cmake/cmake-3.0.0.recipe b/dev-util/cmake/cmake-3.0.0.recipe index db871e9c3..2577717ab 100644 --- a/dev-util/cmake/cmake-3.0.0.recipe +++ b/dev-util/cmake/cmake-3.0.0.recipe @@ -1,4 +1,4 @@ -SUMMARY="Cross-platform Make." +SUMMARY="Cross-platform Make" DESCRIPTION="CMake is a cross-platform, open-source build system. It is a \ family of tools designed to build, test and package software. CMake is used \ to control the software compilation process using simple platform and \ @@ -28,17 +28,14 @@ PROVIDES=" cmd:cpack = $portVersion compat >= 3.0 cmd:ctest = $portVersion compat >= 3.0 " - REQUIRES=" haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libncurses$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel haiku_devel diff --git a/dev-util/gyp/gyp-r1948.recipe b/dev-util/gyp/gyp-r1948.recipe index 988db89d4..462aafe59 100644 --- a/dev-util/gyp/gyp-r1948.recipe +++ b/dev-util/gyp/gyp-r1948.recipe @@ -1,8 +1,7 @@ -SUMMARY="GYP can Generate Your Projects." -DESCRIPTION="GYP (Generate Your Projects) is a build automation tool. \ -GYP is created by Google to generate native IDE project files (such as \ -Visual Studio and Xcode) for building the Chromium web browser and is \ -licensed as open source software using the BSD software license. \ +SUMMARY="Generate Your Projects (GYP) is a build automation tool" +DESCRIPTION="GYP is created by Google to generate native IDE project files \ +(such as Visual Studio and Xcode) for building the Chromium web browser and is \ +licensed as open source software using the BSD software license. " HOMEPAGE="https://code.google.com/p/gyp/" SRC_URI="svn+http://gyp.googlecode.com/svn/trunk#1948" @@ -18,17 +17,14 @@ PROVIDES=" gyp = $portVersion cmd:gyp = $portVersion " - REQUIRES=" haiku cmd:python python_setuptools " - BUILD_REQUIRES=" python_setuptools -" - + " BUILD_PREREQUIRES=" haiku_devel cmd:python diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe index 0fff8db85..92f223d8d 100644 --- a/dev-util/intltool/intltool-0.40.6.recipe +++ b/dev-util/intltool/intltool-0.40.6.recipe @@ -1,7 +1,8 @@ -SUMMARY="A set of tools to centralize translation of file formats." +SUMMARY="A set of tools to centralize translation of file formats" DESCRIPTION=" intltool is a set of tools to centralize translation of many different file \ formats using GNU gettext-compatible PO files. + The intltool collection can be used to do these things: * Extract translatable strings from various source files (.xml.in, glade, \ .desktop.in, .server.in, .oaf.in). @@ -13,12 +14,9 @@ files. This merge step will happen at build resp. installation time. HOMEPAGE="http://freedesktop.org/wiki/Software/intltool" SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz" CHECKSUM_SHA256="36cd8fe249d0cc20918b6d4583267208bf74c8d541c67a5fe63316846344f9f7" - LICENSE="GNU GPL v2" COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc." - REVISION="4" - ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/dev-util/ninja/ninja-1.5.1.recipe b/dev-util/ninja/ninja-1.5.1.recipe index 7b52e8348..1f2ef86c3 100644 --- a/dev-util/ninja/ninja-1.5.1.recipe +++ b/dev-util/ninja/ninja-1.5.1.recipe @@ -1,11 +1,12 @@ -SUMMARY="A small build system similar to make." +SUMMARY="A small build system similar to make" DESCRIPTION="Ninja is a small build system with a focus on speed. It differs \ from other build systems in two major respects: it is designed to have its \ input files generated by a higher-level build system, and it is designed to \ run builds as fast as possible. Ninja's low-level approach makes it perfect for embedding into more featureful \ build systems. Via gyp it can build Chrome and v8 and node.js etc.; via CMake \ -it can build LLVM, KDE, Blender, etc." +it can build LLVM, KDE, Blender, etc. +" HOMEPAGE="http://martine.github.io/ninja/" LICENSE="Apache v2" COPYRIGHT="2014 Google Inc." @@ -25,13 +26,11 @@ PROVIDES=" ninja$secondaryArchSuffix = $portVersion cmd:ninja = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel haiku_devel diff --git a/dev-vcs/cvsps/cvsps-2.2b1.recipe b/dev-vcs/cvsps/cvsps-2.2b1.recipe index 70d83e307..39ddad0ba 100644 --- a/dev-vcs/cvsps/cvsps-2.2b1.recipe +++ b/dev-vcs/cvsps/cvsps-2.2b1.recipe @@ -1,11 +1,11 @@ SUMMARY="Generate patch sets from a CVS repository" DESCRIPTION=" -CVSps is a program for generating 'patchset' information from a CVS -repository. A patchset in this case is defined as a set of changes made -to a collection of files, and all committed at the same time (using a -single 'cvs commit' command). This information is valuable to seeing the -big picture of the evolution of a cvs project. While cvs tracks revision -information, it is often difficult to see what changes were committed +CVSps is a program for generating 'patchset' information from a CVS \ +repository. A patchset in this case is defined as a set of changes made \ +to a collection of files, and all committed at the same time (using a \ +single 'cvs commit' command). This information is valuable to seeing the \ +big picture of the evolution of a cvs project. While cvs tracks revision \ +information, it is often difficult to see what changes were committed \ 'atomically' to the repository. " HOMEPAGE="http://www.cobite.com/cvsps/" @@ -40,7 +40,6 @@ BUILD_PREREQUIRES=" cmd:make " - BUILD() { CC="gcc -lnetwork" make $jobArgs diff --git a/dev-vcs/tig/tig-2.0.2.recipe b/dev-vcs/tig/tig-2.0.2.recipe index 358b14280..4eecb52d9 100644 --- a/dev-vcs/tig/tig-2.0.2.recipe +++ b/dev-vcs/tig/tig-2.0.2.recipe @@ -1,5 +1,8 @@ -SUMMARY="Tig: text mode interface for git" -DESCRIPTION="Tig is a text-mode git repository browser" +SUMMARY="A text mode interface for git" +DESCRIPTION=" +Tig functions mainly as a git repository browser. It can also help in the \ +staging changes for commit at chunk level and act as a pager for output \ +different git commands." HOMEPAGE="http://jonas.nitro.dk/tig/" SRC_URI="http://jonas.nitro.dk/tig/releases/tig-2.0.2.tar.gz" CHECKSUM_SHA256="b91cf0b3d044f643a1032c3a7c7cd855685bb8ead5f71f4703eb0c19238e273e" @@ -26,13 +29,11 @@ REQUIRES=" lib:libreadline$secondaryArchSuffix cmd:git " - BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libncurses$secondaryArchSuffix devel:libreadline$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:asciidoc diff --git a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe index 3171e18bd..13e35ba9e 100644 --- a/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe +++ b/games-arcade/f1spirit/f1spirit-0.rc9.1615.recipe @@ -1,4 +1,8 @@ -SUMMARY="a top down Formula One Racing game" +SUMMARY="A top down Formula One racing game" +DESCRIPTION=" +Race against your opponents on 21 tracks. Features online high scores, \ +realtime rain effect, split-screen multiplayer, and more! +" HOMEPAGE="http://www2.braingames.getput.com/f1spirit/" LICENSE="GNU GPL v2" COPYRIGHT="2002-2008 Brain Games" @@ -10,7 +14,6 @@ ARCHITECTURES="x86_gcc2" PROVIDES=" $portName = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libcurl$secondaryArchSuffix @@ -59,8 +62,3 @@ INSTALL() addAppDeskbarSymlink "$installDir/$portName" "F-1 Spirit" } - -DESCRIPTION=" -Race against your opponents on 21 tracks. Features online high scores, realtime -rain effect, split-screen multiplayer, and more! -" diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe index ff81c85db..c32d7b600 100644 --- a/games-arcade/goonies/goonies-1.4.1528.recipe +++ b/games-arcade/goonies/goonies-1.4.1528.recipe @@ -1,4 +1,19 @@ -SUMMARY="Find treasure and escape back to save the Goon Docks from demolition." +SUMMARY="Find treasure and escape back to save the Goon Docks from demolition" +DESCRIPTION=" +The action takes place in the sleepy seaside town of Cauldron Point - down in \ +an area known as the Goon Docks. The Goonies are a group of local kids - Mikey, \ +Brand, Mouth, Chunk and Data. One day they find an old treasure map in Mikey's \ +attic. +Data figures that this must be the fabulous hidden treasure of the \ +notorious local pirate, One-Eyed Willy. +The girls, Andy and Stef, join the other Goonies and the adventure begins. But \ +the secret underground tunnels they are exploring are actually the hideout of \ +the Fratelli Gang, and the Goonies are soon trapped! The Goonies have a \ +powerful ally on their side, however, in the form of the huge and amiable Sloth. + +When you play this game, you are Sloth! Can you help the Goonies find the \ +treasure and escape back to save the Goon Docks from demolition? +" HOMEPAGE="http://www2.braingames.getput.com/goonies/" LICENSE="GNU GPL v2" COPYRIGHT="2006-2009 Brain Games" @@ -16,7 +31,6 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" goonies = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -43,6 +57,7 @@ BUILD_PREREQUIRES=" " PATCHES="goonies-$portVersion.patchset" + BUILD() { make $jobArgs @@ -59,18 +74,3 @@ INSTALL() addAppDeskbarSymlink "$installDir/goonies" "Goonies" } - -DESCRIPTION=" -The action takes place in the sleepy seaside town of Cauldron Point - down in -an area known as the Goon Docks. The Goonies are a group of local kids - Mikey, -Brand, Mouth, Chunk and Data. One day they find an old treasure map in Mikey's -attic. Data figures that this must be the fabulous hidden treasure of the -notorious local pirate, One-Eyed Willy. The girls, Andy and Stef, join the -other Goonies and the adventure begins. But the secret underground tunnels they -are exploring are actually the hideout of the Fratelli Gang, and the Goonies -are soon trapped! The Goonies have a powerful ally on their side, however, in -the form of the huge and amiable Sloth. - -When you play this game, you are Sloth! Can you help the Goonies find the -treasure and escape back to save the Goon Docks from demolition? -" diff --git a/games-arcade/mog/mog-0.63.1548.recipe b/games-arcade/mog/mog-0.63.1548.recipe index 9aade712d..50adf6f44 100644 --- a/games-arcade/mog/mog-0.63.1548.recipe +++ b/games-arcade/mog/mog-0.63.1548.recipe @@ -1,4 +1,27 @@ -SUMMARY="The Maze of Galious." +SUMMARY="The Maze of Galious" +DESCRIPTION=" +The Maze of Galious (MoG in short) was originally a Konami game for the MSX \ +computer system. Its real name is Knightmare II: The Maze of Galious and is \ +the sequel of another Konami game called Knightmare. + +MoG is a very addictive game where you have to kill thousands of enemies, \ +collect items in order to obtain new powers and defeat some really great demons \ +at the end of each level. The gameplay of MoG is not the boring linear one. In \ +MoG you are free to go everywhere you want from the beginning of the game. You \ +have to be very careful of the order in which you visit all the rooms in the \ +HUGE map if you want to keep your character alive. + +The map is structured in a main map (called the castle) and 10 submaps (called \ +the worlds). Initially you are in the castle and you have to find the keys \ +that open the doors to go to each of the worlds. +To complete the game you have to defeat the boss at the end of each one of the \ +10 worlds. You are free to revisit each world as often as you want in order to \ +see if you have missed something. + +To defeat all 10 demons you control two characters: Popolon and Aphrodite. \ +Each one has special abilities, i.e. Popolon has a greater ability to jump \ +and Aphrodite is able to dive. +" HOMEPAGE="http://www2.braingames.getput.com/mog/" LICENSE="GNU GPL v2" COPYRIGHT="2002-2009 Brain Games" @@ -9,8 +32,8 @@ ARCHITECTURES="x86_gcc2" PROVIDES=" mog = $portVersion + app:mog = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -44,24 +67,3 @@ INSTALL() make install PREFIX="$installDir" GAMEDIR="$installDir" addAppDeskbarSymlink "$installDir/mog" "Maze of Galious" } - -DESCRIPTION=" -The Maze of Galious (MoG in short) was originally a Konami game for the MSX -computer system. Its real name is Knightmare II: The Maze of Galious and is the -sequel of another Konami game called Knightmare. - -MoG is a very addictive game where you have to kill thousands of enemies, -collect items in order to obtain new powers and defeat some really great demons -at the end of each level. The gameplay of MoG is not the boring linear one. In -MoG you are free to go everywhere you want from the beginning of the game. You -have to be very careful of the order in which you visit all the rooms in the -HUGE map if you want to keep your character alive. The map is structured in a -main map (called the castle) and 10 submaps (called the worlds). Initially you -are in the castle and you have to find the keys that open the doors to go to -each of the worlds. To complete the game you have to defeat the boss at the end -of each one of the 10 worlds. You are free to revisit each world as often as -you want in order to see if you have missed something. To defeat all 10 demons -you control two characters: Popolon and Aphrodite. Each one has special -abilities, i.e. Popolon has a greater ability to jump and Aphrodite is able to -dive. -" diff --git a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe index 5b8e8c46a..159e3b588 100644 --- a/games-arcade/roadfighter/roadfighter-1.0.1269.recipe +++ b/games-arcade/roadfighter/roadfighter-1.0.1269.recipe @@ -1,4 +1,9 @@ -SUMMARY="A 2d racing game. Can you finish the race in time?" +SUMMARY="A 2D racing game" +DESCRIPTION=" +The goal is to reach the finish line within the stages without running out of \ +time, hitting other cars or running out of fuel (fuel is refilled by hitting a \ +special type of car). +" HOMEPAGE="http://www2.braingames.getput.com/roadf/" LICENSE="GNU GPL v2" COPYRIGHT="2003-2009 Brain Games" @@ -10,7 +15,6 @@ ARCHITECTURES="x86_gcc2" PROVIDES=" roadfighter = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -50,9 +54,3 @@ INSTALL() addAppDeskbarSymlink "$installDir/roadfighter" "Road Fighter" } - -DESCRIPTION=" -The goal is to reach the finish line within the stages without running out of -time, hitting other cars or running out of fuel (fuel is refilled by hitting a -special type of car). -" diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe index 3a572b47c..02b4af31f 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe +++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe @@ -1,4 +1,14 @@ -SUMMARY="Arcade style game in the style of Boulder Dash." +SUMMARY="Arcade style game in the style of Boulder Dash" +DESCRIPTION=" +- network multiplayer games (upto 4 players) +- local multiplayer games (upto 4 players) +- soft scrolling with 50 frames per second +- freely customizable keyboard and joystick support +- stereo sound effects and music +- music modules and fullscreen in SDL version +- contains levels to play Boulder Dash, Emerald Mine and Sokoban +- lots of additional levels available (over 10.000) +" HOMEPAGE="http://www.artsoft.org/rocksndiamonds/" LICENSE="GNU GPL v2" COPYRIGHT="2001-2013 Artsoft Entertainment" @@ -56,16 +66,3 @@ INSTALL() cp -r rocksndiamonds sounds graphics levels music $destdir addAppDeskbarSymlink $destdir/rocksndiamonds "Rocks'n'Diamonds" } - -# ----- DESCRIPTION ----------------------------------------------------------- - -DESCRIPTION=" -- network multiplayer games (upto 4 players) -- local multiplayer games (upto 4 players) -- soft scrolling with 50 frames per second -- freely customizable keyboard and joystick support -- stereo sound effects and music -- music modules and fullscreen in SDL version -- contains levels to play Boulder Dash, Emerald Mine and Sokoban -- lots of additional levels available (over 10.000) -" 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 30c746670..6b908cd7e 100644 --- a/games-arcade/slime_volley/slime_volley-2.4.2.recipe +++ b/games-arcade/slime_volley/slime_volley-2.4.2.recipe @@ -1,14 +1,14 @@ 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." +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" HOMEPAGE="http://slime.tuxfamily.org/" - SRC_URI="http://slime.tuxfamily.org/down.php?id=1&os=src" SRC_FILENAME="slimevolley-$portVersion.tar.bz2" CHECKSUM_SHA256="be8f461c6f1188ba709b1fbcbe64edffca4b8eb358bd2ed8825f8ebf30e660d3" @@ -17,37 +17,36 @@ SOURCE_DIR="slimevolley" PROVIDES=" slime_voley = $portVersion cmd:slimevolley -" - + " REQUIRES=" haiku lib:libintl lib:libsdl lib:libsdl_image lib:libsdl_ttf -" - + " BUILD_REQUIRES=" devel:libintl devel:libsdl devel:libsdl_image devel:libsdl_net devel:libsdl_ttf -" - + " BUILD_PREREQUIRES=" haiku_devel cmd:cmake cmd:gcc cmd:make -" + " -BUILD() { +BUILD() +{ cmake . -DCMAKE_INSTALL_PREFIX=$prefix -DI10N_DIR=$dataDir/locale -DDATA_DIR=$dataDir/games/slimevolley make $jobArgs } -INSTALL() { +INSTALL() +{ make install mkdir -p $dataDir 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 412840fa1..4a8d5889d 100644 --- a/games-arcade/super_transball/super_transball-2.1.5.recipe +++ b/games-arcade/super_transball/super_transball-2.1.5.recipe @@ -1,4 +1,13 @@ -SUMMARY="find and capture the SPHERE, and carry it to the sky." +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... +" HOMEPAGE="http://www2.braingames.getput.com/stransball2/default.asp" LICENSE="GNU GPL v2" COPYRIGHT="2003-2005 Brain Games" @@ -9,8 +18,8 @@ ARCHITECTURES="x86_gcc2" PROVIDES=" super_transball = $portVersion + app:super_transball = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -49,12 +58,3 @@ INSTALL() cp -r stransball2 demos graphics maps sound "$installDir" addAppDeskbarSymlink "$installDir/stransball2" "Super Transball 2" } - -DESCRIPTION=" -\"Super Transbal 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... -" diff --git a/games-arcade/xrick/xrick-021212.recipe b/games-arcade/xrick/xrick-021212.recipe index 797a10f58..bd9c0babc 100644 --- a/games-arcade/xrick/xrick-021212.recipe +++ b/games-arcade/xrick/xrick-021212.recipe @@ -1,4 +1,12 @@ -SUMMARY="XRick is a clone of Rick Dangerous." +SUMMARY="A clone of Rick Dangerous" +DESCRIPTION=" +Remember Rick Dangerous? + +Way before Lara Croft, back in the 1980's and early 1990's, Rick Dangerous \ +was the Indiana Jones of computer games, running away from rolling rocks, \ +avoiding traps, from South America to a futuristic missile base via Egypt \ +and theSchwarzendumpf castle. +" HOMEPAGE="http://www.bigorno.net/xrick" LICENSE="xrick" COPYRIGHT="2000-2006 Bigorno.net" @@ -29,6 +37,7 @@ BUILD_PREREQUIRES=" " PATCHES="xrick-$portVersion.patchset" + BUILD() { make $jobArgs @@ -45,14 +54,3 @@ INSTALL() cp -r images $appsDir/XRick addAppDeskbarSymlink $appsDir/XRick/XRick } - -# ----- DESCRIPTION ----------------------------------------------------------- - -DESCRIPTION=" -Remember Rick Dangerous? - -Way before Lara Croft, back in the 1980's and early 1990's, Rick Dangerous was -the Indiana Jones of computer games, running away from rolling rocks, avoiding -traps, from South America to a futuristic missile base via Egypt and the -Schwarzendumpf castle. -" diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe index 7c194a6f4..922d4a450 100644 --- a/games-kids/pipepanic/pipepanic-0.1.3.recipe +++ b/games-kids/pipepanic/pipepanic-0.1.3.recipe @@ -1,6 +1,6 @@ -SUMMARY="A pipe connecting game." -DESCRIPTION="Pipepanic is a pipe connecting game using libSDL. Connect as many different \ -shaped pipes together as possible within the time given. +SUMMARY="A pipe connecting game" +DESCRIPTION="Pipepanic is a pipe connecting game using libSDL. Connect as many \ +different shaped pipes together as possible within the time given. " HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/" SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz" diff --git a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe index 513d176bd..515ed45e6 100644 --- a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe +++ b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe @@ -1,10 +1,11 @@ -SUMMARY="LBreakout2 is a fun breakout-style arcade game" +SUMMARY="A fun breakout-style arcade game" DESCRIPTION="The successor to LBreakout offers you a new challenge in more than 50 \ levels with loads of new bonuses (goldshower, joker, explosive balls, \ -bonus magnet ...), maluses (chaos, darkness, weak balls, malus magnet ...) \ -and special bricks (growing bricks, explosive bricks, regenerative bricks ..). \ +bonus magnet), maluses (chaos, darkness, weak balls, malus magnet) \ +and special bricks (growing bricks, explosive bricks, regenerative bricks). If you are hungry for more you can create your own levelsets with the integrated \ -level editor. There is also an experimental two player mode (via LAN) available." +level editor. +There is also an experimental two player mode (via LAN) available." HOMEPAGE="http://lgames.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/lgames/files/lbreakout2/2.6/lbreakout2-2.6.4.tar.gz" CHECKSUM_SHA256="0b90716d52e67c27ff41ab7aa5c09dad4f5f19a78076cc57dd4b4d7ed2c1dbd9" @@ -20,8 +21,7 @@ PROVIDES=" lbreakout2 = $portVersion cmd:lbreakout2 = $portVersion cmd:lbreakout2server = $portVersion -" - + " REQUIRES=" haiku lib:libsdl @@ -30,8 +30,7 @@ REQUIRES=" lib:libpng lib:libz lib:libintl -" - + " BUILD_REQUIRES=" haiku_devel devel:libsdl @@ -40,14 +39,13 @@ BUILD_REQUIRES=" devel:libintl devel:libz devel:libpng -" - + " BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:ld cmd:libtoolize -" + " BUILD() { @@ -56,6 +54,7 @@ BUILD() make $jobArgs addResourcesToBinaries LBreakout2.rdef client/lbreakout2 } + INSTALL() { make install diff --git a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe index a60248823..1190b4406 100644 --- a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe +++ b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="LGeneral is a turn-based strategy engine " +SUMMARY="A turn-based strategy engine" DESCRIPTION="LGeneral is a turn-based strategy engine heavily inspired by Panzer General. \ You play single scenarios or whole campaigns turn by turn against a human \ player or the AI. Entrenchment, rugged defense, defensive fire, surprise \ @@ -23,29 +23,26 @@ PROVIDES=" cmd:lged = $portVersion cmd:ltrextract = $portVersion cmd:shptool = $portVersion -" - + " REQUIRES=" haiku lib:libsdl lib:libsdl_mixer lib:libsdl_net -" - + " BUILD_REQUIRES=" haiku_devel devel:libsdl devel:libsdl_mixer devel:libsdl_net devel:libintl -" - + " BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:ld cmd:libtoolize -" + " BUILD() { @@ -57,6 +54,7 @@ BUILD() make $jobArgs } + INSTALL() { make install diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe index 41bbeb6cd..96660a6f6 100644 --- a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe +++ b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe @@ -1,4 +1,4 @@ -SUMMARY="LMarbles is an Atomix clone with a slight change in concept." +SUMMARY="An Atomix clone with a slight change in concept" DESCRIPTION="LMarbles is an Atomix clone with a slight change in concept. \ Instead of assembling molecules you create figures out of marbles. \ Nevertheless, the basic game play is the same: If a marble starts to move \ @@ -19,27 +19,24 @@ PATCHES="lmarbles-1.0.8.patchset" PROVIDES=" lmarbles = $portVersion app:LMarbles = $portVersion -" - + " REQUIRES=" haiku lib:libsdl lib:libsdl_mixer -" - + " BUILD_REQUIRES=" haiku_devel devel:libsdl devel:libsdl_mixer -" - + " BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:ld cmd:libtoolize cmd:xres -" + " BUILD() { diff --git a/games-puzzle/lpairs/lpairs-1.0.4.recipe b/games-puzzle/lpairs/lpairs-1.0.4.recipe index 137eeec41..b8708741c 100644 --- a/games-puzzle/lpairs/lpairs-1.0.4.recipe +++ b/games-puzzle/lpairs/lpairs-1.0.4.recipe @@ -1,4 +1,4 @@ -SUMMARY="LPairs is a classical memory game." +SUMMARY="A classical memory game" DESCRIPTION="LPairs is a classical memory game. This means you have to \ find pairs of identical cards which will then be removed. Your time and \ tries needed will be counted but there is no highscore chart or limit to this." @@ -15,24 +15,21 @@ PATCHES="lpairs-1.0.4.patch" PROVIDES=" lpairs = $portVersion cmd:lpairs = $portVersion -" - + " REQUIRES=" haiku lib:libsdl -" - + " BUILD_REQUIRES=" haiku_devel devel:libsdl -" - + " BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:ld cmd:libtoolize -" + " BUILD() { diff --git a/games-puzzle/ltris/ltris-1.0.19.recipe b/games-puzzle/ltris/ltris-1.0.19.recipe index 487bcf18c..46899f909 100644 --- a/games-puzzle/ltris/ltris-1.0.19.recipe +++ b/games-puzzle/ltris/ltris-1.0.19.recipe @@ -1,4 +1,4 @@ -SUMMARY="LTris is a tetris clone" +SUMMARY="A tetris clone" DESCRIPTION="LTris is a tetris clone: differently shaped blocks are falling down the \ rectangular playing field and can be moved sideways or rotated by 90 degree \ units with the aim of building lines without gaps which then disappear \ @@ -17,28 +17,25 @@ GLOBAL_WRITABLE_FILES="var/ltris.hscr keep-old" PROVIDES=" ltris = $portVersion cmd:ltris = $portVersion -" - + " REQUIRES=" haiku lib:libsdl lib:libsdl_mixer lib:libintl -" - + " BUILD_REQUIRES=" haiku_devel devel:libsdl devel:libsdl_mixer devel:libintl -" - + " BUILD_PREREQUIRES=" cmd:make cmd:gcc cmd:ld cmd:libtoolize -" + " BUILD() { @@ -47,6 +44,7 @@ BUILD() make $jobArgs addResourcesToBinaries LTris.rdef src/ltris } + INSTALL() { make install diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe index 7801bdb0a..b31ac92a3 100644 --- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe +++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.recipe @@ -1,4 +1,8 @@ -SUMMARY="a game like Deflektor (C64) or Mindbender (Amiga) " +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. +" HOMEPAGE="http://www.artsoft.org/mirrormagic/" LICENSE="GNU GPL v2" COPYRIGHT="1989-2003 Artsoft Entertainment" @@ -11,7 +15,6 @@ PROVIDES=" mirrormagic = $portVersion app:mirrormagic = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -45,10 +48,3 @@ INSTALL() cp -r mirrormagic graphics levels music sounds "$destDir" addAppDeskbarSymlink "$destDir/mirrormagic" "Mirror Magic" } - -# ----- DESCRIPTION ----------------------------------------------------------- - -DESCRIPTION=" -Make the Laser reach the target by rotating mirrors, but take care of not -overheating. -" diff --git a/games-puzzle/wizznic/wizznic-0.9.9.recipe b/games-puzzle/wizznic/wizznic-0.9.9.recipe index e8e597d18..6fc2226e6 100644 --- a/games-puzzle/wizznic/wizznic-0.9.9.recipe +++ b/games-puzzle/wizznic/wizznic-0.9.9.recipe @@ -1,12 +1,17 @@ -SUMMARY="brick-matching puzzle-game, an improved version of Puzznic." +SUMMARY="A brick-matching puzzle-game" DESCRIPTION=" Wizznic! is a brick-matching puzzle-game, an improved version of Puzznic. The challenge is to clear each level of bricks by moving the bricks next to \ each other, this sounds a lot easier than it is. The bricks are heavy, so you \ -can only push them, not lift them up +can only push them, not lift them up. " -HOMEPAGE="http://wizznic.sourceforge.net/" +HOMEPAGE="http://wizznic.sourceforge.net/" +SRC_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9.9-src.tar.bz2" +CHECKSUM_SHA256="2cf9462177474d7f5bfe95bbc21303ec7031ca86412b587b5e7d3ed531d5b16b" +LICENSE="GNU GPL v3" +COPYRIGHT="2011 Jimmy Christensen" +REVISION="2" ARCHITECTURES="" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -14,18 +19,14 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi SECONDARY_ARCHITECTURES="x86" -REVISION="2" -SRC_URI="http://sourceforge.net/projects/wizznic/files/Source%20Releases/wizznic-0.9.9-src.tar.bz2" -CHECKSUM_SHA256="2cf9462177474d7f5bfe95bbc21303ec7031ca86412b587b5e7d3ed531d5b16b" SOURCE_DIR="wizznic-$portVersion-src" PATCHES="wizznic-$portVersion.patchset" PROVIDES=" wizznic$secondaryArchSuffix = $portVersion cmd:wizznic$secondaryArchSuffix = $portVersion -" - + " REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -33,21 +34,19 @@ REQUIRES=" lib:libsdl_image$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix -" - + " BUILD_REQUIRES=" devel:sdl_image$secondaryArchSuffix devel:sdl_mixer$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix cmd:make cmd:sdl_config$secondaryArchSuffix -" + " BUILD() { @@ -58,10 +57,5 @@ BUILD() INSTALL() { DATADIR=$dataDir/wizznic/ BINDIR=$binDir/ make install - - addAppDeskbarSymlink $binDir/wizznic "WizzNic!" } - -LICENSE="GNU GPL v3" -COPYRIGHT="2011 Jimmy Christensen" diff --git a/games-rpg/flare/flare-0.19.recipe b/games-rpg/flare/flare-0.19.recipe index 83572737f..6dc09dc06 100644 --- a/games-rpg/flare/flare-0.19.recipe +++ b/games-rpg/flare/flare-0.19.recipe @@ -1,4 +1,4 @@ -SUMMARY="Single-player 2D action RPG." +SUMMARY="Single-player 2D action role playing game" DESCRIPTION="Flare is a single-player 2D action RPG with fast-paced action \ and a dark fantasy style." HOMEPAGE="http://flarerpg.org" @@ -19,7 +19,6 @@ PROVIDES=" flare$secondaryArchSuffix = $portVersion app:Flare$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -27,7 +26,6 @@ REQUIRES=" lib:libsdl_image$secondaryArchSuffix lib:libsdl_ttf$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix @@ -35,7 +33,6 @@ BUILD_REQUIRES=" devel:sdl_image$secondaryArchSuffix devel:sdl_ttf$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:make cmd:cmake diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe index d4c231e1c..a726c7ed1 100644 --- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe +++ b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.recipe @@ -1,21 +1,21 @@ SUMMARY="A role playing game battling roboters" DESCRIPTION=" -The game tells the story of a world destroyed by a conflict between robots and\ +The game tells the story of a world destroyed by a conflict between robots and \ their human masters. Play as Tux in a quest to save the world from the \ murderous rebel bots who know no mercy. You get to choose which path you wish \ -to follow, and freedom of choice is everywhere in the game. \ -\ +to follow, and freedom of choice is everywhere in the game. + FreedroidRPG features a real time combat system with melee and ranged weapons, \ -fairly similar to the proprietary game Diablo. There is an innovative system of\ +fairly similar to the proprietary game Diablo. There is an innovative system of \ programs that can be run in order to take control of enemy robots, alter their \ -behavior, or improve one's characteristics. You can use over 50 different kinds\ +behavior, or improve one's characteristics. You can use over 50 different kinds \ of items and fight countless enemies on your way to your destiny. An advanced \ -dialog system provides story background and immersive role playing situations.\ -\ -The game is complete, fully playable, and can provide about 10 hours of fun. \ -It is still being actively developed, and help is welcome in many areas. People\ +dialog system provides story background and immersive role playing situations. + +The game is complete, fully playable, and can provide about 10 hours of fun. +It is still being actively developed, and help is welcome in many areas. People \ having - or trying to acquire - programming, map editing, or writing skills \ -will find FreedroidRPG to be an exciting, fast-moving project in which they can\ +will find FreedroidRPG to be an exciting, fast-moving project in which they can \ fully express their creativity." HOMEPAGE="http://freedroid.org" SRC_URI="http://sourceforge.net/projects/freedroid/files/freedroidRPG/freedroidRPG-0.15/freedroidRPG-0.15.1.tar.gz/download" @@ -39,7 +39,7 @@ PROVIDES=" cmd:explodefont$secondaryArchSuffix = $portVersion cmd:gluefont$secondaryArchSuffix = $portVersion cmd:make_atlas$secondaryArchSuffix = $portVersion -" + " REQUIRES=" haiku$secondaryArchSuffix freedroidrpg_data == $portVersion @@ -54,7 +54,7 @@ REQUIRES=" lib:libpng$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libgl$secondaryArchSuffix -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix @@ -68,7 +68,7 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libgl$secondaryArchSuffix -" + " BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -78,13 +78,13 @@ BUILD_PREREQUIRES=" cmd:automake cmd:pkg_config$secondaryArchSuffix cmd:python -" + " SOURCE_DIR="freedroidrpg-0.15.1" PATCHES=" configure.ac.patch configure.2.ac.patch -" + " PATCH() { sed -i 's/lua.h/..\/lua\/lua.h/g' src/*.c @@ -115,11 +115,14 @@ INSTALL() packageEntries data $dataDir addAppDeskbarSymlink $appsDir/freedroidRPG "FreedroidRPG" } -PROVIDES_data=" - freedroidrpg_data = $portVersion -" -REQUIRES_data=" - haiku -" + SUMMARY_data="FreedroidRPG data files" ARCHITECTURES_data="any" + +PROVIDES_data=" + freedroidrpg_data = $portVersion + " +REQUIRES_data=" + haiku + " + diff --git a/games-simulation/openttd/openttd-1.4.3.recipe b/games-simulation/openttd/openttd-1.4.3.recipe index 4638e6f3f..3ecc6c977 100644 --- a/games-simulation/openttd/openttd-1.4.3.recipe +++ b/games-simulation/openttd/openttd-1.4.3.recipe @@ -1,12 +1,15 @@ SUMMARY="OpenTTD is a clone of Transport Tycoon Deluxe" DESCRIPTION=" -OpenTTD is an open source simulation game based upon the popular Microprose -game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic -the original game as closely as possible while extending it with new features. +OpenTTD is an open source simulation game based upon the popular Microprose \ +game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to \ +mimic the original game as closely as possible while extending it with new \ +features. " HOMEPAGE="http://www.openttd.org" SRC_URI="http://binaries.openttd.org/releases/$portVersion/openttd-$portVersion-source.tar.xz" CHECKSUM_SHA256="11bcbbddb9864d69f1bca11966ece9abfc28973151e6dd73ceadff89ebdf63dd" +COPYRIGHT="2005-2013 OpenTTD Team" +LICENSE="GNU GPL v2" REVISION="2" ARCHITECTURES="x86" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -19,7 +22,6 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" openttd$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -32,7 +34,6 @@ REQUIRES=" openttd_msx timgmsoundfont " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix @@ -40,7 +41,6 @@ BUILD_REQUIRES=" devel:liblzma$secondaryArchSuffix devel:liblzo2$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:git @@ -76,6 +76,3 @@ INSTALL() } # no TEST script available - -COPYRIGHT="2005-2013 OpenTTD Team" -LICENSE="GNU GPL v2" diff --git a/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe b/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe index f746dcd7f..b7e9b638b 100644 --- a/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe +++ b/games-simulation/openttd_gfx/openttd_gfx-0.4.7.recipe @@ -1,15 +1,18 @@ SUMMARY="OpenTTD - free graphics files" DESCRIPTION=" -OpenTTD is an open source simulation game based upon the popular Microprose -game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic -the original game as closely as possible while extending it with new features. +OpenTTD is an open source simulation game based upon the popular Microprose \ +game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to \ +mimic the original game as closely as possible while extending it with new \ +features. -This package provides free to use graphics file. You can use them if you don't -have the files from the original Transport Tycoon Deluxe game. +This package provides free to use graphics file. You can use them if you \ +don't have the files from the original Transport Tycoon Deluxe game. " HOMEPAGE="http://www.openttd.org" SRC_URI="http://binaries.openttd.org/extra/opengfx/$portVersion/opengfx-$portVersion-all.zip" CHECKSUM_SHA256="10032c683f98b4d378c0651118a4858ae6d3f0a5059302dc3f96bfbfcdc67241" +COPYRIGHT="2005-2013 OpenTTD Team" +LICENSE="GNU GPL v2" REVISION="1" ARCHITECTURES="any" @@ -39,6 +42,3 @@ INSTALL() } # no TEST script available - -COPYRIGHT="2005-2013 OpenTTD Team" -LICENSE="GNU GPL v2" diff --git a/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe b/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe index d9290e4b2..9251571d3 100644 --- a/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe +++ b/games-simulation/openttd_msx/openttd_msx-0.3.1.recipe @@ -1,15 +1,18 @@ SUMMARY="OpenTTD - free music files" DESCRIPTION=" -OpenTTD is an open source simulation game based upon the popular Microprose -game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic -the original game as closely as possible while extending it with new features. +OpenTTD is an open source simulation game based upon the popular Microprose \ +game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to \ +mimic the original game as closely as possible while extending it with new \ +features. -This package provides free to use music files. You can use them if you don't +This package provides free to use music files. You can use them if you don't \ have the files from the original Transport Tycoon Deluxe game. " HOMEPAGE="http://www.openttd.org" SRC_URI="http://binaries.openttd.org/extra/openmsx/$portVersion/openmsx-$portVersion-all.zip" CHECKSUM_SHA256="92e293ae89f13ad679f43185e83fb81fb8cad47fe63f4af3d3d9f955130460f5" +COPYRIGHT="2005-2013 OpenTTD Team" +LICENSE="GNU GPL v2" REVISION="1" ARCHITECTURES="any" @@ -39,6 +42,3 @@ INSTALL() } # no TEST script available - -COPYRIGHT="2005-2013 OpenTTD Team" -LICENSE="GNU GPL v2" diff --git a/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe b/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe index 098600f7b..277b19df2 100644 --- a/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe +++ b/games-simulation/openttd_sfx/openttd_sfx-0.2.3.recipe @@ -1,15 +1,18 @@ SUMMARY="OpenTTD - free sound files" DESCRIPTION=" -OpenTTD is an open source simulation game based upon the popular Microprose -game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to mimic -the original game as closely as possible while extending it with new features. +OpenTTD is an open source simulation game based upon the popular Microprose \ +game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to \ +mimic the original game as closely as possible while extending it with new \ +features. -This package provides free to use sound files. You can use them if you don't +This package provides free to use sound files. You can use them if you don't \ have the files from the original Transport Tycoon Deluxe game. " HOMEPAGE="http://www.openttd.org" SRC_URI="http://binaries.openttd.org/extra/opensfx/$portVersion/opensfx-$portVersion-all.zip" CHECKSUM_SHA256="6831b651b3dc8b494026f7277989a1d757961b67c17b75d3c2e097451f75af02" +COPYRIGHT="2005-2013 OpenTTD Team" +LICENSE="GNU GPL v2" REVISION="1" ARCHITECTURES="any" @@ -39,6 +42,3 @@ INSTALL() } # no TEST script available - -COPYRIGHT="2005-2013 OpenTTD Team" -LICENSE="GNU GPL v2" diff --git a/games-strategy/vcmi/vcmi-0.94.recipe b/games-strategy/vcmi/vcmi-0.94.recipe index dd0cbeed7..aa9ae6d2e 100644 --- a/games-strategy/vcmi/vcmi-0.94.recipe +++ b/games-strategy/vcmi/vcmi-0.94.recipe @@ -1,14 +1,16 @@ -SUMMARY="VCMI is an open source engine for Heroes or Migh and Magic III" +SUMMARY="An open source engine for Heroes or Migh and Magic III" DESCRIPTION=" -We want to rewrite the entire H3 engine (VCMI is NOT another mod) giving it -new possibilities. Few years of intensive work resulted in creating application -with impressive amount of features. +We want to rewrite the entire H3 engine (VCMI is NOT another mod) giving it \ +new possibilities. Few years of intensive work resulted in creating an \ +application with an impressive amount of features. -You require the original game files to use this port +You'll require the original game files to use this port. " HOMEPAGE="http://vcmi.eu" SRC_URI="http://download.vcmi.eu/vcmi-0.94.tar.gz" CHECKSUM_SHA256="2a1ad60cd64e7d5cb0a9eda11c6bc1cbf8866035f95597e467591c958dfde4d7" +COPYRIGHT="2005-2013 VCMI Team" +LICENSE="GNU GPL v2" REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -27,7 +29,6 @@ PROVIDES=" lib:libminizip$secondaryArchSuffix lib:libvcmi$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix lib:libSDL_1.2$secondaryArchSuffix @@ -43,7 +44,6 @@ REQUIRES=" lib:libboost_unit_test_framework$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix @@ -57,14 +57,13 @@ BUILD_REQUIRES=" devel:libboost_system$secondaryArchSuffix devel:libboost_thread$secondaryArchSuffix devel:libboost_unit_test_framework$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" cmd:cmake cmd:make cmd:gcc$secondaryArchSuffix cmd:as$secondaryArchSuffix -" + " BUILD() { @@ -84,6 +83,3 @@ INSTALL() rm -r $prefix/share # desktop file and png icons we don't care about } - -COPYRIGHT="2005-2013 VCMI Team" -LICENSE="GNU GPL v2" diff --git a/haiku-apps/a_book/a_book-1.1.recipe b/haiku-apps/a_book/a_book-1.1.recipe index 92451dd63..0fbcda13d 100644 --- a/haiku-apps/a_book/a_book-1.1.recipe +++ b/haiku-apps/a_book/a_book-1.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="A small calendar application with reminders." +SUMMARY="A small calendar application with reminders" 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." @@ -13,15 +13,12 @@ PROVIDES=" a_book = $portVersion app:A_Book = $portVersion " - REQUIRES=" haiku " - BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc diff --git a/haiku-apps/album/album-0.9.3.recipe b/haiku-apps/album/album-0.9.3.recipe index bec201385..f0a6627db 100644 --- a/haiku-apps/album/album-0.9.3.recipe +++ b/haiku-apps/album/album-0.9.3.recipe @@ -1,11 +1,12 @@ -SUMMARY="An image viewer/organiser designed for BeOS-compatible systems." +SUMMARY="An image viewer/organiser designed for BeOS-compatible systems" DESCRIPTION="Album is a file browsing and tagging utility for Haiku. It \ started out with a goal of the ultimate image organiser (code named \ Aberration), but ended up as something much more modest and BeOS-specific. The \ idea is to have a work pad for pictures from different locations where they \ -can be previewed and tagged in one place. The program is not limited to \ -picture files and BFS volumes, although this further limits usefulness \ -since much of the functionality has to do with file attributes." +can be previewed and tagged in one place. +The program is not limited to picture files and BFS volumes, although this \ +further limits usefulness since much of the functionality has to do with file \ +attributes." HOMEPAGE="http://users.volja.net/mkovac1/proj/album/" SRC_URI="git+https://github.com/HaikuArchives/Album#cbabd25282" LICENSE="MIT" @@ -17,17 +18,14 @@ PROVIDES=" Album = $portVersion app:Album = $portVersion " - REQUIRES=" haiku lib:libiptcdata$secondaryArchSuffix " - BUILD_REQUIRES=" haiku_devel devel:libiptcdata$secondaryArchSuffix " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc diff --git a/haiku-apps/beae/beae-1.2.recipe b/haiku-apps/beae/beae-1.2.recipe index 83381bd5e..f75eaa381 100644 --- a/haiku-apps/beae/beae-1.2.recipe +++ b/haiku-apps/beae/beae-1.2.recipe @@ -1,6 +1,6 @@ -SUMMARY="Well featured audio editor for Haiku." -DESCRIPTION="BeAE is an audio editor for Haiku, with features like silencing, \ -fading in/out, analyzing, etc." +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" SRC_URI="git+https://github.com/HaikuArchives/BeAE.git#7b8ec80082" REVISION="2" @@ -13,15 +13,12 @@ PROVIDES=" beae = $portVersion app:BeAE = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:make cmd:cmake diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index fab9f0f64..c916c6ca6 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,7 +1,13 @@ -SUMMARY="An e-mail client." +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. +" HOMEPAGE="http://beam.sourceforge.net" SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam#95dc769db2f9090a038bc5a2c46f009379b2d57b" REVISION="5" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2012 Oliver Tappe" ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion @@ -11,7 +17,7 @@ REQUIRES=" liblayout >= 1.4.0 libpcre >= 8.00 lib:libssl -" + " BUILD_REQUIRES=" devel:liblayout >= 1.4.0 devel:libpcre @@ -44,9 +50,3 @@ INSTALL() addAppDeskbarSymlink ${appsDir}/Beam/Beam } -LICENSE="GNU GPL v2" -COPYRIGHT="2000-2012 Oliver Tappe" -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. -" diff --git a/haiku-apps/belife/belife-1.0.0.recipe b/haiku-apps/belife/belife-1.0.0.recipe index 051ea8ed9..d35666f8e 100644 --- a/haiku-apps/belife/belife-1.0.0.recipe +++ b/haiku-apps/belife/belife-1.0.0.recipe @@ -1,4 +1,4 @@ -SUMMARY="The Game of Life." +SUMMARY="Conway's Game of Life" DESCRIPTION=" The Game of Life is not a game in the conventional sense. There are no \ players, and no winning or losing. Once the \"pieces\" are placed in the \ @@ -6,6 +6,10 @@ starting position, the rules determine everything that happens later. \ Nevertheless, Life is full of surprises! In most cases, it is impossible to \ look at a starting position (or pattern) and see what will happen in the \ future. The only way to find out is to follow the rules of the game. + +Find out more about about Conway's Game of Life: +- http://en.wikipedia.org/wiki/Conway's_Game_of_Life +- http://www.math.com/students/wonders/life/life.html " HOMEPAGE="https://github.com/HaikuArchives/BeLife" SRC_URI="git://github.com/HaikuArchives/BeLife.git#aa35a935e55e9ee17fbb9d414534ba79798a95a1" @@ -18,11 +22,9 @@ PROVIDES=" belife = $portVersion app:BeLife = $portVersion " - REQUIRES=" haiku " - BUILD_PREREQUIRES=" makefile_engine cmd:g++ @@ -30,7 +32,6 @@ BUILD_PREREQUIRES=" cmd:mkdepend cmd:xres " - BUILD_REQUIRES=" haiku_devel " diff --git a/haiku-apps/bemines/bemines-1.0b2.recipe b/haiku-apps/bemines/bemines-1.0b2.recipe index bf3092174..5b6311505 100644 --- a/haiku-apps/bemines/bemines-1.0b2.recipe +++ b/haiku-apps/bemines/bemines-1.0b2.recipe @@ -1,6 +1,6 @@ -SUMMARY="More than a near-exact clone of the classic Windows game." +SUMMARY="More than a near-exact clone of the classic Windows game" DESCRIPTION=" -It's about time we had more than a near-exact clone of the classic Windows game, +It's about time for a more than a near-exact clone of the classic Windows game, \ Minesweeper. Controls @@ -8,11 +8,11 @@ Controls - Right click: Change a box to either unmarked, flagged as a mine, or a question mark. - Middle click: Sonar ping which reveals all mines in a 3x3 square without the \ danger of setting them off. It comes with a 20 second cost added to your \ - time. Left clicking while holding down the Alt key will also will do this. + time. Left clicking while holding down ALT will also will do this. - Click with both buttons: If the tile is a number and the appropriate number \ of mines around it have been flagged, it will clear all the other squares \ around the number. Of course, if you've made a mistake, you'll probably \ - set off a mine. Left clicking while holding down the Shift key will also \ + set off a mine. Left clicking while holding down SHIFT will also \ do this." HOMEPAGE="https://github.com/HaikuArchives/BeMines" SRC_URI="git+https://github.com/haikuarchives/bemines#be29173f854c82f5b312ed31b5245b807a5afe0f" @@ -26,19 +26,20 @@ PATCHES="bemines-$portVersion.patchset" PROVIDES=" bemines = $portVersion app:bemines -" - + " BUILD_PREREQUIRES=" haiku_devel cmd:gcc -" + " -BUILD() { +BUILD() +{ gcc src/*.cpp -o BeMines -lbe -ltranslation -lmedia xres -o BeMines src/BeMines.rsrc } -INSTALL() { +INSTALL() +{ mkdir -p $appsDir/BeMines cp BeMines $appsDir/BeMines cp -r src/themes $appsDir/BeMines diff --git a/haiku-apps/bepdf/bepdf-1.2.0.recipe b/haiku-apps/bepdf/bepdf-1.2.0.recipe index 77090a8e7..bdcdd7f7d 100644 --- a/haiku-apps/bepdf/bepdf-1.2.0.recipe +++ b/haiku-apps/bepdf/bepdf-1.2.0.recipe @@ -1,8 +1,8 @@ -SUMMARY="The PDF viewer for Haiku." -DESCRIPTION="BePDF is a PDF viewer for Haiku. \ -Besides viewing, it supports annotating and user-defined bookmarking for \ -unencrypted PDFs. It's fully localized for 20 languages at the moment with \ -additional languages being easily added via text files." +SUMMARY="The PDF viewer for Haiku" +DESCRIPTION="BePDF is a PDF viewer for Haiku. Besides viewing, it supports \ +annotating and user-defined bookmarking for unencrypted PDFs. It's fully \ +localized for 20 languages at the moment with additional languages being \ +easily added via text files." HOMEPAGE="http://haikuarchives.github.io/BePDF/" SRC_URI="https://github.com/HaikuArchives/BePDF/archive/v1.2.0.tar.gz" CHECKSUM_SHA256="663c8819db01b49227165cfd3f68ba1f659ae004b96f0bac5a7e52f773aed405" @@ -11,7 +11,8 @@ COPYRIGHT=" 1997 Benoit Triquet 1999-2000 Hubert Figuiere 2000-2011 Michael Pfeiffer - 2013-2014 Augustin Cavalier" + 2013-2014 Augustin Cavalier + " LICENSE="GNU GPL v2" REVISION="1" ARCHITECTURES="x86_gcc2 x86" @@ -29,7 +30,6 @@ PROVIDES=" bepdf = $portVersion app:BePDF = $portVersion " - REQUIRES=" haiku lib:liblayout @@ -39,7 +39,6 @@ REQUIRES=" lib:libbz2 lib:libpng " - BUILD_REQUIRES=" haiku_devel devel:liblayout @@ -49,7 +48,6 @@ BUILD_REQUIRES=" devel:libbz2 devel:libpng " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc diff --git a/haiku-apps/beshare/beshare-4.recipe b/haiku-apps/beshare/beshare-4.recipe index 662c62529..8d2ab6c3f 100644 --- a/haiku-apps/beshare/beshare-4.recipe +++ b/haiku-apps/beshare/beshare-4.recipe @@ -1,16 +1,14 @@ -SUMMARY="Native file sharing and chat application" +SUMMARY="A native file sharing and chat application" DESCRIPTION="BeShare is a BeOS/Haiku-native file sharing program. \ It operates similarly to other such programs (Napster, Hotline, etc) \ but with a few advantages: -- BeShare allows you to upload or download any type \ -of file, not just mp3. -- When browsing files, you can see their attributes \ -(similar to Be's Tracker view) -- Your query is always \"live\", so if new files that \ -match your query become available, you will see them \ -added to the results list right away (you won't have to \ -click \"refresh\" or anything first) +- BeShare allows you to upload or download any type of file, not just mp3. +- When browsing files, you can see their attributes (similar to Be's Tracker \ +view) +- Your query is always \"live\", so if new files that match your query become \ +available, you will see them added to the results list right away (you won't \ +have to click \"refresh\" or anything first) - BeShare includes a rudimentary chat mechanism for you social types. - BeShare supports any number of simultaneous uploads and downloads \ in parallel, but will serialize simultaneous file requests to any \ @@ -41,18 +39,15 @@ PROVIDES=" beshare$secondaryArchSuffix = $portVersion app:BeShare = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix #lib:libz " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel #devel:libz$secondaryArchSuffix #devel:muscle$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix diff --git a/haiku-apps/capitalbe/capitalbe-1.1.recipe b/haiku-apps/capitalbe/capitalbe-1.1.recipe index f23636c4e..f8924b5f8 100644 --- a/haiku-apps/capitalbe/capitalbe-1.1.recipe +++ b/haiku-apps/capitalbe/capitalbe-1.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="A finance manager for Haiku" +SUMMARY="A finance manager" DESCRIPTION="CapitalBe is a finance manager for Haiku. Easily track \ where your money is going. View reports, reconcile accounts and more! \ Like other programs published by the same author, Capital Be focuses \ @@ -16,17 +16,14 @@ PROVIDES=" capitalbe = $portVersion app:CapitalBe = $portVersion " - REQUIRES=" haiku lib:libsqlite3 " - BUILD_REQUIRES=" haiku_devel devel:libsqlite3 " - BUILD_PREREQUIRES=" cmd:gcc cmd:make diff --git a/haiku-apps/caya/caya-2013.10.12.recipe b/haiku-apps/caya/caya-2013.10.12.recipe index 30520ff1d..173caa088 100644 --- a/haiku-apps/caya/caya-2013.10.12.recipe +++ b/haiku-apps/caya/caya-2013.10.12.recipe @@ -1,16 +1,27 @@ -SUMMARY="Caya is a multiprotocol IM client." +SUMMARY="Caya is a multiprotocol IM client" +DESCRIPTION=" +Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ +google talk, and facebook. +" HOMEPAGE="http://www.versut.com/caya/" REVISION="1" ARCHITECTURES="x86 x86_gcc2" SRC_URI="git+https://github.com/Barrett17/Caya.git#0746cacb94f78b656226d8679baa3a4d968a03e6" +LICENSE="MIT" +COPYRIGHT=" + 2009-2011 Andrea Anzani + 2009-2011 Pierluigi Fiorini + 2010-2011 Oliver Ruiz Dorantes + 2011-2012 Casalinuovo Dario + " + PATCHES="caya-$portVersion.patchset" PROVIDES=" caya = $portVersion app:Caya " - REQUIRES=" haiku lib:libz @@ -61,15 +72,3 @@ INSTALL() addAppDeskbarSymlink $appsDir/Caya/Caya } - -LICENSE="MIT" -COPYRIGHT=" - 2009-2011 Andrea Anzani - 2009-2011 Pierluigi Fiorini - 2010-2011 Oliver Ruiz Dorantes - 2011-2012 Casalinuovo Dario - " -DESCRIPTION=" -Caya is a multiprotocol chat client for Haiku. It supports msn, aim, jabber, \ -google talk, and facebook. -" diff --git a/haiku-apps/chat/chat-20100903.recipe b/haiku-apps/chat/chat-20100903.recipe index 0643f3a94..303fc9a22 100644 --- a/haiku-apps/chat/chat-20100903.recipe +++ b/haiku-apps/chat/chat-20100903.recipe @@ -1,11 +1,11 @@ -SUMMARY="XMPP client for Haiku Operating System." +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. - " +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. +" HOMEPAGE="http://synrc.com/client/chat/haiku/" SRC_URI="git+https://github.com/devaspot/chat.git" LICENSE="MIT" @@ -17,19 +17,16 @@ PROVIDES=" chat = $portVersion app:Chat = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libexpat$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libssl$secondaryArchSuffix devel:libexpat$SecondaryArchSuffix " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc$secondaryArchSuffix diff --git a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe index 54c535e35..e46942a47 100644 --- a/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe +++ b/haiku-apps/lnlauncher/lnlauncher-1.1.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="Yet another launcher app." +SUMMARY="Yet another launcher app" DESCRIPTION="Yet another launcher app. This one docks to the screen edge, and \ has a neat drag n drop interface. @@ -8,8 +8,8 @@ the tiny handle. Various localization files can be downloaded from the homepage, and if you \ want to add your own just mail it to me and I'll put it up with the rest! -The latest version, 1.1.2, was adapted for Haiku by Daniel Weber - thank you! \ -This means it won't work on R5, so use the old versions for that." +The latest version, 1.1.2, was adapted for Haiku by Daniel Weber - thank you! +" LICENSE="MIT" COPYRIGHT="2000-2014 Mikael Eiman" HOMEPAGE="http://einman.tv/LnLauncher" @@ -23,14 +23,13 @@ SOURCE_DIR="" PROVIDES=" lnlauncher = $portVersion app:LnLauncher -" - + " BUILD_PREREQUIRES=" haiku_devel cmd:gcc cmd:jam cmd:unzip -" + " BUILD() { diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe index 806787a5b..558be6804 100644 --- a/haiku-apps/netpulse/netpulse-0.2.3.recipe +++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe @@ -1,6 +1,6 @@ -SUMMARY="NetPulse by Carlos Hasan" +SUMMARY="A Replicant showing the network status" DESCRIPTION=" - Network status replicant that gives an indication of data being sent \ + Netpulse is status replicant that gives an indication of data being sent \ or received over the network. " HOMEPAGE="https://github.com/HaikuArchives/NetPulse" @@ -16,9 +16,9 @@ PROVIDES=" netpulse = $portVersion app:NetPulse = $portVersion " -REQUIRES="" - - +REQUIRES=" + haiku$secondaryArchSuffix + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel makefile_engine diff --git a/haiku-apps/pe/pe-2.4.5.recipe b/haiku-apps/pe/pe-2.4.5.recipe index 564fcd1cb..09388885f 100644 --- a/haiku-apps/pe/pe-2.4.5.recipe +++ b/haiku-apps/pe/pe-2.4.5.recipe @@ -1,14 +1,18 @@ -SUMMARY="A programmer's editor." -DESCRIPTION="\ +SUMMARY="A programmer's editor" +DESCRIPTION=" Pe is a native programmer's editor for Haiku. It features syntax highlighting \ and a structural view for several programming language, as well as basic \ -support for Makefile and Jamfile project management." +support for Makefile and Jamfile project management. +" HOMEPAGE="https://github.com/olta/pe" -LICENSE="BSD (4-clause) - MIT" -COPYRIGHT="1996-2002 Maarteen Hekkelman - 2003-2014 Team Pe" - +LICENSE=" + BSD (4-clause) + MIT + " +COPYRIGHT=" + 1996-2002 Maarteen Hekkelman + 2003-2014 Team Pe + " srcrev="0f29ad9bd84c14c99a16ebc57f49661e55254ca2" SRC_URI="https://github.com/olta/pe/archive/$srcrev.tar.gz" CHECKSUM_SHA256="f76b70a1b444582ee537f4a190b788bc63a25d7cd6c759f427c744dbf861b342" @@ -25,19 +29,16 @@ PROVIDES=" app:Pe = $portVersion compat >= 2 cmd:lpe = $portVersion compat >= 2 " - REQUIRES=" haiku lib:libpcre lib:libpcreposix " - BUILD_REQUIRES=" haiku_devel devel:libpcre devel:libpcreposix " - BUILD_PREREQUIRES=" cmd:bison cmd:flex diff --git a/haiku-apps/substrate/substrate-1.0.recipe b/haiku-apps/substrate/substrate-1.0.recipe index 0fef123bd..00312154b 100644 --- a/haiku-apps/substrate/substrate-1.0.recipe +++ b/haiku-apps/substrate/substrate-1.0.recipe @@ -1,7 +1,7 @@ -SUMMARY="Screensaver drawing interesting city-like structures." +SUMMARY="Screensaver drawing interesting city-like structures" DESCRIPTION=" -Substrate is a screensaver which creates interesting images from lines and circles. \ -Inspired by xscreensaver's Substrate. +Substrate is a screensaver which creates interesting images from lines and \ +circles. Inspired by xscreensaver's Substrate. " HOMEPAGE="https://github.com/atalax/haiku-substrate" SRC_URI="git+https://github.com/atalax/haiku-substrate.git#1bd0a5" @@ -14,18 +14,15 @@ ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" substrate = $portVersion " - REQUIRES=" haiku " - BUILD_PREREQUIRES=" makefile_engine cmd:mkdepend cmd:make cmd:gcc " - BUILD_REQUIRES=" haiku_devel " diff --git a/haiku-apps/sum_it/sum_it-0.2beta.recipe b/haiku-apps/sum_it/sum_it-0.2beta.recipe index 3ac3683f3..9a7162324 100644 --- a/haiku-apps/sum_it/sum_it-0.2beta.recipe +++ b/haiku-apps/sum_it/sum_it-0.2beta.recipe @@ -1,4 +1,4 @@ -SUMMARY="Sum-It is a native spreadsheet for BeOS" +SUMMARY="Sum-It is a native spreadsheet" DESCRIPTION=" Sum-It is a spreadsheet for BeOS (Download BeOS for free). This is Open \ Sum-It, the open source version of Maarten Hekkelman's Sum-It application. \ @@ -6,8 +6,10 @@ Sum-It has many features, including a plug-in architecture for formulas and \ graphs. This product includes software developed by Hekkelman Programmatuur B.V. " LICENSE="BSD (4-clause)" -COPYRIGHT="1996-1998, 2000 Hekkelman Programmatuur B.V. All rights reserved. - 1999-2000 Tim Vernum. All rights reserved." +COPYRIGHT=" + 1996-1998, 2000 Hekkelman Programmatuur B.V. All rights reserved. + 1999-2000 Tim Vernum. All rights reserved. + " HOMEPAGE="https://github.com/HaikuArchives/OpenSumIt" SRC_URI="git+https://github.com/HaikuArchives/OpenSumIt.git#cdab184a27" REVISION="3" @@ -17,11 +19,9 @@ PROVIDES=" sum_it = $portVersion app:Sum_It = $portVersion " - BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" cmd:make cmd:gcc diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe index c779ba02e..ebf4e3877 100644 --- a/haiku-apps/timecop/timecop-0.61.recipe +++ b/haiku-apps/timecop/timecop-0.61.recipe @@ -1,9 +1,9 @@ -SUMMARY="TimeCop helps you collect statistics about your computer working" +SUMMARY="TimeCop helps you collect statistics about your computer usage" DESCRIPTION=" You want to know, how much time you spend in front of your computer? You want to know, how often your computer crashes? -So you can use TimeCop to write a protocol of your computer sessions. +You can use TimeCop to write a protocol of your computer sessions. " HOMEPAGE="http://www.augusta.de/michael/BeOS/TimeCop/index.us.html" SRC_URI="git://github.com/HaikuArchives/TimeCop.git#ee79c42895" @@ -15,22 +15,19 @@ CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a9 REQUIRES=" haiku -" - + " PROVIDES=" cmd:TimeCop_daemon = $portVersion app:TimeCop = $portVersion -" - + " BUILD_REQUIRES=" haiku_devel -" - + " BUILD_PREREQUIRES=" cmd:make cmd:gcc -" - + " + BUILD() { make diff --git a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe index 076e83268..6f63ea6d0 100644 --- a/haiku-apps/yab_ide/yab_ide-2.2.3.recipe +++ b/haiku-apps/yab_ide/yab_ide-2.2.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="integrated development environment for yab." +SUMMARY="An integrated development environment for yab" DESCRIPTION=" Yab allows fast prototyping with simple and clean code. yab contains a large \ number of BeAPI specific commands for GUI creation and much, much more. @@ -14,19 +14,19 @@ CHECKSUM_SHA512="a74edcf9718ee9a13a16ab0a99fbbed3cceebf1ea4bfac714b098d51531de7f SOURCE_DIR="Yab-1.7.3" REVISION="1" - LICENSE="Artistic" -COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic) +COPYRIGHT=" + 1995-2006 Marc-Oliver Ihm (yabasic) 2006-2009 Jan Bungeroth (yab improvements) - 2013 Jim Saxton (yab improvements)" + 2013 Jim Saxton (yab improvements) + " ARCHITECTURES="x86_gcc2 x86 ?x86_64" PROVIDES=" yab_ide$secondaryArchSuffix = $portVersion app:yab_IDE = $portVersion - " - + " REQUIRES=" haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix @@ -34,13 +34,11 @@ REQUIRES=" devel:libncurses$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix devel:libz$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" cmd:bison cmd:flex diff --git a/haiku-games/bevexed/bevexed-20141224.recipe b/haiku-games/bevexed/bevexed-20141224.recipe index c7987d621..691ade23f 100644 --- a/haiku-games/bevexed/bevexed-20141224.recipe +++ b/haiku-games/bevexed/bevexed-20141224.recipe @@ -1,7 +1,7 @@ -SUMMARY="A maddeningly-addictive puzzle game." +SUMMARY="A maddeningly-addictive puzzle game" DESCRIPTION=" A maddeningly-addictive puzzle game. The concept is simple: put the tiles in \ -the grid on the left such that the numbers match wherever 2 tiles touch. +the grid on the left such that the numbers match wherever two tiles touch. " HOMEPAGE="https://github.com/HaikuArchives/BeVexed" SRC_URI="git+https://github.com/HaikuArchives/BeVexed#01613e90e6ce3c2b47a592efe8e248db3445f536" @@ -16,15 +16,12 @@ PROVIDES=" BeVexed = $portVersion app:BeVexed = $portVersion " - REQUIRES=" haiku " - BUILD_REQUIRES=" haiku_devel " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc diff --git a/haiku-libs/ale/ale-0.9.1.recipe b/haiku-libs/ale/ale-0.9.1.recipe index 4d1d32e71..305797a87 100644 --- a/haiku-libs/ale/ale-0.9.1.recipe +++ b/haiku-libs/ale/ale-0.9.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="ALE: GUI Editor to create and edit constraint-based layouts." +SUMMARY="A GUI editor to create and edit constraint-based layouts" DESCRIPTION="The Auckland Layout Editor (ALE) is a constraint-based layout \ editor that is based on the BALMLayout layout class. The constraint-based \ layout model is very powerful and can describe layouts that can't be described \ @@ -9,6 +9,7 @@ views. Furthermore, layouts created with ALE have no conflicting constraints. ALE provides a small but powerful set of edit operations. These edit \ operations keep views automatically aligned to each other. This makes \ creating and editing layouts very easy. + For more information read: https://www.cs.auckland.ac.nz/~lutteroth/publications/ZeidlerEtAl2013-AucklandLayoutEditor.pdf or watch: diff --git a/haiku-libs/libsanta/libsanta-3.0.1.recipe b/haiku-libs/libsanta/libsanta-3.0.1.recipe index 12b1ec4d9..474cdb306 100644 --- a/haiku-libs/libsanta/libsanta-3.0.1.recipe +++ b/haiku-libs/libsanta/libsanta-3.0.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="Deprecated custom widget library." +SUMMARY="Deprecated custom widget library" DESCRIPTION="Santa's Gift Bag has some useful custom widgets \ (color picker, column list view, scroll view etc.) DO NOT use for new \ applications! Use libwalter or Haiku's experimental widgets (libshared). \ @@ -17,15 +17,12 @@ PROVIDES=" libsanta$secondaryArchSuffix = $portVersion lib:libsanta$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" makefile_engine cmd:gcc$secondaryArchSuffix @@ -38,7 +35,6 @@ PROVIDES_devel=" libsanta${secondaryArchSuffix}_devel = $portVersion devel:libsanta$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" libsanta$secondaryArchSuffix == $portVersion base " diff --git a/media-fonts/vl_gothic/vl_gothic-20141206.recipe b/media-fonts/vl_gothic/vl_gothic-20141206.recipe index 08ba3b550..1221f8397 100644 --- a/media-fonts/vl_gothic/vl_gothic-20141206.recipe +++ b/media-fonts/vl_gothic/vl_gothic-20141206.recipe @@ -1,22 +1,25 @@ -SUMMARY="A modern gothic font including Japanese, as well as Latin and Greek glyphs" +SUMMARY="A modern gothic font including Japanese, Latin and Greek glyphs" DESCRIPTION="This package includes the VL Gothic (monospace) and VL PGothic \ (proportional) fonts. Originally developed for the Vine Linux project, they \ include glyphs suitable for rendering Japanese text, as well as Latin and Greek \ alphabets. -The fonts are based on the M+ fonts and the Sazanami fonts." +The fonts are based on the M+ fonts and the Sazanami fonts. +" HOMEPAGE="http://vlgothic.dicey.org/" SRC_URI="http://sourceforge.jp/frs/redir.php?m=jaist&f=%2Fvlgothic%2F62375%2FVLGothic-20141206.tar.xz" CHECKSUM_SHA256="982040db2f9cb73d7c6ab7d9d163f2ed46d1180f330c9ba2fae303649bf8102d" -LICENSE="BSD (3-clause) +LICENSE=" + BSD (3-clause) M+ Fonts Project Sazanami Gothic Font -" -COPYRIGHT="1990-2003 Wada Laboratory, the University of Tokyo. -2003-2004 Electronic Font Open Laboratory (/efont/). -2002-2014 M+ FONTS PROJECT -2006-2014 Daisuke SUZUKI . -2006-2014 Project Vine . -" + " +COPYRIGHT=" + 1990-2003 Wada Laboratory, the University of Tokyo + 2003-2004 Electronic Font Open Laboratory (/efont/) + 2002-2014 M+ FONTS PROJECT + 2006-2014 Daisuke SUZUKI + 2006-2014 Project Vine + " REVISION="1" ARCHITECTURES="any" diff --git a/media-libs/devil/devil-1.7.8.recipe b/media-libs/devil/devil-1.7.8.recipe index fd23e4774..f1d625f3b 100644 --- a/media-libs/devil/devil-1.7.8.recipe +++ b/media-libs/devil/devil-1.7.8.recipe @@ -1,8 +1,18 @@ SUMMARY="A full-featured cross-platform image library" +DESCRIPTION=" +Developer's Image Library (DevIL) is a programmer's library to develop \ +applications with very powerful image loading capabilities, yet is easy for a \ +developer to learn and use. Ultimate control of images is left to the \ +developer, so unnecessary conversions, etc. are not performed. DevIL utilizes \ +a simple, yet powerful, syntax. DevIL can load, save, convert, manipulate, \ +filter and display a wide variety of image formats. +" HOMEPAGE="http://openil.sourceforge.net/" SRC_URI="http://sourceforge.net/projects/openil/files/DevIL/1.7.8/DevIL-1.7.8.tar.gz" CHECKSUM_SHA256="682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd" REVISION="2" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2009 Denton Woods" ARCHITECTURES="x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86" @@ -10,11 +20,9 @@ PROVIDES=" devil$secondaryArchSuffix = $portVersion lib:libIL$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libjasper$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix @@ -23,8 +31,7 @@ BUILD_REQUIRES=" devel:libpng$secondaryArchSuffix devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:awk @@ -35,7 +42,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " - BUILD() { runConfigure ./configure CFLAGS=-Dpng_set_gray_1_2_4_to_8=png_set_expand_gray_1_2_4_to_8 @@ -63,19 +69,7 @@ PROVIDES_devel=" devil${secondaryArchSuffix}_devel = $portVersion devel:libIL$secondaryArchSuffix " - REQUIRES_devel=" haiku$secondaryArchSuffix devil$secondaryArchSuffix == $portVersion base " - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2009 Denton Woods" -DESCRIPTION=" -Developer's Image Library (DevIL) is a programmer's library to develop -applications with very powerful image loading capabilities, yet is easy for a -developer to learn and use. Ultimate control of images is left to the -developer, so unnecessary conversions, etc. are not performed. DevIL utilizes a -simple, yet powerful, syntax. DevIL can load, save, convert, manipulate, filter -and display a wide variety of image formats. -" diff --git a/media-libs/faad2/faad2-2.7.recipe b/media-libs/faad2/faad2-2.7.recipe index 45ebeb10b..448ecbc6e 100644 --- a/media-libs/faad2/faad2-2.7.recipe +++ b/media-libs/faad2/faad2-2.7.recipe @@ -1,14 +1,17 @@ -SUMMARY="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" -DESCRIPTION="FAAD2 is an open source MPEG-4 and MPEG-2 AAC decoder" - +SUMMARY="An open source MPEG-4 and MPEG-2 AAC decoder" +DESCRIPTION=" +This is an open source MPEG-4 and MPEG-4 ACC decoder programmed in C \ +and used in FAAC (freeware Advanced Audio Coder). It is used with the FAAC \ +encoder and can be compile on various platforms. It supports MPEG-4 audio \ +object types including LC, Main, LTP, LD, ER, SBR and PS. It contains a \ +library (libfaad) that may be used by other programs." HOMEPAGE="http://www.audiocoding.com/" SRC_URI="http://downloads.sourceforge.net/faac/faad2-2.7.tar.gz" +CHECKSUM_SHA256="ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2003-2005 M. Bakker, Nero AG." -CHECKSUM_SHA256="ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330" - ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -19,11 +22,9 @@ PROVIDES=" lib:libfaad$secondaryArchSuffix = 2.0.0 compat >= 2 cmd:faad$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku${secondaryArchSuffix} -" - + " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:libtool @@ -35,7 +36,6 @@ BUILD_PREREQUIRES=" cmd:make " - PATCH() { sed -i 's/(LTCOMPILE) -c/(LTCOMPILE) -nostart/' libfaad/Makefile.in diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe index 84b608274..6829c9b2e 100644 --- a/media-libs/jasper/jasper-1.900.1.recipe +++ b/media-libs/jasper/jasper-1.900.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard." +SUMMARY="Implementation of the codec specified in the JPEG-2000 Part-1 standard" DESCRIPTION=" The JasPer Project is an open-source initiative to provide a free \ software-based reference implementation of the codec specified in the \ @@ -9,10 +9,8 @@ HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/" SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip" CHECKSUM_SHA256="6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494" REVISION="4" - LICENSE="JasPer v2" COPYRIGHT="1999-2007 Michael D. Adams" - ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -22,15 +20,12 @@ PROVIDES=" jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0 lib:libjasper$secondaryArchSuffix = 1.0.0 compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -43,8 +38,6 @@ BUILD_PREREQUIRES=" cmd:chmod " - - BUILD() { autoreconf -fi @@ -83,7 +76,6 @@ PROVIDES_devel=" jasper${secondaryArchSuffix}_devel = $portVersion devel:libjasper$secondaryArchSuffix = 1.0.0 compat >=1 " - REQUIRES_devel=" jasper$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/lcms/lcms-2.6.recipe b/media-libs/lcms/lcms-2.6.recipe index 54f17e369..67b778fec 100644 --- a/media-libs/lcms/lcms-2.6.recipe +++ b/media-libs/lcms/lcms-2.6.recipe @@ -26,7 +26,6 @@ PROVIDES=" cmd:tificc$secondaryArchSuffix cmd:transicc$secondaryArchSuffix " - REQUIRES=" haiku lib:libjpeg$secondaryArchSuffix @@ -34,7 +33,6 @@ REQUIRES=" lib:libtiff$secondaryArchSuffix lib:libz$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libjpeg$secondaryArchSuffix @@ -42,7 +40,6 @@ BUILD_REQUIRES=" devel:libtiff$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc${secondaryArchSuffix} cmd:ld${secondaryArchSuffix} @@ -51,6 +48,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:make " + SOURCE_DIR="lcms2-$portVersion" BUILD() diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe index 2fcdffd06..ef667e469 100644 --- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe +++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe @@ -1,9 +1,10 @@ -SUMMARY="Libart is a library for high-performance 2D graphics" +SUMMARY="A library for high-performance 2D graphics" DESCRIPTION=" Libart is free software (all components are either GPL or LGPL). Libart is \ -also available for commercial licensing. Libart supports a very powerful \ -imaging model, basically the same as SVG and the Java 2D API. It includes all \ -PostScript imaging operations, and adds antialiasing and alpha-transparency. \ +also available for commercial licensing. +Libart supports a very powerful imaging model, basically the same as SVG and \ +the Java 2D API. It includes all PostScript imaging operations, and adds \ +antialiasing and alpha-transparency. Libart is also highly tuned for incremental rendering. It contains data \ structures and algorithms suited to rapid, precise computation of Region of \ Interest, as well as a two-phase rendering pipeline optimized for interactive \ @@ -23,15 +24,12 @@ PROVIDES=" libart_lgpl$secondaryArchSuffix = $portVersion lib:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoreconf @@ -69,7 +67,6 @@ PROVIDES_devel=" devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2 cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2 " - REQUIRES_devel=" libart_lgpl_2$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/libwebp/libwebp-0.4.1.recipe b/media-libs/libwebp/libwebp-0.4.1.recipe index 8c199f7da..54f7f7235 100644 --- a/media-libs/libwebp/libwebp-0.4.1.recipe +++ b/media-libs/libwebp/libwebp-0.4.1.recipe @@ -1,4 +1,4 @@ -SUMMARY="library for encoding and decoding WebP image files" +SUMMARY="A library for encoding and decoding WebP image files" DESCRIPTION=" A library for encoding and decoding WebP image files. " @@ -18,7 +18,6 @@ PROVIDES=" cmd:cwebp$secondaryArchSuffix cmd:dwebp$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix @@ -26,14 +25,12 @@ REQUIRES=" lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libjpeg$secondaryArchSuffix devel:libgif$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -69,7 +66,6 @@ PROVIDES_devel=" libwebp${secondaryArchSuffix}_devel = $portVersion compat >= 0.4 devel:libwebp$secondaryArchSuffix = 5.0.1 compat >= 5 " - REQUIRES_devel=" libwebp$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index 70d7c0724..39a9c8d8d 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -1,15 +1,19 @@ SUMMARY="A software implementation of the OpenAL 3D audio API" DESCRIPTION=" -OpenAL - A software implementation of the OpenAL 3D audio API. -" +OpenAL stands for (Open Audio Library), a cross-platform audio application \ +programming interface written in C. It is an environmental 3D audio \ +library that aims to provide a replacement for proprietary 3D audio systems \ +such as EAX and A3D. Openal is designed for efficient rendering of \ +multichannel 3D positional audio." HOMEPAGE="http://kcat.strangesoft.net/openal.html" SRC_URI="http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2" CHECKSUM_SHA256="dc735b8b2ab21f6ec54b4262f150a7e0527ae42aa975a1965b9342df1520443c" REVISION="2" LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2000 Loki Software - 2005-2011 OpenAL Soft team" - +COPYRIGHT=" + 1999-2000 Loki Software + 2005-2011 OpenAL Soft team + " ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -17,15 +21,12 @@ PROVIDES=" openal$secondaryArchSuffix = $portVersion compat >= 1 lib:libopenal$secondaryArchSuffix = 1.13.0 compat >= 1 " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " - BUILD_PREREQUIRES=" cmd:cmake cmd:gcc$secondaryArchSuffix @@ -67,7 +68,6 @@ PROVIDES_devel=" devel:libopenal$secondaryArchSuffix = 1.13.0 compat >= 0 cmd:openal_info$secondaryArchSuffix " - REQUIRES_devel=" haiku$secondaryArchSuffix lib:libopenal$secondaryArchSuffix == $portVersion base diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe index 277edbfce..32ef241a8 100644 --- a/media-libs/openexr/openexr-2.2.0.recipe +++ b/media-libs/openexr/openexr-2.2.0.recipe @@ -1,3 +1,4 @@ +SUMMARY="A high dynamic-range (HDR) image file format" DESCRIPTION=" OpenEXR is a high dynamic-range (HDR) image file format developed \ by Industrial Light & Magic for use in computer imaging \ @@ -7,7 +8,6 @@ Harry Potter and the Sorcerers Stone, Men in Black II, Gangs of \ New York, and Signs. Since then, OpenEXR has become ILM's main \ image file format. " -SUMMARY="OpenEXR is a high dynamic-range (HDR) image file format" HOMEPAGE="http://www.openexr.com" LICENSE="BSD (3-clause)" COPYRIGHT="2002-2011 Industrial Light & Magic" @@ -39,7 +39,6 @@ PROVIDES=" cmd:exrmultiview$secondaryArchSuffix = $portVersion cmd:exrstdattr$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libhalf$secondaryArchSuffix == 12.0.0 diff --git a/media-libs/sdl_net/sdl_net-1.2.8.recipe b/media-libs/sdl_net/sdl_net-1.2.8.recipe index ef629f2c2..2ff416832 100644 --- a/media-libs/sdl_net/sdl_net-1.2.8.recipe +++ b/media-libs/sdl_net/sdl_net-1.2.8.recipe @@ -1,7 +1,10 @@ SUMMARY="Simple Direct Media Layer Net Library" DESCRIPTION=" -This is a small simple cross-platform networking library for SDL. -" +SDL_net is a network library that works with the SDL. It has good network \ +functionality as users are able to code on multiple platforms including \ +Linux, Windows, and Haiku. SDL_net makes handling data transfer and network \ +connections easy. It features a sample chat client and server application; \ +the chat client uses the GUIlib GUI framework library." HOMEPAGE="http://www.libsdl.org/projects/SDL_net" SRC_URI="http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz" CHECKSUM_SHA256="5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4" @@ -16,17 +19,14 @@ PROVIDES=" lib:libSDL_net$secondaryArchSuffix = 1.2_0.8.0 compat >= 1.2_0 lib:libSDL_net_1.2$secondaryArchSuffix = 0.8.0 compat >= 1.2 " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix lib:libGL$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libsdl$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:aclocal @@ -69,7 +69,6 @@ PROVIDES_devel=" devel:libSDL_net$secondaryArchSuffix = 1.2_0.8.0 compat >= 0 devel:libSDL_net_1.2$secondaryArchSuffix = 0.8.0 compat >= 0 " - REQUIRES_devel=" sdl_net$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/sge/sge-030809.recipe b/media-libs/sge/sge-030809.recipe index 0a830b65c..8c485def2 100644 --- a/media-libs/sge/sge-030809.recipe +++ b/media-libs/sge/sge-030809.recipe @@ -1,7 +1,9 @@ SUMMARY="SDL Graphics Extension" DESCRIPTION=" -SDL Graphics Extension -" +SGE is an extension for the open source multimedia library-SDL. It provides \ +many graphics operations such as drawing of lines, circles and primitives. It \ +also allows for the rotation and scaling of surfaces, pixel operations and \ +much more." HOMEPAGE="http://www.etek.chalmers.se/~e8cal1/sge/" SRC_URI="http://ports-space.haiku-files.org/source/sge-030809.tar.gz" CHECKSUM_SHA256="25cfbe59ab99647254e69d25984707045492c2a5d1b15f27d999d0284a7110fc" @@ -17,7 +19,6 @@ PROVIDES=" sge$secondaryArchSuffix = $portVersion compat >= 030809 lib:libSGE$secondaryArchSuffix = $portVersion compat >= 030809 " - REQUIRES=" haiku$secondaryArchSuffix lib:libsdl$secondaryArchSuffix @@ -25,7 +26,6 @@ REQUIRES=" lib:libfreetype$secondaryArchSuffix lib:libz$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libsdl$secondaryArchSuffix @@ -33,7 +33,6 @@ BUILD_REQUIRES=" devel:libfreetype$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -63,7 +62,6 @@ PROVIDES_devel=" sge${secondaryArchSuffix}_devel = $portVersion compat >= 030809 devel:libSGE$secondaryArchSuffix = $portVersion compat >= 030809 " - REQUIRES_devel=" sge$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/smpeg/smpeg-0.4.5.recipe b/media-libs/smpeg/smpeg-0.4.5.recipe index 9a9829527..f0bd5abae 100644 --- a/media-libs/smpeg/smpeg-0.4.5.recipe +++ b/media-libs/smpeg/smpeg-0.4.5.recipe @@ -1,4 +1,4 @@ -SUMMARY="smpeg is an mpeg decoding library." +SUMMARY="An mpeg decoding library" DESCRIPTION=" SMPEG is short for the SDL MPEG library originally developed by Loki Software. \ SMPEG uses MPEG-1 standard as a video display library, rather than MPEG-2, \ @@ -23,7 +23,6 @@ PROVIDES=" lib:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 lib:libsmpeg_0.4$secondaryArchSuffix = 0.1.4 compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix @@ -31,13 +30,11 @@ REQUIRES=" lib:libSDL_1.2$secondaryArchSuffix lib:libGL$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libSDL$secondaryArchSuffix devel:libglu$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:libtoolize @@ -88,7 +85,6 @@ PROVIDES_devel=" devel:libsmpeg$secondaryArchSuffix = 0.4_0.1.4 compat >= 0.4_0 devel:libsmpeg_0.4$secondaryArchSuffix = 0.1.4 compat >= 0 " - REQUIRES_devel=" smpeg$secondaryArchSuffix == $portVersion base " diff --git a/media-libs/taglib/taglib-1.9.1.recipe b/media-libs/taglib/taglib-1.9.1.recipe index 5e3cc64fc..b01a27ab1 100644 --- a/media-libs/taglib/taglib-1.9.1.recipe +++ b/media-libs/taglib/taglib-1.9.1.recipe @@ -1,12 +1,16 @@ -SUMMARY="TabLib Audio Meta-Data Library" +SUMMARY="An audio meta-data library" DESCRIPTION=" -TagLib Audio Meta-Data Library. -" +TagLib is a free library written in C++ for reading and editing \ +metadata that has been embedded into audio files. It is able to read and \ +edit all relevant metadata formats for audio files, including APEv2, ID3 and \ +Vorbis. It can find tags in multiple formats such as .mp3 .wma .wav .m4a \ +.flac etc. TagLib is platform independent." HOMEPAGE="http://github.com/taglib" SRC_URI="http://taglib.github.io/releases/taglib-1.9.1.tar.gz" CHECKSUM_SHA256="72d371cd1419a87ae200447a53bff2be219283071e80fd12337928cc967dc71a" COPYRIGHT="2002-2013 Scott Wheeler" -LICENSE="GNU LGPL v2 +LICENSE=" + GNU LGPL v2 MPL v1.1 " REVISION="2" @@ -25,17 +29,14 @@ PROVIDES=" lib:libtag$secondaryArchSuffix = 1.14.0 compat >= 1 lib:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix lib:libz$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix @@ -82,7 +83,6 @@ PROVIDES_devel=" devel:libtag$secondaryArchSuffix = 1.14.0 compat >= 1 devel:libtag_c$secondaryArchSuffix = 0.0.0 compat >= 0 " - REQUIRES_devel=" taglib$secondaryArchSuffix == $portVersion base " diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe index d80f09ce4..cde4c685e 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe @@ -1,8 +1,10 @@ -SUMMARY="Fluidsynth is a software real-time synthesizer" +SUMMARY="FA software real-time synthesizer" DESCRIPTION=" -Fluidsynth is a software real-time synthesizer based on the Soundfont 2 \ -specifications. -" +Fluidsynth is a free open source software synthesizer written in C. It \ +can convert MIDI note data to an audio signal using SoundFont technology \ +without a SoundFont compatible soundcard. Fluidsynth can perform as a virtual \ +MIDI device and read in SMF (.mid) files directly. Another function is its \ +ability to send audio data to a Raw or Wave file." HOMEPAGE="http://www.fluidsynth.org/" SRC_URI="http://sourceforge.net/projects/fluidsynth/files/fluidsynth-$portVersion/fluidsynth-$portVersion.tar.bz2" CHECKSUM_SHA256="d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601" @@ -20,7 +22,6 @@ PROVIDES=" lib:libfluidsynth${secondaryArchSuffix} = 1.5.2 compat >= 1 cmd:fluidsynth${secondaryArchSuffix} " - REQUIRES=" haiku${secondaryArchSuffix} lib:libFLAC$secondaryArchSuffix @@ -33,7 +34,6 @@ REQUIRES=" lib:libsndfile$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libFLAC$secondaryArchSuffix @@ -45,7 +45,6 @@ BUILD_REQUIRES=" devel:libsndfile$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:libtoolize @@ -60,25 +59,21 @@ BUILD_PREREQUIRES=" BUILD() { libtoolize -fci - ./autogen.sh runConfigure ./configure - make $jobArgs } INSTALL() { make install - prepareInstalledDevelLib libfluidsynth fixPkgconfig # devel package packageEntries devel \ $developDir - } # ----- devel package ------------------------------------------------------- diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index e3cea0b52..5e3e23168 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -1,4 +1,4 @@ -SUMMARY="ocp - Open Cubic Player" +SUMMARY="Open Cubic Player" DESCRIPTION=" ocp - Open Cubic Player, a music player ported from DOS. " diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe index c2443c98b..530df6431 100644 --- a/net-irc/quassel/quassel-0.10.0.recipe +++ b/net-irc/quassel/quassel-0.10.0.recipe @@ -1,14 +1,15 @@ -SUMMARY="Quassel IRC" +SUMMARY="A distributed IRC client" DESCRIPTION=" -Quassel IRC is a modern, cross-platform, distributed IRC client, -meaning that one (or multiple) client(s) can attach to and detach -from a central core -- much like the popular combination of screen -and a text-based IRC client such as WeeChat, but graphical. In -addition to this unique feature, we aim to bring a pleasurable, -comfortable chatting experience to all major platforms (including -Linux, Windows, and Mac OS X as well as Android smartphones), making -communication with your peers not only convenient, but also -easily available." +Quassel IRC is a modern, cross-platform, distributed IRC client, meaning \ +that one (or multiple) client(s) can attach to and detach from a central \ +core -- much like the popular combination of screen and a text-based IRC \ +client such as WeeChat, but graphical. + +In addition to this unique feature, it aims to bring a pleasurable, \ +comfortable chatting experience to all major platforms (including Linux, \ +Windows, and Mac OS X as well as Android smartphones), making communication \ +with your peers not only convenient, but also easily available. +" HOMEPAGE="http://quassel-irc.org" SRC_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2" CHECKSUM_SHA256="68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23" @@ -34,24 +35,20 @@ PROVIDES=" cmd:quasselcore${secondaryArchSuffix} cmd:quasselclient${secondaryArchSuffix} " - REQUIRES=" haiku${secondaryArchSuffix} libqt4${secondaryArchSuffix} >= 4.8 lib:libz${secondaryArchSuffix} " - PATCHES=" quassel-0.9.2.patchset " - BUILD_PREREQUIRES=" cmd:cmake cmd:g++${secondaryArchSuffix} cmd:make cmd:pkg_config${secondaryArchSuffix} - " - + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel libqt4${secondaryArchSuffix}_devel >= 4.8 diff --git a/net-libs/hubbub/hubbub-0.3.0.recipe b/net-libs/hubbub/hubbub-0.3.0.recipe index 53b93ef26..fd1cf0d79 100644 --- a/net-libs/hubbub/hubbub-0.3.0.recipe +++ b/net-libs/hubbub/hubbub-0.3.0.recipe @@ -1,4 +1,4 @@ -SUMMARY="Hubbub is an HTML5 compliant parsing library" +SUMMARY="An HTML5 compliant parsing library" DESCRIPTION=" Hubbub is an HTML5 compliant parsing library, written in C. It was developed \ as part of the NetSurf project and is available for use by other software \ diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.4.3.recipe index 08cf1e30f..539e2e4a3 100644 --- a/net-libs/libssh2/libssh2-1.4.3.recipe +++ b/net-libs/libssh2/libssh2-1.4.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="A SSH2 library." +SUMMARY="A SSH2 library" DESCRIPTION=" libssh2 is a library implementing the SSH2 protocol, available under \ the revised BSD license. diff --git a/net-libs/neon/neon-0.30.1.recipe b/net-libs/neon/neon-0.30.1.recipe index 5e575414c..1e9afcf3a 100644 --- a/net-libs/neon/neon-0.30.1.recipe +++ b/net-libs/neon/neon-0.30.1.recipe @@ -1,6 +1,8 @@ SUMMARY="HTTP and WebDAV client library, with a C interface" DESCRIPTION=" -neon is an HTTP and WebDAV client library, with a C interface. Features: +neon is an HTTP and WebDAV client library, with a C interface. + +Features: - high-level wrappers for common HTTP and WebDAV operations (GET, MOVE, \ DELETE, etc) - low-level interface to the HTTP request/response engine, allowing the use of \ @@ -56,7 +58,6 @@ BUILD_PREREQUIRES=" cmd:make " - BUILD() { echo 'LT_INIT' >> configure.in diff --git a/net-misc/muscle/muscle-6.00.recipe b/net-misc/muscle/muscle-6.00.recipe index ec2615541..b96d1d509 100644 --- a/net-misc/muscle/muscle-6.00.recipe +++ b/net-misc/muscle/muscle-6.00.recipe @@ -2,12 +2,14 @@ SUMMARY="Robust, somewhat scalable, cross-platform client-server solution" DESCRIPTION=" The MUSCLE system is a robust, somewhat scalable, cross-platform client-server \ solution for dynamic distributed applications for Haiku and other operating \ -systems. It allows (n) client programs (each of which may be running on a \ +systems. +It allows (n) client programs (each of which may be running on a \ separate computer and/or under a different OS) to communicate with each other \ in a many-to-many message-passing style. It employs a central server to which \ client programs may connect or disconnect at any time (this design is similar \ to other client-server systems such as Quake servers, IRC servers, and Napster \ -servers, but more general in application). In addition to the client-server \ +servers, but more general in application). +In addition to the client-server \ system, MUSCLE contains classes to support peer-to-peer message streaming \ connections, as well as some handy miscellaneous utility classes. " @@ -33,16 +35,13 @@ PROVIDES=" cmd:muscled$secondaryArchSuffix = $portVersion cmd:muscled_admin$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -87,7 +86,6 @@ PROVIDES_devel=" devel:muscle$secondaryArchSuffix = $portVersion devel:libmuscle$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" muscle$secondaryArchSuffix == $portVersion base " diff --git a/net-print/gutenprint/gutenprint-5.2.10.recipe b/net-print/gutenprint/gutenprint-5.2.10.recipe index c05b8c3b0..0633e899e 100644 --- a/net-print/gutenprint/gutenprint-5.2.10.recipe +++ b/net-print/gutenprint/gutenprint-5.2.10.recipe @@ -5,8 +5,8 @@ drivers that may be used with most common UNIX print spooling \ systems, including CUPS, lpr, LPRng, or others. These drivers \ provide high quality printing for UNIX (including Macintosh OS X \ 10.3 and newer) and Linux systems in many cases equal to or better \ -than proprietary vendor-supplied drivers. Gutenprint also \ -includes an enhanced print plug-in for the GIMP image editor, \ +than proprietary vendor-supplied drivers. +Gutenprint also includes an enhanced print plug-in for the GIMP image editor, \ replacing the Gimp-Print 4.2-based plugin supplied with GIMP 1.2, \ 2.0, and 2.2, and offering an alternative with additional \ capabilities to the GtkPrint-based plugin supplied with GIMP 2.4 \ @@ -46,6 +46,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:sed " + PATCH() { # git doesn't handle correctly multilines with straybackspaces. diff --git a/sys-apps/dbus/dbus-1.8.6.recipe b/sys-apps/dbus/dbus-1.8.6.recipe index e3be51801..412224bbf 100644 --- a/sys-apps/dbus/dbus-1.8.6.recipe +++ b/sys-apps/dbus/dbus-1.8.6.recipe @@ -1,4 +1,4 @@ -SUMMARY="D-Bus provides simple way for applications to talk to one another." +SUMMARY="D-Bus provides simple way for applications to talk to one another" DESCRIPTION="NOTE: D-Bus should not be used in native Haiku apps, but is only \ here because some ported software requires it. @@ -43,7 +43,6 @@ PROVIDES=" cmd:dbus_uuidgen = $portVersion lib:libdbus_1$secondaryArchSuffix = $portVersion " - REQUIRES=" haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix @@ -53,7 +52,6 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix " - BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix glib2${secondaryArchSuffix}_devel @@ -62,7 +60,6 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:awk @@ -77,7 +74,6 @@ PROVIDES_devel=" dbus${secondaryArchSuffix}_devel = $portVersion devel:libdbus_1$secondaryArchSuffix = $portVersion " - REQUIRES_devel=" dbus$secondaryArchSuffix == $portVersion base haiku$secondaryArchSuffix diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe index 552bb1bac..d01d91c92 100644 --- a/sys-apps/findutils/findutils-4.4.2.recipe +++ b/sys-apps/findutils/findutils-4.4.2.recipe @@ -4,10 +4,10 @@ GNU Findutils are typically used in conjunction with other programs to \ provide modular and powerful directory search and file locating \ capabilities to other commands. The tools supplied with this package are: -find - search for files in a directory hierarchy -locate - list files in databases that match a pattern -updatedb - update a file name database -xargs - build and execute command lines from a standard input. +- find - search for files in a directory hierarchy +- locate - list files in databases that match a pattern +- updatedb - update a file name database +- xargs - build and execute command lines from a standard input. " HOMEPAGE="http://www.gnu.org/software/findutils" COPYRIGHT="1994-2011 Free Software Foundation, Inc." diff --git a/sys-apps/gawk/gawk-4.1.0.recipe b/sys-apps/gawk/gawk-4.1.0.recipe index 2f871b4a1..eecc606bb 100644 --- a/sys-apps/gawk/gawk-4.1.0.recipe +++ b/sys-apps/gawk/gawk-4.1.0.recipe @@ -1,20 +1,22 @@ SUMMARY="A pattern scanning and processing language" DESCRIPTION=" - If you are like many computer users, you would frequently like to make - changes in various text files wherever certain patterns appear, or - extract data from parts of certain lines while discarding the rest. To - write a program to do this in a language such as C or Pascal is a - time-consuming inconvenience that may take many lines of code. The job - is easy with awk, especially the GNU implementation: gawk. +If you are like many computer users, you would frequently like to make \ +changes in various text files wherever certain patterns appear, or \ +extract data from parts of certain lines while discarding the rest. To \ +write a program to do this in a language such as C or Pascal is a \ +time-consuming inconvenience that may take many lines of code. The job \ +is easy with awk, especially the GNU implementation: gawk. - The awk utility interprets a special-purpose programming language that - makes it possible to handle simple data-reformatting jobs with just a - few lines of code. - " +The awk utility interprets a special-purpose programming language that \ +makes it possible to handle simple data-reformatting jobs with just a \ +few lines of code. +" HOMEPAGE="http://www.gnu.org/s/gawk" SRC_URI="http://ftp.gnu.org/gnu/gawk/gawk-4.1.0.tar.gz" CHECKSUM_SHA256="79f81b09bc3cce50e083f78acc0f91783821ad30866615d30dd1731f17ec440b" REVISION="2" +LICENSE="GNU GPL v3" +COPYRIGHT="1983-2013 Free Software Foundation, Inc." ARCHITECTURES="x86_gcc2 x86 x86_64 arm" PATCHES="gawk-4.1.0.patchset" @@ -63,6 +65,3 @@ TEST() { make check } - -LICENSE="GNU GPL v3" -COPYRIGHT="1983-2013 Free Software Foundation, Inc." diff --git a/sys-apps/help2man/help2man-1.46.3.recipe b/sys-apps/help2man/help2man-1.46.3.recipe index c54a6e8e7..a5b7b741e 100644 --- a/sys-apps/help2man/help2man-1.46.3.recipe +++ b/sys-apps/help2man/help2man-1.46.3.recipe @@ -1,4 +1,4 @@ -SUMMARY="Produces simple manual pages from the --help and --version output of other commands." +SUMMARY="Produces simple manual pages from --help and --version output of commands" DESCRIPTION=" help2man is a tool for automatically generating simple manual pages from \ program output. @@ -9,7 +9,6 @@ Given a program which produces reasonably standard ‘--help’ and ‘--version outputs, help2man can re-arrange that output into something which resembles a \ manual page. " - HOMEPAGE="http://www.gnu.org/software/help2man/" SRC_URI="http://ftpmirror.gnu.org/help2man/help2man-$portVersion.tar.xz" CHECKSUM_SHA256="a669dc3baf2f9fcfcf9d55d8555d1c234bc3cabd5fbe8e36e0dea4a88c222942" diff --git a/sys-apps/less/less-466.recipe b/sys-apps/less/less-466.recipe index f3e69e87f..d203b4c30 100644 --- a/sys-apps/less/less-466.recipe +++ b/sys-apps/less/less-466.recipe @@ -1,4 +1,4 @@ -SUMMARY="Less is a free, open-source file pager." +SUMMARY="A free, open-source file pager" DESCRIPTION="GNU less is a program similar to more, but which allows \ backward movement in the file as well as forward movement. Also, less \ does not have to read the entire input file before starting, so with \ @@ -22,17 +22,14 @@ PROVIDES=" cmd:lessecho cmd:lesskey " - REQUIRES=" haiku$secondaryArchSuffix lib:libncurses$secondaryArchSuffix " - BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libncurses$secondaryArchSuffix " - BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make @@ -44,7 +41,7 @@ BUILD_PREREQUIRES=" GLOBAL_WRITABLE_FILES=" settings/etc/sysless.src keep-old settings/etc/sysless keep-old -" + " BUILD() { diff --git a/sys-apps/which/which-2.20.recipe b/sys-apps/which/which-2.20.recipe index 3f22ca0ef..711c42b35 100644 --- a/sys-apps/which/which-2.20.recipe +++ b/sys-apps/which/which-2.20.recipe @@ -1,4 +1,8 @@ SUMMARY="Prints out location of specified executables that are in your path" +DESCRIPTION=" +GNU which is an utility that is used to find which executable (or alias or \ +shell function) is executed when entered on the shell prompt. +" HOMEPAGE="http://carlo17.home.xs4all.nl/which/" COPYRIGHT="Free Software Foundation" LICENSE="GNU GPL v2" @@ -12,19 +16,19 @@ PATCHES="which-2.20.patch" PROVIDES=" which = $portVersion cmd:which = $portVersion -" + " REQUIRES=" haiku -" + " BUILD_REQUIRES=" -" + " BUILD_PREREQUIRES=" haiku_devel cmd:gcc cmd:make cmd:sed cmd:grep -" + " BUILD() { @@ -36,8 +40,3 @@ INSTALL() { make install } - -DESCRIPTION=" -GNU which is an utility that is used to find which executable (or alias or \ -shell function) is executed when entered on the shell prompt. -" diff --git a/sys-devel/flex/flex-2.5.39.recipe b/sys-devel/flex/flex-2.5.39.recipe index a703380ff..0c27f99d6 100644 --- a/sys-devel/flex/flex-2.5.39.recipe +++ b/sys-devel/flex/flex-2.5.39.recipe @@ -1,10 +1,13 @@ -SUMMARY="A tool for generating scanners." +SUMMARY="A tool for generating scanners" DESCRIPTION=" Flex is a fast lexical analyser generator. It is a tool for generating \ programs that perform pattern-matching on text. " HOMEPAGE="http://flex.sourceforge.net/" -COPYRIGHT="2001-2007 The Flex Project; 1990, 1997 The Regents of the University of California" +COPYRIGHT=" + 2001-2007 The Flex Project + 1990, 1997 The Regents of the University of California + " LICENSE="Flex" SRC_URI="http://sourceforge.net/projects/flex/files/flex-$portVersion.tar.bz2" CHECKSUM_SHA256="add2b55f3bc38cb512b48fad7d72f43b11ef244487ff25fc00aabec1e32b617f" @@ -42,7 +45,6 @@ BUILD_PREREQUIRES=" cmd:find " - BUILD() { rm -f aclocal.m4 diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe index 8698c8f77..6336418f5 100644 --- a/sys-devel/gettext/gettext-0.18.1.1.recipe +++ b/sys-devel/gettext/gettext-0.18.1.1.recipe @@ -5,7 +5,9 @@ an asset on which we may build many other steps. This package offers to \ programmers, translators, and even users, a well integrated set of tools and \ documentation. Specifically, the GNU 'gettext' utilities are a set of tools \ that provides a framework to help other GNU packages produce multi-lingual \ -messages. These tools include a set of conventions about how programs should \ +messages. + +These tools include a set of conventions about how programs should \ be written to support message catalogs, a directory and file naming \ organization for the message catalogs themselves, a runtime library supporting \ the retrieval of translated messages, and a few stand-alone programs to \ @@ -60,7 +62,6 @@ PROVIDES=" cmd:recode_sr_latin$secondaryArchSuffix = $portVersion compat >= 0 cmd:xgettext$secondaryArchSuffix = $portVersion compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix gettext${secondaryArchSuffix}_libintl == $portVersion base diff --git a/sys-devel/jam/jam-2.5_2012_10_12.recipe b/sys-devel/jam/jam-2.5_2012_10_12.recipe index a4ffd9fe0..6785dc2c7 100644 --- a/sys-devel/jam/jam-2.5_2012_10_12.recipe +++ b/sys-devel/jam/jam-2.5_2012_10_12.recipe @@ -4,6 +4,7 @@ Jam is a small open-source build tool that can be used as a replacement for \ Make. Even though Jam is a lot simpler to use than Make, it is far more \ powerful and easy to master. Its design is sufficiently clear to allow any \ average programmer to extend it with advanced features at will. + The main differences between Jam and Make are as follows: - Jam uses ‘Jamfiles’ instead of ‘Makefiles’. - Jamfiles do not normally contain toolset-specific rules or actions. They are \ @@ -25,7 +26,6 @@ PROVIDES=" jam = $portVersion cmd:jam = $portVersion compat >= 2.5 " - REQUIRES=" haiku " diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe index 14e9d96b7..0a3d19ae6 100644 --- a/sys-devel/libtool/libtool-2.4.2.recipe +++ b/sys-devel/libtool/libtool-2.4.2.recipe @@ -1,8 +1,8 @@ SUMMARY="A generic library support script" DESCRIPTION=" - GNU libtool is a set of shell scripts to automatically configure UNIX - architectures to build shared libraries in a generic fashion. - " +GNU libtool is a set of shell scripts to automatically configure UNIX \ +architectures to build shared libraries in a generic fashion. +" HOMEPAGE="http://www.gnu.org/software/libtool" COPYRIGHT="2004-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v2" @@ -50,7 +50,6 @@ BUILD_PREREQUIRES=" cmd:xargs " - BUILD() { ./bootstrap diff --git a/sys-devel/libtool/libtool-2.4.recipe b/sys-devel/libtool/libtool-2.4.recipe index e1b49aae1..949523931 100644 --- a/sys-devel/libtool/libtool-2.4.recipe +++ b/sys-devel/libtool/libtool-2.4.recipe @@ -1,8 +1,8 @@ SUMMARY="A generic library support script" DESCRIPTION=" - GNU libtool is a set of shell scripts to automatically configure UNIX - architectures to build shared libraries in a generic fashion. - " +GNU libtool is a set of shell scripts to automatically configure UNIX \ +architectures to build shared libraries in a generic fashion. +" HOMEPAGE="http://www.gnu.org/software/libtool" COPYRIGHT="2004-2010 Free Software Foundation, Inc." LICENSE="GNU GPL v2" @@ -45,7 +45,6 @@ BUILD_PREREQUIRES=" cmd:sed " - BUILD() { ./bootstrap diff --git a/sys-devel/llvm/llvm-3.5.0.recipe b/sys-devel/llvm/llvm-3.5.0.recipe index b47d34e70..afb5833d2 100644 --- a/sys-devel/llvm/llvm-3.5.0.recipe +++ b/sys-devel/llvm/llvm-3.5.0.recipe @@ -1,4 +1,4 @@ -SUMMARY="Modular and reuseable compiler and toolchain technologies." +SUMMARY="Modular and reuseable compiler and toolchain technologies" DESCRIPTION=" LLVM is a collection of modular and reuseable compiler and and toolchain \ technologies. @@ -157,16 +157,13 @@ PROVIDES=" devel:libLLVMipo$secondaryArchSuffix devel:libLTO$secondaryArchSuffix " - REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libstdc++$secondaryArchSuffix lib:libgcc_s$secondaryArchSuffix " - BUILD_REQUIRES=" " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal diff --git a/sys-libs/libexecinfo/libexecinfo-1.1.recipe b/sys-libs/libexecinfo/libexecinfo-1.1.recipe index 44e18a571..dbdd91a66 100644 --- a/sys-libs/libexecinfo/libexecinfo-1.1.recipe +++ b/sys-libs/libexecinfo/libexecinfo-1.1.recipe @@ -1,9 +1,8 @@ -SUMMARY="Library for inspecting program's backtrace" +SUMMARY="Library for inspecting a program's backtrace" DESCRIPTION=" -This is a quick-n-dirty BSD licensed clone of backtrace facility found -in the GNU libc, mainly intended for porting linuxish code to BSD -platforms, however it can be used at any platform which has a gcc -compiler. +This is a quick-n-dirty BSD licensed clone of backtrace facility found in the \ +GNU libc, mainly intended for porting linuxish code to BSD platforms, however \ +it can be used at any platform which has a gcc compiler. " HOMEPAGE="http://www.freshports.org/devel/libexecinfo" COPYRIGHT="2003-2014 Maxim Sobolev" diff --git a/sys-libs/mesa/mesa-10.2.9.recipe b/sys-libs/mesa/mesa-10.2.9.recipe index d9c049955..6e8d3f584 100644 --- a/sys-libs/mesa/mesa-10.2.9.recipe +++ b/sys-libs/mesa/mesa-10.2.9.recipe @@ -120,12 +120,12 @@ REQUIRES_devel=" # ----- swrast package ------------------------------------------------------- SUMMARY_swrast="Mesa software rasterization renderer" -DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software - rasterization on Haiku systems. Software rasterization performs all - 3D rendering on the systems CPU and doesn't require any specialized - hardware. Software rasterization is generally considered a fallback - 3D rendering method as performance is limited. - " +DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software \ +rasterization on Haiku systems. Software rasterization performs all 3D \ +rendering on the systems CPU and doesn't require any specialized hardware. \ +Software rasterization is generally considered a fallback 3D rendering method \ +as performance is limited. +" PROVIDES_swrast=" mesa${secondaryArchSuffix}_swrast = $portVersion " @@ -137,20 +137,16 @@ REQUIRED_swrast=" # ----- swpipe package ------------------------------------------------------- SUMMARY_swpipe="Mesa LLVM enhanced Gallium software pipe renderer" -DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM - enhanced software rendering. Software pipe rendering performs all - 3D rendering on the systems CPU and doesn't require any specialized - hardware. The usage of LLVM over traditional rasterization gives this - renderer a boost in performance. - - Gallium software pipe rendering is in an extremely early state as of - this version of Mesa, and may not function as expected. - " +DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM enhanced \ +software rendering. Software pipe rendering performs all 3D rendering on the \ +systems CPU and doesn't require any specialized hardware. The usage of LLVM \ +over traditional rasterization gives this renderer a boost in performance. +Gallium software pipe rendering is in an extremely early state as of this \ +version of Mesa, and may not function as expected. +" PROVIDES_swpipe=" mesa${secondaryArchSuffix}_swpipe = $portVersion " - REQUIRED_swpipe=" mesa$secondaryArchSuffix == $portVersion base " - diff --git a/sys-libs/zlib/zlib-1.2.8.recipe b/sys-libs/zlib/zlib-1.2.8.recipe index 448d813fc..9c3eb65ae 100644 --- a/sys-libs/zlib/zlib-1.2.8.recipe +++ b/sys-libs/zlib/zlib-1.2.8.recipe @@ -1,9 +1,10 @@ -SUMMARY="A Massively Spiffy Yet Delicately Unobtrusive Compression Library" +SUMMARY="A massively spiffy yet delicately unobtrusive compression library" DESCRIPTION=" zlib is designed to be a free, general-purpose, legally unencumbered -- that \ is, not covered by any patents -- lossless data-compression library for use on \ virtually any computer hardware and operating system. The zlib data format is \ -itself portable across platforms. Unlike the LZW compression method used in \ +itself portable across platforms. +Unlike the LZW compression method used in \ Unix compress(1) and in the GIF image format, the compression method currently \ used in zlib essentially never expands the data. (LZW can double or triple the \ file size in extreme cases.) zlib's memory footprint is also independent of \ diff --git a/x11-libs/pixman/pixman-0.32.6.recipe b/x11-libs/pixman/pixman-0.32.6.recipe index 3be9c6a8e..1f621f75c 100644 --- a/x11-libs/pixman/pixman-0.32.6.recipe +++ b/x11-libs/pixman/pixman-0.32.6.recipe @@ -1,6 +1,8 @@ -SUMMARY="pixman" +SUMMARY="A pixel-manipulation library for X and cairo" DESCRIPTION=" -Pixman - The pixel-manipulation library for X and cairo. +Pixman is a low-level software library for pixel manipulation, providing \ +features such as image compositing and trapezoid rasterization. Important \ +users of pixman are the cairo graphics library and the X server. " HOMEPAGE="http://cgit.freedesktop.org/pixman/" SRC_URI="http://cairographics.org/releases/pixman-$portVersion.tar.gz" @@ -22,23 +24,19 @@ PROVIDES=" pixman$secondaryArchSuffix = $portVersion lib:libpixman_1$secondaryArchSuffix = $portVersion compat >= 0 " - PROVIDES_devel=" pixman${secondaryArchSuffix}_devel = $portVersion devel:libpixman_1$secondaryArchSuffix = $portVersion compat >= 0 " - REQUIRES=" haiku$secondaryArchSuffix " - REQUIRES_devel=" pixman$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" " - BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:aclocal From f4190fe14fbbbe6d0f3dcb8b1ae9cab20251d41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= Date: Mon, 12 Jan 2015 18:25:22 +0000 Subject: [PATCH 298/326] Bumped freeciv-2.4.3 revision --- games-strategy/freeciv/freeciv-2.4.3.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/freeciv/freeciv-2.4.3.recipe b/games-strategy/freeciv/freeciv-2.4.3.recipe index 424cae144..a9e5b796d 100644 --- a/games-strategy/freeciv/freeciv-2.4.3.recipe +++ b/games-strategy/freeciv/freeciv-2.4.3.recipe @@ -14,7 +14,7 @@ COPYRIGHT="2002-2014 The Freeciv Team" LICENSE="GNU GPL v2" SRC_URI="http://sourceforge.net/projects/freeciv/files/Freeciv%202.4/$portVersion/freeciv-$portVersion.tar.bz2" CHECKSUM_SHA256="7f107fe3b09f37934410dc7a64ac1b99a95997ddf53da53933b75d4da79fa899" -REVISION="1" +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 From 69f51b2fa381e5fca5a6650a87c6e4676922665d Mon Sep 17 00:00:00 2001 From: Alex Striff Date: Tue, 13 Jan 2015 01:33:34 +0000 Subject: [PATCH 299/326] updated to work with makefile-engine --- .../libavlduptree/libavlduptree-1.0.0.recipe | 16 +---- .../patches/libavlduptree-1.0.0.patch | 65 ------------------- 2 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch diff --git a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe index c3c910c4c..9eead7fc4 100644 --- a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe +++ b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe @@ -21,49 +21,35 @@ REVISION="1" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libavlduptree-${portVersion}.patch" - PROVIDES=" libavlduptree$secondaryArchSuffix = $portVersion lib:libavlduptree$secondaryArchSuffix = 1.0.0 compat >= 1 - cmd:AGMSAVLTest$secondaryArchSuffix - app:AGMSAVLTest " REQUIRES=" haiku$secondaryArchSuffix - cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:ar - cmd:ranlib - cmd:install " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel - cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:install cmd:mkdir " BUILD() { - autoconf - runConfigure ./configure make $jobArgs } INSTALL() { mkdir -p $libDir - mkdir -p $binDir - make install PREFIX=$libDir BINDIR=$binDir - addAppDeskbarSymlink $binDir/AGMSAVLTest + make install INSTALL_DIR=$libDir # set up the develop directory correctly prepareInstalledDevelLibs libavlduptree diff --git a/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch b/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch deleted file mode 100644 index 2d54ee78c..000000000 --- a/haiku-libs/libavlduptree/patches/libavlduptree-1.0.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -Naur AVLDupTree/configure.in AVLDupTree-haiku/configure.in ---- AVLDupTree/configure.in 1970-01-01 00:00:00.000000000 +0000 -+++ AVLDupTree-haiku/configure.in 2015-01-11 18:54:32.475791360 +0000 -@@ -0,0 +1,25 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.69]) -+AC_INIT(AVLDupTree, 1.0.0, https://github.com/HaikuArchives/AVLDupTree/issues) -+AC_CONFIG_SRCDIR([Source/AVLDupTree.c]) -+# AC_CONFIG_HEADERS([config.h]) -+ -+# Checks for programs. -+AC_PROG_CXX -+AC_PROG_CC -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_CHECK_HEADERS([OS.h stdlib.h string.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_CHECK_HEADER_STDBOOL -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_CHECK_FUNCS([memset strerror]) -+ -+AC_OUTPUT -diff -Naur AVLDupTree/Makefile AVLDupTree-haiku/Makefile ---- AVLDupTree/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ AVLDupTree-haiku/Makefile 2015-01-11 23:01:41.289406976 +0000 -@@ -0,0 +1,32 @@ -+CC=gcc -+CFLAGS=-g -O2 -Wall -ISource $(OPTFLAGS) -+ -+SOURCES=$(wildcard Source/*.c) -+OBJECTS=$(patsubst %.c,%.o,$(SOURCES)) -+GUISOURCES=Source/Main.cpp -+GUIEXE=bin/AGMSAVLTest -+ -+TARGET=build/libavlduptree.so -+ -+all: $(TARGET) $(SO_TARGET) -+ -+$(TARGET): build $(OBJECTS) -+ $(CC) -shared -o $(TARGET) $(OBJECTS) -+ -+build: -+ @mkdir -p build -+ @mkdir -p bin -+ -+clean: -+ @rm -rf build $(OBJECTS) $(TESTS) -+ -+install: all $(GUIEXE) -+ install $(TARGET) $(PREFIX) -+ -+$(GUIEXE): CFLAGS += -Wno-multichar -+$(GUIEXE): CFLAGS+= -lbe -+$(GUIEXE): $(SOURCES) $(GUISOURCES) -+ $(CC) $(CFLAGS) $^ -o $@ -+ install $(GUIEXE) $(BINDIR)/ -+ -+.PHONY: all clean install From 0657e0037fcd7568ed349f257df64c296b66f591 Mon Sep 17 00:00:00 2001 From: Alex Striff Date: Tue, 13 Jan 2015 02:04:07 +0000 Subject: [PATCH 300/326] cleaned up the recipe a bit --- haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe index 9eead7fc4..836396a6b 100644 --- a/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe +++ b/haiku-libs/libavlduptree/libavlduptree-1.0.0.recipe @@ -1,5 +1,5 @@ SUMMARY="A set of C subroutines that is useful for indexing a set of key/value \ -pairs." +pairs" DESCRIPTION=" AVLDupTree is a set of C subroutines (not C++, so you can use it in drivers) \ that is useful for indexing a set of key/value pairs, using the key to find \ @@ -12,9 +12,6 @@ libavlduptree. " LICENSE="GNU LGPL v2.1" COPYRIGHT="2001 Alexander G. M. Smith" -# This is the original homepage, but the domain is up for sale at the time -# of writing this recipe. -# HOMEPAGE="http://achilles.net/~agsmith/" HOMEPAGE="https://github.com/HaikuArchives/AVLDupTree" SRC_URI="git+https://github.com/HaikuArchives/AVLDupTree.git#5969ca7e26e65857a9ade8ed6abee2fda7f1e9d9" REVISION="1" From 9326fc3638240916719ebd378363cae6b7e080b0 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 13 Jan 2015 15:42:11 +0000 Subject: [PATCH 301/326] faac-1.28.recipe edited online with Bitbucket Fixes #141 --- media-libs/faac/faac-1.28.recipe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/faac/faac-1.28.recipe b/media-libs/faac/faac-1.28.recipe index 746fcee1d..3a30f1ed2 100644 --- a/media-libs/faac/faac-1.28.recipe +++ b/media-libs/faac/faac-1.28.recipe @@ -7,7 +7,8 @@ SRC_URI="http://downloads.sourceforge.net/faac/faac-1.28.tar.bz2" CHECKSUM_SHA256="aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352" REVISION="2" -LICENSE="GNU GPL v2" +LICENSE="FAAC + GNU GPL v2" COPYRIGHT="Copyright (C) 2003 Krzysztof Nikiel" ARCHITECTURES="x86_gcc2 ?x86 x86_64" From d137a38f4ac14aae6d3c17c60c9ca05e39acce44 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 13 Jan 2015 15:44:45 +0200 Subject: [PATCH 302/326] libevent: Mark x86_gcc2 architecture as not working libgcc_s does not exist on x86_gcc2. --- dev-libs/libevent/libevent-2.0.21.recipe | 9 ++++-- net-misc/tor/tor-0.2.4.20.recipe | 36 +++++++++++++----------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe index 4d467655a..7c23a3b0d 100644 --- a/dev-libs/libevent/libevent-2.0.21.recipe +++ b/dev-libs/libevent/libevent-2.0.21.recipe @@ -16,8 +16,13 @@ COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors." REVISION="7" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" PROVIDES=" libevent${secondaryArchSuffix} = ${portVersion} diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe index c7626f4c3..44412c11e 100644 --- a/net-misc/tor/tor-0.2.4.20.recipe +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -1,6 +1,5 @@ SUMMARY="A virtual layer that helps you improve privacy and anonymity" -DESCRIPTION=" -Tor is a network of virtual tunnels that allows people and groups to improve \ +DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve \ their privacy and security on the Internet. It also enables software \ developers to create new communication tools with built-in privacy features. \ Tor provides the foundation for a range of applications that allow \ @@ -33,23 +32,27 @@ government IP addresses in their web logs, and for security during sting \ operations. The variety of people who use Tor is actually part of what makes it so secure. \ Tor hides you among the other users on the network, so the more populous and \ -diverse the user base for Tor is, the more your anonymity will be protected. -" +diverse the user base for Tor is, the more your anonymity will be protected." HOMEPAGE="https://www.torproject.org" SRC_URI="https://archive.torproject.org/tor-package-archive/tor-0.2.4.20.tar.gz" CHECKSUM_SHA256="ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9f" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" +fi +SECONDARY_ARCHITECTURES="x86" PROVIDES=" tor = $portVersion - cmd:tor$secondaryArchSuffix - cmd:tor_gencert$secondaryArchSuffix - cmd:tor_resolve$secondaryArchSuffix - cmd:torify$secondaryArchSuffix + cmd:tor = $portVersion + cmd:tor_gencert = $portVersion + cmd:tor_resolve = $portVersion + cmd:torify = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -68,6 +71,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make + cmd:awk " LICENSE="Tor" @@ -77,13 +81,13 @@ COPYRIGHT=" 2007-2013, The Tor Project, Inc. " -USER_SETTINGS_FILES=" - settings/tor directory - " +#USER_SETTINGS_FILES=" +# settings/tor directory +# " -GLOBAL_WRITABLE_FILES=" - settings/tor/torrc.sample auto-merge - " +#GLOBAL_WRITABLE_FILES=" +# settings/tor/torrc.sample auto-merge +# " BUILD() { From f1c06a1eefbf8c572978f0d1faa8f0d3dd715852 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 13 Jan 2015 22:41:21 +0200 Subject: [PATCH 303/326] tor: Mark x86_gcc2 as broken libevent is marked as broken on x86_gcc2 and tor depends on it. --- net-misc/tor/tor-0.2.4.20.recipe | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe index c7626f4c3..8ca3ed4f4 100644 --- a/net-misc/tor/tor-0.2.4.20.recipe +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -41,8 +41,13 @@ CHECKSUM_SHA256="ccc51747cbcbf98f658c34d5c693ff8a868698da0349d056e98287ef2e294d9 REVISION="1" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" +fi +SECONDARY_ARCHITECTURES="x86" PROVIDES=" tor = $portVersion From 9e1d4b3513c9eaecce0ecdf727e9860b37c7b398 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 13 Jan 2015 22:42:51 +0200 Subject: [PATCH 304/326] torsocks: Import and fix torsocks recipe Closes #80. --- net-proxy/torsocks/patches/torsocks-1.2.patch | 112 ++++++++++++++++++ net-proxy/torsocks/torsocks-1.2.recipe | 82 +++++++++++++ 2 files changed, 194 insertions(+) create mode 100644 net-proxy/torsocks/patches/torsocks-1.2.patch create mode 100644 net-proxy/torsocks/torsocks-1.2.recipe diff --git a/net-proxy/torsocks/patches/torsocks-1.2.patch b/net-proxy/torsocks/patches/torsocks-1.2.patch new file mode 100644 index 000000000..f9d2fee48 --- /dev/null +++ b/net-proxy/torsocks/patches/torsocks-1.2.patch @@ -0,0 +1,112 @@ +diff -ur torsocks-1.2/configure.in torsocks-1.2-haiku/configure.in +--- torsocks-1.2/configure.in 2011-10-24 22:30:58.009175040 +0300 ++++ torsocks-1.2-haiku/configure.in 2015-01-13 21:59:38.462684160 +0200 +@@ -82,30 +82,19 @@ + dnl list) but that isn't a problem + OLDLIBS="${LIBS}" + LIBS= +-CONNECTLIB= +-for LIB in c socket; do +- AC_CHECK_LIB("${LIB}",connect,[ +- CONNECTLIB="${LIB}" +- break +- ],) +-done +-LIBS="${OLDLIBS} -l${CONNECTLIB}" +-if test "${CONNECTLIB}" = ""; then +- AC_MSG_ERROR('Could not find library containing connect()') +-fi +- ++AC_SEARCH_LIBS(connect,[c socket network],,[AC_MSG_ERROR('Could not find library containing connect()')]) + + dnl Check for socket + AC_CHECK_FUNC(socket,, [ +- AC_CHECK_LIB(socket, socket,,AC_MSG_ERROR("socket function not found"))]) ++ AC_SEARCH_LIBS(socket, [socket network],[],[AC_MSG_ERROR("socket function not found")])]) + + dnl Check for a function to convert an ascii ip address +-dnl to a sin_addr. ++dnl to a sin_addr. + AC_CHECK_FUNC(inet_aton, AC_DEFINE([HAVE_INET_ATON],[],[Description]), [ + AC_CHECK_FUNC(inet_addr, AC_DEFINE([HAVE_INET_ADDR],[],[Description]), [ +- AC_CHECK_LIB(nsl, inet_addr, [ AC_DEFINE([HAVE_INET_ADDR],[],[Description]) +- LIBS="${LIBS} -lnsl" ], [ +- AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) ++ AC_SEARCH_LIBS(inet_aton, [nsl network], [ ++ AC_DEFINE([HAVE_INET_ADDR],[],[Description]) ++ LIBS="${LIBS} ${ac_cv_search_inet_aton}"], [AC_MSG_ERROR("Neither inet_aton or inet_addr present")])])]) + + + dnl Look for gethostbyname (needed by torsocks) +diff -ur torsocks-1.2/Makefile.am torsocks-1.2-haiku/Makefile.am +--- torsocks-1.2/Makefile.am 2011-03-05 18:38:11.007864320 +0200 ++++ torsocks-1.2-haiku/Makefile.am 2015-01-13 21:59:38.463994880 +0200 +@@ -2,4 +2,4 @@ + # have all needed files, that a GNU package needs + AUTOMAKE_OPTIONS = foreign 1.4 + +-SUBDIRS = src doc test ++SUBDIRS = src doc +diff -ur torsocks-1.2/src/torsocks.in torsocks-1.2-haiku/src/torsocks.in +--- torsocks-1.2/src/torsocks.in 2011-10-24 00:12:13.014942208 +0300 ++++ torsocks-1.2-haiku/src/torsocks.in 2015-01-13 22:01:14.478412800 +0200 +@@ -28,34 +28,34 @@ + # + # There are three forms of usage for this script: + # +-# @prefix@/bin/torsocks program [program arguments...] ++# @bindir@/torsocks program [program arguments...] + # + # This form sets the users @LDPRELOAD@ environment variable so that torsocks(8) + # will be loaded to socksify the application then executes the specified + # program (with the provided arguments). The following simple example might + # be used to telnet to www.foo.org via a torsocks.conf(5) configured socks server: + # +-# @prefix@/bin/torsocks telnet www.foo.org ++# @bindir@/torsocks telnet www.foo.org + # + # The second form allows for torsocks(8) to be switched on and off for a + # session (that is, it adds and removes torsocks from the @LDPRELOAD@ environment + # variable). This form must be _sourced_ into the user's existing session + # (and will only work with bourne shell users): + # +-# . @prefix@/bin/torsocks on ++# . @bindir@/torsocks on + # telnet www.foo.org +-# . @prefix@/bin/torsocks off ++# . @bindir@/torsocks off + # + # Or + # +-# source @prefix@/bin/torsocks on ++# source @bindir@/torsocks on + # telnet www.foo.org +-# source @prefix@/bin/torsocks off ++# source @bindir@/torsocks off + # + # The third form creates a new shell with @LDPRELOAD@ set and is achieved + # simply by running the script with no arguments + # +-# @prefix@/bin/torsocks ++# @bindir@/torsocks + # + # When finished the user can simply terminate the shell with 'exit' + # +@@ -73,7 +73,7 @@ + exit + fi + +-LIBDIR="@prefix@/lib/torsocks" ++LIBDIR="@libdir@/torsocks" + LIB_NAME="libtorsocks" + SHLIB_EXT="@SHLIB_EXT@" + SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +@@ -101,7 +101,7 @@ + #replace '/' with '\/' in @prefix@ + # escprefix=`echo '@prefix@' |sed 's/\\//\\\\\//g'` + # export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"` +- export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#@prefix@/lib/torsocks/libtorsocks\.@SHLIB_EXT@ *##"` ++ export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#@libdir@/torsocks/libtorsocks\.@SHLIB_EXT@ *##"` + if [ -z "$@LDPRELOAD@" ] + then + unset @LDPRELOAD@ diff --git a/net-proxy/torsocks/torsocks-1.2.recipe b/net-proxy/torsocks/torsocks-1.2.recipe new file mode 100644 index 000000000..5d4717d1b --- /dev/null +++ b/net-proxy/torsocks/torsocks-1.2.recipe @@ -0,0 +1,82 @@ +SUMMARY="A transparent socks proxy for use with tor" +DESCRIPTION="Torsocks allows you to use most socks-friendly applications \ +in a safe way with Tor. It ensures that DNS requests are handled safely \ +and explicitly rejects UDP traffic from the application you're using." + +HOMEPAGE="https://www.torproject.org" +SRC_URI="http://torsocks.googlecode.com/files/torsocks-1.2.tar.gz" +CHECKSUM_SHA256="bea57d3624d723724fd1e260f0e6b2a354c0da742c023aa994c7692270d111d4" + +REVISION="1" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + torsocks = $portVersion + cmd:torsocks$secondaryArchSuffix + cmd:usewithtor$secondaryArchSuffix + lib:libtorsocks$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:make + " + +LICENSE="GNU GPL v2" +COPYRIGHT=" + 2000-2008 Shaun Clowes + 2008-2011 Robert Hogan + 2005 Total Information Security Ltd. + 2010 Alex Rosenberg + 2004, 2006 Peter Palfrader + 2000 Alessandro Iurlano + 2004 Tomasz Kojm + " + +PATCHES="torsocks-1.2.patch" + +GLOBAL_WRITABLE_FILES=" + settings/torsocks.conf manual + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + + runConfigure ./configure + make +} + +INSTALL() +{ + make install + + # Documentation is put into $dataDir/torsocks + # as opposed to $dataDir + + mkdir /temp + mv $dataDir/* /temp + mkdir $dataDir/torsocks + mv /temp/* $dataDir/torsocks + rm -r /temp +} From 032acb866309e6db7fc474970830790f6c568941 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Tue, 13 Jan 2015 23:14:29 +0200 Subject: [PATCH 305/326] tor: Added cmd:awk to BUILD_PREREQUIRES. --- net-misc/tor/tor-0.2.4.20.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe index 8ca3ed4f4..42324b128 100644 --- a/net-misc/tor/tor-0.2.4.20.recipe +++ b/net-misc/tor/tor-0.2.4.20.recipe @@ -70,6 +70,7 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:make From 652548311162c1e81d24349d6360b2eeaa32d644 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 10 Jan 2015 21:19:20 +0000 Subject: [PATCH 306/326] freetype: forgot to adjust the lib PROVIDES. --- media-libs/freetype/freetype-2.5.5.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/freetype/freetype-2.5.5.recipe b/media-libs/freetype/freetype-2.5.5.recipe index 7f176fff4..17be40605 100644 --- a/media-libs/freetype/freetype-2.5.5.recipe +++ b/media-libs/freetype/freetype-2.5.5.recipe @@ -9,7 +9,7 @@ LICENSE="FreeType" COPYRIGHT="1996-2013 David Turner, Robert Wilhelm, Werner Lemberg, et al." SRC_URI="http://download.savannah.gnu.org/releases/freetype/freetype-$portVersion.tar.bz2" CHECKSUM_SHA256="387bcc4b780b12484aa2ec9f7db1a55d8286eb5639f45fbc0fbba7a4e5a1afb9" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -18,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" freetype$secondaryArchSuffix = $portVersion - lib:libfreetype$secondaryArchSuffix = 6.11.2 compat >= 6 + lib:libfreetype$secondaryArchSuffix = 6.11.4 compat >= 6 " REQUIRES=" haiku$secondaryArchSuffix @@ -85,7 +85,7 @@ INSTALL() PROVIDES_devel=" freetype${secondaryArchSuffix}_devel = $portVersion cmd:freetype_config${secondaryArchSuffix} = $portVersion - devel:libfreetype${secondaryArchSuffix} = 6.11.2 compat >= 6 + devel:libfreetype${secondaryArchSuffix} = 6.11.4 compat >= 6 " REQUIRES_devel=" freetype${secondaryArchSuffix} == $portVersion base From 471fab2f2604ca88016e37ea8098398a637171ee Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 13 Jan 2015 21:44:32 +0000 Subject: [PATCH 307/326] sbc: added a recipe for version 1.3 --- media-libs/sbc/patches/sbc-1.3.patchset | 146 ++++++++++++++++++++++++ media-libs/sbc/sbc-1.3.recipe | 101 ++++++++++++++++ 2 files changed, 247 insertions(+) create mode 100644 media-libs/sbc/patches/sbc-1.3.patchset create mode 100644 media-libs/sbc/sbc-1.3.recipe diff --git a/media-libs/sbc/patches/sbc-1.3.patchset b/media-libs/sbc/patches/sbc-1.3.patchset new file mode 100644 index 000000000..e709843a0 --- /dev/null +++ b/media-libs/sbc/patches/sbc-1.3.patchset @@ -0,0 +1,146 @@ +From 6d238064d1df3161a1bd43236ac3d29ea9b595c9 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 13 Jan 2015 20:57:54 +0000 +Subject: Haiku patch + + +diff --git a/sbc/sbc.c b/sbc/sbc.c +index 606f11c..6bee729 100644 +--- a/sbc/sbc.c ++++ b/sbc/sbc.c +@@ -29,6 +29,7 @@ + #include + #endif + ++#include + #include + #include + #include +diff --git a/src/formats.h b/src/formats.h +index 3050b25..dd7aba2 100644 +--- a/src/formats.h ++++ b/src/formats.h +@@ -21,18 +21,32 @@ + * + */ + ++#ifdef __HAIKU__ ++#include ++#else + #include ++#endif + + #if __BYTE_ORDER == __LITTLE_ENDIAN + #define COMPOSE_ID(a,b,c,d) ((a) | ((b)<<8) | ((c)<<16) | ((d)<<24)) + #define LE_SHORT(v) (v) + #define LE_INT(v) (v) ++#ifdef __HAIKU__ ++#define BE_SHORT(v) B_SWAP_INT16(v) ++#define BE_INT(v) B_SWAP_INT32(v) ++#else + #define BE_SHORT(v) bswap_16(v) + #define BE_INT(v) bswap_32(v) ++#endif + #elif __BYTE_ORDER == __BIG_ENDIAN + #define COMPOSE_ID(a,b,c,d) ((d) | ((c)<<8) | ((b)<<16) | ((a)<<24)) ++#ifdef __HAIKU__ ++#define LE_SHORT(v) B_SWAP_INT16(v) ++#define LE_INT(v) B_SWAP_INT32(v) ++#else + #define LE_SHORT(v) bswap_16(v) + #define LE_INT(v) bswap_32(v) ++#endif + #define BE_SHORT(v) (v) + #define BE_INT(v) (v) + #else +diff --git a/src/sbcdec.c b/src/sbcdec.c +index ba17f7a..9cda0c4 100644 +--- a/src/sbcdec.c ++++ b/src/sbcdec.c +@@ -37,7 +37,9 @@ + #include + #include + #include ++#ifndef __HAIKU__ + #include ++#endif + + #include "sbc/sbc.h" + #include "formats.h" +@@ -53,7 +55,11 @@ static void decode(char *filename, char *output, int tofile, bool msbc) + sbc_t sbc; + int fd, ad, pos, streamlen, framelen, count; + size_t len; ++#ifndef __HAIKU__ + int format = AFMT_S16_BE, frequency, channels; ++#else ++ int frequency, channels; ++#endif + ssize_t written; + + if (stat(filename, &st) < 0) { +@@ -154,6 +160,7 @@ static void decode(char *filename, char *output, int tofile, bool msbc) + goto close; + } + } else { ++#ifndef __HAIKU__ + if (ioctl(ad, SNDCTL_DSP_SETFMT, &format) < 0) { + fprintf(stderr, "Can't set audio format on %s: %s\n", + output, strerror(errno)); +@@ -171,6 +178,7 @@ static void decode(char *filename, char *output, int tofile, bool msbc) + output, strerror(errno)); + goto close; + } ++#endif + } + + count = len; +@@ -233,7 +241,9 @@ static void usage(void) + + printf("Options:\n" + "\t-h, --help Display help\n" ++#ifndef __HAIKU__ + "\t-d, --device Sound device\n" ++#endif + "\t-v, --verbose Verbose mode\n" + "\t-m, --msbc mSBC codec\n" + "\t-f, --file Decode to a file\n" +@@ -243,7 +253,9 @@ static void usage(void) + static struct option main_options[] = { + { "help", 0, 0, 'h' }, + { "msbc", 0, 0, 'm' }, ++#ifndef __HAIKU__ + { "device", 1, 0, 'd' }, ++#endif + { "verbose", 0, 0, 'v' }, + { "file", 1, 0, 'f' }, + { 0, 0, 0, 0 } +@@ -252,7 +264,11 @@ static struct option main_options[] = { + int main(int argc, char *argv[]) + { + char *output = NULL; ++#ifndef __HAIKU__ + int i, opt, tofile = 0; ++#else ++ int i, opt, tofile = 1; ++#endif + bool msbc = false; + + while ((opt = getopt_long(argc, argv, "+hmvd:f:", +@@ -270,11 +286,13 @@ int main(int argc, char *argv[]) + msbc = true; + break; + ++#ifndef __HAIKU__ + case 'd': + free(output); + output = strdup(optarg); + tofile = 0; + break; ++#endif + + case 'f' : + free(output); +-- +1.8.3.4 + diff --git a/media-libs/sbc/sbc-1.3.recipe b/media-libs/sbc/sbc-1.3.recipe new file mode 100644 index 000000000..cc1c2b44b --- /dev/null +++ b/media-libs/sbc/sbc-1.3.recipe @@ -0,0 +1,101 @@ +SUMMARY="An audio codec to connect Bluetooth audio devices" +DESCRIPTION=" +SBC is an audio subband codec specified by the Bluetooth Special Interest Group +for the A2DP profile. SBC is a digital audio encoder and decoder used to +transfer date to Bluetooth audio output devcies likes headphones or +loudspeakers. It can be also used on the Internet. It was designed to obtain +a reasonably good audio quality at medium bit rates while keeping low +computational complexity, having Bluetooth bandwidth limitations and processing +power in mind. +" +HOMEPAGE="http://www.bluez.org" +COPYRIGHT=" + 2004-2010 Marcel Holtmann + 2008-2010 Nokia Corporation + 2012-2013 Intel Corporation + 2007-2008 Frederic Dalleau + " +LICENSE="GNU GPL v2 + GNU LGPL v2.1" +SRC_URI="http://www.kernel.org/pub/linux/bluetooth/sbc-$portVersion.tar.gz" +CHECKSUM_SHA256="4a358581fb57b98e0c1c34606a35343f31f908f57c26659e51495f75e283785d" +REVISION="1" +ARCHITECTURES="x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +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" +fi + +PATCHES="sbc-$portVersion.patchset" + +PROVIDES=" + sbc$secondaryArchSuffix = $portVersion compat >= 1 + lib:libsbc$secondaryArchSuffix = 1.2.1 compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsndfile$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsndfile$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + autoreconf -fi + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libsbc + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + # tools package + packageEntries tools \ + $binDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + sbc${secondaryArchSuffix}_devel = $portVersion compat >= 1 + devel:libsbc$secondaryArchSuffix = 1.2.1 compat >= 1 + " +REQUIRES_devel=" + sbc$secondaryArchSuffix == $portVersion base + " + +# ----- tools package ------------------------------------------------------- + +SUMMARY_tools="The SBC tools" +PROVIDES_tools=" + sbc_tools$secondaryArchSuffix = $portVersion compat >= 1 + cmd:sbcdec = $portVersion compat >= 1 + cmd:sbcenc = $portVersion compat >= 1 + cmd:sbcinfo = $portVersion compat >= 1 + " +REQUIRES_tools=" + haiku$secondaryArchSuffix + sbc$secondaryArchSuffix == $portVersion base + " From d613f15d0346046c49dc5831d0275bf1485e76ac Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Wed, 14 Jan 2015 00:08:23 +0200 Subject: [PATCH 308/326] tor: add tor v0.2.5.10 recipe Import patch (with minor modifications) and close #132. --- net-misc/tor/tor-0.2.5.10.recipe | 80 ++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 net-misc/tor/tor-0.2.5.10.recipe diff --git a/net-misc/tor/tor-0.2.5.10.recipe b/net-misc/tor/tor-0.2.5.10.recipe new file mode 100644 index 000000000..ecf42625c --- /dev/null +++ b/net-misc/tor/tor-0.2.5.10.recipe @@ -0,0 +1,80 @@ +SUMMARY="A virtual layer that helps you improve privacy and anonymity" +DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve \ +their privacy and security on the Internet. It also enables software \ +developers to create new communication tools with built-in privacy features. \ +Tor provides the foundation for a range of applications that allow \ +organizations and individuals to share information over public networks \ +without compromising their privacy." +HOMEPAGE="https://www.torproject.org" +SRC_URI="https://www.torproject.org/dist/tor-0.2.5.10.tar.gz" +CHECKSUM_SHA256="b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b" + +REVISION="1" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="x86_gcc2 $ARCHITECTURES" +else + ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + tor = $portVersion + cmd:tor$secondaryArchSuffix + cmd:tor_gencert$secondaryArchSuffix + cmd:tor_resolve$secondaryArchSuffix + cmd:torify$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libevent$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libevent$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +LICENSE="BSD (3-clause)" +COPYRIGHT=" + 2001-2004, Roger Dingledine + 2004-2006, Roger Dingledine, Nick Mathewson + 2007-2014, The Tor Project, Inc. + " + +USER_SETTINGS_FILES=" + settings/tor directory + " + +GLOBAL_WRITABLE_FILES=" + settings/tor/torrc.sample auto-merge + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} From 99dd10a8e83188adc302742ac8c607fbe5c32f6c Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Wed, 14 Jan 2015 06:30:01 +0000 Subject: [PATCH 309/326] Updated recipe --- games-strategy/eggchess/eggchess-1.0.recipe | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe index daaf555ce..51e4d4465 100644 --- a/games-strategy/eggchess/eggchess-1.0.recipe +++ b/games-strategy/eggchess/eggchess-1.0.recipe @@ -4,9 +4,9 @@ However, instead of using Xs and Os, you use different egg forms. \ What's more, YOU CAN ACTUALLY CHANGE A SQUARE WITH SOMETHING ELSE. \ The first one to get three-in-a-row with the same egg form wins." HOMEPAGE="http://www.haikuware.com/directory/view-details/development/games/egg-chess-ppc" -SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/master" -CHECKSUM_SHA256="9c0b70ebda96d3acecfdb5fdd7c9e9d411d7b954267d815bc56575577e4987bb" -SOURCE_DIR="EggChess-master" +SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/feature" +CHECKSUM_SHA256="67b8a6061169031493103d0a32dbdcd3af3c69d540cf1294e249e199eb140bc0" +SOURCE_DIR="EggChess-feature" REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="Anders Lindström" @@ -34,7 +34,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:gcc " - + BUILD() { cd src From aafe9304c6c7b4f953f314185d614dbf9d84aa77 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Wed, 14 Jan 2015 00:26:28 +0000 Subject: [PATCH 310/326] Fixed description --- games-strategy/eggchess/eggchess-1.0.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe index 51e4d4465..faef26803 100644 --- a/games-strategy/eggchess/eggchess-1.0.recipe +++ b/games-strategy/eggchess/eggchess-1.0.recipe @@ -1,7 +1,7 @@ SUMMARY="Egg Chess" DESCRIPTION="This game is similar to Tic-Tac-Toe. \ However, instead of using Xs and Os, you use different egg forms. \ -What's more, YOU CAN ACTUALLY CHANGE A SQUARE WITH SOMETHING ELSE. \ +What's more, you can actually change a square with something else. \ The first one to get three-in-a-row with the same egg form wins." HOMEPAGE="http://www.haikuware.com/directory/view-details/development/games/egg-chess-ppc" SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/feature" @@ -9,7 +9,7 @@ CHECKSUM_SHA256="67b8a6061169031493103d0a32dbdcd3af3c69d540cf1294e249e199eb140bc SOURCE_DIR="EggChess-feature" REVISION="1" LICENSE="GNU GPL v2" -COPYRIGHT="Anders Lindström" +COPYRIGHT="1999-2000 Anders Lindström" ARCHITECTURES="x86 x86_gcc2" From 9e681066ec5907bcbe9603047de4873319bdf5d0 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Wed, 14 Jan 2015 00:27:53 +0000 Subject: [PATCH 311/326] Final update --- games-strategy/eggchess/eggchess-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe index faef26803..b8be889da 100644 --- a/games-strategy/eggchess/eggchess-1.0.recipe +++ b/games-strategy/eggchess/eggchess-1.0.recipe @@ -48,5 +48,5 @@ INSTALL() cd $sourceDir cp eggchess.x86 $appsDir/EggChess cp -r gfx docs $appsDir/EggChess - addAppDeskbarSymlink $appsDir/EggChess/eggchess.x86 + addAppDeskbarSymlink $appsDir/EggChess/eggchess.x86 EggChess } From b7d86baa6d0f45fb653bf201a9f2a7dbe469065a Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:20:24 -0800 Subject: [PATCH 312/326] Fix python crash on resource.getrusage --- dev-lang/python/patches/python-2.7.9.patchset | 98 +++++++++++++------ dev-lang/python/python-2.7.9.recipe | 2 +- 2 files changed, 68 insertions(+), 32 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset index fafb60a2f..b09445b20 100644 --- a/dev-lang/python/patches/python-2.7.9.patchset +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -1,4 +1,4 @@ -From f7d6b2b6f44a8f9337c9103d298222747d547ebf Mon Sep 17 00:00:00 2001 +From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -79,7 +79,7 @@ index b9f1c6c..7be61d3 100644 # finalize_unix () diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 4aa9334..d06e5e8 100644 +index de7da1d..8180c8e 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -90,7 +90,8 @@ def get_python_inc(plat_specific=0, prefix=None): @@ -497,10 +497,10 @@ index 53a6c3e..6c5f52f 100644 if (PyErr_Occurred()) { Py_DECREF(result); diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 880f311..54b66f7 100644 +index e9e4479..84b6305 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -4868,7 +4868,9 @@ init_socket(void) +@@ -4869,7 +4869,9 @@ init_socket(void) #ifndef __BEOS__ /* We have incomplete socket support. */ PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); @@ -511,7 +511,7 @@ index 880f311..54b66f7 100644 PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); #endif diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h -index 8515499..4e33e4f 100644 +index d98e00e..2bfb3dc 100644 --- a/Modules/socketmodule.h +++ b/Modules/socketmodule.h @@ -47,6 +47,10 @@ typedef int socklen_t; @@ -584,10 +584,10 @@ index c64501e..7df3ad7 100755 elif sys.platform.startswith("atheos"): searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff --git a/configure.ac b/configure.ac -index 54f8c0f..1ea438a 100644 +index 94a215e..41fbd47 100644 --- a/configure.ac +++ b/configure.ac -@@ -883,7 +883,7 @@ if test $enable_shared = "yes"; then +@@ -886,7 +886,7 @@ if test $enable_shared = "yes"; then RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} INSTSONAME="$LDLIBRARY".$SOVERSION ;; @@ -596,7 +596,7 @@ index 54f8c0f..1ea438a 100644 LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} -@@ -891,6 +891,9 @@ if test $enable_shared = "yes"; then +@@ -894,6 +894,9 @@ if test $enable_shared = "yes"; then FreeBSD*) SOVERSION=`echo $SOVERSION|cut -d "." -f 1` ;; @@ -606,7 +606,7 @@ index 54f8c0f..1ea438a 100644 esac INSTSONAME="$LDLIBRARY".$SOVERSION ;; -@@ -1006,7 +1009,7 @@ AC_PROG_MKDIR_P +@@ -1009,7 +1012,7 @@ AC_PROG_MKDIR_P AC_SUBST(LN) if test -z "$LN" ; then case $ac_sys_system in @@ -615,7 +615,7 @@ index 54f8c0f..1ea438a 100644 CYGWIN*) LN="ln -s";; atheos*) LN="ln -s";; *) LN=ln;; -@@ -2030,7 +2033,7 @@ then +@@ -2033,7 +2036,7 @@ then BLDSHARED="$LDSHARED" fi ;; @@ -624,7 +624,7 @@ index 54f8c0f..1ea438a 100644 LDSHARED='$(CC) -shared' LDCXXSHARED='$(CXX) -shared';; BSD/OS*/4*) -@@ -2102,7 +2105,7 @@ then +@@ -2105,7 +2108,7 @@ then then CCSHARED="-fPIC"; else CCSHARED="+z"; fi;; @@ -633,7 +633,7 @@ index 54f8c0f..1ea438a 100644 BSD/OS*/4*) CCSHARED="-fpic";; FreeBSD*|NetBSD*|OpenBSD*|DragonFly*) CCSHARED="-fPIC";; OpenUNIX*|UnixWare*) -@@ -2134,7 +2137,7 @@ then +@@ -2137,7 +2140,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; BSD/OS/4*) LINKFORSHARED="-Xlinker -export-dynamic";; @@ -642,7 +642,7 @@ index 54f8c0f..1ea438a 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*) # -u _PyMac_Error is needed to pull in the mac toolbox glue, -@@ -2249,14 +2252,16 @@ case "$ac_sys_system" in +@@ -2252,14 +2255,16 @@ case "$ac_sys_system" in esac # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl. @@ -663,7 +663,7 @@ index 54f8c0f..1ea438a 100644 esac AC_MSG_CHECKING(for --with-libs) -@@ -3592,7 +3597,7 @@ fi], +@@ -3595,7 +3600,7 @@ fi], AC_SUBST(LIBM) case $ac_sys_system in Darwin) ;; @@ -673,10 +673,10 @@ index 54f8c0f..1ea438a 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index a46bf35..9fe247f 100644 +index 7868b7b..bc4a1a4 100644 --- a/setup.py +++ b/setup.py -@@ -523,6 +523,12 @@ class PyBuildExt(build_ext): +@@ -525,6 +525,12 @@ class PyBuildExt(build_ext): lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) @@ -689,7 +689,7 @@ index a46bf35..9fe247f 100644 # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: -@@ -551,7 +557,7 @@ class PyBuildExt(build_ext): +@@ -553,7 +559,7 @@ class PyBuildExt(build_ext): # Check for MacOS X, which doesn't need libm.a at all math_libs = ['m'] @@ -698,7 +698,7 @@ index a46bf35..9fe247f 100644 math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -790,15 +796,22 @@ class PyBuildExt(build_ext): +@@ -792,15 +798,22 @@ class PyBuildExt(build_ext): '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] @@ -724,7 +724,7 @@ index a46bf35..9fe247f 100644 ['/usr/local/ssl/lib', '/usr/contrib/ssl/lib/' ] ) -@@ -806,8 +819,8 @@ class PyBuildExt(build_ext): +@@ -808,8 +821,8 @@ class PyBuildExt(build_ext): if (ssl_incs is not None and ssl_libs is not None): exts.append( Extension('_ssl', ['_ssl.c'], @@ -735,7 +735,7 @@ index a46bf35..9fe247f 100644 libraries = ['ssl', 'crypto'], depends = ['socketmodule.h']), ) else: -@@ -845,8 +858,8 @@ class PyBuildExt(build_ext): +@@ -847,8 +860,8 @@ class PyBuildExt(build_ext): # The _hashlib module wraps optimized implementations # of hash functions from the OpenSSL library. exts.append( Extension('_hashlib', ['_hashopenssl.c'], @@ -746,7 +746,7 @@ index a46bf35..9fe247f 100644 libraries = ['ssl', 'crypto']) ) else: print ("warning: openssl 0x%08x is too old for _hashlib" % -@@ -1325,7 +1338,7 @@ class PyBuildExt(build_ext): +@@ -1327,7 +1340,7 @@ class PyBuildExt(build_ext): missing.append('resource') # Sun yellow pages. Some systems have the functions in libc. @@ -759,14 +759,14 @@ index a46bf35..9fe247f 100644 1.8.3.4 -From 571ed69e1ab40fd11c4a1fdcb6198ff787c5129b Mon Sep 17 00:00:00 2001 +From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path diff --git a/Makefile.pre.in b/Makefile.pre.in -index bcd83bf..f93c10a 100644 +index 7f4ec2f..25a93e5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -105,7 +105,7 @@ BINDIR= @bindir@ @@ -782,7 +782,7 @@ index bcd83bf..f93c10a 100644 1.8.3.4 -From d49a8ee2494391b3a1c50bc652f0838ac036e046 Mon Sep 17 00:00:00 2001 +From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 12:19:13 +0000 Subject: Import missed change from the 2.6.9 patches @@ -814,17 +814,17 @@ index d2e18f1..34d5aee 100644 1.8.3.4 -From a0b72ccfc2f385c3ec9148523d981c7d971e2636 Mon Sep 17 00:00:00 2001 +From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Sep 2014 18:59:44 +0200 Subject: gcc2 fix. diff --git a/Modules/_ctypes/libffi/include/ffi_common.h b/Modules/_ctypes/libffi/include/ffi_common.h -index 650ca69..02a1913 100644 +index 37f5a9e..37b0b25 100644 --- a/Modules/_ctypes/libffi/include/ffi_common.h +++ b/Modules/_ctypes/libffi/include/ffi_common.h -@@ -115,7 +115,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); +@@ -119,7 +119,7 @@ typedef signed int SINT64 __attribute__((__mode__(__DI__))); typedef float FLOAT32; @@ -837,17 +837,17 @@ index 650ca69..02a1913 100644 1.8.3.4 -From d50a28e47cbd54263d065f47b2650333d917c2b9 Mon Sep 17 00:00:00 2001 +From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Nov 2014 16:26:28 +0000 Subject: tarfile: let link fail and catch exception. diff --git a/Lib/tarfile.py b/Lib/tarfile.py -index 57ea877..bc3f82c 100644 +index b0d1292..b5952ae 100644 --- a/Lib/tarfile.py +++ b/Lib/tarfile.py -@@ -2242,7 +2242,7 @@ class TarFile(object): +@@ -2261,7 +2261,7 @@ class TarFile(object): (platform limitation), we try to make a copy of the referenced file instead of a link. """ @@ -856,7 +856,7 @@ index 57ea877..bc3f82c 100644 # For systems that support symbolic and hard links. if tarinfo.issym(): if os.path.lexists(targetpath): -@@ -2256,7 +2256,7 @@ class TarFile(object): +@@ -2275,7 +2275,7 @@ class TarFile(object): os.link(tarinfo._link_target, targetpath) else: self._extract_member(self._find_link_target(tarinfo), targetpath) @@ -868,3 +868,39 @@ index 57ea877..bc3f82c 100644 -- 1.8.3.4 + +From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 11 Jan 2015 18:18:22 -0800 +Subject: Fix resource module after the initial haiku patch + + +diff --git a/Modules/resource.c b/Modules/resource.c +index 6c5f52f..73758bb 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -101,6 +101,21 @@ resource_getrusage(PyObject *self, PyObject *args) + PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); + PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); + PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); ++#else ++ PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 5, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 6, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 7, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 8, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 9, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 10, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 11, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 12, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(0)); ++ PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(0)); + #endif + + if (PyErr_Occurred()) { +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe index dc6e40078..a5d00a643 100644 --- a/dev-lang/python/python-2.7.9.recipe +++ b/dev-lang/python/python-2.7.9.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 0561b48fd8d48221848afa3284d3aebbdb022074 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:43:34 -0800 Subject: [PATCH 313/326] python: Stricter [gs]et_rlimit mode detection There doesn't seem to be a better way, else than configure runtime checks, which is harmful for cross-compilation. --- dev-lang/python/patches/python-2.7.9.patchset | 91 +++++++++++++++++-- dev-lang/python/python-2.7.9.recipe | 2 +- 2 files changed, 86 insertions(+), 7 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.9.patchset b/dev-lang/python/patches/python-2.7.9.patchset index b09445b20..6d16b8d6a 100644 --- a/dev-lang/python/patches/python-2.7.9.patchset +++ b/dev-lang/python/patches/python-2.7.9.patchset @@ -1,4 +1,4 @@ -From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001 +From 87c88af3eef31c978cecf0d96665af0c4109d7e5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -759,7 +759,7 @@ index 7868b7b..bc4a1a4 100644 1.8.3.4 -From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001 +From 6347fda5298f9aa5eca939541924464fcf8a19d1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path @@ -782,7 +782,7 @@ index 7f4ec2f..25a93e5 100644 1.8.3.4 -From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001 +From 5e90b750c4bfef1376bb083d48524c41fc5fefa6 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 12:19:13 +0000 Subject: Import missed change from the 2.6.9 patches @@ -814,7 +814,7 @@ index d2e18f1..34d5aee 100644 1.8.3.4 -From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001 +From 307d21aa5ea6336db7ec3dd9429436441b61ab8d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 21 Sep 2014 18:59:44 +0200 Subject: gcc2 fix. @@ -837,7 +837,7 @@ index 37f5a9e..37b0b25 100644 1.8.3.4 -From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001 +From b1aabdb8e27c669873ec393344389aa343a6aeab Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 28 Nov 2014 16:26:28 +0000 Subject: tarfile: let link fail and catch exception. @@ -869,7 +869,7 @@ index b0d1292..b5952ae 100644 1.8.3.4 -From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001 +From 5398326cd9e24ca71a025f48ea0079b8d40456ec Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 11 Jan 2015 18:18:22 -0800 Subject: Fix resource module after the initial haiku patch @@ -904,3 +904,82 @@ index 6c5f52f..73758bb 100644 -- 1.8.3.4 + +From 6d7958a9371618a6b7a53f8de6b71633be2af7c3 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Sun, 11 Jan 2015 18:40:43 -0800 +Subject: resource: Fix [gs]et_rlimit() modes detection + +Haiku defines many of them, but they are actually empty stubs that will always +return EINVAL. No better way of doing this. + +diff --git a/Modules/resource.c b/Modules/resource.c +index 73758bb..0c396f6 100644 +--- a/Modules/resource.c ++++ b/Modules/resource.c +@@ -284,19 +284,19 @@ initresource(void) + (PyObject*) &StructRUsageType); + + /* insert constants */ +-#ifdef RLIMIT_CPU ++#if !defined(__HAIKU__) && defined(RLIMIT_CPU) + PyModule_AddIntConstant(m, "RLIMIT_CPU", RLIMIT_CPU); + #endif + +-#ifdef RLIMIT_FSIZE ++#if !defined(__HAIKU__) && defined(RLIMIT_FSIZE) + PyModule_AddIntConstant(m, "RLIMIT_FSIZE", RLIMIT_FSIZE); + #endif + +-#ifdef RLIMIT_DATA ++#if !defined(__HAIKU__) && defined(RLIMIT_DATA) + PyModule_AddIntConstant(m, "RLIMIT_DATA", RLIMIT_DATA); + #endif + +-#ifdef RLIMIT_STACK ++#if !defined(__HAIKU__) && defined(RLIMIT_STACK) + PyModule_AddIntConstant(m, "RLIMIT_STACK", RLIMIT_STACK); + #endif + +@@ -308,31 +308,31 @@ initresource(void) + PyModule_AddIntConstant(m, "RLIMIT_NOFILE", RLIMIT_NOFILE); + #endif + +-#ifdef RLIMIT_OFILE ++#if !defined(__HAIKU__) && defined(RLIMIT_OFILE) + PyModule_AddIntConstant(m, "RLIMIT_OFILE", RLIMIT_OFILE); + #endif + +-#ifdef RLIMIT_VMEM ++#if !defined(__HAIKU__) && defined(RLIMIT_VMEM) + PyModule_AddIntConstant(m, "RLIMIT_VMEM", RLIMIT_VMEM); + #endif + +-#ifdef RLIMIT_AS ++#if !defined(__HAIKU__) && defined(RLIMIT_AS) + PyModule_AddIntConstant(m, "RLIMIT_AS", RLIMIT_AS); + #endif + +-#ifdef RLIMIT_RSS ++#if !defined(__HAIKU__) && defined(RLIMIT_RSS) + PyModule_AddIntConstant(m, "RLIMIT_RSS", RLIMIT_RSS); + #endif + +-#ifdef RLIMIT_NPROC ++#if !defined(__HAIKU__) && defined(RLIMIT_NPROC) + PyModule_AddIntConstant(m, "RLIMIT_NPROC", RLIMIT_NPROC); + #endif + +-#ifdef RLIMIT_MEMLOCK ++#if !defined(__HAIKU__) && defined(RLIMIT_MEMLOCK) + PyModule_AddIntConstant(m, "RLIMIT_MEMLOCK", RLIMIT_MEMLOCK); + #endif + +-#ifdef RLIMIT_SBSIZE ++#if !defined(__HAIKU__) && defined(RLIMIT_SBSIZE) + PyModule_AddIntConstant(m, "RLIMIT_SBSIZE", RLIMIT_SBSIZE); + #endif + +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.9.recipe b/dev-lang/python/python-2.7.9.recipe index a5d00a643..34a5db8ca 100644 --- a/dev-lang/python/python-2.7.9.recipe +++ b/dev-lang/python/python-2.7.9.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" CHECKSUM_SHA256="90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="python-$portVersion.patchset" From 56c2929f4756b357b2242c16b45552c6f8a037e9 Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 11 Jan 2015 15:03:54 +0200 Subject: [PATCH 314/326] Removed the unneeded haiku_devel requirement in BUILD_REQUIRES --- haiku-apps/sawteeth/sawteeth-1.3.recipe | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/haiku-apps/sawteeth/sawteeth-1.3.recipe b/haiku-apps/sawteeth/sawteeth-1.3.recipe index ae9b8494e..6a410535b 100644 --- a/haiku-apps/sawteeth/sawteeth-1.3.recipe +++ b/haiku-apps/sawteeth/sawteeth-1.3.recipe @@ -26,9 +26,7 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:gcc " -BUILD_REQUIRES=" - haiku_devel - " +BUILD_REQUIRES="" BUILD() { From d9e4ca4eeaac83767872d0b694ad3270dadff440 Mon Sep 17 00:00:00 2001 From: Nav Date: Mon, 12 Jan 2015 15:11:55 +0200 Subject: [PATCH 315/326] Updated Box2D recipe and patch --- dev-games/box2d/box2d-2.1.2.recipe | 46 ++++++-- dev-games/box2d/patches/box2d-2.1.2.patch | 121 +++++++++++++++++----- 2 files changed, 129 insertions(+), 38 deletions(-) diff --git a/dev-games/box2d/box2d-2.1.2.recipe b/dev-games/box2d/box2d-2.1.2.recipe index 3740e7c64..8ce79fe03 100644 --- a/dev-games/box2d/box2d-2.1.2.recipe +++ b/dev-games/box2d/box2d-2.1.2.recipe @@ -1,22 +1,46 @@ -DESCRIPTION="Box2d is an open source 2d physics engine for games." +SUMMARY="A 2D Physics Engine for Games" +DESCRIPTION="Box2D is a feature rich 2D rigid body physics engine, written in C++. \ +It has been used in many games, including Crayon Physics Deluxe, \ +winner of the 2008 Independant Game Festival Grand Prize" HOMEPAGE="http://www.box2d.org" SRC_URI="http://box2d.googlecode.com/files/Box2D_v2.1.2.zip" -CHECKSUM_MD5="59d142cd8d4d73e8832c7b67591f590c" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +LICENSE="MIT" +COPYRIGHT="2007-2009 Erin Catto" +CHECKSUM_SHA256="3b351c3e51c6bf78c3e48a2b51260297f3f309fde389c9bfc21ebd484efbba54" +REVISION="2" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SOURCE_DIR="Box2D_v2.1.2" + +PROVIDES=" + box2d + " + +REQUIRES=" + haiku +" + +PATCHES="box2d-2.1.2.patch" + +BUILD_PREREQUIRES=" + haiku_devel + cmd:make + cmd:cmake + cmd:gcc + devel:libgl + devel:libglu +" + +BUILD_REQUIRES="" + BUILD() { - cd Box2D_v2.1.2/Box2D - cmake . -DOPENGL_INCLUDE_DIR:=/boot/develop/headers/os/opengl/GL \ - -DHAIKU:=TRUE + cd Box2D + cmake . make } INSTALL() { - cd Box2D_v2.1.2/Box2D + cd Box2D make install } -LICENSE="MIT" -COPYRIGHT="2007-2009 Erin Catto" diff --git a/dev-games/box2d/patches/box2d-2.1.2.patch b/dev-games/box2d/patches/box2d-2.1.2.patch index e7bea1e19..8f4a8eb3a 100644 --- a/dev-games/box2d/patches/box2d-2.1.2.patch +++ b/dev-games/box2d/patches/box2d-2.1.2.patch @@ -1,7 +1,8 @@ -diff -urN Box2D_v2.1.2/Box2D/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/CMakeLists.txt ---- Box2D_v2.1.2/Box2D/CMakeLists.txt 2010-04-03 11:10:30.046661632 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/CMakeLists.txt 2010-09-21 12:18:05.000000000 +0000 -@@ -26,7 +26,9 @@ +diff --git a/Box2D/CMakeLists.txt b/Box2D/CMakeLists.txt +index a8ad550..17b3069 100644 +--- a/Box2D/CMakeLists.txt ++++ b/Box2D/CMakeLists.txt +@@ -26,7 +26,9 @@ if(BOX2D_BUILD_EXAMPLES) # Testbed and dependencies. find_package(OpenGL REQUIRED) @@ -11,10 +12,11 @@ diff -urN Box2D_v2.1.2/Box2D/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/CMakeLists. add_subdirectory(glui) add_subdirectory(Testbed) endif(BOX2D_BUILD_EXAMPLES) -diff -urN Box2D_v2.1.2/Box2D/Testbed/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/Testbed/CMakeLists.txt ---- Box2D_v2.1.2/Box2D/Testbed/CMakeLists.txt 2010-04-04 11:07:26.007077888 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/CMakeLists.txt 2010-09-21 13:44:55.000000000 +0000 -@@ -72,10 +72,19 @@ +diff --git a/Box2D/Testbed/CMakeLists.txt b/Box2D/Testbed/CMakeLists.txt +index d1be5c0..ad716e4 100644 +--- a/Box2D/Testbed/CMakeLists.txt ++++ b/Box2D/Testbed/CMakeLists.txt +@@ -72,10 +72,19 @@ add_executable(Testbed ${Testbed_Tests_SRCS} ) @@ -24,27 +26,28 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/CMakeLists.txt Box2D_v2.1.2-haiku/Box2D/Tes - freeglut_static - glui - ${OPENGL_LIBRARIES} -+if(HAIKU) # Haiku has glut, so no need for freeglut +-) ++if(HAIKU) # Haiku has glut, so no need for freeglut + target_link_libraries ( + Testbed + Box2D + glui + ${OPENGL_LIBRARIES} -+) -+else(HAIKU) ++) ++else(HAIKU) + target_link_libraries ( + Testbed + Box2D + freeglut_static + glui + ${OPENGL_LIBRARIES} - ) -+endif(HAIKU) -\ No newline at end of file -diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Render.cpp Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Render.cpp ---- Box2D_v2.1.2/Box2D/Testbed/Framework/Render.cpp 2010-02-01 02:12:46.031719424 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Render.cpp 2010-09-21 11:29:02.000000000 +0000 -@@ -18,7 +18,11 @@ ++) ++endif(HAIKU) +diff --git a/Box2D/Testbed/Framework/Render.cpp b/Box2D/Testbed/Framework/Render.cpp +index 3a6c680..b406367 100644 +--- a/Box2D/Testbed/Framework/Render.cpp ++++ b/Box2D/Testbed/Framework/Render.cpp +@@ -18,12 +18,16 @@ #include "Render.h" @@ -56,9 +59,16 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Render.cpp Box2D_v2.1.2-haiku/Box #include #include -diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Test.cpp Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Test.cpp ---- Box2D_v2.1.2/Box2D/Testbed/Framework/Test.cpp 2010-02-14 12:15:52.031719424 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/Framework/Test.cpp 2010-09-21 11:28:49.000000000 +0000 + +-#include ++#include + + void DebugDraw::DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color) + { +diff --git a/Box2D/Testbed/Framework/Test.cpp b/Box2D/Testbed/Framework/Test.cpp +index 9e6a935..f43ee39 100644 +--- a/Box2D/Testbed/Framework/Test.cpp ++++ b/Box2D/Testbed/Framework/Test.cpp @@ -19,7 +19,11 @@ #include "Test.h" #include "Render.h" @@ -71,9 +81,10 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/Framework/Test.cpp Box2D_v2.1.2-haiku/Box2D #include -diff -urN Box2D_v2.1.2/Box2D/Testbed/Tests/TestEntries.cpp Box2D_v2.1.2-haiku/Box2D/Testbed/Tests/TestEntries.cpp ---- Box2D_v2.1.2/Box2D/Testbed/Tests/TestEntries.cpp 2010-04-17 11:18:18.035127296 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/Testbed/Tests/TestEntries.cpp 2010-09-21 11:30:22.000000000 +0000 +diff --git a/Box2D/Testbed/Tests/TestEntries.cpp b/Box2D/Testbed/Tests/TestEntries.cpp +index e12c102..1ca1db1 100644 +--- a/Box2D/Testbed/Tests/TestEntries.cpp ++++ b/Box2D/Testbed/Tests/TestEntries.cpp @@ -18,7 +18,11 @@ #include "../Framework/Test.h" @@ -86,9 +97,10 @@ diff -urN Box2D_v2.1.2/Box2D/Testbed/Tests/TestEntries.cpp Box2D_v2.1.2-haiku/Bo #include #include "ApplyForce.h" -diff -urN Box2D_v2.1.2/Box2D/glui/GL/glui.h Box2D_v2.1.2-haiku/Box2D/glui/GL/glui.h ---- Box2D_v2.1.2/Box2D/glui/GL/glui.h 2010-02-01 02:12:42.030408704 +0000 -+++ Box2D_v2.1.2-haiku/Box2D/glui/GL/glui.h 2010-09-21 11:25:12.000000000 +0000 +diff --git a/Box2D/glui/GL/glui.h b/Box2D/glui/GL/glui.h +index a412a77..66a846e 100644 +--- a/Box2D/glui/GL/glui.h ++++ b/Box2D/glui/GL/glui.h @@ -49,6 +49,8 @@ #ifdef __APPLE__ @@ -98,3 +110,58 @@ diff -urN Box2D_v2.1.2/Box2D/glui/GL/glui.h Box2D_v2.1.2-haiku/Box2D/glui/GL/glu #else #include "../../freeglut/GL/glut.h" //#include +diff --git a/Box2D/glui/algebra3.cpp b/Box2D/glui/algebra3.cpp +index ddc18f4..47f93b3 100644 +--- a/Box2D/glui/algebra3.cpp ++++ b/Box2D/glui/algebra3.cpp +@@ -830,11 +830,7 @@ vec4 operator*(float d, const vec4 &a) + + vec4 operator*(const mat4 &a, const vec4 &v) + { +- #define ROWCOL(i) \ +- a.v[i].n[0]*v.n[VX] + \ +- a.v[i].n[1]*v.n[VY] + \ +- a.v[i].n[2]*v.n[VZ] + \ +- a.v[i].n[3]*v.n[VW] ++ #define ROWCOL(i) a.v[i].n[0]*v.n[VX] + a.v[i].n[1]*v.n[VY] + a.v[i].n[2]*v.n[VZ] + a.v[i].n[3]*v.n[VW] + + return vec4(ROWCOL(0), ROWCOL(1), ROWCOL(2), ROWCOL(3)); + +@@ -1107,8 +1103,7 @@ mat3 operator-(const mat3 &a, const mat3 &b) + + mat3 operator*(const mat3 &a, const mat3 &b) + { +- #define ROWCOL(i, j) \ +- a.v[i].n[0]*b.v[0][j] + a.v[i].n[1]*b.v[1][j] + a.v[i].n[2]*b.v[2][j] ++ #define ROWCOL(i, j) a.v[i].n[0]*b.v[0][j] + a.v[i].n[1]*b.v[1][j] + a.v[i].n[2]*b.v[2][j] + + return mat3( + vec3(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2)), +@@ -1413,11 +1408,7 @@ mat4 operator-(const mat4 &a, const mat4 &b) + + mat4 operator*(const mat4 &a, const mat4 &b) + { +- #define ROWCOL(i, j) \ +- a.v[i].n[0]*b.v[0][j] + \ +- a.v[i].n[1]*b.v[1][j] + \ +- a.v[i].n[2]*b.v[2][j] + \ +- a.v[i].n[3]*b.v[3][j] ++ #define ROWCOL(i, j) a.v[i].n[0]*b.v[0][j] + a.v[i].n[1]*b.v[1][j] + a.v[i].n[2]*b.v[2][j] + a.v[i].n[3]*b.v[3][j] + + return mat4( + vec4(ROWCOL(0,0), ROWCOL(0,1), ROWCOL(0,2), ROWCOL(0,3)), +diff --git a/Box2D/glui/glui_internal.h b/Box2D/glui/glui_internal.h +index 20efc6f..8f450e1 100644 +--- a/Box2D/glui/glui_internal.h ++++ b/Box2D/glui/glui_internal.h +@@ -74,8 +74,7 @@ + + /************ check if a 2D point lies within a 2D box ***************/ + #ifndef PT_IN_BOX +-#define PT_IN_BOX( x, y, lo_x, hi_x, lo_y, hi_y ) \ +-( IN_BOUNDS(x,lo_x,hi_x) AND IN_BOUNDS(y,lo_y,hi_y) ) ++#define PT_IN_BOX( x, y, lo_x, hi_x, lo_y, hi_y ) ( IN_BOUNDS(x,lo_x,hi_x) AND IN_BOUNDS(y,lo_y,hi_y) ) + #endif + + /****** check if value lies on proper side of another value *****/ + From da4a3b2dee48d51634b41613182f82e48877cfd1 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Mon, 12 Jan 2015 22:26:36 +0000 Subject: [PATCH 316/326] LTris: Save config/themes/highscores to the user settings directory --- games-puzzle/ltris/ltris-1.0.19.recipe | 9 +- games-puzzle/ltris/patches/ltris-1.0.19.patch | 40 ---- .../ltris/patches/ltris-1.0.19.patchset | 187 ++++++++++++++++++ 3 files changed, 194 insertions(+), 42 deletions(-) delete mode 100644 games-puzzle/ltris/patches/ltris-1.0.19.patch create mode 100644 games-puzzle/ltris/patches/ltris-1.0.19.patchset diff --git a/games-puzzle/ltris/ltris-1.0.19.recipe b/games-puzzle/ltris/ltris-1.0.19.recipe index 487bcf18c..6412a2068 100644 --- a/games-puzzle/ltris/ltris-1.0.19.recipe +++ b/games-puzzle/ltris/ltris-1.0.19.recipe @@ -11,8 +11,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2002-2011 Michael Speck" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -PATCHES="ltris-1.0.19.patch" -GLOBAL_WRITABLE_FILES="var/ltris.hscr keep-old" +PATCHES="ltris-1.0.19.patchset" PROVIDES=" ltris = $portVersion @@ -50,5 +49,11 @@ BUILD() INSTALL() { make install + + # Clean up some unnecessary things from the package + rm $localStateDir/ltris.hscr + rm -rf $dataDir/applications + rm -rf $dataDir/icons + addAppDeskbarSymlink $binDir/ltris LTris } diff --git a/games-puzzle/ltris/patches/ltris-1.0.19.patch b/games-puzzle/ltris/patches/ltris-1.0.19.patch deleted file mode 100644 index 3a4a239e7..000000000 --- a/games-puzzle/ltris/patches/ltris-1.0.19.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- /dev/null 2014-09-03 18:56:15.136019000 +0200 -+++ ltris-1.0.19/LTris.rdef 2014-09-03 17:14:27.000000000 +0200 -@@ -0,0 +1,37 @@ -+resource app_signature "application/x-vnd-ltris"; -+ -+resource app_flags B_SINGLE_LAUNCH; -+ -+resource app_version { -+ major = 1, -+ middle = 0, -+ minor = 19, -+ -+ /* 0 = development 1 = alpha 2 = beta -+ 3 = gamma 4 = golden master 5 = final */ -+ variety = 5, -+ -+ internal = 0, -+ -+ short_info = "LTris is a tetris clone.", -+ long_info = "LTris is a tetris clone: differently shaped blocks are falling down the rectangular playing field." -+}; -+ -+resource vector_icon { -+ $"6E6369660A05000200060239BCD5357062B86B6C3CA1364826E049473700C0BE" -+ $"33FF6A6925020006023C15033A71ACB873493A166346BF9949CB5C00FFFC1BFF" -+ $"CDCB16020006023A39972E8567AFC35B3B523345A11E4863C900CECC1BFF9E9D" -+ $"150392901702001602399F0E3686A9B98DF63C8C42488EEB4924C900C2FF5A02" -+ $"0016023C15033A71ACB873493A166347FF994A15AE00FAFFD7020016023C9D60" -+ $"377C1EB78C243CA9674705BF48FA9100DAFFB30578040174060A04223E224A2D" -+ $"4F2D420A042D422D4F334B333F0A04223E2D42333F283B0A1C224A223E233D22" -+ $"3C222F282D2E2F2E2735243F283F2A41294B2D4B394A3B4B3C5740574C51504B" -+ $"4E4B5545593A543A483B473344334B2D4F0A072D513A4F455B5159575A605337" -+ $"420A04463F533E35332E351B0A090104000A0001031001178403040A01010100" -+ $"0A020100000A040102000A05010120382A0A06010020382A0A08010220382A0A" -+ $"0101012020120A0201002020120A0301022020120A010101202C170A02010020" -+ $"2C170A040102202C170A05010120381C0A06010020381C0A08010220381C0A05" -+ $"01012044210A0601002044210A0701022044210A090105000A010101202C090A" -+ $"020100202C090A030102202C090A05010120380E0A06010020380E0A07010220" -+ $"380E" -+}; diff --git a/games-puzzle/ltris/patches/ltris-1.0.19.patchset b/games-puzzle/ltris/patches/ltris-1.0.19.patchset new file mode 100644 index 000000000..7a5d753f0 --- /dev/null +++ b/games-puzzle/ltris/patches/ltris-1.0.19.patchset @@ -0,0 +1,187 @@ +From 3afd9f9500c8cc0a9cc7d8f09128e4c44b5c2538 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Mon, 12 Jan 2015 20:53:30 +0000 +Subject: [PATCH 1/2] Original resource definition file + +--- + LTris.rdef | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + create mode 100644 LTris.rdef + +diff --git a/LTris.rdef b/LTris.rdef +new file mode 100644 +index 0000000..b1cea42 +--- /dev/null ++++ b/LTris.rdef +@@ -0,0 +1,37 @@ ++resource app_signature "application/x-vnd.lgames.ltris"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 1, ++ middle = 0, ++ minor = 19, ++ ++ /* 0 = development 1 = alpha 2 = beta ++ 3 = gamma 4 = golden master 5 = final */ ++ variety = 5, ++ ++ internal = 0, ++ ++ short_info = "LTris is a tetris clone.", ++ long_info = "LTris is a tetris clone: differently shaped blocks are falling down the rectangular playing field." ++}; ++ ++resource vector_icon { ++ $"6E6369660A05000200060239BCD5357062B86B6C3CA1364826E049473700C0BE" ++ $"33FF6A6925020006023C15033A71ACB873493A166346BF9949CB5C00FFFC1BFF" ++ $"CDCB16020006023A39972E8567AFC35B3B523345A11E4863C900CECC1BFF9E9D" ++ $"150392901702001602399F0E3686A9B98DF63C8C42488EEB4924C900C2FF5A02" ++ $"0016023C15033A71ACB873493A166347FF994A15AE00FAFFD7020016023C9D60" ++ $"377C1EB78C243CA9674705BF48FA9100DAFFB30578040174060A04223E224A2D" ++ $"4F2D420A042D422D4F334B333F0A04223E2D42333F283B0A1C224A223E233D22" ++ $"3C222F282D2E2F2E2735243F283F2A41294B2D4B394A3B4B3C5740574C51504B" ++ $"4E4B5545593A543A483B473344334B2D4F0A072D513A4F455B5159575A605337" ++ $"420A04463F533E35332E351B0A090104000A0001031001178403040A01010100" ++ $"0A020100000A040102000A05010120382A0A06010020382A0A08010220382A0A" ++ $"0101012020120A0201002020120A0301022020120A010101202C170A02010020" ++ $"2C170A040102202C170A05010120381C0A06010020381C0A08010220381C0A05" ++ $"01012044210A0601002044210A0701022044210A090105000A010101202C090A" ++ $"020100202C090A030102202C090A05010120380E0A06010020380E0A07010220" ++ $"380E" ++}; +-- +1.8.3.4 + + +From c735a348244339d0e12c90a027e20cce1de18370 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Mon, 12 Jan 2015 22:16:46 +0000 +Subject: [PATCH 2/2] Move settings and highscores to B_USER_SETTINGS_DIRECTORY + +--- + src/chart.c | 4 ++++ + src/config.c | 18 +++++++++++++++++- + src/config.h | 4 ++++ + src/manager.c | 20 ++++++++++++++++++++ + 4 files changed, 45 insertions(+), 1 deletion(-) + +diff --git a/src/chart.c b/src/chart.c +index 87d8e03..8cee31d 100644 +--- a/src/chart.c ++++ b/src/chart.c +@@ -189,15 +189,19 @@ void chart_load() + if ( charts ) list_delete( charts ); charts = 0; + charts = list_create( LIST_AUTO_DELETE, chart_set_delete ); + /* load highscore */ ++#ifndef __HAIKU__ + if ( !chart_load_from_path( HI_DIR ) ) { + fprintf( stderr, "Unable to access highscore chart in '%s'.\n", HI_DIR ); + fprintf( stderr, "Trying to use config directory '%s'.\n", config.dir_name ); ++#endif + if ( !chart_load_from_path( config.dir_name ) ) { + fprintf( stderr, "Unable to access highscore chart in config directory... won't be " + "able to save any results. Sorry.\n" ); + return; + } ++#ifndef __HAIKU__ + } ++#endif + printf( "Saving highscore chart in: %s\n", chart_path ); + /* load resources */ + cfont = load_fixed_font( "f_small_yellow.bmp", 32, 96, 8 ); +diff --git a/src/config.c b/src/config.c +index 00f7e9c..c4d6ea0 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -23,6 +23,11 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "sdl.h" + #include "config.h" + #include "parser.h" +@@ -40,7 +45,18 @@ void config_check_dir() + { + #ifdef DISABLE_INSTALL + sprintf( config.dir_name, "." ); +-#else ++#elif __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory(B_USER_SETTINGS_DIRECTORY, volume, false, ++ config.dir_name, sizeof(config.dir_name)-1 ) == B_OK && ++ strlen(config.dir_name) + strlen(CONFIG_DIR_NAME) ++ < sizeof(config.dir_name)-1 ) { ++ strcat(config.dir_name, "/"); ++ strcat(config.dir_name, CONFIG_DIR_NAME); ++ } else ++ snprintf( config.dir_name, sizeof(config.dir_name)-1, "%s/%s", getenv( "HOME" ), CONFIG_DIR_NAME ); ++ fprintf( stderr, "HAIKU: Config directory is '%s'\n", config.dir_name ); ++#else + snprintf( config.dir_name, sizeof(config.dir_name)-1, "%s/%s", getenv( "HOME" ), CONFIG_DIR_NAME ); + #endif + if ( opendir( config.dir_name ) == 0 ) { +diff --git a/src/config.h b/src/config.h +index ee52a64..491ed64 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -99,7 +99,11 @@ typedef struct { + } Config; + + /* config directory name in home directory */ ++#ifdef __HAIKU__ ++#define CONFIG_DIR_NAME "LGames" ++#else + #define CONFIG_DIR_NAME ".lgames" ++#endif + + /* set config to default */ + void config_reset(); +diff --git a/src/manager.c b/src/manager.c +index b8cc411..de07f73 100644 +--- a/src/manager.c ++++ b/src/manager.c +@@ -19,6 +19,11 @@ + #include "../config.h" + #endif + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "ltris.h" + #include "manager.h" + #include "chart.h" +@@ -143,7 +148,22 @@ void cb_delete_set() + return; + } + /* get file name + path */ ++#ifdef __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory(B_USER_SETTINGS_DIRECTORY, volume, false, ++ fname, sizeof(config.dir_name)-1 ) == B_OK && ++ strlen(fname) + strlen(CONFIG_DIR_NAME) ++ + strlen(levelset_home_names[config.levelset_home_id]) ++ < sizeof(fname)-9 ) { ++ strcat(fname, "/"); ++ strcat(fname, CONFIG_DIR_NAME); ++ strcat(fname, "/levels/"); ++ strcat(fname, levelset_home_names[config.levelset_home_id]); ++ } else ++ snprintf( fname, sizeof(fname)-1, "%s/%s/levels/%s", getenv( "HOME" ), CONFIG_DIR_NAME, levelset_home_names[config.levelset_home_id] ); ++#else + snprintf( fname, sizeof(fname)-1, "%s/%s/levels/%s", getenv( "HOME" ), CONFIG_DIR_NAME, levelset_home_names[config.levelset_home_id] ); ++#endif + remove( fname ); + levelsets_load_names(); /* reinit name lists and configs indices */ + /* reassign these name lists as position in memory has changed */ +-- +1.8.3.4 + From 8a09a9e0b54561de89e8568e939c5148767951e2 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Wed, 14 Jan 2015 18:17:06 +0000 Subject: [PATCH 317/326] LBreakout2: Move config, high scores, saved games and custom levels to the user settings directory. --- .../lbreakout2/lbreakout2-2.6.4.recipe | 8 +- .../lbreakout2/patches/lbreakout2-2.6.4.patch | 107 ---- .../patches/lbreakout2-2.6.4.patchset | 601 ++++++++++++++++++ 3 files changed, 607 insertions(+), 109 deletions(-) delete mode 100644 games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patch create mode 100644 games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset diff --git a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe index 513d176bd..53ba0257f 100644 --- a/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe +++ b/games-puzzle/lbreakout2/lbreakout2-2.6.4.recipe @@ -13,8 +13,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2001-2011 Michael Speck" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -PATCHES="lbreakout2-2.6.4.patch" -GLOBAL_WRITABLE_FILES="var/lbreakout2.hscr keep-old" +PATCHES="lbreakout2-2.6.4.patchset" PROVIDES=" lbreakout2 = $portVersion @@ -59,5 +58,10 @@ BUILD() INSTALL() { make install + + rm $localStateDir/lbreakout2.hscr + rm -rf $dataDir/applications + rm -rf $dataDir/icons + addAppDeskbarSymlink $binDir/lbreakout2 LBreakout2 } diff --git a/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patch b/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patch deleted file mode 100644 index 796ec586a..000000000 --- a/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- lbreakout2-2.6.4/configure.orig 2012-06-19 21:49:30.000000000 +0200 -+++ lbreakout2-2.6.4/configure 2014-07-13 22:23:51.202375168 +0200 -@@ -11392,7 +11392,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" -+LIBS=" $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -11446,7 +11446,7 @@ - #define HAVE_LIBM 1 - _ACEOF - -- LIBS="-lm $LIBS" -+ LIBS=" $LIBS" - - else - { { echo "$as_me:$LINENO: error: lib math is needed" >&5 - ---- lbreakout2-2.6.4/client/chart.c.org 2014-08-23 14:15:06.036700160 +0200 -+++ lbreakout2-2.6.4/client/chart.c 2014-08-23 14:11:54.634650624 +0200 -@@ -213,6 +213,7 @@ - } - printf( _("Saving highscore chart in: %s\n"), chart_path ); - /* compute size and position stuff of highscore */ -+ { - char *cheader = _("Name Level Score"); - chart_pos.w = stk_font_string_width( ccfont, cheader ); - chart_pos.h = ccfont->height + chart_gap + /* title + gap */ -@@ -220,6 +221,7 @@ - chart_gap + /*gap between caption and entries */ - ccfont->height; /* caption size */ - chart_level_offset = stk_font_string_width( ccfont, _("name.-----") ) + stk_font_string_width( ccfont, _("Level") ) / 2; /* level offset centered */ -+ } - } - /* - ==================================================================== -@@ -344,6 +346,7 @@ - chart->name ); - /* caption */ - ccfont->align = STK_FONT_ALIGN_LEFT | STK_FONT_ALIGN_TOP; -+ { - char *cheader = _("Name Level Score"); - stk_font_write( ccfont, stk_display, - chart_pos.x, chart_pos.y + ccfont->height + chart_gap, -1, -@@ -370,6 +373,7 @@ - chart_pos.x + chart_pos.w, entry_offset, -1, number_buffer ); - /* change offset */ - entry_offset += font->height; -+ } - } - stk_display_store_rect( &chart_pos ); - } -@@ -389,6 +393,7 @@ - - /* caption */ - ccfont->align = STK_FONT_ALIGN_LEFT | STK_FONT_ALIGN_TOP; -+ { - char *cheader = _("Name Level Score"); - stk_font_write( ccfont, stk_display, px, py, -1, cheader ); - -@@ -416,6 +421,7 @@ - /* change offset */ - entry_offset += font->height - 1; - } -+ } - { SDL_Rect region = { x, y, w, h }; - stk_display_store_rect( ®ion ); } - } ---- /dev/null 2014-09-02 10:55:51.858924000 +0200 -+++ lbreakout2-2.6.4/LBreakout2.rdef 2014-09-02 09:38:25.879230976 +0200 -@@ -0,0 +1,33 @@ -+resource app_signature "application/x-vnd-lbreakout"; -+ -+resource app_flags B_SINGLE_LAUNCH; -+ -+resource app_version { -+ major = 2, -+ middle = 6, -+ minor = 4, -+ -+ /* 0 = development 1 = alpha 2 = beta -+ 3 = gamma 4 = golden master 5 = final */ -+ variety = 5, -+ -+ internal = 0, -+ -+ short_info = "LBreakout2 arcade game.", -+ long_info = "LBreakout2 is a fun breakout-style arcade game." -+}; -+ -+resource vector_icon { -+ $"6E63696605020106023D5738B7D6E13769AC3CF83249ADC94642AAFFA5040400" -+ $"FF9E9E02000205B6B6DB3925EEBD5FCABAE8BF4A54944AC9EB00846C1BFF34B6" -+ $"9627FF77DBCD5CF983C9C088FFFE6A5716FF020106023B7084B697593638963A" -+ $"F2BB4202AB49ECC600AAD2A5F440503F050001010000850502044C24C62E24C2" -+ $"E124442C44B62144B96E4C34C2E134C62E34542C54B96E54B6210604AF303937" -+ $"3C2B3A2948243E2D4A48584E450204B6C93AB8A73AB4EA3AB365C0BFB365BEE0" -+ $"B365C29DB6C94BB4EA4BB8A74B32C0BF32C29D32BEE006033E402E5037423A50" -+ $"374438493B3F330606BE0F3039233D27352242294822452948445654574E5C5B" -+ $"504E4555474642090A0401042028220A0301041001178500040A020102024000" -+ $"000000000000003FC3C3400000BDC3C30A010101000A02010202404DAB000000" -+ $"000000404DAB4A26D645D13D0A000100000A0301001001178100040A03010300" -+ $"0A030103023EC27B0000000000003EC27B46388E46B10D" -+}; diff --git a/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset b/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset new file mode 100644 index 000000000..02dd8bc98 --- /dev/null +++ b/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset @@ -0,0 +1,601 @@ +From 4bb650564a24ec9d6915684c3370caa293bdd002 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Mon, 12 Jan 2015 18:11:27 +0000 +Subject: [PATCH 1/3] applying patch lbreakout2-2.6.4.patch + +--- + LBreakout2.rdef | 33 +++++++++++++++++++++++++++++++++ + client/chart.c | 6 ++++++ + configure | 4 ++-- + 3 files changed, 41 insertions(+), 2 deletions(-) + create mode 100644 LBreakout2.rdef + +diff --git a/LBreakout2.rdef b/LBreakout2.rdef +new file mode 100644 +index 0000000..6b165ae +--- /dev/null ++++ b/LBreakout2.rdef +@@ -0,0 +1,33 @@ ++resource app_signature "application/x-vnd-lbreakout"; ++ ++resource app_flags B_SINGLE_LAUNCH; ++ ++resource app_version { ++ major = 2, ++ middle = 6, ++ minor = 4, ++ ++ /* 0 = development 1 = alpha 2 = beta ++ 3 = gamma 4 = golden master 5 = final */ ++ variety = 5, ++ ++ internal = 0, ++ ++ short_info = "LBreakout2 arcade game.", ++ long_info = "LBreakout2 is a fun breakout-style arcade game." ++}; ++ ++resource vector_icon { ++ $"6E63696605020106023D5738B7D6E13769AC3CF83249ADC94642AAFFA5040400" ++ $"FF9E9E02000205B6B6DB3925EEBD5FCABAE8BF4A54944AC9EB00846C1BFF34B6" ++ $"9627FF77DBCD5CF983C9C088FFFE6A5716FF020106023B7084B697593638963A" ++ $"F2BB4202AB49ECC600AAD2A5F440503F050001010000850502044C24C62E24C2" ++ $"E124442C44B62144B96E4C34C2E134C62E34542C54B96E54B6210604AF303937" ++ $"3C2B3A2948243E2D4A48584E450204B6C93AB8A73AB4EA3AB365C0BFB365BEE0" ++ $"B365C29DB6C94BB4EA4BB8A74B32C0BF32C29D32BEE006033E402E5037423A50" ++ $"374438493B3F330606BE0F3039233D27352242294822452948445654574E5C5B" ++ $"504E4555474642090A0401042028220A0301041001178500040A020102024000" ++ $"000000000000003FC3C3400000BDC3C30A010101000A02010202404DAB000000" ++ $"000000404DAB4A26D645D13D0A000100000A0301001001178100040A03010300" ++ $"0A030103023EC27B0000000000003EC27B46388E46B10D" ++}; +diff --git a/client/chart.c b/client/chart.c +index 68e9f44..8fbd8c6 100644 +--- a/client/chart.c ++++ b/client/chart.c +@@ -213,6 +213,7 @@ void chart_load() + } + printf( _("Saving highscore chart in: %s\n"), chart_path ); + /* compute size and position stuff of highscore */ ++ { + char *cheader = _("Name Level Score"); + chart_pos.w = stk_font_string_width( ccfont, cheader ); + chart_pos.h = ccfont->height + chart_gap + /* title + gap */ +@@ -220,6 +221,7 @@ void chart_load() + chart_gap + /*gap between caption and entries */ + ccfont->height; /* caption size */ + chart_level_offset = stk_font_string_width( ccfont, _("name.-----") ) + stk_font_string_width( ccfont, _("Level") ) / 2; /* level offset centered */ ++ } + } + /* + ==================================================================== +@@ -344,6 +346,7 @@ void chart_show( Set_Chart *chart, int x, int y, int w, int h ) + chart->name ); + /* caption */ + ccfont->align = STK_FONT_ALIGN_LEFT | STK_FONT_ALIGN_TOP; ++ { + char *cheader = _("Name Level Score"); + stk_font_write( ccfont, stk_display, + chart_pos.x, chart_pos.y + ccfont->height + chart_gap, -1, +@@ -370,6 +373,7 @@ void chart_show( Set_Chart *chart, int x, int y, int w, int h ) + chart_pos.x + chart_pos.w, entry_offset, -1, number_buffer ); + /* change offset */ + entry_offset += font->height; ++ } + } + stk_display_store_rect( &chart_pos ); + } +@@ -389,6 +393,7 @@ void chart_show_compact( Set_Chart *chart, int x, int y, int w, int h ) + + /* caption */ + ccfont->align = STK_FONT_ALIGN_LEFT | STK_FONT_ALIGN_TOP; ++ { + char *cheader = _("Name Level Score"); + stk_font_write( ccfont, stk_display, px, py, -1, cheader ); + +@@ -416,6 +421,7 @@ void chart_show_compact( Set_Chart *chart, int x, int y, int w, int h ) + /* change offset */ + entry_offset += font->height - 1; + } ++ } + { SDL_Rect region = { x, y, w, h }; + stk_display_store_rect( ®ion ); } + } +diff --git a/configure b/configure +index e3da323..eb8b692 100755 +--- a/configure ++++ b/configure +@@ -11392,7 +11392,7 @@ if test "${ac_cv_lib_m_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS=" $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -11446,7 +11446,7 @@ if test $ac_cv_lib_m_main = yes; then + #define HAVE_LIBM 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS=" $LIBS" + + else + { { echo "$as_me:$LINENO: error: lib math is needed" >&5 +-- +1.8.3.4 + + +From 9c323258dc4be15ba6299abb40af19b76dbe80b8 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Tue, 13 Jan 2015 16:19:54 +0000 +Subject: [PATCH 2/3] Relocate save files, high scores and config + +--- + client/chart.c | 4 ++++ + client/config.c | 17 +++++++++++++++++ + client/editor.c | 20 ++++++++++++++++++++ + client/lbreakout.h | 2 ++ + client/main.c | 17 +++++++++++++++++ + client/manager.c | 31 +++++++++++++++++++++++++++++++ + client/slot.c | 36 ++++++++++++++++++++++++++++++++++-- + client/theme.c | 38 ++++++++++++++++++++++++++++++++++++-- + game/levels.c | 42 ++++++++++++++++++++++++++++++++++++++++-- + 9 files changed, 201 insertions(+), 6 deletions(-) + +diff --git a/client/chart.c b/client/chart.c +index 8fbd8c6..6dfe30e 100644 +--- a/client/chart.c ++++ b/client/chart.c +@@ -202,15 +202,19 @@ void chart_load() + if ( charts ) list_delete( charts ); charts = 0; + charts = list_create( LIST_AUTO_DELETE, chart_set_delete ); + /* load highscore */ ++#ifndef __HAIKU__ + if ( !chart_load_from_path( HI_DIR ) ) { + fprintf( stderr, _("Unable to access highscore chart in '%s'.\n"), HI_DIR ); + fprintf( stderr, _("Trying to use config directory '%s'.\n"), config.dir_name ); ++#endif + if ( !chart_load_from_path( config.dir_name ) ) { + fprintf( stderr, _("Unable to access highscore chart in config directory... won't be " + "able to save any results. Sorry.\n") ); + return; + } ++#ifndef __HAIKU__ + } ++#endif + printf( _("Saving highscore chart in: %s\n"), chart_path ); + /* compute size and position stuff of highscore */ + { +diff --git a/client/config.c b/client/config.c +index 83a924c..7b2ed81 100644 +--- a/client/config.c ++++ b/client/config.c +@@ -21,6 +21,11 @@ + #include + #include + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "config.h" + #include "../common/parser.h" + +@@ -38,7 +43,19 @@ Config config; + void config_check_dir() + { + char level_dir[512]; ++#ifdef __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, volume, false, ++ config.dir_name, sizeof(config.dir_name)-1 ) == B_OK && ++ strlen(config.dir_name) + strlen(CONFIG_DIR_NAME) ++ < sizeof(config.dir_name)-1 ) { ++ strcat(config.dir_name, "/"); ++ strcat(config.dir_name, CONFIG_DIR_NAME); ++ } else ++ snprintf( config.dir_name, sizeof(config.dir_name)-1, "%s/%s", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); ++#else + snprintf( config.dir_name, sizeof(config.dir_name)-1, "%s/%s", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); ++#endif + /* test and create .lgames */ + if ( opendir( config.dir_name ) == 0 ) { + fprintf( stderr, "couldn't find/open config directory '%s'\n", config.dir_name ); +diff --git a/client/editor.c b/client/editor.c +index e182081..81a4b7c 100644 +--- a/client/editor.c ++++ b/client/editor.c +@@ -15,6 +15,11 @@ + * * + ***************************************************************************/ + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "lbreakout.h" + #include "../game/game.h" + #include "game.h" +@@ -722,7 +727,22 @@ int editor_init( char *file_name ) + { + FILE *file = 0; + /* set full file name */ ++#ifdef __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory(B_USER_SETTINGS_DIRECTORY, volume, false, ++ edit_file_name, sizeof(edit_file_name)-1 ) == B_OK && ++ strlen(edit_file_name) + strlen(CONFIG_DIR_NAME) + strlen(file_name) ++ < sizeof(edit_file_name) - 18 ) { ++ strcat(edit_file_name, "/"); ++ strcat(edit_file_name, CONFIG_DIR_NAME); ++ strcat(edit_file_name, "/lbreakout2-levels/"); ++ strcat(edit_file_name, file_name); ++ } else ++ snprintf( edit_file_name, sizeof(edit_file_name)-1, "%s/%s/lbreakout2-levels/%s", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME, file_name ); ++ fprintf( stderr, "HAIKU: Saving at %s\n", edit_file_name); ++#else + snprintf( edit_file_name, sizeof(edit_file_name)-1, "%s/%s/lbreakout2-levels/%s", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME, file_name ); ++#endif + /* test this file for write access. use append to keep contents */ + if ( ( file = fopen( edit_file_name, "a" ) ) == 0 ) { + fprintf( stderr, "Permission to write to file '%s' denied.\n", edit_file_name ); +diff --git a/client/lbreakout.h b/client/lbreakout.h +index 4b0090c..8ab9cd6 100644 +--- a/client/lbreakout.h ++++ b/client/lbreakout.h +@@ -48,6 +48,8 @@ Global definitions for LBreakout and general system includes. + /* config directory name in home directory */ + #ifdef _WIN32 + #define CONFIG_DIR_NAME "lgames" ++#elif __HAIKU__ ++#define CONFIG_DIR_NAME "LGames" + #else + #define CONFIG_DIR_NAME ".lgames" + #endif +diff --git a/client/main.c b/client/main.c +index 81e7f57..7f29cfc 100644 +--- a/client/main.c ++++ b/client/main.c +@@ -23,6 +23,11 @@ + #include + #endif + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "lbreakout.h" + #include "../game/game.h" + #include "file.h" +@@ -198,7 +203,19 @@ int main(int argc, char *argv[]) + /* new set? */ + if ( strequal( NEW_SET, edit_set ) ) { + editor_file = calloc( 16, sizeof( char ) ); ++#ifdef __HAIKU__ ++ if ( find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ path, sizeof(path)-1 ) == B_OK && ++ strlen(path) + strlen(CONFIG_DIR_NAME) ++ < sizeof(path) - 18 ) { ++ strcat(path, "/"); ++ strcat(path, CONFIG_DIR_NAME); ++ strcat(path, "/lbreakout2-levels"); ++ } else ++ snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels", getenv( "HOME" )? getenv("HOME"):".", CONFIG_DIR_NAME ); ++#else + snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels", getenv( "HOME" )? getenv("HOME"):".", CONFIG_DIR_NAME ); ++#endif + if ( !enter_string( font, _("Set Name:"), editor_file, 12 ) || !file_check( path, editor_file, "w" ) ) { + free( editor_file ); + break; +diff --git a/client/manager.c b/client/manager.c +index 5c94c38..9cbbcdd 100644 +--- a/client/manager.c ++++ b/client/manager.c +@@ -15,6 +15,11 @@ + * * + ***************************************************************************/ + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "manager.h" + #include "../game/game.h" + #include "file.h" +@@ -278,7 +283,19 @@ void levelsets_load_names() + delete_text( text ); + } + /* parse home directory */ ++#ifdef __HAIKU__ ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ level_dir, sizeof(level_dir)-1 ) == B_OK && ++ strlen(level_dir) + strlen(CONFIG_DIR_NAME) ++ < sizeof(level_dir)-19 ) { ++ strcat(level_dir, "/"); ++ strcat(level_dir, CONFIG_DIR_NAME); ++ strcat(level_dir, "/lbreakout2-levels"); ++ } else ++ snprintf( level_dir, sizeof(level_dir)-1, "%s/%s/lbreakout2-levels", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); ++#else + snprintf( level_dir, sizeof(level_dir)-1, "%s/%s/lbreakout2-levels", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); ++#endif + if ( ( text = get_file_list( level_dir, 0, level_dir ) ) ) { + for ( i = 0; i < text->count; i++ ) { + /* filter stuff */ +@@ -353,7 +370,21 @@ void cb_delete_set() + return; + } + /* get file name + path */ ++#ifdef __HAIKU__ ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ fname, sizeof(fname)-1 ) == B_OK && ++ strlen(fname) + strlen(CONFIG_DIR_NAME) ++ + strlen(levelset_names_home[config.levelset_id_home]) ++ < sizeof(fname)-19 ) { ++ strcat(fname, "/"); ++ strcat(fname, CONFIG_DIR_NAME); ++ strcat(fname, "/lbreakout2-levels/"); ++ strcat(fname, levelset_names_home[config.levelset_id_home]); ++ } else ++ snprintf( fname, sizeof(fname)-1,"%s/%s/lbreakout2-levels/%s", getenv( "HOME" ), CONFIG_DIR_NAME, levelset_names_home[config.levelset_id_home] ); ++#else + snprintf( fname, sizeof(fname)-1,"%s/%s/lbreakout2-levels/%s", getenv( "HOME" ), CONFIG_DIR_NAME, levelset_names_home[config.levelset_id_home] ); ++#endif + remove( fname ); + levelsets_load_names(); /* reinit name lists and configs indices */ + /* reassign these name lists as position in memory has changed */ +diff --git a/client/slot.c b/client/slot.c +index 238d4c8..a32805a 100644 +--- a/client/slot.c ++++ b/client/slot.c +@@ -15,15 +15,34 @@ + * * + ***************************************************************************/ + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "lbreakout.h" + #include "slot.h" + + static FILE *open_slot( int id, char *mode ) + { + char fname[512]; +- snprintf( fname, 511, "%s/%s/lbr2_save_%d", +- (getenv( "HOME" )?getenv( "HOME" ):"."), ++#ifdef __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory(B_USER_SETTINGS_DIRECTORY, volume, false, ++ fname, sizeof(fname)-1 ) == B_OK && strlen(fname) + ++ strlen(CONFIG_DIR_NAME) < sizeof(fname) - 16 ) { ++ off_t len = strlen(fname); ++ snprintf( fname+len, 511-len, "/%s/lbr2_save_%d", CONFIG_DIR_NAME, id); ++ } else ++ snprintf( fname, 511, "%s/%s/lbr2_save_%d", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), + CONFIG_DIR_NAME, id ); ++ fprintf( stderr, "HAIKU: Accessing savefile at %s\n", fname ); ++#else ++ snprintf( fname, 511, "%s/%s/lbr2_save_%d", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), ++ CONFIG_DIR_NAME, id ); ++#endif + //printf( "accessing '%s' in mode '%s'\n", fname, mode ); + return fopen( fname, mode ); + } +@@ -62,9 +81,22 @@ int slot_save( int slot_id, GameSlot *gs ) + int slot_delete( int slot_id ) + { + char fname[512]; ++#ifdef __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory(B_USER_SETTINGS_DIRECTORY, volume, false, ++ fname, sizeof(fname)-1 ) == B_OK && strlen(fname) + ++ strlen(CONFIG_DIR_NAME) < sizeof(fname) - 16 ) { ++ off_t len = strlen(fname); ++ snprintf( fname+len, 511-len, "/%s/lbr2_save_%d", CONFIG_DIR_NAME, slot_id); ++ } else ++ snprintf( fname, 511, "%s/%s/lbr2_save_%d", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), ++ CONFIG_DIR_NAME, slot_id ); ++#else + snprintf( fname, 511, "%s/%s/lbr2_save_%d", + (getenv( "HOME" )?getenv( "HOME" ):"."), + CONFIG_DIR_NAME, slot_id ); ++#endif + if ( remove(fname) != 0 ) + { + fprintf( stderr, "ERROR: couldn't delete file %s\n", fname ); +diff --git a/client/theme.c b/client/theme.c +index ad6de96..a0e1b8e 100644 +--- a/client/theme.c ++++ b/client/theme.c +@@ -15,6 +15,11 @@ + * * + ***************************************************************************/ + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include + #include + #include +@@ -133,10 +138,25 @@ static char theme_dir[512]; + static char theme_path[512]; + void theme_set_dir( char *name ) + { +- if ( name[0] == '~' ) ++ if ( name[0] == '~' ) { ++#ifdef __HAIKU__ ++ dev_t volume = dev_for_path("/boot"); ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, volume, false, ++ theme_dir, sizeof(theme_dir)-1 ) == B_OK && ++ strlen(theme_dir) + strlen(CONFIG_DIR_NAME) + strlen(name) ++ < sizeof(theme_dir)-19 ) { ++ strcat(theme_dir, "/"); ++ strcat(theme_dir, CONFIG_DIR_NAME); ++ strcat(theme_dir, "/lbreakout2-themes/"); ++ strcat(theme_dir, name + (off_t)1); ++ } else ++ snprintf( theme_dir, sizeof(theme_dir)-1, "%s/%s/lbreakout2-themes/%s", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME, name + 1 ); ++#else + snprintf( theme_dir, sizeof(theme_dir)-1, "%s/%s/lbreakout2-themes/%s", + (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME, name + 1 ); +- else { ++#endif ++ } else { + if ( STRCMP( SRC_DIR, "." ) ) { + getcwd( theme_dir, 511 ); + strcat( theme_dir, "/gfx/" ); +@@ -327,6 +347,20 @@ void theme_get_list() + closedir( hdir ); + } + /* home theme directory */ ++#ifdef __HAIKU__ ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ dir, sizeof(dir)-1 ) == B_OK && ++ strlen(dir) + strlen(CONFIG_DIR_NAME) ++ < sizeof(dir)-19 ) { ++ strcat(dir, "/"); ++ strcat(dir, CONFIG_DIR_NAME); ++ strcat(dir, "/lbreakout2-themes"); ++ } else ++ snprintf( dir, sizeof(dir)-1, "%s/%s/lbreakout2-themes", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); ++#else ++ snprintf( dir, sizeof(dir)-1, "%s/%s/lbreakout2-themes", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); ++#endif ++ + snprintf( dir, sizeof(dir)-1, "%s/%s/lbreakout2-themes", (getenv( "HOME" )?getenv( "HOME" ):"."), CONFIG_DIR_NAME ); + if ( ( hdir = opendir( dir ) ) != 0 ) { + while ( ( entry = readdir( hdir ) ) ) { +diff --git a/game/levels.c b/game/levels.c +index a93a633..0d728ac 100644 +--- a/game/levels.c ++++ b/game/levels.c +@@ -15,6 +15,11 @@ + * * + ***************************************************************************/ + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include "levels.h" + + /* +@@ -66,9 +71,26 @@ FILE *levelset_open( const char *fname, char *mode ) + FILE *file; + char path[512]; + if ( fname[0] == '~' ) { +- snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels/%s", +- (getenv( "HOME" )?getenv( "HOME" ):"."), ++#ifdef __HAIKU__ ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ path, sizeof(path)-1 ) == B_OK && ++ strlen(path) + strlen(CONFIG_DIR_NAME) ++ + strlen(fname) ++ < sizeof(path)-19 ) { ++ strcat(path, "/"); ++ strcat(path, CONFIG_DIR_NAME); ++ strcat(path, "/lbreakout2-levels/"); ++ strcat(path, fname + 1); ++ } else ++ snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels/%s", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), ++ CONFIG_DIR_NAME, fname + 1 ); ++ fprintf ( stderr, "HAIKU: opening %s\n", path ); ++#else ++ snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels/%s", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), + CONFIG_DIR_NAME, fname + 1 ); ++#endif + } + else + if ( fname[0] != '/' ) /* keep global pathes */ +@@ -276,9 +298,25 @@ int levelset_save( LevelSet *set, char *fname ) + + if ( set == 0 || set->count == 0 ) return 0; + ++#ifdef __HAIKU__ ++ if ( find_directory( B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ path, sizeof(path)-1 ) == B_OK && ++ strlen(path) + strlen(CONFIG_DIR_NAME) ++ + strlen(fname) ++ < sizeof(path)-19 ) { ++ strcat(path, "/"); ++ strcat(path, CONFIG_DIR_NAME); ++ strcat(path, "/lbreakout2-levels/"); ++ strcat(path, (fname[0]=='~') ? fname + 1 : fname); ++ } else ++ snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels/%s", ++ (getenv( "HOME" )?getenv( "HOME" ):"."), ++ CONFIG_DIR_NAME, (fname[0]=='~')?fname+1:fname ); ++#else + snprintf( path, sizeof(path)-1, "%s/%s/lbreakout2-levels/%s", + (getenv( "HOME" )?getenv( "HOME" ):"."), + CONFIG_DIR_NAME, (fname[0]=='~')?fname+1:fname ); ++#endif + if ( ( file = fopen( path, "w" ) ) == 0 ) { + fprintf( stderr, "couldn't open %s\n", path ); + return 0; +-- +1.8.3.4 + + +From 18758854c84c8fc8e12ce85ecf441b278aaa0d59 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Wed, 14 Jan 2015 18:23:21 +0000 +Subject: [PATCH 3/3] Add updated icon + +--- + LBreakout2.rdef | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/LBreakout2.rdef b/LBreakout2.rdef +index 6b165ae..69a4652 100644 +--- a/LBreakout2.rdef ++++ b/LBreakout2.rdef +@@ -18,16 +18,17 @@ resource app_version { + }; + + resource vector_icon { +- $"6E63696605020106023D5738B7D6E13769AC3CF83249ADC94642AAFFA5040400" +- $"FF9E9E02000205B6B6DB3925EEBD5FCABAE8BF4A54944AC9EB00846C1BFF34B6" +- $"9627FF77DBCD5CF983C9C088FFFE6A5716FF020106023B7084B697593638963A" +- $"F2BB4202AB49ECC600AAD2A5F440503F050001010000850502044C24C62E24C2" ++ $"6E63696605020106023D5FC8326AB4B225F53CFFCE4A14594559B7FFA5040400" ++ $"FF9E9E02000205B6B6DB3925EEBD5FCABAE8BF4A54944AC9EB00FFCD22FF34EA" ++ $"BE26FF77F1D806F983E5D882FFFEC2A43EFF020106023B7084B697593638963A" ++ $"F2BB44015549CCC600AAD2A5F440503F050001010000850502044C24C62E24C2" + $"E124442C44B62144B96E4C34C2E134C62E34542C54B96E54B6210604AF303937" +- $"3C2B3A2948243E2D4A48584E450204B6C93AB8A73AB4EA3AB365C0BFB365BEE0" +- $"B365C29DB6C94BB4EA4BB8A74B32C0BF32C29D32BEE006033E402E5037423A50" +- $"374438493B3F330606BE0F3039233D27352242294822452948445654574E5C5B" +- $"504E4555474642090A0401042028220A0301041001178500040A020102024000" +- $"000000000000003FC3C3400000BDC3C30A010101000A02010202404DAB000000" +- $"000000404DAB4A26D645D13D0A000100000A0301001001178100040A03010300" +- $"0A030103023EC27B0000000000003EC27B46388E46B10D" ++ $"3C2B3A2948243E2D4A48584E450204B6C93AB86F3AB5223AB3CBC0BFB3CBBEE0" ++ $"B3CBC29DB6C94BB5224BB86F4B31C0BF31C29D31BEE006033E402E5037423A50" ++ $"374438493B3F330606BE0F3039243D28352342294822452948445653574D5C5A" ++ $"504E4555474642090A040104023FFB5DB90A98390A983FFB5D4347234571E30A" ++ $"03010430222001178500040A020102024000000000000000003FC3C3430000BD" ++ $"C3C30A0101012022200A02010202404DAB000000000000404DAB4A46D645D13D" ++ $"0A0001002022200A03010030222001178100040A0301032022200A030103023E" ++ $"C27B0000000000003EC27B46B88E46B10D" + }; +-- +1.8.3.4 + From d412d66ec9440402b0c841a347e0215559ebe1c5 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Wed, 14 Jan 2015 17:41:05 +0000 Subject: [PATCH 318/326] Add a new build tool, ham --- sys-devel/ham/ham-0.1.recipe | 62 ++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 sys-devel/ham/ham-0.1.recipe diff --git a/sys-devel/ham/ham-0.1.recipe b/sys-devel/ham/ham-0.1.recipe new file mode 100644 index 000000000..a875b85bb --- /dev/null +++ b/sys-devel/ham/ham-0.1.recipe @@ -0,0 +1,62 @@ +SUMMARY="Build tool, replacement for jam" +DESCRIPTION="Ham is a a meaty Jam build tool replacement + +One of the main goals is to have an API library, so that IDEs can implement \ +actual Jam support. Another one is to add features that are complicated to add \ +in Jam (like more intelligent header scanning, plug-in support (for header \ +scanning, archive types), dependence of targets on their actual actions (i.e. \ +Jamfile change would trigger rebuild of affected targets) +" +HOMEPAGE="https://github.com/weinhold/Ham" +SRC_URI="git+https://github.com/weinhold/Ham#b83d767047a93ed58717a6c7662b8838342a54fb" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2010-2013 Ingo Weinhold" + +ARCHITECTURES="x86" +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" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + ham${secondaryArchSuffix} = $portVersion + cmd:ham${secondaryArchSuffix} = $portVersion + lib:libham${secondaryArchSuffix} = $portVersion + " + +REQUIRES=" + haiku${secondaryArchSuffix} + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc${secondaryArchSuffix} + cmd:jam + " + +BUILD() +{ + jam $jobArgs +} + +INSTALL() +{ + mkdir -p $binDir + mkdir -p $libDir + cp -a generated/objects/haiku/x86/release/ham $binDir + cp -a generated/objects/haiku/x86/release/libham.so $libDir +} + +TEST() +{ + LIBRARY_PATH=$LIBRARY_PATH:generated/objects/haiku/x86/release \ + generated/objects/haiku/x86/release/ham-tests +} From 698f89c78916f4b8153a1e07539959a5e94140ab Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Wed, 14 Jan 2015 20:11:38 +0100 Subject: [PATCH 319/326] Add recipe for libpurple --- dev-libs/libpurple/libpurple-2.10.11.recipe | 157 ++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 dev-libs/libpurple/libpurple-2.10.11.recipe diff --git a/dev-libs/libpurple/libpurple-2.10.11.recipe b/dev-libs/libpurple/libpurple-2.10.11.recipe new file mode 100644 index 000000000..a26a16ca2 --- /dev/null +++ b/dev-libs/libpurple/libpurple-2.10.11.recipe @@ -0,0 +1,157 @@ +SUMMARY="A library for IM communication." +DESCRIPTION="libpurple is a library for IM communication used by many open \ +source IM clients. It implements a variety of protocols, for example IRC, Jabber \ +or ICQ." +HOMEPAGE="https://pidgin.im/" +SRC_URI="http://downloads.sourceforge.net/project/pidgin/Pidgin/$portVersion/pidgin-$portVersion.tar.bz2" +SOURCE_DIR="pidgin-$portVersion" +CHECKSUM_SHA256="f2ae211341fc77efb9945d40e9932aa535cdf3a6c8993fe7919fca8cc1c04007" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="1998-2015 Rob Flynn et al." + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libpurple$secondaryArchSuffix = $portVersion + lib:libpurple$secondaryArchSuffix = $portVersion + lib:libgnt$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libgobject_2.0$secondaryArchSuffix + lib:libgmodule_2.0$secondaryArchSuffix + lib:libgthread_2.0$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libidn$secondaryArchSuffix + lib:libnss3$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libnspr4$secondaryArchSuffix + lib:libfreebl3$secondaryArchSuffix + lib:libnss3$secondaryArchSuffix + lib:libnssckbi$secondaryArchSuffix + lib:libnssdbm3$secondaryArchSuffix + lib:libnssutil3$secondaryArchSuffix + lib:libsmime3$secondaryArchSuffix + lib:libsoftokn3$secondaryArchSuffix + lib:libssl3$secondaryArchSuffix + lib:libz$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libffi$secondaryArchSuffix + lib:libpanelw$secondaryArchSuffix + lib:libncursesw$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + glib2${secondaryArchSuffix}_devel + devel:libglib_2.0$secondaryArchSuffix + devel:libgobject_2.0$secondaryArchSuffix + devel:libgmodule_2.0$secondaryArchSuffix + devel:libgthread_2.0$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libidn$secondaryArchSuffix + devel:libnss3$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libnspr4$secondaryArchSuffix + devel:libfreebl3${secondaryArchSuffix} + devel:libnss3${secondaryArchSuffix} + devel:libnssckbi${secondaryArchSuffix} + devel:libnssdbm3${secondaryArchSuffix} + devel:libnssutil3${secondaryArchSuffix} + devel:libsmime3${secondaryArchSuffix} + devel:libsoftokn3${secondaryArchSuffix} + devel:libssl3${secondaryArchSuffix} + devel:libncurses${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix + cmd:mkdepend + cmd:awk + cmd:gettext + cmd:intltool_update + cmd:intltool_merge + cmd:intltool_extract + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:automake + " + +PATCH() +{ + sed -i 's/-lresolv/-lnetwork/g' configure +} + +BUILD() +{ + libtoolize --force --copy --install + CFLAGS="-D__SVR4 -D__sun -D_XPG5" \ + LDFLAGS="-lbsd" \ + runConfigure ./configure \ + --disable-gtkui --disable-screensaver \ + --disable-meanwhile --disable-dbus --disable-gstreamer --disable-vv \ + --disable-avahi --disable-gnutls --disable-tcl -enable-textui \ + --with-nspr-includes=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} \ + --with-nspr-libs=$(finddir B_SYSTEM_LIB_DIRECTORY)/${secondaryArchSubDir} \ + --with-nss-includes=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir}/nss \ + --with-nss-libs=$(finddir B_SYSTEM_LIB_DIRECTORY)/${secondaryArchSubDir} \ + --with-ncurses-headers=$(finddir B_SYSTEM_HEADERS_DIRECTORY)/${secondaryArchSubDir} + make $jobArgs +} + +INSTALL() +{ + make install + rm -rf $prefix/share + + packageEntries finch $binDir + + prepareInstalledDevelLib libpurple + prepareInstalledDevelLib libgnt + packageEntries devel $developDir +} + +# ----- devel package ------------------------------------------------------ + +PROVIDES_devel=" + libpurple${secondaryArchSuffix}_devel = $portVersion + devel:libpurple$secondaryArchSuffix = $portVersion + devel:libgnt$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + libpurple$secondaryArchSuffix == $portVersion base + " + +# ----- finch package ------------------------------------------------------ + +PROVIDES_finch=" + libpurple${secondaryArchPrefix}_finch = $portVersion + cmd:finch$secondaryArchSuffix + " +REQUIRES_finch=" + haiku${secondaryArchSuffix} + libpurple$secondaryArchSuffix == $portVersion base + lib:libffi$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libgmodule_2.0$secondaryArchSuffix + lib:libgobject_2.0$secondaryArchSuffix + lib:libgthread_2.0$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libidn$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libncurses${secondaryArchSuffix} + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " From 31a7d8caa9e478fb879244a3d70d5419c9489a29 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Wed, 14 Jan 2015 19:16:33 +0000 Subject: [PATCH 320/326] LMarbles: Move config and preferences to user settings dir --- games-puzzle/lmarbles/lmarbles-1.0.8.recipe | 6 +- .../lmarbles/patches/lmarbles-1.0.8.patchset | 83 ++++++++++++++++++- 2 files changed, 84 insertions(+), 5 deletions(-) diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe index 41bbeb6cd..af7252acd 100644 --- a/games-puzzle/lmarbles/lmarbles-1.0.8.recipe +++ b/games-puzzle/lmarbles/lmarbles-1.0.8.recipe @@ -13,7 +13,6 @@ REVISION="2" LICENSE="GNU GPL v2" COPYRIGHT="2000 Michael Speck" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -GLOBAL_WRITABLE_FILES="var/lmarbles.prfs keep-old" PATCHES="lmarbles-1.0.8.patchset" PROVIDES=" @@ -55,6 +54,11 @@ INSTALL() make install mkdir -p $appsDir mv $binDir/lmarbles $appsDir/LMarbles + + rm $localStateDir/lmarbles.prfs + rm -rf $dataDir/applications + rm -rf $dataDir/icons + addAppDeskbarSymlink $appsDir/LMarbles LMarbles mimeset -f $appsDir/LMarbles } diff --git a/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset b/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset index ae0e5c29e..898a87f1a 100644 --- a/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset +++ b/games-puzzle/lmarbles/patches/lmarbles-1.0.8.patchset @@ -1,8 +1,11 @@ -From 6b5f57906db0f0fd8a15fc60da2a791d9ea2bc36 Mon Sep 17 00:00:00 2001 +From 9045675625d6ca5bc0c56bbd2be5498ab99776b9 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 5 Jan 2015 17:41:59 +0100 -Subject: Apply original lmarbles patch +Subject: [PATCH 1/3] Apply original lmarbles patch +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 543fb95..b012313 100755 @@ -30,11 +33,15 @@ index 543fb95..b012313 100755 1.8.3.4 -From f837403562b62f6aa17a967597fe61e54499a7bb Mon Sep 17 00:00:00 2001 +From a5a1d08c9a5754c3f790088cec87de41a6ac84c5 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 5 Jan 2015 17:54:53 +0100 -Subject: Have lmarbles use find_directory for config +Subject: [PATCH 2/3] Have lmarbles use find_directory for config +--- + src/cfg.c | 10 ++++++++-- + src/profile.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/cfg.c b/src/cfg.c index 2831c1b..4d713f5 100644 @@ -103,3 +110,71 @@ index 218c856..9ebf47b 100644 -- 1.8.3.4 + +From b956be01acbcbf76175ee3a2303f87a99e501320 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Wed, 14 Jan 2015 18:38:13 +0000 +Subject: [PATCH 3/3] Move lmarbles config to LGames folder + +--- + src/cfg.c | 6 +++++- + src/profile.c | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/cfg.c b/src/cfg.c +index 4d713f5..d9ec8f0 100644 +--- a/src/cfg.c ++++ b/src/cfg.c +@@ -27,6 +27,7 @@ + + #ifdef __HAIKU__ + #include ++#include + #endif + + #ifdef _WIN32 +@@ -45,7 +46,10 @@ void C_StPth() + { + DIR *dir; + #if defined(__HAIKU__) +- find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, c_pth, sizeof(c_pth) - 1); ++ size_t length; ++ find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, c_pth, sizeof(c_pth) - 1); ++ length = strlen(c_pth); ++ snprintf( c_pth+length, sizeof(c_pth)-(1+length), "/LGames" ); + #elif defined(_WIN32) + snprintf( c_pth, sizeof(c_pth)-1, "%s/lgames", (getenv( "HOME" )?getenv( "HOME" ):".") ); + #else +diff --git a/src/profile.c b/src/profile.c +index 9ebf47b..927f217 100644 +--- a/src/profile.c ++++ b/src/profile.c +@@ -24,6 +24,7 @@ + + #ifdef __HAIKU__ + #include ++#include + #endif + + // profiles // +@@ -39,13 +40,16 @@ extern Cfg cfg; + /* initialize dyn list and source path */ + void Prf_Ini() + { ++ size_t length; + DL_Ini(&prfs); + prfs.flgs = DL_AUTODEL; + prfs.cb = Prf_Del; + #ifdef __HAIKU__ + find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, prf_pth, + sizeof(prf_pth) - 1); +- strcat(prf_pth, "/lmarbles.prfs"); ++ length = strlen(prf_pth); ++ snprintf(prf_pth + length, sizeof(prf_pth)-(1+length), ++ "/LGames/lmarbles.prfs"); + #else + sprintf(prf_pth, "%s/lmarbles.prfs", PRF_DIR); + #endif +-- +1.8.3.4 + From ad1fa2ba9213cc5ce7923d2e49e38c4e9313890b Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Wed, 14 Jan 2015 19:51:18 +0000 Subject: [PATCH 321/326] LPairs: Move config to user settings directory --- games-puzzle/lpairs/lpairs-1.0.4.recipe | 5 +- .../lpairs/patches/lpairs-1.0.4.patch | 11 --- .../lpairs/patches/lpairs-1.0.4.patchset | 73 +++++++++++++++++++ 3 files changed, 77 insertions(+), 12 deletions(-) delete mode 100644 games-puzzle/lpairs/patches/lpairs-1.0.4.patch create mode 100644 games-puzzle/lpairs/patches/lpairs-1.0.4.patchset diff --git a/games-puzzle/lpairs/lpairs-1.0.4.recipe b/games-puzzle/lpairs/lpairs-1.0.4.recipe index 137eeec41..cd69887de 100644 --- a/games-puzzle/lpairs/lpairs-1.0.4.recipe +++ b/games-puzzle/lpairs/lpairs-1.0.4.recipe @@ -10,7 +10,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="2001 Michael Speck" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -PATCHES="lpairs-1.0.4.patch" +PATCHES="lpairs-1.0.4.patchset" PROVIDES=" lpairs = $portVersion @@ -46,5 +46,8 @@ INSTALL() { make install + rm -rf $dataDir/applications + rm -rf $dataDir/icons + addAppDeskbarSymlink $binDir/lpairs LPairs } diff --git a/games-puzzle/lpairs/patches/lpairs-1.0.4.patch b/games-puzzle/lpairs/patches/lpairs-1.0.4.patch deleted file mode 100644 index c9f820fbf..000000000 --- a/games-puzzle/lpairs/patches/lpairs-1.0.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lpairs-1.0.4/configure.org 2014-08-25 20:17:46.978059264 +0200 -+++ lpairs-1.0.4/configure 2014-08-25 20:13:42.108265472 +0200 -@@ -13034,7 +13034,7 @@ - localedir=$datadir/locale - locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" - --inst_dir=$datadir/games/lpairs -+inst_dir=$datadir/lpairs - inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" - - # Check whether --enable-install was given. diff --git a/games-puzzle/lpairs/patches/lpairs-1.0.4.patchset b/games-puzzle/lpairs/patches/lpairs-1.0.4.patchset new file mode 100644 index 000000000..967dab056 --- /dev/null +++ b/games-puzzle/lpairs/patches/lpairs-1.0.4.patchset @@ -0,0 +1,73 @@ +From 62c097ba3a2dc90d55c7064ca9c28094354a7eb4 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Wed, 14 Jan 2015 19:19:28 +0000 +Subject: [PATCH 1/2] applying patch lpairs-1.0.4.patch + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 4dcecb1..a1908af 100755 +--- a/configure ++++ b/configure +@@ -13034,7 +13034,7 @@ fi + localedir=$datadir/locale + locdir_flag="-DLOCALEDIR=\\\"$localedir\\\"" + +-inst_dir=$datadir/games/lpairs ++inst_dir=$datadir/lpairs + inst_flag="-DSRC_DIR=\\\"$inst_dir/\\\"" + + # Check whether --enable-install was given. +-- +1.8.3.4 + + +From 563cfd6ddafe187d5555f801c539a16bccf960e0 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Wed, 14 Jan 2015 19:36:34 +0000 +Subject: [PATCH 2/2] Move config to LGames folder in user settings + +--- + lpairs/cfg.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/lpairs/cfg.c b/lpairs/cfg.c +index 301878a..a786e39 100644 +--- a/lpairs/cfg.c ++++ b/lpairs/cfg.c +@@ -15,6 +15,11 @@ + * * + ***************************************************************************/ + ++#ifdef __HAIKU__ ++#include ++#include ++#endif ++ + #include + #include + #include +@@ -32,10 +37,18 @@ Cfg cfg; + */ + void C_StPth(char *p) + { ++ size_t length; + memset( c_pth, 0, sizeof( c_pth ) ); + if (p[0] == '~') { ++#ifdef __HAIKU__ ++ find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ c_pth, sizeof(c_pth) - 1); ++ length = strlen(c_pth); ++ snprintf(c_pth+length, sizeof(c_pth)-(1+length), "/LGames%s", p+1); ++#else + snprintf(c_pth, sizeof(c_pth)-1, "%s%s", + home_dir, p+1); ++#endif + } + else + strncpy(c_pth, p, sizeof(c_pth)-1); +-- +1.8.3.4 + From 958f88d1bd848abdc2a94f25d653367121815247 Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Wed, 14 Jan 2015 21:08:48 +0000 Subject: [PATCH 322/326] LGeneral: Move config and save files to user settings directory --- games-puzzle/lgeneral/lgeneral-1.2.3.recipe | 5 +- .../lgeneral/patches/lgeneral-1.2.3.patch | 20 ----- .../lgeneral/patches/lgeneral-1.2.3.patchset | 89 +++++++++++++++++++ 3 files changed, 93 insertions(+), 21 deletions(-) delete mode 100644 games-puzzle/lgeneral/patches/lgeneral-1.2.3.patch create mode 100644 games-puzzle/lgeneral/patches/lgeneral-1.2.3.patchset diff --git a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe index a60248823..8520e06df 100644 --- a/games-puzzle/lgeneral/lgeneral-1.2.3.recipe +++ b/games-puzzle/lgeneral/lgeneral-1.2.3.recipe @@ -14,7 +14,7 @@ LICENSE="GNU GPL v2" COPYRIGHT="Michael Speck, Leo Savernik, Peter Ivanyi" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -PATCHES="lgeneral-1.2.3.patch" +PATCHES="lgeneral-1.2.3.patchset" PROVIDES=" lgeneral = $portVersion @@ -60,6 +60,9 @@ BUILD() INSTALL() { make install + + rm -rf $dataDir/applications + rm -rf $dataDir/icons $binDir/lgc-pg -s ./pg-data addAppDeskbarSymlink $binDir/lgeneral LGeneral diff --git a/games-puzzle/lgeneral/patches/lgeneral-1.2.3.patch b/games-puzzle/lgeneral/patches/lgeneral-1.2.3.patch deleted file mode 100644 index 1719eb095..000000000 --- a/games-puzzle/lgeneral/patches/lgeneral-1.2.3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lgeneral-1.2.3/configure.org 2012-04-20 20:50:03.000000000 +0200 -+++ lgeneral-1.2.3/configure 2014-07-14 16:31:39.049283072 +0200 -@@ -5314,7 +5314,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lm $LIBS" -+LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5368,7 +5368,7 @@ - #define HAVE_LIBM 1 - _ACEOF - -- LIBS="-lm $LIBS" -+ LIBS="$LIBS" - - else - { { echo "$as_me:$LINENO: error: maths library is needed" >&5 diff --git a/games-puzzle/lgeneral/patches/lgeneral-1.2.3.patchset b/games-puzzle/lgeneral/patches/lgeneral-1.2.3.patchset new file mode 100644 index 000000000..2f740fdbd --- /dev/null +++ b/games-puzzle/lgeneral/patches/lgeneral-1.2.3.patchset @@ -0,0 +1,89 @@ +From a7b2bc562fb3a4403fefc4061b8730f27bade615 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Mon, 12 Jan 2015 20:01:38 +0000 +Subject: [PATCH 1/2] applying patch lgeneral-1.2.3.patch + +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 846e301..e6073fd 100755 +--- a/configure ++++ b/configure +@@ -5314,7 +5314,7 @@ if test "${ac_cv_lib_m_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lm $LIBS" ++LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5368,7 +5368,7 @@ if test $ac_cv_lib_m_main = yes; then + #define HAVE_LIBM 1 + _ACEOF + +- LIBS="-lm $LIBS" ++ LIBS="$LIBS" + + else + { { echo "$as_me:$LINENO: error: maths library is needed" >&5 +-- +1.8.3.4 + + +From b29a7822ee12df83585548077267afe2be0c78e1 Mon Sep 17 00:00:00 2001 +From: Markus Himmel +Date: Wed, 14 Jan 2015 20:15:41 +0000 +Subject: [PATCH 2/2] Move main config + +--- + src/config.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/src/config.c b/src/config.c +index 5baa759..b44e162 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -22,6 +22,13 @@ + #include + #include + #include ++ ++#ifdef __HAIKU__ ++#include ++#include ++#include ++#endif ++ + #include "sdl.h" + #include "config.h" + #include "parser.h" +@@ -32,13 +39,21 @@ Config config; + /* check if config directory exists; if not create it and set config_dir */ + void check_config_dir_name() + { ++ size_t length; + struct stat info; + #ifndef INSTALLDIR + /* if no installation store config to current directory not home */ + sprintf( config.dir_name, "." ); +-#else ++#elif __HAIKU__ ++ find_directory(B_USER_SETTINGS_DIRECTORY, dev_for_path("/boot"), false, ++ config.dir_name, sizeof(config.dir_name) - 1); ++ length = strlen(config.dir_name); ++ snprintf(config.dir_name + length, sizeof(config.dir_name) - (1 + length), ++ "/LGames"); ++ fprintf( stderr, "HAIKU: Config path is %s\n", config.dir_name); ++#else + sprintf( config.dir_name, "%s/.lgames", getenv( "HOME" ) ); +-#endif ++#endif + if ( stat( config.dir_name, &info ) != 0 ) { + int res; + +-- +1.8.3.4 + From 5e595387686421bab7ecd8ab08620c2f5cbb4096 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Thu, 15 Jan 2015 01:55:45 +0000 Subject: [PATCH 323/326] Real final update. --- games-strategy/eggchess/eggchess-1.0.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/eggchess/eggchess-1.0.recipe b/games-strategy/eggchess/eggchess-1.0.recipe index b8be889da..1022c86d2 100644 --- a/games-strategy/eggchess/eggchess-1.0.recipe +++ b/games-strategy/eggchess/eggchess-1.0.recipe @@ -4,7 +4,7 @@ However, instead of using Xs and Os, you use different egg forms. \ What's more, you can actually change a square with something else. \ The first one to get three-in-a-row with the same egg form wins." HOMEPAGE="http://www.haikuware.com/directory/view-details/development/games/egg-chess-ppc" -SRC_URI="https://codeload.github.com/psirockin/EggChess/zip/feature" +SRC_URI="https://codeload.github.com/HaikuArchives/EggChess/zip/feature" CHECKSUM_SHA256="67b8a6061169031493103d0a32dbdcd3af3c69d540cf1294e249e199eb140bc0" SOURCE_DIR="EggChess-feature" REVISION="1" From 80cefe04607c4da3881809902304f3f3cfc5e8f0 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 14 Jan 2015 23:22:20 -0500 Subject: [PATCH 324/326] golang: requires git. Nothing changed in the port, I assume that somehow HaikuPorter was previously pulling in Git and now it isn't. --- dev-lang/golang/golang-1.3.recipe | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-lang/golang/golang-1.3.recipe b/dev-lang/golang/golang-1.3.recipe index c80d3a84e..7b03a93c2 100644 --- a/dev-lang/golang/golang-1.3.recipe +++ b/dev-lang/golang/golang-1.3.recipe @@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/zhuowei/go-1-3-haiku/downloads/golang-1.3-porthai SOURCE_DIR="golang-1.3-porthaiku2" CHECKSUM_SHA256="7ec832d47bf5080f579aa80f8f196bf0b8f60aa99718510e8028586255f716c7" -REVISION="1" +REVISION="2" LICENSE="BSD (3-clause)" COPYRIGHT="2009-2014 The Go Authors" @@ -53,6 +53,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:hg + cmd:git " BUILD() @@ -65,7 +66,7 @@ BUILD() export GOPATH=/tmp export GOROOT=`pwd` bin/go get code.google.com/p/go.tools/cmd/godoc - bin/go get code.google.com/p/go.tools/cmd/vet + bin/go get code.google.com/p/go.tools/cmd/vet } INSTALL() From 6bcc8bda67edab3cd4334ec660f81179700e5466 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 15 Jan 2015 01:19:26 -0800 Subject: [PATCH 325/326] Add recipes and patchsets for pnet and treecc --- dev-dotnet/pnet/patches/pnet-0.8.0.patchset | 138 ++++++++++++++++++ dev-dotnet/pnet/patches/pnet-CVS.diff | 41 ------ dev-dotnet/pnet/pnet-0.8.0.recipe | 106 ++++++++++++-- .../treecc/patches/treecc-0.3.10.patchset | 32 ++++ dev-util/treecc/treecc-0.3.10.recipe | 57 ++++++++ dev-util/treecc/treecc-CVS.diff | 35 ----- 6 files changed, 321 insertions(+), 88 deletions(-) create mode 100644 dev-dotnet/pnet/patches/pnet-0.8.0.patchset delete mode 100644 dev-dotnet/pnet/patches/pnet-CVS.diff create mode 100644 dev-util/treecc/patches/treecc-0.3.10.patchset create mode 100644 dev-util/treecc/treecc-0.3.10.recipe delete mode 100644 dev-util/treecc/treecc-CVS.diff diff --git a/dev-dotnet/pnet/patches/pnet-0.8.0.patchset b/dev-dotnet/pnet/patches/pnet-0.8.0.patchset new file mode 100644 index 000000000..935ce0027 --- /dev/null +++ b/dev-dotnet/pnet/patches/pnet-0.8.0.patchset @@ -0,0 +1,138 @@ +From 49ff4bf74fef8c191e72658f3b939ec3db46102c Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Wed, 14 Jan 2015 20:47:28 -0800 +Subject: Haiku fixes + + +diff --git a/libgc/include/private/gcconfig.h b/libgc/include/private/gcconfig.h +index 5f897a4..2882878 100644 +--- a/libgc/include/private/gcconfig.h ++++ b/libgc/include/private/gcconfig.h +@@ -229,6 +229,16 @@ + # define BEOS + # define mach_type_known + # endif ++# if defined(__HAIKU__) && defined(_X86_) ++# define I386 ++# define BEOS ++# define mach_type_known ++# endif ++# if defined(__HAIKU__) && defined(_X86_64_) ++# define X86_64 ++# define BEOS ++# define mach_type_known ++# endif + # if defined(LINUX) && (defined(i386) || defined(__i386__)) + # define I386 + # define mach_type_known +-- +1.8.3.4 + + +From 92ed68680f8d2940f29e6571bd998e699f4d33c0 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Wed, 14 Jan 2015 23:31:05 -0800 +Subject: Fix a few gcc2 issues + + +diff --git a/engine/debugger.c b/engine/debugger.c +index 65f52c7..e6cef4a 100644 +--- a/engine/debugger.c ++++ b/engine/debugger.c +@@ -104,6 +104,7 @@ static int SocketIO_Open(ILDebuggerIO *io, const char *connectionString) + { + ILSysIOHandle sockfd; + int port = 4571; ++ unsigned char addr[16]; + + /* + * Create socket descriptor +@@ -120,7 +121,6 @@ static int SocketIO_Open(ILDebuggerIO *io, const char *connectionString) + + /* Convert the end point into a sockaddr buffer like in + * CombinedToSerialized() in socket.c */ +- unsigned char addr[16]; + addr[0] = 2; /* address family - AF_INET */ + addr[1] = 0; + addr[2] = (unsigned char)(port >> 8); /* port */ +diff --git a/engine/lib_string.c b/engine/lib_string.c +index bb2a081..3206794 100644 +--- a/engine/lib_string.c ++++ b/engine/lib_string.c +@@ -1025,12 +1025,15 @@ ILInt32 _IL_String_FindInRange(ILExecThread *thread, System_String *_this, + ILInt32 srcFirst, ILInt32 srcLast, + ILInt32 step, System_String *dest) + { ++ ILUInt16 *buf1; ++ ILUInt16 *buf2; ++ ILUInt32 size; + /* Searches for zero length strings always match */ + if(dest->length == 0) + return srcFirst; +- ILUInt16 *buf1 = StringToBuffer(_this) + srcFirst; +- ILUInt16 *buf2 = StringToBuffer(dest); +- ILUInt32 size = (ILUInt32)(dest->length * sizeof(ILUInt16)); ++ buf1 = StringToBuffer(_this) + srcFirst; ++ buf2 = StringToBuffer(dest); ++ size = (ILUInt32)(dest->length * sizeof(ILUInt16)); + if(step > 0) + { + /* Scan forwards for the string */ +-- +1.8.3.4 + + +From b378bbb5da796ae92b7b3c64ee7c34cdbf2c277d Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Thu, 15 Jan 2015 00:44:19 -0800 +Subject: Add Haiku build support into configure.in + + +diff --git a/configure.in b/configure.in +index 04db657..740f963 100644 +--- a/configure.in ++++ b/configure.in +@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM + + dnl Initialize automake. + AM_INIT_AUTOMAKE(pnet, 0.8.0) +-AM_CONFIG_HEADER(include/il_config.h) ++AC_CONFIG_HEADERS(include/il_config.h) + AM_MAINTAINER_MODE + + # Tell everyone if we are crosscompiling +@@ -44,6 +44,10 @@ else + WINLIBS="-lole32" + suppress_libm=yes + ;; ++ *-*-haiku*) ++ SOCKETLIBS="-lnetwork" ++ suppress_libm=yes ++ ;; + *) ;; + esac + fi +@@ -261,6 +265,8 @@ if test "$THREADS" = "no"; then + *-*-beos*) + THREADS=beos + ;; ++ *-*-haiku*) ++ THREADS=posix + esac + fi + +@@ -326,6 +332,11 @@ case "$THREADS" in + *-*-irix*) + AC_DEFINE(GC_IRIX_THREADS, 1, [Define to use libgc irix thread support]) + ;; ++ *-*-haiku*) ++ AC_DEFINE(GC_LINUX_THREADS, 1, [Define to use libgc haiku thread support]) ++ INCLUDES="$INCLUDES" ++ THREADLIBS="" ++ ;; + esac + ;; + win32) +-- +1.8.3.4 + diff --git a/dev-dotnet/pnet/patches/pnet-CVS.diff b/dev-dotnet/pnet/patches/pnet-CVS.diff deleted file mode 100644 index 0bc52884f..000000000 --- a/dev-dotnet/pnet/patches/pnet-CVS.diff +++ /dev/null @@ -1,41 +0,0 @@ -? config.sub -? libtool -? ltmain.sh -? ylwrap -? libffi/Makefile.in -? libffi/aclocal.m4 -? libffi/configure -? libffi/fficonfig.h.in -? libffi/include/Makefile.in -? libgc/Makefile.in -? libgc/aclocal.m4 -? libgc/config.guess -? libgc/config.sub -? libgc/configure -? libgc/ltmain.sh -? libgc/doc/Makefile.in -? libgc/include/Makefile.in -Index: configure.in -=================================================================== -RCS file: /sources/dotgnu-pnet/pnet/configure.in,v -retrieving revision 1.229 -diff -u -r1.229 configure.in ---- configure.in 9 Dec 2007 21:17:20 -0000 1.229 -+++ configure.in 18 May 2008 11:43:34 -0000 -@@ -262,7 +262,7 @@ - *-*-darwin*) - THREADS=posix - ;; -- *-*-beos*) -+ *-*-beos*|*-*-haiku*) - THREADS=beos - ;; - esac -@@ -375,6 +375,7 @@ - fi - AC_CHECK_LIB(dl, dlopen) - AC_CHECK_LIB(socket, connect) -+AC_CHECK_LIB(network, connect) - AC_CHECK_LIB(nsl, gethostbyname) - AC_CHECK_LIB(rt, clock_gettime) - have_libz=no diff --git a/dev-dotnet/pnet/pnet-0.8.0.recipe b/dev-dotnet/pnet/pnet-0.8.0.recipe index 0f5f62432..13fd86970 100644 --- a/dev-dotnet/pnet/pnet-0.8.0.recipe +++ b/dev-dotnet/pnet/pnet-0.8.0.recipe @@ -1,26 +1,108 @@ -DESCRIPTION="GNU Portable.NET class library" +SUMMARY="DotGNU Portable .NET suite" +DESCRIPTION="DotGNU Portable.NET is a portable suite of tools (including a C# \ +compiler, assembler, and runtime engine) for non-Microsoft platforms. It is \ +part of the DotGNU meta-project" HOMEPAGE="http://www.dotgnu.org/pnet.html" SRC_URI="http://download.savannah.gnu.org/releases/dotgnu-pnet/pnet-0.8.0.tar.gz" +CHECKSUM_SHA256="f1340ae3567a5f05729d9d201bd719268ceca07bde4f62c58a92abfda64551bb" REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-util/treecc" -CHECKSUM_MD5="84cb3612d7175bd9e476c88e66fe19f9" +LICENSE="GNU GPL v1" +COPYRIGHT="2001-2006 Southern Storm Software, Pty Ltd. + 1984-2002 Free Software Foundation, Inc. + 2003 Gopal.V + 2002 FSF INDIA + 2002 Richard Baumann + " +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + pnet = $portVersion + lib:libpnet = $portVersion + cmd:al + cmd:cli_unknown_ar + cmd:cli_unknown_cpp + cmd:cli_unknown_gcc + cmd:cli_unknown_ranlib + cmd:cli_unknown_size + cmd:cli_unknown_strip + cmd:clrwrap + cmd:csant + cmd:cscc + cmd:cscc_cpp + cmd:csdoc + cmd:csdoc2hier + cmd:csdoc2html + cmd:csdoc2texi + cmd:cssrc2html + cmd:ilalink + cmd:ilasm + cmd:ildasm + cmd:ildd + cmd:ilfind + cmd:ilgac + cmd:ilheader + cmd:ilnative + cmd:ilranlib + cmd:ilrun + cmd:ilsize + cmd:ilstrip + cmd:ilverify + cmd:resgen + " + +PROVIDES_devel=" + devel:libILAsm = $portVersion compat >= 0 + devel:libILCodeGen = $portVersion compat >= 0 + devel:libILDumpAsm = $portVersion compat >= 0 + devel:libILEngine = $portVersion compat >= 0 + devel:libILImage = $portVersion compat >= 0 + devel:libILLink = $portVersion compat >= 0 + devel:libILSupport = $portVersion compat >= 0 + " + +REQUIRES=" + haiku + lib:libncurses + lib:zlib + " + +BUILD_REQUIRES=" + haiku_devel + devel:libncurses + " + +BUILD_PREREQUIRES=" + cmd:gcc + cmd:make + cmd:ld + cmd:find + cmd:flex + cmd:awk + cmd:libtoolize + cmd:aclocal + cmd:autoconf + cmd:autoconf + cmd:treecc + " + +PATCHES="pnet-0.8.0.patchset" + BUILD() { - cd pnet-0.8.0 libtoolize --force --copy --install aclocal - automake --add-missing autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + automake --add-missing + runConfigure ./configure --without-libffi --without-libgc --enable-shared \ + --libdir=$developLibDir + make $jobArgs } INSTALL() { - cd pnet-0.8.0 make install + + packageEntries devel \ + $developDir \ + $manDir } - -#LICENSE="" -#COPYRIGHT="" diff --git a/dev-util/treecc/patches/treecc-0.3.10.patchset b/dev-util/treecc/patches/treecc-0.3.10.patchset new file mode 100644 index 000000000..89e488089 --- /dev/null +++ b/dev-util/treecc/patches/treecc-0.3.10.patchset @@ -0,0 +1,32 @@ +From e10460f3da6ea18be1bec76f732354abe65c8233 Mon Sep 17 00:00:00 2001 +From: Scott McCreary +Date: Wed, 14 Jan 2015 16:44:08 -0800 +Subject: Add haiku as beos platform, add AC_CONFIG_HEADERS in place of + AM_CONFIG_HEADER + + +diff --git a/configure.in b/configure.in +index f8d2fc4..c80fefe 100644 +--- a/configure.in ++++ b/configure.in +@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. + AC_INIT(input.h) + AC_CANONICAL_SYSTEM + AM_INIT_AUTOMAKE(treecc, 0.3.10) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + + dnl Turn off the cygwin library if building for Win32. +@@ -23,7 +23,7 @@ AC_MSG_RESULT($platform_win32) + + AC_MSG_CHECKING([if building for BeOS platform]) + case "$host" in +- *-*-beos*) ++ *-*-beos*|*-*-haiku*) + platform_beos=yes + LDADD="" + ;; +-- +1.8.3.4 + diff --git a/dev-util/treecc/treecc-0.3.10.recipe b/dev-util/treecc/treecc-0.3.10.recipe new file mode 100644 index 000000000..2713c32a7 --- /dev/null +++ b/dev-util/treecc/treecc-0.3.10.recipe @@ -0,0 +1,57 @@ +SUMMARY="A compiler-compiler tool for aspect-oriented programming" +DESCRIPTION="\ +Tree Compiler-Compiler (treecc) is designed to assist in the development of \ +compilers and other language- based tools. It manages the generation of code \ +to handle abstract syntax trees and operations upon the trees. \ +" +HOMEPAGE="http://www.gnu.org/software/dotgnu/treecc/treecc.html" +SRC_URI="http://download.savannah.gnu.org/releases/dotgnu-pnet/treecc-0.3.10.tar.gz" +CHECKSUM_SHA256="5e9d20a6938e0c6fedfed0cabc7e9e984024e4881b748d076e8c75f1aeb6efe7" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2001-2003 Southern Storm Software, Pty Ltd + 2003 Free Software Foundation, Inc. + " +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + treecc = $portVersion + cmd:treecc = $portVersion + " + +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + cmd:awk + cmd:bison + cmd:libtoolize + cmd:aclocal + cmd:autoconf + " + +PATCHES="treecc-0.3.10.patchset" + +BUILD() +{ + sed -i "s/expr_c_LDADD = -lm/expr_c_LDADD = /" examples/Makefile* + libtoolize -fci + aclocal + autoconf + automake --add-missing + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install +# mkdir -p $binDir +# cp -a objects/projectx $binDir +} diff --git a/dev-util/treecc/treecc-CVS.diff b/dev-util/treecc/treecc-CVS.diff deleted file mode 100644 index 05ab32275..000000000 --- a/dev-util/treecc/treecc-CVS.diff +++ /dev/null @@ -1,35 +0,0 @@ -? ylwrap -Index: Makefile.am -=================================================================== -RCS file: /sources/dotgnu-pnet/treecc/Makefile.am,v -retrieving revision 1.12 -diff -u -p -r1.12 Makefile.am ---- Makefile.am 4 Jun 2007 10:14:29 -0000 1.12 -+++ Makefile.am 26 Apr 2008 19:49:11 -0000 -@@ -47,8 +47,8 @@ SKELETON_FILES = $(top_srcdir)/etc/c_ske - $(top_srcdir)/etc/cpp_gc_skel.h \ - $(top_srcdir)/etc/cpp_gc_skel.cc - --skels.c: $(SKELETON_FILES) mkskel-sh -- $(SHELL) mkskel-sh $(SKELETON_FILES) >skels.c -+skels.c: $(SKELETON_FILES) $(top_srcdir)/mkskel-sh -+ $(SHELL) $(top_srcdir)/mkskel-sh $(SKELETON_FILES) >skels.c - - CLEANFILES = skels.c - -Index: configure.in -=================================================================== -RCS file: /sources/dotgnu-pnet/treecc/configure.in,v -retrieving revision 1.52 -diff -u -p -r1.52 configure.in ---- configure.in 4 Jun 2007 18:45:48 -0000 1.52 -+++ configure.in 26 Apr 2008 19:49:11 -0000 -@@ -23,7 +23,7 @@ AC_MSG_RESULT($platform_win32) - - AC_MSG_CHECKING([if building for BeOS platform]) - case "$host" in -- *-*-beos*) -+ *-*-beos*|*-*-haiku*) - platform_beos=yes - LDADD="" - ;; From aef0e3aa9ec7d19ecb5ddeff33f087f127900c6a Mon Sep 17 00:00:00 2001 From: Humdinger Date: Thu, 15 Jan 2015 19:55:37 +0100 Subject: [PATCH 326/326] Changed app sig to the normally used format. Added app flag single launch. --- games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset | 2 +- games-puzzle/lmarbles/additional-files/lmarbles.rdef | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset b/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset index 02dd8bc98..700370ddc 100644 --- a/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset +++ b/games-puzzle/lbreakout2/patches/lbreakout2-2.6.4.patchset @@ -16,7 +16,7 @@ index 0000000..6b165ae --- /dev/null +++ b/LBreakout2.rdef @@ -0,0 +1,33 @@ -+resource app_signature "application/x-vnd-lbreakout"; ++resource app_signature "application/x-vnd.lgames.lbreakout2"; + +resource app_flags B_SINGLE_LAUNCH; + diff --git a/games-puzzle/lmarbles/additional-files/lmarbles.rdef b/games-puzzle/lmarbles/additional-files/lmarbles.rdef index 22084485e..54d5d9acd 100644 --- a/games-puzzle/lmarbles/additional-files/lmarbles.rdef +++ b/games-puzzle/lmarbles/additional-files/lmarbles.rdef @@ -1,5 +1,7 @@ resource app_signature "application/x-vnd.lgames.lmarbles"; +resource app_flags B_SINGLE_LAUNCH; + resource vector_icon array { $"6E63696604020106023D1D3F341202B40EF83D18AC49111A48F914FF00008200" $"0097FF020116023D20000000000000003D2000494000496000FF4700DD044A82"