From 6375af8cfbf47edc5687cb23284059bc5fe20fa2 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sun, 21 Dec 2014 22:03:22 +0200 Subject: [PATCH 01/89] 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 6ad8617d98b2d70163bc53f51b1bce070f53d7fc Mon Sep 17 00:00:00 2001 From: skykinetic Date: Fri, 2 Jan 2015 22:33:03 +0800 Subject: [PATCH 02/89] 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 03/89] 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 2d5912391cd90e0440b066e206669a7e1b8959de Mon Sep 17 00:00:00 2001 From: skykinetic Date: Mon, 5 Jan 2015 21:42:19 +0800 Subject: [PATCH 04/89] 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 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 05/89] 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 dc9380de65db324d8d72f605e94cc1852bcbaf9b Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Mon, 5 Jan 2015 20:05:06 +0100 Subject: [PATCH 06/89] 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 07/89] 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 f1bd380c3c53e4b4ab02ed2f3e23aa511d7980ce Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Wed, 7 Jan 2015 01:54:48 +0000 Subject: [PATCH 08/89] 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 09/89] 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 10/89] 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 11/89] 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 12/89] 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 13/89] 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 14/89] 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 15/89] 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 16/89] 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 17/89] 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 18/89] 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 19/89] 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 20/89] 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 21/89] 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 22/89] 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 23/89] 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 24/89] 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 25/89] 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 26/89] 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 27/89] 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 28/89] 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 29/89] 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 30/89] 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 31/89] 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 32/89] 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 33/89] 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 34/89] 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 35/89] 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 36/89] 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 37/89] 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 38/89] 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 39/89] 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 40/89] 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 41/89] 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 42/89] 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 43/89] 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 44/89] 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 45/89] 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 46/89] 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 47/89] 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 48/89] 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 8b9a387b0d8ce17694009073101bcac89b9cbedf Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Fri, 9 Jan 2015 17:47:23 +0100 Subject: [PATCH 49/89] 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 50/89] 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 51/89] 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 52/89] 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 53/89] 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 54/89] 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 55/89] 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 56/89] 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 57/89] 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 58/89] 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 59/89] 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 60/89] 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 61/89] 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 62/89] 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 63/89] 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 64/89] 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 65/89] 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 66/89] 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 67/89] 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 68/89] 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 69/89] 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 70/89] 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 71/89] 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 72/89] 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 73/89] 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 74/89] 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 9b7eb2e3ca3fe736b110afbd85c578f90e1e92ae Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Sun, 11 Jan 2015 17:58:59 +0100 Subject: [PATCH 75/89] 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 76/89] 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 77/89] 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 78/89] 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 79/89] 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 80/89] 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 81/89] 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 82/89] 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 83/89] 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 1971004f25c951c01bbdcb8f722fafc30424aefe Mon Sep 17 00:00:00 2001 From: Markus Himmel Date: Sun, 11 Jan 2015 21:03:55 +0000 Subject: [PATCH 84/89] 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 9dafc8d007ebe9dba2ec21c74eb0570cac9e7c77 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 12 Jan 2015 12:12:04 -0500 Subject: [PATCH 85/89] 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 86/89] 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 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 87/89] 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 88/89] 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 89/89] 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"