From 0fa50d489e96e7ee49fcef4dfd9c562a67a0e272 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 15 Jan 2015 17:37:15 +0000 Subject: [PATCH 01/42] Add a new program, jq --- app-misc/jq/jq-1.4.recipe | 54 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 app-misc/jq/jq-1.4.recipe diff --git a/app-misc/jq/jq-1.4.recipe b/app-misc/jq/jq-1.4.recipe new file mode 100644 index 000000000..24ad2bc52 --- /dev/null +++ b/app-misc/jq/jq-1.4.recipe @@ -0,0 +1,54 @@ +SUMMARY="A lightweight and flexible command-line JSON processor" +DESCRIPTION="jq is like sed for JSON data – you can use it to slice \ +and filter and map and transform structured data with the same ease \ +that sed, awk, grep and friends let you play with text. \ +It is written in portable C, and it has zero runtime dependencies. \ +You can download a single binary, scp it to a far away machine, \ +and expect it to work. It can mangle the data format that you have into \ +the one that you want with very little effort, and the program to do so \ +is often shorter and simpler than you’d expect. +" +HOMEPAGE="http://stedolan.github.io/jq/" +SRC_URI="http://stedolan.github.io/jq/download/source/jq-1.4.tar.gz" +CHECKSUM_SHA256="998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2012 Stephen Dolan" + +ARCHITECTURES="x86" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + jq = $portVersion + cmd:jq${secondaryArchSuffix} = $portVersion + " + +REQUIRES=" + haiku${secondaryArchSuffix} + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc${secondaryArchSuffix} + cmd:awk + " + +BUILD() +{ + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + mkdir -p $binDir + cp -a jq $binDir +} From eb00da4afa6f60e840fc1eccae1fe13bdd1fde78 Mon Sep 17 00:00:00 2001 From: Humdinger Date: Thu, 15 Jan 2015 19:18:47 +0100 Subject: [PATCH 02/42] Updated QuickLaunch. Don't ignore /system/bin/ by default. Now that more and more ports are available for Haiku, some GUI apps do appear in that folder... --- .../quicklaunch/quicklaunch-0.9.9.recipe | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 haiku-apps/quicklaunch/quicklaunch-0.9.9.recipe diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.9.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.9.recipe new file mode 100644 index 000000000..1c317f502 --- /dev/null +++ b/haiku-apps/quicklaunch/quicklaunch-0.9.9.recipe @@ -0,0 +1,57 @@ +SUMMARY="A tool to quickly start any installed application" +DESCRIPTION=" +QuickLaunch is a small launcher tool that helps you to quickly start any \ +installed application (as long as it has an app-signature). Simply start \ +to enter the name of an application and QuickLaunch will find all programs \ +matching these initial letters and show them in a list. +You choose an app from that list with the CursorUp/Down keys and launch it \ +by hitting RETURN. ESC quits QuickLaunch. + +It's recommended to set a key combo to start QuickLaunch with Haiku's \ +Shortcuts preferences. +" +HOMEPAGE="http://sourceforge.net/projects/quicklaunch-h/" +SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#01ca6d2e81fd63fee7715a16d87043b7d3a64798" +LICENSE="MIT" +COPYRIGHT="2014 Humdinger" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + quicklaunch = $portVersion + app:QuickLaunch = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + cmd:mkdepend + " + +USER_SETTINGS_FILES="settings/QuickLaunch_settings" + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + quicklaunchDir=$appsDir/QuickLaunch + mkdir -p $quicklaunchDir + + cp -af objects/QuickLaunch $quicklaunchDir + cp -af ReadMe.html $quicklaunchDir + cp -r images $quicklaunchDir + + chmod +x Add\ to\ Deskbar.sh + cp -af Add\ to\ Deskbar.sh $quicklaunchDir + + addAppDeskbarSymlink $quicklaunchDir/QuickLaunch +} From 77c146af8021637a9a9b4bea5cd2f054439e9aa0 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Thu, 15 Jan 2015 20:25:32 +0100 Subject: [PATCH 03/42] abe: Save game to B_USER_SETTINGS_DIRECTORY + fix crash on startup --- games-kids/abe/abe-1.1.recipe | 4 +- games-kids/abe/patches/abe-1.1.patch | 69 ++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 games-kids/abe/patches/abe-1.1.patch diff --git a/games-kids/abe/abe-1.1.recipe b/games-kids/abe/abe-1.1.recipe index f63def4e8..cb7949546 100644 --- a/games-kids/abe/abe-1.1.recipe +++ b/games-kids/abe/abe-1.1.recipe @@ -38,7 +38,9 @@ BUILD_PREREQUIRES=" cmd:automake cmd:autoconf " - + +PATCHES="abe-1.1.patch" + PATCH() { sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in diff --git a/games-kids/abe/patches/abe-1.1.patch b/games-kids/abe/patches/abe-1.1.patch new file mode 100644 index 000000000..cdb203f51 --- /dev/null +++ b/games-kids/abe/patches/abe-1.1.patch @@ -0,0 +1,69 @@ +diff --git a/src/Directories.c b/src/Directories.c +index cca0472..f43d181 100644 +--- a/src/Directories.c ++++ b/src/Directories.c +@@ -7,7 +7,12 @@ getHomeUserAbe() + { + + static char path[PATH_SIZE]; +-#ifndef WIN32 ++#ifdef WIN32 ++ sprintf(path, xstr(BASE_DIR) PATH_SEP); ++#elif __HAIKU__ ++ find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, path, PATH_SIZE); ++ strncat(path, "/abe/", PATH_SIZE); ++#else + struct passwd *pwent; + + pwent = getpwuid(getuid()); +@@ -17,8 +22,6 @@ getHomeUserAbe() + } + + sprintf(path, "%s%s", pwent->pw_dir, PATH_SEP ".abe" PATH_SEP); +-#else +- sprintf(path, xstr(BASE_DIR) PATH_SEP); + #endif + + return path; +diff --git a/src/Directories.h b/src/Directories.h +index 3abe73e..45e8d12 100644 +--- a/src/Directories.h ++++ b/src/Directories.h +@@ -9,6 +9,10 @@ + #include + #endif + ++#ifdef __HAIKU__ ++#include ++#endif ++ + // The macros xstr(s) and str(s) were extracted from + // http://gcc.gnu.org/onlinedocs/cpp/Stringification.html + // They are used to expand BASE_DIR . +diff --git a/src/Main.c b/src/Main.c +index 2520856..a158796 100644 +--- a/src/Main.c ++++ b/src/Main.c +@@ -90,12 +90,22 @@ main(int argc, char *argv[]) + int intro = 0; + char *mapname; + int mapwidth, mapheight; ++ char *directory; ++ char *sep; + + mainstruct.drawBackground = 1; + mainstruct.alphaBlend = 1; + mainstruct.effects_enabled = 1; + runmode = RUNMODE_SPLASH; + mainstruct.full_screen = 1; ++ ++ directory = strdup(argv[0]); ++ sep = strrchr(directory, '/'); ++ if (sep != NULL) { ++ *sep = '\0'; ++ chdir(directory); ++ } ++ free(directory); + + // my laptop can't handle fullscreen for some reason + #if defined(__APPLE__) || defined(__MACH_O__) From a1cf1af23e1eef443904d31a4fd08c647f906688 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 15 Jan 2015 01:13:25 -0500 Subject: [PATCH 04/42] php: remove old versions. --- dev-lang/php/patches/php-5.3.1.patch | 27 ------ dev-lang/php/patches/php-5.3.5.patch | 103 ----------------------- dev-lang/php/patches/php-5.4.34.patchset | 35 -------- dev-lang/php/php-5.3.4.recipe | 25 ------ dev-lang/php/php-5.3.5.recipe | 57 ------------- dev-lang/php/php-5.4.34.recipe | 73 ---------------- 6 files changed, 320 deletions(-) delete mode 100644 dev-lang/php/patches/php-5.3.1.patch delete mode 100644 dev-lang/php/patches/php-5.3.5.patch delete mode 100644 dev-lang/php/patches/php-5.4.34.patchset delete mode 100644 dev-lang/php/php-5.3.4.recipe delete mode 100644 dev-lang/php/php-5.3.5.recipe delete mode 100644 dev-lang/php/php-5.4.34.recipe diff --git a/dev-lang/php/patches/php-5.3.1.patch b/dev-lang/php/patches/php-5.3.1.patch deleted file mode 100644 index e4f86559b..000000000 --- a/dev-lang/php/patches/php-5.3.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -urN php-5.3.1/configure.in php-5.3.1-haiku/configure.in ---- php-5.3.1/configure.in 2009-11-18 19:43:33.000000000 +0000 -+++ php-5.3.1-haiku/configure.in 2009-11-28 07:39:12.000000000 +0000 -@@ -392,6 +392,11 @@ - PHP_CHECK_FUNC(gethostbyaddr, nsl) - PHP_CHECK_FUNC(yp_get_default_domain, nsl) - -+PHP_CHECK_FUNC(socket, network) -+PHP_CHECK_FUNC(socketpair, network) -+PHP_CHECK_FUNC(gethostname, network) -+PHP_CHECK_FUNC(gethostbyaddr, network) -+ - PHP_CHECK_FUNC(dlopen, dl) - if test "$ac_cv_func_dlopen" = "yes"; then - AC_DEFINE(HAVE_LIBDL, 1, [ ]) -diff -urN php-5.3.1/ext/standard/microtime.c php-5.3.1-haiku/ext/standard/microtime.c ---- php-5.3.1/ext/standard/microtime.c 2009-05-21 14:21:40.000000000 +0000 -+++ php-5.3.1-haiku/ext/standard/microtime.c 2009-11-28 07:39:20.000000000 +0000 -@@ -131,7 +131,7 @@ - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__)/* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); diff --git a/dev-lang/php/patches/php-5.3.5.patch b/dev-lang/php/patches/php-5.3.5.patch deleted file mode 100644 index c7c9ed758..000000000 --- a/dev-lang/php/patches/php-5.3.5.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -urN php-5.3.5/configure.in php-5.3.5-haiku/configure.in ---- php-5.3.5/configure.in 2011-01-05 16:35:33.016515072 +0000 -+++ php-5.3.5-haiku/configure.in 2011-02-04 13:58:33.000000000 +0000 -@@ -1,7 +1,7 @@ - ## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- autoconf -*- - dnl ## Process this file with autoconf to produce a configure script. - --divert(1) -+divert(1001) - - dnl ## Diversion 1 is the autoconf + automake setup phase. We also - dnl ## set the PHP version, deal with platform-specific compile -@@ -290,7 +290,7 @@ - sinclude(TSRM/tsrm.m4) - - --divert(2) -+divert(1002) - - dnl ## Diversion 2 is where we set PHP-specific options and come up - dnl ## with reasonable default values for them. We check for pthreads here -@@ -329,7 +329,7 @@ - PTHREADS_FLAGS - fi - --divert(3) -+divert(1003) - - dnl ## In diversion 3 we check for compile-time options to the PHP - dnl ## core and how to deal with different system dependencies. -@@ -675,7 +675,7 @@ - PHP_CRYPT_R_STYLE - fi - --divert(4) -+divert(1004) - - dnl ## In diversion 4 we check user-configurable general settings. - -@@ -916,7 +916,7 @@ - AC_MSG_RESULT([using system default]) - fi - --divert(5) -+divert(1005) - - dnl ## In diversion 5 we check which extensions should be compiled. - dnl ## All of these are normally in the extension directories. -diff -urN php-5.3.5/ext/date/php_date.c php-5.3.5-haiku/ext/date/php_date.c ---- php-5.3.5/ext/date/php_date.c 2010-11-18 11:33:42.044302336 +0000 -+++ php-5.3.5-haiku/ext/date/php_date.c 2011-02-04 14:09:21.000000000 +0000 -@@ -33,7 +33,7 @@ - - #ifdef PHP_WIN32 - static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } --#elif defined(__GNUC__) && __GNUC__ < 3 -+#elif (defined(__GNUC__) && __GNUC__ < 3) && (!defined __HAIKU__) - static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } - #else - static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } -diff -urN php-5.3.5/ext/standard/config.m4 php-5.3.5-haiku/ext/standard/config.m4 ---- php-5.3.5/ext/standard/config.m4 2010-06-17 10:22:03.023592960 +0000 -+++ php-5.3.5-haiku/ext/standard/config.m4 2011-02-04 13:58:33.000000000 +0000 -@@ -1,6 +1,6 @@ - dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- autoconf -*- - --divert(3)dnl -+divert(1003)dnl - - dnl - dnl Check if flush should be called explicitly after buffered io -@@ -342,7 +342,7 @@ - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) - AC_FUNC_FNMATCH - --divert(5)dnl -+divert(1005)dnl - - dnl - dnl Check if there is a support means of creating a new process -diff -urN php-5.3.5/ext/standard/microtime.c php-5.3.5-haiku/ext/standard/microtime.c ---- php-5.3.5/ext/standard/microtime.c 2010-01-03 09:23:27.029097984 +0000 -+++ php-5.3.5-haiku/ext/standard/microtime.c 2011-02-04 14:18:46.000000000 +0000 -@@ -131,7 +131,7 @@ - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) & !defined(__HAIKU__)/* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); -diff -urN php-5.3.5/scripts/phpize.m4 php-5.3.5-haiku/scripts/phpize.m4 ---- php-5.3.5/scripts/phpize.m4 2010-11-02 09:58:08.015204352 +0000 -+++ php-5.3.5-haiku/scripts/phpize.m4 2011-02-04 13:58:33.000000000 +0000 -@@ -1,6 +1,6 @@ - dnl This file becomes configure.in for self-contained extensions. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) diff --git a/dev-lang/php/patches/php-5.4.34.patchset b/dev-lang/php/patches/php-5.4.34.patchset deleted file mode 100644 index 6fa8283bb..000000000 --- a/dev-lang/php/patches/php-5.4.34.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 252717d13be2d08cfc4546b0135b01e35f4e8082 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 20 Oct 2014 11:29:08 +0200 -Subject: Fix build on Haiku. - - -diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index 92e9480..0172809 100644 ---- a/ext/date/php_date.c -+++ b/ext/date/php_date.c -@@ -33,8 +33,6 @@ - - #ifdef PHP_WIN32 - static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } --#elif defined(__GNUC__) && __GNUC__ < 3 --static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } - #else - static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } - #endif -diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c -index fe22366..14298fb 100644 ---- a/ext/standard/microtime.c -+++ b/ext/standard/microtime.c -@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage) - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); --- -1.8.3.4 - diff --git a/dev-lang/php/php-5.3.4.recipe b/dev-lang/php/php-5.3.4.recipe deleted file mode 100644 index 794224740..000000000 --- a/dev-lang/php/php-5.3.4.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="php - hypertext preprocessor" -HOMEPAGE="http://www.php.net" -SRC_URI="http://php.net/distributions/php-5.3.4.tar.bz2" -CHECKSUM_MD5="2c069d8f690933e3bf6a8741ed818150" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="dev-libs/libpcre >= 8.00" -BUILD() -{ - cd php-5.3.4 - cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 - autoreconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared --enable-static - make -} - -INSTALL() -{ - cd php-5.3.4 - make install -} - -COPYRIGHT="2001-2010 PHP Group" -LICENSE="PHP License v3.01" - diff --git a/dev-lang/php/php-5.3.5.recipe b/dev-lang/php/php-5.3.5.recipe deleted file mode 100644 index 03db2e432..000000000 --- a/dev-lang/php/php-5.3.5.recipe +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION="php - hypertext preprocessor" -HOMEPAGE="http://www.php.net" -SRC_URI="http://php.net/distributions/php-5.3.5.tar.bz2" -CHECKSUM_MD5="8aaf20c95e91f25c5b6a591e5d6d61b9" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-libs/libpcre >= 8.00 - " -BUILD() -{ - cd php-5.3.5 - libtoolize --force --copy --install - aclocal - autoconf - export LIBS="-lnetwork" - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --includedir=`finddir B_COMMON_DIRECTORY`/include \ - --libdir=`finddir B_COMMON_LIB_DIRECTORY` \ - --enable-shared \ - --enable-static \ - --enable-dom \ - --enable-sqlite-utf8 \ - --enable-xml=shared \ - --enable-dba=shared \ - --enable-ftp \ - --enable-sqlite-utf8 \ -# --enable-sockets \ - --with-bz2=`finddir B_COMMON_DIRECTORY` \ - --with-zlib-dir=`finddir B_COMMON_DIRECTORY` \ - --with-icu-dir=/boot/system/lib \ - --with-libxml-dir=`finddir B_COMMON_DIRECTORY` \ - --with-gd-dir=`finddir B_COMMON_DIRECTORY` \ - --with-png-dir=`finddir B_COMMON_DIRECTORY` \ - --with-jpeg-dir=`finddir B_COMMON_LIB_DIRECTORY` \ - --with-readline=`finddir B_COMMON_DIRECTORY` \ - --with-freetype-dir=/boot/develop/headers/3rdparty/freetype \ - --with-openssl-dir=`finddir B_COMMON_DIRECTORY` \ - --with-openssl=`finddir B_COMMON_DIRECTORY` \ - --without-iconv - - make -} - -INSTALL() -{ - cd php-5.3.5 - make install INSTALL_ROOT=${DESTDIR} -} - -TEST() -{ - cd php-5.3.5 - make test -} - -COPYRIGHT="2001-2011 PHP Group" -LICENSE="PHP License v3.01" diff --git a/dev-lang/php/php-5.4.34.recipe b/dev-lang/php/php-5.4.34.recipe deleted file mode 100644 index 8cfc6940f..000000000 --- a/dev-lang/php/php-5.4.34.recipe +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY="A popular general-purpose scripting language" -DESCRIPTION="PHP is a popular general-purpose scripting language that is \ -especially suited to web development. - -Fast, flexible and pragmatic, PHP powers everything from your blog to the most \ -popular websites in the world. -" -HOMEPAGE="http://www.php.net" -REVISION="1" -COPYRIGHT="2001-2014 PHP Group" -LICENSE="PHP License v3.01" -ARCHITECTURES="x86_gcc2" - -SRC_URI="http://php.net/get/php-$portVersion.tar.bz2/from/this/mirror" -SRC_FILENAME="php-$portVersion.tar.bz2" -CHECKSUM_SHA256="57d4ea10f0c18b096a7c8fd0a98dcbe40c8f4dc94453fd3ca0a10e35fb2f8234" -PATCHES="php-$portVersion.patchset" - -PROVIDES=" - php = $portVersion - cmd:pear - cmd:peardev - cmd:pecl - cmd:phar - cmd:phar.phar - cmd:php - cmd:php_cgi - cmd:php_config - cmd:phpize -" - -GLOBAL_WRITABLE_FILES=" - settings/pear.conf keep-old -" - -REQUIRES=" - haiku - lib:libxml2 - lib:libz -" - -BUILD_REQUIRES=" - devel:libxml2 - devel:libz -" - -BUILD_PREREQUIRES=" - haiku_devel - cmd:awk - cmd:bison - cmd:dos2unix - cmd:gcc - cmd:make -" - -BUILD() -{ - runConfigure ./configure --with-libxml-dir=/system --without-iconv - dos2unix Zend/zend_language_scanner.l - dos2unix Zend/zend_language_scanner.c - make $jobArgs -} - -INSTALL() -{ - make install -} - -TEST() -{ - make test -} - From 4c499801a25fbfe1082690563492d6ea631ba026 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 15 Jan 2015 01:13:52 -0500 Subject: [PATCH 05/42] php: version for 5.6.4. --- ...{php-5.6.2.patchset => php-5.6.4.patchset} | 0 .../{php-5.6.2.recipe => php-5.6.4.recipe} | 20 +++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) rename dev-lang/php/patches/{php-5.6.2.patchset => php-5.6.4.patchset} (100%) rename dev-lang/php/{php-5.6.2.recipe => php-5.6.4.recipe} (81%) diff --git a/dev-lang/php/patches/php-5.6.2.patchset b/dev-lang/php/patches/php-5.6.4.patchset similarity index 100% rename from dev-lang/php/patches/php-5.6.2.patchset rename to dev-lang/php/patches/php-5.6.4.patchset diff --git a/dev-lang/php/php-5.6.2.recipe b/dev-lang/php/php-5.6.4.recipe similarity index 81% rename from dev-lang/php/php-5.6.2.recipe rename to dev-lang/php/php-5.6.4.recipe index fb1056ae7..776ec1c9d 100644 --- a/dev-lang/php/php-5.6.2.recipe +++ b/dev-lang/php/php-5.6.4.recipe @@ -3,15 +3,15 @@ DESCRIPTION="PHP is a popular general-purpose scripting language that is \ especially suited to web development. Fast, flexible and pragmatic, PHP powers everything from your blog to the most \ -popular websites in the world. -" -HOMEPAGE="http://www.php.net" +popular websites in the world." +HOMEPAGE="https://php.net" REVISION="1" COPYRIGHT="2001-2014 PHP Group" LICENSE="PHP License v3.01" ARCHITECTURES="x86_gcc2" -SRC_URI="http://php.net/get/php-5.6.2.tar.bz2/from/this/mirror" +SRC_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror" +CHECKSUM_SHA256="576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1" SRC_FILENAME="php-$portVersion.tar.bz2" PATCHES="php-$portVersion.patchset" @@ -26,23 +26,22 @@ PROVIDES=" cmd:php_cgi cmd:php_config cmd:phpize -" + " GLOBAL_WRITABLE_FILES=" settings/pear.conf keep-old -" + " REQUIRES=" haiku lib:libxml2 lib:libz -" + " BUILD_REQUIRES=" devel:libxml2 devel:libz -" - + " BUILD_PREREQUIRES=" haiku_devel cmd:awk @@ -50,7 +49,7 @@ BUILD_PREREQUIRES=" cmd:dos2unix cmd:gcc cmd:make -" + " BUILD() { @@ -69,4 +68,3 @@ TEST() { make test } - From 28d5b9755c8293e8df4201d2d18a63de9db89ccf Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 15 Jan 2015 21:08:00 -0500 Subject: [PATCH 06/42] php: enable more features. --- dev-lang/php/patches/php-5.6.4.patch | 186 ++++++++++++++++++++++++ dev-lang/php/patches/php-5.6.4.patchset | 35 ----- dev-lang/php/php-5.6.4.recipe | 50 ++++++- 3 files changed, 231 insertions(+), 40 deletions(-) create mode 100644 dev-lang/php/patches/php-5.6.4.patch delete mode 100644 dev-lang/php/patches/php-5.6.4.patchset diff --git a/dev-lang/php/patches/php-5.6.4.patch b/dev-lang/php/patches/php-5.6.4.patch new file mode 100644 index 000000000..bfa12e25f --- /dev/null +++ b/dev-lang/php/patches/php-5.6.4.patch @@ -0,0 +1,186 @@ +From a6c749bea2f66db568d9868e302fc030f1ce1980 Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Thu, 15 Jan 2015 20:35:37 -0500 +Subject: [PATCH] php: fixes to work on Haiku. + +C code changes by Adrien, build system changes by me. +--- + acinclude.m4 | 2 +- + aclocal.m4 | 2 +- + ext/curl/config.m4 | 6 +++--- + ext/date/php_date.c | 2 -- + ext/gd/config.m4 | 12 ++++++------ + ext/standard/microtime.c | 2 +- + ext/zip/config.m4 | 8 ++++---- + ext/zlib/config0.m4 | 10 +++++----- + 8 files changed, 21 insertions(+), 23 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 81dc0db..42dca5e 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[ + if test -z "$php_cxx_done"; then + AC_PROG_CXX + AC_PROG_CXXCPP +- PHP_ADD_LIBRARY(stdc++) ++ PHP_ADD_LIBRARY(stdc++.r4) + php_cxx_done=yes + fi + ]) +diff --git a/aclocal.m4 b/aclocal.m4 +index 189149f..390dd21 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[ + if test -z "$php_cxx_done"; then + AC_PROG_CXX + AC_PROG_CXXCPP +- PHP_ADD_LIBRARY(stdc++) ++ PHP_ADD_LIBRARY(stdc++.r4) + php_cxx_done=yes + fi + ]) +diff --git a/ext/curl/config.m4 b/ext/curl/config.m4 +index 2f82c34..07b940e 100644 +--- a/ext/curl/config.m4 ++++ b/ext/curl/config.m4 +@@ -10,8 +10,8 @@ if test "$PHP_CURL" != "no"; then + CURL_DIR=$PHP_CURL + else + AC_MSG_CHECKING(for cURL in default path) +- for i in /usr/local /usr; do +- if test -r $i/include/curl/easy.h; then ++ for i in /usr/local /usr /system; do ++ if test -r $i/develop/headers/curl/easy.h; then + CURL_DIR=$i + AC_MSG_RESULT(found in $i) + break +@@ -22,7 +22,7 @@ if test "$PHP_CURL" != "no"; then + if test -z "$CURL_DIR"; then + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please reinstall the libcurl distribution - +- easy.h should be in /include/curl/) ++ easy.h should be in /develop/headers/curl/) + fi + + CURL_CONFIG="curl-config" +diff --git a/ext/date/php_date.c b/ext/date/php_date.c +index bf29a56..17d2446 100644 +--- a/ext/date/php_date.c ++++ b/ext/date/php_date.c +@@ -33,8 +33,6 @@ + + #ifdef PHP_WIN32 + static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } +-#elif defined(__GNUC__) && __GNUC__ < 3 +-static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } + #else + static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } + #endif +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index 446c242..e81cc94 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -50,12 +50,12 @@ dnl + + AC_DEFUN([PHP_GD_ZLIB],[ + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then +- if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then ++ if test -f "$PHP_ZLIB_DIR/develop/headers/zlib/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" +- elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers/zlib" ++ elif test -f "$PHP_ZLIB_DIR/develop/headers/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers" + else + AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"]) + fi +@@ -102,7 +102,7 @@ AC_DEFUN([PHP_GD_JPEG],[ + if test "$PHP_JPEG_DIR" != "no"; then + + for i in $PHP_JPEG_DIR /usr/local /usr; do +- test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break ++ test -f $i/develop/headers/jpeglib.h && GD_JPEG_DIR=$i && break + done + + if test -z "$GD_JPEG_DIR"; then +@@ -127,7 +127,7 @@ AC_DEFUN([PHP_GD_PNG],[ + if test "$PHP_PNG_DIR" != "no"; then + + for i in $PHP_PNG_DIR /usr/local /usr; do +- test -f $i/include/png.h && GD_PNG_DIR=$i && break ++ test -f $i/develop/headers/png.h && GD_PNG_DIR=$i && break + done + + if test -z "$GD_PNG_DIR"; then +diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c +index fe22366..14298fb 100644 +--- a/ext/standard/microtime.c ++++ b/ext/standard/microtime.c +@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage) + array_init(return_value); + #define PHP_RUSAGE_PARA(a) \ + add_assoc_long(return_value, #a, usg.a) +-#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ ++#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */ + PHP_RUSAGE_PARA(ru_oublock); + PHP_RUSAGE_PARA(ru_inblock); + PHP_RUSAGE_PARA(ru_msgsnd); +diff --git a/ext/zip/config.m4 b/ext/zip/config.m4 +index a21ad2d..c6dad41 100644 +--- a/ext/zip/config.m4 ++++ b/ext/zip/config.m4 +@@ -20,12 +20,12 @@ if test "$PHP_ZIP" != "no"; then + + dnl libzip, depends on zlib + if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then +- if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then ++ if test -f "$PHP_ZLIB_DIR/develop/headers/zlib/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" +- elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers/zlib" ++ elif test -f "$PHP_ZLIB_DIR/develop/headers/zlib.h"; then + PHP_ZLIB_DIR="$PHP_ZLIB_DIR" +- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" ++ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers" + else + AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"]) + fi +diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 +index ebf67cc..607f6df 100644 +--- a/ext/zlib/config0.m4 ++++ b/ext/zlib/config0.m4 +@@ -22,12 +22,12 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then + fi + else + for i in /usr/local /usr $PHP_ZLIB_DIR; do +- if test -f $i/include/zlib/zlib.h; then ++ if test -f $i/develop/headers/zlib/zlib.h; then + ZLIB_DIR=$i +- ZLIB_INCDIR=$i/include/zlib +- elif test -f $i/include/zlib.h; then ++ ZLIB_INCDIR=$i/develop/headers/zlib ++ elif test -f $i/develop/headers/zlib.h; then + ZLIB_DIR=$i +- ZLIB_INCDIR=$i/include ++ ZLIB_INCDIR=$i/develop/headers + fi + done + fi +@@ -42,7 +42,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then + esac + + AC_MSG_CHECKING([for zlib version >= 1.2.0.4]) +- ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'` ++ ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/develop/headers/zlib.h | $SED -e 's/[[^0-9\.]]//g'` + AC_MSG_RESULT([$ZLIB_VERSION]) + if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then + AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required]) +-- +1.8.3.4 + diff --git a/dev-lang/php/patches/php-5.6.4.patchset b/dev-lang/php/patches/php-5.6.4.patchset deleted file mode 100644 index 24a26835c..000000000 --- a/dev-lang/php/patches/php-5.6.4.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From ab052deefe2d7bb24449c4f0c2baf536551ef43c Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Fri, 17 Oct 2014 13:22:16 +0200 -Subject: port php 5.3 patch from 2011. - - -diff --git a/ext/date/php_date.c b/ext/date/php_date.c -index 64a40a2..6b0d782 100644 ---- a/ext/date/php_date.c -+++ b/ext/date/php_date.c -@@ -33,8 +33,6 @@ - - #ifdef PHP_WIN32 - static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; } --#elif defined(__GNUC__) && __GNUC__ < 3 --static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; } - #else - static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; } - #endif -diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c -index fe22366..14298fb 100644 ---- a/ext/standard/microtime.c -+++ b/ext/standard/microtime.c -@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage) - array_init(return_value); - #define PHP_RUSAGE_PARA(a) \ - add_assoc_long(return_value, #a, usg.a) --#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ -+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */ - PHP_RUSAGE_PARA(ru_oublock); - PHP_RUSAGE_PARA(ru_inblock); - PHP_RUSAGE_PARA(ru_msgsnd); --- -1.8.3.4 - diff --git a/dev-lang/php/php-5.6.4.recipe b/dev-lang/php/php-5.6.4.recipe index 776ec1c9d..630e3e2ea 100644 --- a/dev-lang/php/php-5.6.4.recipe +++ b/dev-lang/php/php-5.6.4.recipe @@ -5,7 +5,7 @@ especially suited to web development. Fast, flexible and pragmatic, PHP powers everything from your blog to the most \ popular websites in the world." HOMEPAGE="https://php.net" -REVISION="1" +REVISION="2" COPYRIGHT="2001-2014 PHP Group" LICENSE="PHP License v3.01" ARCHITECTURES="x86_gcc2" @@ -13,7 +13,7 @@ ARCHITECTURES="x86_gcc2" SRC_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror" CHECKSUM_SHA256="576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1" SRC_FILENAME="php-$portVersion.tar.bz2" -PATCHES="php-$portVersion.patchset" +PATCHES="php-$portVersion.patch" PROVIDES=" php = $portVersion @@ -34,28 +34,68 @@ GLOBAL_WRITABLE_FILES=" REQUIRES=" haiku + icu lib:libxml2 lib:libz + lib:libssl + lib:libcrypto + lib:libcurl + + lib:libpng16 + lib:libjpeg + lib:libfreetype " BUILD_REQUIRES=" + icu_devel devel:libxml2 devel:libz + devel:libssl + devel:libcrypto + devel:libcurl + + devel:libpng16 + devel:libjpeg + devel:libfreetype " BUILD_PREREQUIRES=" haiku_devel + cmd:autoreconf cmd:awk cmd:bison cmd:dos2unix cmd:gcc cmd:make + cmd:pkg_config + cmd:freetype_config + cmd:xml2_config + cmd:icu_config " +PATCH() +{ + dos2unix Zend/zend_language_scanner.l + dos2unix Zend/zend_language_scanner.c +} + BUILD() { - runConfigure ./configure --with-libxml-dir=/system --without-iconv - dos2unix Zend/zend_language_scanner.l - dos2unix Zend/zend_language_scanner.c + autoreconf + runConfigure ./configure \ + --with-libxml-dir=/system \ + --with-zlib-dir=/system \ + --with-openssl \ + --with-curl \ + --with-gd \ + --with-png-dir=/system \ + --with-jpeg-dir=/system \ + --with-freetype-dir=/system \ + --disable-opcache \ + --enable-intl \ + --enable-ftp \ + --enable-soap \ + --without-iconv \ + --disable-debug make $jobArgs } From f739d9ab5fccb5ad590ac0be8d04e84533a3c95b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 16 Jan 2015 01:13:32 -0500 Subject: [PATCH 07/42] zsh: remove old versions, recipe for 5.0.7, provide cmd:sh. --- app-shells/zsh/patches/zsh-5.0.0.patch | 55 ------------------- ...{zsh-5.0.2.patchset => zsh-5.0.7.patchset} | 0 app-shells/zsh/zsh-5.0.0.recipe | 32 ----------- .../{zsh-5.0.2.recipe => zsh-5.0.7.recipe} | 21 +++---- 4 files changed, 11 insertions(+), 97 deletions(-) delete mode 100644 app-shells/zsh/patches/zsh-5.0.0.patch rename app-shells/zsh/patches/{zsh-5.0.2.patchset => zsh-5.0.7.patchset} (100%) delete mode 100644 app-shells/zsh/zsh-5.0.0.recipe rename app-shells/zsh/{zsh-5.0.2.recipe => zsh-5.0.7.recipe} (53%) diff --git a/app-shells/zsh/patches/zsh-5.0.0.patch b/app-shells/zsh/patches/zsh-5.0.0.patch deleted file mode 100644 index 2d984f9a0..000000000 --- a/app-shells/zsh/patches/zsh-5.0.0.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -aur zsh-5.0.0.org/configure.ac zsh-5.0.0/configure.ac ---- zsh-5.0.0.org/configure.ac 2012-06-21 20:36:03.034865152 +0200 -+++ zsh-5.0.0/configure.ac 2012-11-04 20:38:45.770703360 +0100 -@@ -796,8 +796,8 @@ - AC_CHECK_LIB(cap, cap_get_proc) - fi - --AC_CHECK_LIB(socket, socket) --AC_SEARCH_LIBS(gethostbyname2, bind) -+AC_SEARCH_LIBS(socket, socket network) -+AC_SEARCH_LIBS(gethostbyname2, bind network) - - case $LIBS in - *-lbind*) -diff -aur zsh-5.0.0.org/Functions/Newuser/zsh-newuser-install zsh-5.0.0/Functions/Newuser/zsh-newuser-install ---- zsh-5.0.0.org/Functions/Newuser/zsh-newuser-install 2010-08-12 21:09:05.037224448 +0200 -+++ zsh-5.0.0/Functions/Newuser/zsh-newuser-install 2012-11-04 20:37:13.598736896 +0100 -@@ -10,14 +10,17 @@ - # How the function will be referred to. - local myname=zsh-newuser-install - --# Quick test not requiring any setting up. --# Don't run if we're root. (These variables are provided by the shell.) --if (( EUID == 0 || UID == 0 )); then -- if [[ $1 = -f ]]; then -- print -r "$myname: won't run as root. Read the manual." >&2 -- fi -- return 1 --fi -+# Haiku OS specific: We want to perform newuser configuration for -+# zero UID too! ;-) So we have to disable it by patch. -+## -+## Quick test not requiring any setting up. -+## Don't run if we're root. (These variables are provided by the shell.) -+#if (( EUID == 0 || UID == 0 )); then -+# if [[ $1 = -f ]]; then -+# print -r "$myname: won't run as root. Read the manual." >&2 -+# fi -+# return 1 -+#fi - - # clear is missing in some Cygwin configurations (lacking ncurses) - if ! ( clear >/dev/null 2>/dev/null ); then -diff -aur zsh-5.0.0.org/Src/prototypes.h zsh-5.0.0/Src/prototypes.h ---- zsh-5.0.0.org/Src/prototypes.h 2011-05-03 20:38:21.027000832 +0200 -+++ zsh-5.0.0/Src/prototypes.h 2012-11-04 21:07:23.734789632 +0100 -@@ -40,7 +40,7 @@ - * TBD: we'd much prefer to get hold of the header where - * these are defined. - */ --#ifdef _AIX -+#if defined(_AIX) || defined(__HAIKU__) - #define TC_CONST const - #else - #define TC_CONST diff --git a/app-shells/zsh/patches/zsh-5.0.2.patchset b/app-shells/zsh/patches/zsh-5.0.7.patchset similarity index 100% rename from app-shells/zsh/patches/zsh-5.0.2.patchset rename to app-shells/zsh/patches/zsh-5.0.7.patchset diff --git a/app-shells/zsh/zsh-5.0.0.recipe b/app-shells/zsh/zsh-5.0.0.recipe deleted file mode 100644 index aee26c8ea..000000000 --- a/app-shells/zsh/zsh-5.0.0.recipe +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY="Zsh is a UNIX command interpreter (shell)" -DESCRIPTION=" -Zsh is a shell designed for interactive use, although it is also a powerful \ -scripting language. Many of the useful features of bash, ksh, and tcsh were \ -incorporated into zsh; many original features were added. -" -HOMEPAGE="http://www.zsh.org" -SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/5.0.0/zsh-5.0.0.tar.bz2/download" -REVISION="1" -CHECKSUM_MD5="e8484468925cec8d9a84b8b04797e764" -STATUS_HAIKU="unstable" -DEPEND="" -BUILD() -{ - cd zsh-5.0.0 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man \ - --infodir=$COMMON_DOCS/info \ - LIBS="-lgnu" - make -} - -INSTALL() -{ - cd zsh-5.0.0 - make install -} -LICENSE="ZSH" -COPYRIGHT="(c) 1992-2009 Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others." diff --git a/app-shells/zsh/zsh-5.0.2.recipe b/app-shells/zsh/zsh-5.0.7.recipe similarity index 53% rename from app-shells/zsh/zsh-5.0.2.recipe rename to app-shells/zsh/zsh-5.0.7.recipe index 52d42993f..ae2746eb2 100644 --- a/app-shells/zsh/zsh-5.0.2.recipe +++ b/app-shells/zsh/zsh-5.0.7.recipe @@ -1,21 +1,21 @@ SUMMARY="Zsh is a UNIX command interpreter (shell)" -DESCRIPTION=" -Zsh is a shell designed for interactive use, although it is also a powerful \ -scripting language. Many of the useful features of bash, ksh, and tcsh were \ -incorporated into zsh; many original features were added. -" +DESCRIPTION="Zsh is a shell designed for interactive use, although it \ +is also a powerful scripting language. Many of the useful features of \ +bash, ksh, and tcsh were incorporated into zsh; many original features \ +were added." HOMEPAGE="http://www.zsh.org" LICENSE="ZSH" -COPYRIGHT="1992-2013, Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others." -SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/5.0.2/zsh-5.0.2.tar.bz2" -CHECKSUM_SHA256="eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03" +COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wishnowsky, and others." +SRC_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2" +CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="zsh-5.0.2.patchset" +PATCHES="zsh-$portVersion.patchset" PROVIDES=" zsh = $portVersion compat >= 5 cmd:zsh = $portVersion compat >= 5 cmd:zsh_$portVersion = $portVersion compat >= 5 + cmd:sh " REQUIRES=" haiku @@ -38,12 +38,13 @@ BUILD_PREREQUIRES=" BUILD() { runConfigure ./configure - make + make $jobArgs } INSTALL() { make install + ln -s zsh $binDir/sh } TEST() From 378b065f6581244a6e91894b619d2d33988af408 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Fri, 16 Jan 2015 21:42:27 +0100 Subject: [PATCH 08/42] Add libmdi recipe --- haiku-libs/libmdi/libmdi-0.5.recipe | 61 +++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 haiku-libs/libmdi/libmdi-0.5.recipe diff --git a/haiku-libs/libmdi/libmdi-0.5.recipe b/haiku-libs/libmdi/libmdi-0.5.recipe new file mode 100644 index 000000000..ba71ace52 --- /dev/null +++ b/haiku-libs/libmdi/libmdi-0.5.recipe @@ -0,0 +1,61 @@ +SUMMARY="Haiku framework to create Windows-style multidocument applications." +DESCRIPTION="BeMDI is a framework to emulate windows inside of other windows \ +using a list of classes that emulate the windows' style. This makes it \ +possible to make programs that weren't possible before." +HOMEPAGE="https://github.com/HaikuArchives/BeMDI" +SRC_URI="https://github.com/HaikuArchives/BeMDI/archive/d55bec50ba7776d0d62bcfc863f46869fedb70cf.tar.gz" +CHECKSUM_SHA256="0895dcc6dd191fc56dfed6ea93197a20e239782bda3278db21fc8022be20af2b" +SOURCE_DIR="BeMDI-d55bec50ba7776d0d62bcfc863f46869fedb70cf" +REVISION="1" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="2000 3rd-evolution" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + bemdi$secondaryArchSuffix = $portVersion + lib:libmdi$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + bemdi${secondaryArchSuffix}_devel = $portVersion + devel:libmdi$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + bemdi$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:mkdepend + " + +BUILD() +{ + cd source + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $libDir + mkdir -p $includeDir + + cp -a source/objects/libmdi.a $libDir + cp -R headers/mdi $includeDir + + prepareInstalledDevelLibs \ + libmdi + packageEntries devel \ + $developDir +} From 4752d43f921b895ae38507584a6885f54431ec17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Fri, 16 Jan 2015 21:31:51 +0000 Subject: [PATCH 09/42] [WIP] libuv 1.2.0 - Build system fixed --- dev-libs/libuv/libuv-1.2.0.recipe | 82 ++++ dev-libs/libuv/patches/libuv-1.2.0.patchset | 433 ++++++++++++++++++++ 2 files changed, 515 insertions(+) create mode 100644 dev-libs/libuv/libuv-1.2.0.recipe create mode 100644 dev-libs/libuv/patches/libuv-1.2.0.patchset diff --git a/dev-libs/libuv/libuv-1.2.0.recipe b/dev-libs/libuv/libuv-1.2.0.recipe new file mode 100644 index 000000000..921cbeb4d --- /dev/null +++ b/dev-libs/libuv/libuv-1.2.0.recipe @@ -0,0 +1,82 @@ +SUMMARY="A new platform layer for Node" +DESCRIPTION=" +libuv is a multi-platform support library with a focus on asynchronous I/O. \ +It was primarily developed for use by Node.js, but it's also used by Luvit, \ +Julia, pyuv, and others." +HOMEPAGE="http://github.com/libuv/libuv" +SRC_URI="http://libuv.org/dist/v1.2.0/libuv-v1.2.0.tar.gz" +CHECKSUM_SHA256="40e2d7b3ea9800d2a4fc6423c1cdcb4deaa6a834eaa02e22ad0de5dd4f3d8e10" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2009-2015 Ryan Dahl and others" + +ARCHITECTURES="x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + libuv$secondaryArchSuffix = $portVersion + lib:libuv$secondaryArchSuffix = $portVersion +" + +REQUIRES=" + haiku$secondaryArchSuffix +" + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel +" + +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:autoconf + cmd:python + cmd:automake + cmd:libtoolize + cmd:gyp +" + +SOURCE_DIR="libuv-v1.2.0" + +PATCHES="libuv-1.2.0.patchset" + +BUILD() +{ + #./autogen.sh + #runConfigure ./configure + #make + rm -rf out + ./gyp_uv.py -f make + make -C out +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libuv + + packageEntries devel $developDir +} + +TEST() +{ + true + #./out/Debug/run-tests +} + +REQUIRES_devel=" + libuv$secondaryArchSuffix == $portVersion +" + +PROVIDES_devel=" + libuv${secondaryArchSuffix}_devel = $portVersion + devel:libuv$secondaryArchSuffix = $portVersion +" + diff --git a/dev-libs/libuv/patches/libuv-1.2.0.patchset b/dev-libs/libuv/patches/libuv-1.2.0.patchset new file mode 100644 index 000000000..40edb9cb7 --- /dev/null +++ b/dev-libs/libuv/patches/libuv-1.2.0.patchset @@ -0,0 +1,433 @@ +From 376534d7dfdce7bf4e817bc20d12e3d91bfc4332 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= + +Date: Fri, 16 Jan 2015 19:19:54 +0000 +Subject: Haiku fixes first part + + +diff --git a/include/pthread-fixes.h b/include/pthread-fixes.h +index 88c6b66..dca8e2c 100644 +--- a/include/pthread-fixes.h ++++ b/include/pthread-fixes.h +@@ -34,9 +34,8 @@ + + #include + +- + /*Android doesn't provide pthread_barrier_t for now.*/ +-#ifndef PTHREAD_BARRIER_SERIAL_THREAD ++#if !defined(PTHREAD_BARRIER_SERIAL_THREAD) || (__HAIKU__) + + /* Anything except 0 will do here.*/ + #define PTHREAD_BARRIER_SERIAL_THREAD 0x12345 +diff --git a/include/uv-unix.h b/include/uv-unix.h +index e724925..8583c40 100644 +--- a/include/uv-unix.h ++++ b/include/uv-unix.h +@@ -36,12 +36,12 @@ + #include + #include + ++#include + #include + #include +-#ifdef __ANDROID__ ++#if defined (__ANDROID__) || defined(__HAIKU__) + #include "pthread-fixes.h" + #endif +-#include + + #include "uv-threadpool.h" + +diff --git a/src/unix/core.c b/src/unix/core.c +index 6f284ff..9b9bfe3 100644 +--- a/src/unix/core.c ++++ b/src/unix/core.c +@@ -43,6 +43,11 @@ + # include + #endif + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + #ifdef __sun + # include + # include +@@ -876,7 +881,7 @@ int uv_getrusage(uv_rusage_t* rusage) { + rusage->ru_stime.tv_sec = usage.ru_stime.tv_sec; + rusage->ru_stime.tv_usec = usage.ru_stime.tv_usec; + +- rusage->ru_maxrss = usage.ru_maxrss; ++ /*rusage->ru_maxrss = usage.ru_maxrss; + rusage->ru_ixrss = usage.ru_ixrss; + rusage->ru_idrss = usage.ru_idrss; + rusage->ru_isrss = usage.ru_isrss; +@@ -889,7 +894,7 @@ int uv_getrusage(uv_rusage_t* rusage) { + rusage->ru_msgrcv = usage.ru_msgrcv; + rusage->ru_nsignals = usage.ru_nsignals; + rusage->ru_nvcsw = usage.ru_nvcsw; +- rusage->ru_nivcsw = usage.ru_nivcsw; ++ rusage->ru_nivcsw = usage.ru_nivcsw;*/ + + return 0; + } +diff --git a/src/unix/haiku.c b/src/unix/haiku.c +new file mode 100644 +index 0000000..357eb41 +--- /dev/null ++++ b/src/unix/haiku.c +@@ -0,0 +1,115 @@ ++#include "uv.h" ++#include "internal.h" ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#undef NANOSEC ++#define NANOSEC ((uint64_t) 1e9) ++ ++static char *process_title; ++ ++int uv_platform_loop_init(uv_loop_t* loop, int default_loop) { ++ return 1; ++} ++ ++void uv__platform_loop_delete(uv_loop_t* loop) { ++} ++ ++uint64_t uv__hrtime(uv_clocktype_t type) { ++ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ++ return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); ++} ++ ++int uv_exepath(char* buffer, size_t* size) { ++ ++ ++ return 0; ++} ++ ++ ++uint64_t uv_get_free_memory(void) { ++ ++} ++ ++ ++uint64_t uv_get_total_memory(void) { ++ ++} ++ ++ ++void uv_loadavg(double avg[3]) { ++ ++} ++ ++ ++char** uv_setup_args(int argc, char** argv) { ++ process_title = argc ? strdup(argv[0]) : NULL; ++ return argv; ++} ++ ++ ++int uv_set_process_title(const char* title) { ++ ++ return 0; ++} ++ ++ ++int uv_get_process_title(char* buffer, size_t size) { ++ ++ return 0; ++} ++ ++ ++int uv_resident_set_memory(size_t* rss) { ++ ++ return 0; ++} ++ ++ ++int uv_uptime(double* uptime) { ++ return 0; ++} ++ ++ ++int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { ++ ++ return 0; ++} ++ ++ ++void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { ++ int i; ++ ++ for (i = 0; i < count; i++) { ++ free(cpu_infos[i].model); ++ } ++ ++ free(cpu_infos); ++} ++ ++ ++int uv_interface_addresses(uv_interface_address_t** addresses, int* count) { ++ ++ return 0; ++} ++ ++ ++void uv_free_interface_addresses(uv_interface_address_t* addresses, ++ int count) { ++ int i; ++ ++ for (i = 0; i < count; i++) { ++ free(addresses[i].name); ++ } ++ ++ free(addresses); ++} +diff --git a/src/unix/pthread-fixes.c b/src/unix/pthread-fixes.c +index dc54f35..3a71eb5 100644 +--- a/src/unix/pthread-fixes.c ++++ b/src/unix/pthread-fixes.c +@@ -35,6 +35,7 @@ + * */ + #include + #include ++#include + + int uv__pthread_sigmask(int how, const sigset_t* set, sigset_t* oset) { + static int workaround; +diff --git a/uv.gyp b/uv.gyp +index 45af6a1..21390e0 100644 +--- a/uv.gyp ++++ b/uv.gyp +@@ -10,7 +10,7 @@ + ['OS=="solaris"', { + 'cflags': [ '-pthreads' ], + }], +- ['OS not in "solaris android"', { ++ ['OS not in "solaris android haiku"', { + 'cflags': [ '-pthread' ], + }], + ], +@@ -152,13 +152,13 @@ + 'src/unix/udp.c', + ], + 'link_settings': { +- 'libraries': [ '-lm' ], + 'conditions': [ + ['OS=="solaris"', { + 'ldflags': [ '-pthreads' ], + }], +- ['OS != "solaris" and OS != "android"', { ++ ['OS != "solaris" and OS != "android" and OS != "haiku"', { + 'ldflags': [ '-pthread' ], ++ 'libraries': [ '-lm' ], + }], + ], + }, +@@ -175,7 +175,7 @@ + }], + ], + }], +- [ 'OS in "linux mac android"', { ++ [ 'OS in "linux mac android haiku"', { + 'sources': [ 'src/unix/proctitle.c' ], + }], + [ 'OS=="mac"', { +@@ -205,6 +205,15 @@ + 'libraries': [ '-ldl', '-lrt' ], + }, + }], ++ [ 'OS=="haiku"', { ++ 'sources': [ ++ 'src/unix/haiku.c', ++ 'src/unix/pthread-fixes.c', ++ ], ++ 'link_settings': { ++ 'libraries': [ '-lroot', '-lnetwork' ], ++ }, ++ }], + [ 'OS=="android"', { + 'sources': [ + 'src/unix/linux-core.c', +@@ -268,167 +277,6 @@ + }], + ] + }, +- +- { +- 'target_name': 'run-tests', +- 'type': 'executable', +- 'dependencies': [ 'libuv' ], +- 'sources': [ +- 'test/blackhole-server.c', +- 'test/echo-server.c', +- 'test/run-tests.c', +- 'test/runner.c', +- 'test/runner.h', +- 'test/test-get-loadavg.c', +- 'test/task.h', +- 'test/test-active.c', +- 'test/test-async.c', +- 'test/test-async-null-cb.c', +- 'test/test-callback-stack.c', +- 'test/test-callback-order.c', +- 'test/test-close-fd.c', +- 'test/test-close-order.c', +- 'test/test-connection-fail.c', +- 'test/test-cwd-and-chdir.c', +- 'test/test-default-loop-close.c', +- 'test/test-delayed-accept.c', +- 'test/test-error.c', +- 'test/test-embed.c', +- 'test/test-emfile.c', +- 'test/test-fail-always.c', +- 'test/test-fs.c', +- 'test/test-fs-event.c', +- 'test/test-get-currentexe.c', +- 'test/test-get-memory.c', +- 'test/test-getaddrinfo.c', +- 'test/test-getnameinfo.c', +- 'test/test-getsockname.c', +- 'test/test-handle-fileno.c', +- 'test/test-hrtime.c', +- 'test/test-idle.c', +- 'test/test-ip6-addr.c', +- 'test/test-ipc.c', +- 'test/test-ipc-send-recv.c', +- 'test/test-list.h', +- 'test/test-loop-handles.c', +- 'test/test-loop-alive.c', +- 'test/test-loop-close.c', +- 'test/test-loop-stop.c', +- 'test/test-loop-time.c', +- 'test/test-loop-configure.c', +- 'test/test-walk-handles.c', +- 'test/test-watcher-cross-stop.c', +- 'test/test-multiple-listen.c', +- 'test/test-osx-select.c', +- 'test/test-pass-always.c', +- 'test/test-ping-pong.c', +- 'test/test-pipe-bind-error.c', +- 'test/test-pipe-connect-error.c', +- 'test/test-pipe-getsockname.c', +- 'test/test-pipe-sendmsg.c', +- 'test/test-pipe-server-close.c', +- 'test/test-pipe-close-stdout-read-stdin.c', +- 'test/test-platform-output.c', +- 'test/test-poll.c', +- 'test/test-poll-close.c', +- 'test/test-poll-close-doesnt-corrupt-stack.c', +- 'test/test-poll-closesocket.c', +- 'test/test-process-title.c', +- 'test/test-ref.c', +- 'test/test-run-nowait.c', +- 'test/test-run-once.c', +- 'test/test-semaphore.c', +- 'test/test-shutdown-close.c', +- 'test/test-shutdown-eof.c', +- 'test/test-shutdown-twice.c', +- 'test/test-signal.c', +- 'test/test-signal-multiple-loops.c', +- 'test/test-socket-buffer-size.c', +- 'test/test-spawn.c', +- 'test/test-fs-poll.c', +- 'test/test-stdio-over-pipes.c', +- 'test/test-tcp-bind-error.c', +- 'test/test-tcp-bind6-error.c', +- 'test/test-tcp-close.c', +- 'test/test-tcp-close-accept.c', +- 'test/test-tcp-close-while-connecting.c', +- 'test/test-tcp-connect-error-after-write.c', +- 'test/test-tcp-shutdown-after-write.c', +- 'test/test-tcp-flags.c', +- 'test/test-tcp-connect-error.c', +- 'test/test-tcp-connect-timeout.c', +- 'test/test-tcp-connect6-error.c', +- 'test/test-tcp-open.c', +- 'test/test-tcp-write-to-half-open-connection.c', +- 'test/test-tcp-write-after-connect.c', +- 'test/test-tcp-writealot.c', +- 'test/test-tcp-try-write.c', +- 'test/test-tcp-unexpected-read.c', +- 'test/test-tcp-read-stop.c', +- 'test/test-tcp-write-queue-order.c', +- 'test/test-threadpool.c', +- 'test/test-threadpool-cancel.c', +- 'test/test-thread-equal.c', +- 'test/test-mutexes.c', +- 'test/test-thread.c', +- 'test/test-barrier.c', +- 'test/test-condvar.c', +- 'test/test-timer-again.c', +- 'test/test-timer-from-check.c', +- 'test/test-timer.c', +- 'test/test-tty.c', +- 'test/test-udp-bind.c', +- 'test/test-udp-dgram-too-big.c', +- 'test/test-udp-ipv6.c', +- 'test/test-udp-open.c', +- 'test/test-udp-options.c', +- 'test/test-udp-send-and-recv.c', +- 'test/test-udp-send-immediate.c', +- 'test/test-udp-send-unreachable.c', +- 'test/test-udp-multicast-join.c', +- 'test/test-udp-multicast-join6.c', +- 'test/test-dlerror.c', +- 'test/test-udp-multicast-ttl.c', +- 'test/test-ip4-addr.c', +- 'test/test-ip6-addr.c', +- 'test/test-udp-multicast-interface.c', +- 'test/test-udp-multicast-interface6.c', +- 'test/test-udp-try-send.c', +- ], +- 'conditions': [ +- [ 'OS=="win"', { +- 'sources': [ +- 'test/runner-win.c', +- 'test/runner-win.h' +- ], +- 'libraries': [ '-lws2_32' ] +- }, { # POSIX +- 'defines': [ '_GNU_SOURCE' ], +- 'sources': [ +- 'test/runner-unix.c', +- 'test/runner-unix.h', +- ], +- }], +- [ 'OS=="solaris"', { # make test-fs.c compile, needs _POSIX_C_SOURCE +- 'defines': [ +- '__EXTENSIONS__', +- '_XOPEN_SOURCE=500', +- ], +- }], +- [ 'OS=="aix"', { # make test-fs.c compile, needs _POSIX_C_SOURCE +- 'defines': [ +- '_ALL_SOURCE', +- '_XOPEN_SOURCE=500', +- ], +- }], +- ], +- 'msvs-settings': { +- 'VCLinkerTool': { +- 'SubSystem': 1, # /subsystem:console +- }, +- }, +- }, +- + { + 'target_name': 'run-benchmarks', + 'type': 'executable', +-- +1.8.3.4 + From 464c74b346fe916c415b76d2d383b94400b88132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Sat, 17 Jan 2015 15:50:03 +0000 Subject: [PATCH 10/42] libuv 1.2.0 --- dev-libs/libuv/libuv-1.2.0.recipe | 20 +- dev-libs/libuv/patches/libuv-1.2.0.patchset | 433 -------------------- 2 files changed, 14 insertions(+), 439 deletions(-) delete mode 100644 dev-libs/libuv/patches/libuv-1.2.0.patchset diff --git a/dev-libs/libuv/libuv-1.2.0.recipe b/dev-libs/libuv/libuv-1.2.0.recipe index 921cbeb4d..1a38420b4 100644 --- a/dev-libs/libuv/libuv-1.2.0.recipe +++ b/dev-libs/libuv/libuv-1.2.0.recipe @@ -4,8 +4,9 @@ libuv is a multi-platform support library with a focus on asynchronous I/O. \ It was primarily developed for use by Node.js, but it's also used by Luvit, \ Julia, pyuv, and others." HOMEPAGE="http://github.com/libuv/libuv" -SRC_URI="http://libuv.org/dist/v1.2.0/libuv-v1.2.0.tar.gz" -CHECKSUM_SHA256="40e2d7b3ea9800d2a4fc6423c1cdcb4deaa6a834eaa02e22ad0de5dd4f3d8e10" +#SRC_URI="http://libuv.org/dist/v1.2.0/libuv-v1.2.0.tar.gz" +#CHECKSUM_SHA256="40e2d7b3ea9800d2a4fc6423c1cdcb4deaa6a834eaa02e22ad0de5dd4f3d8e10" +SRC_URI="git://github.com/hamishm/libuv#d48e9ae4bd504aadc25e26f06e83e9c2c86921ac" REVISION="1" LICENSE="MIT" COPYRIGHT="2009-2015 Ryan Dahl and others" @@ -25,6 +26,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" @@ -44,7 +47,7 @@ BUILD_PREREQUIRES=" SOURCE_DIR="libuv-v1.2.0" -PATCHES="libuv-1.2.0.patchset" +#PATCHES="libuv-1.2.0.patchset" BUILD() { @@ -52,13 +55,17 @@ BUILD() #runConfigure ./configure #make rm -rf out - ./gyp_uv.py -f make - make -C out + ./gyp_uv.py -f make -Dcomponent=shared_library -Duv_library=shared_library + make -C out BUILDTYPE=Release } INSTALL() { - make install + mkdir -p $includeDir + cp -rf include/* $includeDir/ + + mkdir -p $libDir + cp -rf out/Release/lib.target/libuv.so $libDir/ prepareInstalledDevelLibs libuv @@ -69,6 +76,7 @@ TEST() { true #./out/Debug/run-tests + # Test suite doesn't pass } REQUIRES_devel=" diff --git a/dev-libs/libuv/patches/libuv-1.2.0.patchset b/dev-libs/libuv/patches/libuv-1.2.0.patchset deleted file mode 100644 index 40edb9cb7..000000000 --- a/dev-libs/libuv/patches/libuv-1.2.0.patchset +++ /dev/null @@ -1,433 +0,0 @@ -From 376534d7dfdce7bf4e817bc20d12e3d91bfc4332 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= - -Date: Fri, 16 Jan 2015 19:19:54 +0000 -Subject: Haiku fixes first part - - -diff --git a/include/pthread-fixes.h b/include/pthread-fixes.h -index 88c6b66..dca8e2c 100644 ---- a/include/pthread-fixes.h -+++ b/include/pthread-fixes.h -@@ -34,9 +34,8 @@ - - #include - -- - /*Android doesn't provide pthread_barrier_t for now.*/ --#ifndef PTHREAD_BARRIER_SERIAL_THREAD -+#if !defined(PTHREAD_BARRIER_SERIAL_THREAD) || (__HAIKU__) - - /* Anything except 0 will do here.*/ - #define PTHREAD_BARRIER_SERIAL_THREAD 0x12345 -diff --git a/include/uv-unix.h b/include/uv-unix.h -index e724925..8583c40 100644 ---- a/include/uv-unix.h -+++ b/include/uv-unix.h -@@ -36,12 +36,12 @@ - #include - #include - -+#include - #include - #include --#ifdef __ANDROID__ -+#if defined (__ANDROID__) || defined(__HAIKU__) - #include "pthread-fixes.h" - #endif --#include - - #include "uv-threadpool.h" - -diff --git a/src/unix/core.c b/src/unix/core.c -index 6f284ff..9b9bfe3 100644 ---- a/src/unix/core.c -+++ b/src/unix/core.c -@@ -43,6 +43,11 @@ - # include - #endif - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - #ifdef __sun - # include - # include -@@ -876,7 +881,7 @@ int uv_getrusage(uv_rusage_t* rusage) { - rusage->ru_stime.tv_sec = usage.ru_stime.tv_sec; - rusage->ru_stime.tv_usec = usage.ru_stime.tv_usec; - -- rusage->ru_maxrss = usage.ru_maxrss; -+ /*rusage->ru_maxrss = usage.ru_maxrss; - rusage->ru_ixrss = usage.ru_ixrss; - rusage->ru_idrss = usage.ru_idrss; - rusage->ru_isrss = usage.ru_isrss; -@@ -889,7 +894,7 @@ int uv_getrusage(uv_rusage_t* rusage) { - rusage->ru_msgrcv = usage.ru_msgrcv; - rusage->ru_nsignals = usage.ru_nsignals; - rusage->ru_nvcsw = usage.ru_nvcsw; -- rusage->ru_nivcsw = usage.ru_nivcsw; -+ rusage->ru_nivcsw = usage.ru_nivcsw;*/ - - return 0; - } -diff --git a/src/unix/haiku.c b/src/unix/haiku.c -new file mode 100644 -index 0000000..357eb41 ---- /dev/null -+++ b/src/unix/haiku.c -@@ -0,0 +1,115 @@ -+#include "uv.h" -+#include "internal.h" -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#undef NANOSEC -+#define NANOSEC ((uint64_t) 1e9) -+ -+static char *process_title; -+ -+int uv_platform_loop_init(uv_loop_t* loop, int default_loop) { -+ return 1; -+} -+ -+void uv__platform_loop_delete(uv_loop_t* loop) { -+} -+ -+uint64_t uv__hrtime(uv_clocktype_t type) { -+ struct timespec ts; -+ clock_gettime(CLOCK_MONOTONIC, &ts); -+ return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); -+} -+ -+int uv_exepath(char* buffer, size_t* size) { -+ -+ -+ return 0; -+} -+ -+ -+uint64_t uv_get_free_memory(void) { -+ -+} -+ -+ -+uint64_t uv_get_total_memory(void) { -+ -+} -+ -+ -+void uv_loadavg(double avg[3]) { -+ -+} -+ -+ -+char** uv_setup_args(int argc, char** argv) { -+ process_title = argc ? strdup(argv[0]) : NULL; -+ return argv; -+} -+ -+ -+int uv_set_process_title(const char* title) { -+ -+ return 0; -+} -+ -+ -+int uv_get_process_title(char* buffer, size_t size) { -+ -+ return 0; -+} -+ -+ -+int uv_resident_set_memory(size_t* rss) { -+ -+ return 0; -+} -+ -+ -+int uv_uptime(double* uptime) { -+ return 0; -+} -+ -+ -+int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) { -+ -+ return 0; -+} -+ -+ -+void uv_free_cpu_info(uv_cpu_info_t* cpu_infos, int count) { -+ int i; -+ -+ for (i = 0; i < count; i++) { -+ free(cpu_infos[i].model); -+ } -+ -+ free(cpu_infos); -+} -+ -+ -+int uv_interface_addresses(uv_interface_address_t** addresses, int* count) { -+ -+ return 0; -+} -+ -+ -+void uv_free_interface_addresses(uv_interface_address_t* addresses, -+ int count) { -+ int i; -+ -+ for (i = 0; i < count; i++) { -+ free(addresses[i].name); -+ } -+ -+ free(addresses); -+} -diff --git a/src/unix/pthread-fixes.c b/src/unix/pthread-fixes.c -index dc54f35..3a71eb5 100644 ---- a/src/unix/pthread-fixes.c -+++ b/src/unix/pthread-fixes.c -@@ -35,6 +35,7 @@ - * */ - #include - #include -+#include - - int uv__pthread_sigmask(int how, const sigset_t* set, sigset_t* oset) { - static int workaround; -diff --git a/uv.gyp b/uv.gyp -index 45af6a1..21390e0 100644 ---- a/uv.gyp -+++ b/uv.gyp -@@ -10,7 +10,7 @@ - ['OS=="solaris"', { - 'cflags': [ '-pthreads' ], - }], -- ['OS not in "solaris android"', { -+ ['OS not in "solaris android haiku"', { - 'cflags': [ '-pthread' ], - }], - ], -@@ -152,13 +152,13 @@ - 'src/unix/udp.c', - ], - 'link_settings': { -- 'libraries': [ '-lm' ], - 'conditions': [ - ['OS=="solaris"', { - 'ldflags': [ '-pthreads' ], - }], -- ['OS != "solaris" and OS != "android"', { -+ ['OS != "solaris" and OS != "android" and OS != "haiku"', { - 'ldflags': [ '-pthread' ], -+ 'libraries': [ '-lm' ], - }], - ], - }, -@@ -175,7 +175,7 @@ - }], - ], - }], -- [ 'OS in "linux mac android"', { -+ [ 'OS in "linux mac android haiku"', { - 'sources': [ 'src/unix/proctitle.c' ], - }], - [ 'OS=="mac"', { -@@ -205,6 +205,15 @@ - 'libraries': [ '-ldl', '-lrt' ], - }, - }], -+ [ 'OS=="haiku"', { -+ 'sources': [ -+ 'src/unix/haiku.c', -+ 'src/unix/pthread-fixes.c', -+ ], -+ 'link_settings': { -+ 'libraries': [ '-lroot', '-lnetwork' ], -+ }, -+ }], - [ 'OS=="android"', { - 'sources': [ - 'src/unix/linux-core.c', -@@ -268,167 +277,6 @@ - }], - ] - }, -- -- { -- 'target_name': 'run-tests', -- 'type': 'executable', -- 'dependencies': [ 'libuv' ], -- 'sources': [ -- 'test/blackhole-server.c', -- 'test/echo-server.c', -- 'test/run-tests.c', -- 'test/runner.c', -- 'test/runner.h', -- 'test/test-get-loadavg.c', -- 'test/task.h', -- 'test/test-active.c', -- 'test/test-async.c', -- 'test/test-async-null-cb.c', -- 'test/test-callback-stack.c', -- 'test/test-callback-order.c', -- 'test/test-close-fd.c', -- 'test/test-close-order.c', -- 'test/test-connection-fail.c', -- 'test/test-cwd-and-chdir.c', -- 'test/test-default-loop-close.c', -- 'test/test-delayed-accept.c', -- 'test/test-error.c', -- 'test/test-embed.c', -- 'test/test-emfile.c', -- 'test/test-fail-always.c', -- 'test/test-fs.c', -- 'test/test-fs-event.c', -- 'test/test-get-currentexe.c', -- 'test/test-get-memory.c', -- 'test/test-getaddrinfo.c', -- 'test/test-getnameinfo.c', -- 'test/test-getsockname.c', -- 'test/test-handle-fileno.c', -- 'test/test-hrtime.c', -- 'test/test-idle.c', -- 'test/test-ip6-addr.c', -- 'test/test-ipc.c', -- 'test/test-ipc-send-recv.c', -- 'test/test-list.h', -- 'test/test-loop-handles.c', -- 'test/test-loop-alive.c', -- 'test/test-loop-close.c', -- 'test/test-loop-stop.c', -- 'test/test-loop-time.c', -- 'test/test-loop-configure.c', -- 'test/test-walk-handles.c', -- 'test/test-watcher-cross-stop.c', -- 'test/test-multiple-listen.c', -- 'test/test-osx-select.c', -- 'test/test-pass-always.c', -- 'test/test-ping-pong.c', -- 'test/test-pipe-bind-error.c', -- 'test/test-pipe-connect-error.c', -- 'test/test-pipe-getsockname.c', -- 'test/test-pipe-sendmsg.c', -- 'test/test-pipe-server-close.c', -- 'test/test-pipe-close-stdout-read-stdin.c', -- 'test/test-platform-output.c', -- 'test/test-poll.c', -- 'test/test-poll-close.c', -- 'test/test-poll-close-doesnt-corrupt-stack.c', -- 'test/test-poll-closesocket.c', -- 'test/test-process-title.c', -- 'test/test-ref.c', -- 'test/test-run-nowait.c', -- 'test/test-run-once.c', -- 'test/test-semaphore.c', -- 'test/test-shutdown-close.c', -- 'test/test-shutdown-eof.c', -- 'test/test-shutdown-twice.c', -- 'test/test-signal.c', -- 'test/test-signal-multiple-loops.c', -- 'test/test-socket-buffer-size.c', -- 'test/test-spawn.c', -- 'test/test-fs-poll.c', -- 'test/test-stdio-over-pipes.c', -- 'test/test-tcp-bind-error.c', -- 'test/test-tcp-bind6-error.c', -- 'test/test-tcp-close.c', -- 'test/test-tcp-close-accept.c', -- 'test/test-tcp-close-while-connecting.c', -- 'test/test-tcp-connect-error-after-write.c', -- 'test/test-tcp-shutdown-after-write.c', -- 'test/test-tcp-flags.c', -- 'test/test-tcp-connect-error.c', -- 'test/test-tcp-connect-timeout.c', -- 'test/test-tcp-connect6-error.c', -- 'test/test-tcp-open.c', -- 'test/test-tcp-write-to-half-open-connection.c', -- 'test/test-tcp-write-after-connect.c', -- 'test/test-tcp-writealot.c', -- 'test/test-tcp-try-write.c', -- 'test/test-tcp-unexpected-read.c', -- 'test/test-tcp-read-stop.c', -- 'test/test-tcp-write-queue-order.c', -- 'test/test-threadpool.c', -- 'test/test-threadpool-cancel.c', -- 'test/test-thread-equal.c', -- 'test/test-mutexes.c', -- 'test/test-thread.c', -- 'test/test-barrier.c', -- 'test/test-condvar.c', -- 'test/test-timer-again.c', -- 'test/test-timer-from-check.c', -- 'test/test-timer.c', -- 'test/test-tty.c', -- 'test/test-udp-bind.c', -- 'test/test-udp-dgram-too-big.c', -- 'test/test-udp-ipv6.c', -- 'test/test-udp-open.c', -- 'test/test-udp-options.c', -- 'test/test-udp-send-and-recv.c', -- 'test/test-udp-send-immediate.c', -- 'test/test-udp-send-unreachable.c', -- 'test/test-udp-multicast-join.c', -- 'test/test-udp-multicast-join6.c', -- 'test/test-dlerror.c', -- 'test/test-udp-multicast-ttl.c', -- 'test/test-ip4-addr.c', -- 'test/test-ip6-addr.c', -- 'test/test-udp-multicast-interface.c', -- 'test/test-udp-multicast-interface6.c', -- 'test/test-udp-try-send.c', -- ], -- 'conditions': [ -- [ 'OS=="win"', { -- 'sources': [ -- 'test/runner-win.c', -- 'test/runner-win.h' -- ], -- 'libraries': [ '-lws2_32' ] -- }, { # POSIX -- 'defines': [ '_GNU_SOURCE' ], -- 'sources': [ -- 'test/runner-unix.c', -- 'test/runner-unix.h', -- ], -- }], -- [ 'OS=="solaris"', { # make test-fs.c compile, needs _POSIX_C_SOURCE -- 'defines': [ -- '__EXTENSIONS__', -- '_XOPEN_SOURCE=500', -- ], -- }], -- [ 'OS=="aix"', { # make test-fs.c compile, needs _POSIX_C_SOURCE -- 'defines': [ -- '_ALL_SOURCE', -- '_XOPEN_SOURCE=500', -- ], -- }], -- ], -- 'msvs-settings': { -- 'VCLinkerTool': { -- 'SubSystem': 1, # /subsystem:console -- }, -- }, -- }, -- - { - 'target_name': 'run-benchmarks', - 'type': 'executable', --- -1.8.3.4 - From 55b8b476bead570cb70ec6aab6238d3da1ad1a9c Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 17 Jan 2015 16:21:31 +0100 Subject: [PATCH 11/42] Add Remember --- haiku-apps/remember/remember-1.0.0.recipe | 45 +++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 haiku-apps/remember/remember-1.0.0.recipe diff --git a/haiku-apps/remember/remember-1.0.0.recipe b/haiku-apps/remember/remember-1.0.0.recipe new file mode 100644 index 000000000..50446fa37 --- /dev/null +++ b/haiku-apps/remember/remember-1.0.0.recipe @@ -0,0 +1,45 @@ +SUMMARY="A small app to remember scheduled events" +DESCRIPTION="\ +Remember is a small app for Haiku, which allows you to get notifications about \ +events easily, by adding files into an Events folder. It will automatically \ +find those and, when the time you chose has arrived, it will pop up with a \ +notification, warning you about the event." + +HOMEPAGE="https://github.com/HaikuArchives/Remember" +SRC_URI="https://github.com/HaikuArchives/Remember/archive/1a794865a438563ea4ce1fc9188679444cd115ef.tar.gz" +SOURCE_DIR="Remember-1a794865a438563ea4ce1fc9188679444cd115ef" +CHECKSUM_SHA256="ce1a7f0e05437a6ae069e642d234ddbf5916f58425692ab7dbb88d75ead6a29f" +REVISION="1" +LICENSE="MIT" +COPYRIGHT="2005 Michael Lotz" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + remember = $portVersion + app:remember = $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/Remember $appsDir + addAppDeskbarSymlink $appsDir/Remember +} From d7157c181d7bf70558c8211d0e2e2fcd122f8e9a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 17 Jan 2015 17:50:46 +0000 Subject: [PATCH 12/42] ham-0.1.recipe edited online with Bitbucket Add note to description about this being WIP and NOT ready for HaikuDepot --- sys-devel/ham/ham-0.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/ham/ham-0.1.recipe b/sys-devel/ham/ham-0.1.recipe index a875b85bb..b95d0d867 100644 --- a/sys-devel/ham/ham-0.1.recipe +++ b/sys-devel/ham/ham-0.1.recipe @@ -1,6 +1,6 @@ SUMMARY="Build tool, replacement for jam" DESCRIPTION="Ham is a a meaty Jam build tool replacement - +THIS IS A WORK IN PROGRESS AND NOT YET READY FOR HAIKUDEPOT One of the main goals is to have an API library, so that IDEs can implement \ actual Jam support. Another one is to add features that are complicated to add \ in Jam (like more intelligent header scanning, plug-in support (for header \ From 3f6e0a87f11286a4b7a7bf5f291b8229cf59b758 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 17 Jan 2015 19:32:34 +0100 Subject: [PATCH 13/42] Add RetroArch recipe --- .../patches/retroarch-1.0.0.3_beta.patchset | 35 ++++++++ .../retroarch/retroarch-1.0.0.3_beta.recipe | 81 +++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 games-emulation/retroarch/patches/retroarch-1.0.0.3_beta.patchset create mode 100644 games-emulation/retroarch/retroarch-1.0.0.3_beta.recipe diff --git a/games-emulation/retroarch/patches/retroarch-1.0.0.3_beta.patchset b/games-emulation/retroarch/patches/retroarch-1.0.0.3_beta.patchset new file mode 100644 index 000000000..33669b03f --- /dev/null +++ b/games-emulation/retroarch/patches/retroarch-1.0.0.3_beta.patchset @@ -0,0 +1,35 @@ +From 4a135acf9cafd827f1a59ecdf268253848ca80b7 Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sat, 17 Jan 2015 18:58:21 +0100 +Subject: FFMPEG record driver: Fix Haiku build + + +diff --git a/record/ffmpeg.c b/record/ffmpeg.c +index f0099e0..6f17aa4 100644 +--- a/record/ffmpeg.c ++++ b/record/ffmpeg.c +@@ -27,7 +27,9 @@ extern "C" { + #include + #include + #include ++#ifndef __HAIKU__ + #include ++#endif + #include + #ifdef HAVE_AV_CHANNEL_LAYOUT + #include +@@ -56,7 +58,10 @@ extern "C" { + #include + #endif + +-#if LIBAVUTIL_VERSION_INT <= AV_VERSION_INT(52, 9, 0) ++#if defined(__HAIKU__) ++#define av_frame_alloc avcodec_alloc_frame ++#define av_frame_free av_free ++#elif LIBAVUTIL_VERSION_INT <= AV_VERSION_INT(52, 9, 0) + #define av_frame_alloc avcodec_alloc_frame + #define av_frame_free avcodec_free_frame + #endif +-- +1.8.3.4 + diff --git a/games-emulation/retroarch/retroarch-1.0.0.3_beta.recipe b/games-emulation/retroarch/retroarch-1.0.0.3_beta.recipe new file mode 100644 index 000000000..6a93f59a2 --- /dev/null +++ b/games-emulation/retroarch/retroarch-1.0.0.3_beta.recipe @@ -0,0 +1,81 @@ +SUMMARY="The reference frontend of libretro" +DESCRIPTION="RetroArch is a frontend for the libretro specification for \ +emulation. Libretro supports easy creation of emulators, but people can also \ +make their own frontends and plug existing emulators. It also supports OpenGL \ +shaders and other cool stuff." +HOMEPAGE="https://libretro.com" +SRC_URI="https://github.com/libretro/RetroArch/archive/1.0.0.3-beta.tar.gz" +CHECKSUM_SHA256="bd5be24d81c214db036b756e222f5a8e5cddd3e1c1a2a98180317673c0ca0cc7" +SOURCE_DIR="RetroArch-1.0.0.3-beta" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2010-2015 The RetroArch Team" +PATCHES="retroarch-1.0.0.3_beta.patchset" + +ARCHITECTURES="?x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + retroarch$secondaryArchSuffix = $portVersion + app:retroarch$secondaryArchSuffix = $portVersion + cmd:retroarch$secondaryArchSuffix = $portVersion + cmd:retroarch_joyconfig$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + retroarch${secondaryArchSuffix}_devel = $portVersion + devel:retroarch$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libsdl2$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + ffmpeg$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + retroarch$secondaryArchSuffix == $portVersion base + ffmpeg${secondaryArchSuffix}_devel + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libsdl2$secondaryArchSuffix + devel:libgl$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:make + cmd:which + cmd:pkg_config$secondaryArchSuffix + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + ./configure + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir/RetroArch + mkdir -p $binDir + mkdir -p $includeDir + + cp retroarch $appsDir/RetroArch + cp tools/retroarch-joyconfig $appsDir/RetroArch + + symlinkRelative -s $appsDir/RetroArch/* $binDir + addAppDeskbarSymlink $appsDir/RetroArch/retroarch RetroArch + + cp libretro.h $includeDir + packageEntries devel \ + $developDir +} From 26082ca34f48a98b5a484a2f3034c3b69408c233 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 17 Jan 2015 20:23:01 +0100 Subject: [PATCH 14/42] Add bsnes_libretro recipe --- .../bsnes_libretro/bsnes_libretro-git.recipe | 50 ++++++++ .../patches/bsnes_libretro_x86-git.patchset | 119 ++++++++++++++++++ 2 files changed, 169 insertions(+) create mode 100644 games-emulation/bsnes_libretro/bsnes_libretro-git.recipe create mode 100644 games-emulation/bsnes_libretro/patches/bsnes_libretro_x86-git.patchset diff --git a/games-emulation/bsnes_libretro/bsnes_libretro-git.recipe b/games-emulation/bsnes_libretro/bsnes_libretro-git.recipe new file mode 100644 index 000000000..959733d67 --- /dev/null +++ b/games-emulation/bsnes_libretro/bsnes_libretro-git.recipe @@ -0,0 +1,50 @@ +SUMMARY="A port of bsnes to the libretro architecture" +DESCRIPTION="bsnes is a SNES, NES, and Game Boy (DMG), Color, and Advance \ +emulator. It has a focus on accuracy, but also on speed and can also emulate \ +the Super Game Boy." +HOMEPAGE="http://wiki.libretro.com/index.php?title=Bsnes" +SRC_URI="https://github.com/libretro/bsnes-libretro/archive/4a98250c9bf814d3b48ae8e7836a72115823c05a.tar.gz" +CHECKSUM_SHA256="ae3742fdffce9581ff92ce56bd407dd53afe60efa6efa044bde79f3d89629c39" +SOURCE_DIR="bsnes-libretro-4a98250c9bf814d3b48ae8e7836a72115823c05a" +REVISION="1" +LICENSE="GNU GPL v3" +COPYRIGHT="2014-2015 byuu, the libretro team" + +ARCHITECTURES="?x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +else + ARCHITECTURES="$ARCHITECTURES !x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + bsnes_libretro$secondaryArchSuffix = $portVersion + lib:bsnes_libretro$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + make $jobArgs ui=target-libretro +} + +INSTALL() +{ + mkdir -p $libDir + cp -a out/bsnes_libretro.so $libDir +} diff --git a/games-emulation/bsnes_libretro/patches/bsnes_libretro_x86-git.patchset b/games-emulation/bsnes_libretro/patches/bsnes_libretro_x86-git.patchset new file mode 100644 index 000000000..2778ae6cc --- /dev/null +++ b/games-emulation/bsnes_libretro/patches/bsnes_libretro_x86-git.patchset @@ -0,0 +1,119 @@ +From 56a7340a68473a078cc321d4c50bf8a0d1628efd Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sat, 17 Jan 2015 19:54:22 +0100 +Subject: Fix Haiku build + + +diff --git a/Makefile b/Makefile +index 70f3e6d..96e38da 100644 +--- a/Makefile ++++ b/Makefile +@@ -47,6 +47,9 @@ ifeq ($(findstring libretro,$(ui)),) + ifeq ($(platform),x) + flags += -march=native + link += -Wl,-export-dynamic -ldl -lX11 -lXext ++ else ifeq ($(platform),haiku) ++ flags += -march=native ++ link += -Wl,-export-dynamic + else ifeq ($(platform),win) + ifeq ($(arch),win32) + flags += -m32 +diff --git a/nall/Makefile b/nall/Makefile +index 4e12a39..051cfe2 100755 +--- a/nall/Makefile ++++ b/nall/Makefile +@@ -25,6 +25,9 @@ ifeq ($(platform),) + else ifneq ($(findstring Darwin,$(uname)),) + platform := osx + delete = rm -f $1 ++ else ifneq ($(findstring Haiku,$(uname)),) ++ platform := haiku ++ delete = rm -f $1 + else + platform := unix + delete = rm -f $1 +diff --git a/nall/directory.hpp b/nall/directory.hpp +index 45a062c..d711554 100644 +--- a/nall/directory.hpp ++++ b/nall/directory.hpp +@@ -190,12 +190,18 @@ private: + while(ep = readdir(dp)) { + if(!strcmp(ep->d_name, ".")) continue; + if(!strcmp(ep->d_name, "..")) continue; ++#if defined(PLATFORM_HAIKU) ++ struct stat sp = {0}; ++ stat(string{pathname, ep->d_name}, &sp); ++ bool is_directory = S_ISDIR(sp.st_mode); ++#else + bool is_directory = ep->d_type & DT_DIR; + if(ep->d_type & DT_UNKNOWN) { + struct stat sp = {0}; + stat(string{pathname, ep->d_name}, &sp); + is_directory = S_ISDIR(sp.st_mode); + } ++#endif + if(is_directory) { + if(strmatch(ep->d_name, pattern)) list.append(ep->d_name); + } +@@ -215,7 +221,13 @@ private: + while(ep = readdir(dp)) { + if(!strcmp(ep->d_name, ".")) continue; + if(!strcmp(ep->d_name, "..")) continue; ++#if defined(PLATFORM_HAIKU) ++ struct stat sp = {0}; ++ stat(string{pathname, ep->d_name}, &sp); ++ if(S_ISDIR(sp.st_mode)) { ++#else + if((ep->d_type & DT_DIR) == 0) { ++#endif + if(strmatch(ep->d_name, pattern)) list.append(ep->d_name); + } + } +diff --git a/nall/intrinsics.hpp b/nall/intrinsics.hpp +index db44996..e3dc078 100755 +--- a/nall/intrinsics.hpp ++++ b/nall/intrinsics.hpp +@@ -3,7 +3,7 @@ + + struct Intrinsics { + enum class Compiler : unsigned { Clang, GCC, VisualCPP, Unknown }; +- enum class Platform : unsigned { Windows, MacOSX, X, Unknown }; //X = Linux, BSD, etc ++ enum class Platform : unsigned { Windows, MacOSX, X, BeAPI, Unknown }; //X = Linux, BSD, etc + enum class Architecture : unsigned { x86, amd64, ARM, Unknown }; + enum class Endian : unsigned { LSB, MSB, Unknown }; + +@@ -38,6 +38,9 @@ struct Intrinsics { + #elif defined(linux) || defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__GNU__) + #define PLATFORM_X + Intrinsics::Platform Intrinsics::platform() { return Intrinsics::Platform::X; } ++#elif defined(__HAIKU__) ++ #define PLATFORM_HAIKU ++ Intrinsics::Platform Intrinsics::platform() { return Intrinsics::Platform::BeAPI; } + #else + #warning "unable to detect platform" + #define PLATFORM_UNKNOWN +diff --git a/target-libretro/Makefile b/target-libretro/Makefile +index b923e2b..66bf743 100755 +--- a/target-libretro/Makefile ++++ b/target-libretro/Makefile +@@ -7,6 +7,8 @@ output := libretro + + ifeq ($(platform),unix) + flags += -fPIC ++else ifeq ($(platform),haiku) ++ flags += -fPIC + else ifeq ($(platform),osx) + flags += -fPIC + else ifeq ($(platform),ios) +@@ -35,6 +37,8 @@ obj/libretro.o: $(ui)/libretro.cpp $(ui)/* + build: $(objects) + ifeq ($(platform),unix) + $(compiler) -o out/bsnes_libretro.so -shared $(objects) -ldl -Wl,--no-undefined -Wl,--version-script=$(ui)/link.T ++else ifeq ($(platform),haiku) ++ $(compiler) -o out/bsnes_libretro.so -shared $(objects) -lnetwork -Wl,--no-undefined -Wl,--version-script=$(ui)/link.T + else ifeq ($(platform),ios) + $(compiler) -o out/bsnes_libretro_ios.dylib -dynamiclib $(objects) -isysroot $(IOSSDK) -arch armv7 + else ifeq ($(platform),osx) +-- +1.8.3.4 + From 7d1303b6b6448e78d21cd9e5f965a813e181d19e Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sat, 17 Jan 2015 19:35:12 +0100 Subject: [PATCH 15/42] libsdl2: Add extra check on switching context, fix build --- media-libs/libsdl2/libsdl2-2.0.3.recipe | 4 +-- .../libsdl2/patches/libsdl2-2.0.3.patchset | 29 +++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/media-libs/libsdl2/libsdl2-2.0.3.recipe b/media-libs/libsdl2/libsdl2-2.0.3.recipe index 5c92df11f..d29592ab3 100644 --- a/media-libs/libsdl2/libsdl2-2.0.3.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.3.recipe @@ -8,7 +8,7 @@ emulators, and popular games. HOMEPAGE="http://www.libsdl.org/" SRC_URI="http://www.libsdl.org/release/SDL2-$portVersion.tar.gz" CHECKSUM_SHA256="a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c" -REVISION="1" +REVISION="2" LICENSE="Zlib" COPYRIGHT="1997-2014 Sam Lantinga" @@ -30,7 +30,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libGL$secondaryArchSuffix + devel:libgl$secondaryArchSuffix devel:libglu$secondaryArchSuffix " diff --git a/media-libs/libsdl2/patches/libsdl2-2.0.3.patchset b/media-libs/libsdl2/patches/libsdl2-2.0.3.patchset index 39f127e6f..6ce4023cf 100644 --- a/media-libs/libsdl2/patches/libsdl2-2.0.3.patchset +++ b/media-libs/libsdl2/patches/libsdl2-2.0.3.patchset @@ -1,4 +1,4 @@ -From d6e2e7b054e8aff4979dc762b33236c4391587b0 Mon Sep 17 00:00:00 2001 +From 3f0701d67fbbd5398c8c7cdbc41faa62d16aea85 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Aug 2014 15:24:11 +0000 Subject: haiku patch @@ -126,7 +126,7 @@ index 245cec1..52ee67a 100644 1.8.3.4 -From 10d5f202f16294da23c5752d9a2d9d1ea238cde3 Mon Sep 17 00:00:00 2001 +From 344472b0218ba8acbc535c0c456ede1c1008ad67 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 3 Sep 2014 19:22:12 +0200 Subject: Fix null pointer dereference. @@ -149,3 +149,28 @@ index 52ee67a..2f0073d 100644 -- 1.8.3.4 + +From 4c1fe53d13c6cada30bcb1606308487154003d9a Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sat, 17 Jan 2015 19:33:32 +0100 +Subject: SDL_BApp: Make sure _current_context isn't NULL before trying to lock + it + + +diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h +index 1e4a0f5..a13ea3b 100644 +--- a/src/main/haiku/SDL_BApp.h ++++ b/src/main/haiku/SDL_BApp.h +@@ -193,7 +193,8 @@ public: + if(_current_context) + _current_context->UnlockGL(); + _current_context = newContext; +- _current_context->LockGL(); ++ if (_current_context) ++ _current_context->LockGL(); + } + private: + /* Event management */ +-- +1.8.3.4 + From 9dfe2a9d78fae21b5b24f1809169ae1faa810ee7 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Sat, 17 Jan 2015 22:14:15 +0100 Subject: [PATCH 16/42] Add recipe for Niue --- haiku-apps/niue/licenses/Niue | 16 +++++++++++ haiku-apps/niue/niue-20140701.recipe | 41 ++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 haiku-apps/niue/licenses/Niue create mode 100644 haiku-apps/niue/niue-20140701.recipe diff --git a/haiku-apps/niue/licenses/Niue b/haiku-apps/niue/licenses/Niue new file mode 100644 index 000000000..4318b9470 --- /dev/null +++ b/haiku-apps/niue/licenses/Niue @@ -0,0 +1,16 @@ +Niue Development Environment +Copyright 2008 T. Lansbergen, All Rights Reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted for non-commercial use only. + +This software is provided ``as is'' and any express or implied warranties, +including, but not limited to, the implied warranties of merchantability and +fitness for a particular purpose are disclaimed. In no event shall +authors be liable for any direct, indirect, incidental, special, +exemplary, or consequential damages (including, but not limited to, +procurement of substitute goods or services; loss of use, data, or profits; +or business interruption) however caused and on any theory of liability, +whether in contract, strict liability, or tort (including negligence or +otherwise) arising in any way out of the use of this software, even if +advised of the possibility of such damage. diff --git a/haiku-apps/niue/niue-20140701.recipe b/haiku-apps/niue/niue-20140701.recipe new file mode 100644 index 000000000..c74588444 --- /dev/null +++ b/haiku-apps/niue/niue-20140701.recipe @@ -0,0 +1,41 @@ +SUMMARY="An easy to use but powerful development environment" +DESCRIPTION="Niue is an easy to use but powerful development environment for \ +Haiku. It supports project management, syntax highlighting, GUI builder and more." + +HOMEPAGE="https://github.com/HaikuArchives/Niue" +SRC_URI="git+https://github.com/HaikuArchives/Niue#6745dcca121799572d0b4c98f9a006b6a657aac2" +REVISION="1" +LICENSE="Niue" +COPYRIGHT="2008 T. Lansbergen" + +ARCHITECTURES="x86_gcc2" + +PROVIDES=" + niue = $portVersion + app:niue = $portVersion + " +REQUIRES=" + haiku + " +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:gcc + cmd:mkdepend + " + +BUILD() +{ + mkdir Source/obj.x86 + make -C Source $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + cp -a Source/Niue $appsDir + addAppDeskbarSymlink $appsDir/Niue +} From fc4d492b24df59640782179b3652e501904bc6c8 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Sat, 17 Jan 2015 17:30:19 +0200 Subject: [PATCH 17/42] libmusicbrainz: Add libmusicbrainz 5.1.0 recipe and patchset --- .../musicbrainz/musicbrainz-5.0.1.recipe | 30 ----- .../musicbrainz/musicbrainz-5.1.0.recipe | 61 ++++++++++ .../patches/musicbrainz-5.1.0.patchset | 104 ++++++++++++++++++ 3 files changed, 165 insertions(+), 30 deletions(-) delete mode 100644 media-libs/musicbrainz/musicbrainz-5.0.1.recipe create mode 100644 media-libs/musicbrainz/musicbrainz-5.1.0.recipe create mode 100644 media-libs/musicbrainz/patches/musicbrainz-5.1.0.patchset diff --git a/media-libs/musicbrainz/musicbrainz-5.0.1.recipe b/media-libs/musicbrainz/musicbrainz-5.0.1.recipe deleted file mode 100644 index b8a85c876..000000000 --- a/media-libs/musicbrainz/musicbrainz-5.0.1.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="The MusicBrainz Client Library (for accessing the latest XML based web service" -HOMEPAGE="http://musicbrainz.org/doc/libmusicbrainz" -SRC_URI="https://github.com/downloads/metabrainz/libmusicbrainz/libmusicbrainz-5.0.1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="a0406b94c341c2b52ec0fe98f57cadf3" -MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building." - -BUILD() -{ - cd libmusicbrainz-5.0.1 - cmake . - make -} - -INSTALL() -{ - cd libmusicbrainz-5.0.1 - make install -} - -TEST() -{ - cd libmusicbrainz-5.0.1 - make test -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="2012 Andrew Hawkins" diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.recipe b/media-libs/musicbrainz/musicbrainz-5.1.0.recipe new file mode 100644 index 000000000..316f48d9e --- /dev/null +++ b/media-libs/musicbrainz/musicbrainz-5.1.0.recipe @@ -0,0 +1,61 @@ +SUMMARY="Lookup capabilities for music files" +DESCRIPTION="The MusicBrainz Client Library (libmusicbrainz), also known as \ +mb_client, is a development library geared towards developers who wish to \ +add MusicBrainz lookup capabilities to their applications." + +REVISION="1" +HOMEPAGE="http://musicbrainz.org/doc/libmusicbrainz" +SRC_URI="https://github.com/metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz" +CHECKSUM_SHA256="6749259e89bbb273f3f5ad7acdffb7c47a2cf8fcaeab4c4695484cef5f4c6b46" + +COPYRIGHT="2012 Andrew Hawkins" +LICENSE="GNU LGPL v2.1" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + musicbrainz$secondaryArchSuffix = $portVersion + lib:libmusicbrainz5$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libneon$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libneon$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + cmd:cmake + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +PATCHES="musicbrainz-5.1.0.patchset" + +BUILD() { + cmake . -DCMAKE_INSTALL_PREFIX=$prefix + make +} + +INSTALL() { + make install + + prepareInstalledDevelLibs libmusicbrainz5 + fixPkgconfig + + packageEntries devel \ + $developDir +} + +PROVIDES_devel=" + musicbrainz${secondaryArchSuffix}_devel = $portVersion + devel:libmusicbrainz5$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + musicbrainz$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/musicbrainz/patches/musicbrainz-5.1.0.patchset b/media-libs/musicbrainz/patches/musicbrainz-5.1.0.patchset new file mode 100644 index 000000000..4dc62ad06 --- /dev/null +++ b/media-libs/musicbrainz/patches/musicbrainz-5.1.0.patchset @@ -0,0 +1,104 @@ +From 5b985f20b6ac7aafaaccba676aeda2770b0794ed Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Sat, 17 Jan 2015 17:23:20 +0200 +Subject: [PATCH 1/4] Add secondary arch suffix to library path + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 384cb65..32770df 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + FIND_PACKAGE(Neon REQUIRED) + FIND_PACKAGE(LibXml2 REQUIRED) + +-SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") ++SET(LIB_SUFFIX "${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}" CACHE STRING "Define suffix of directory name (32/64)") + SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) + SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) + SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) +-- +1.8.3.4 + +From 43f6063c57e697082e7942248ee471677e157f50 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Sat, 17 Jan 2015 17:25:04 +0200 +Subject: [PATCH 2/4] Change header installation directory on Haiku + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 32770df..a3550a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,7 +26,11 @@ SET(LIB_SUFFIX "${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}" CACHE STRING "Define suffi + SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) + SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) + SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) ++if (HAIKU) ++SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/develop/headers CACHE PATH "Installation prefix for C header files" FORCE) ++else (HAIKU) + SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) ++endif (HAIKU) + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz5.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile) +-- +1.8.3.4 + +From bb1836b89190990cae7f4ef505824eae6baa61be Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Sat, 17 Jan 2015 17:25:26 +0200 +Subject: [PATCH 3/4] Remove tests and examples build + +Doesn't work with gcc2 (std::boolalpha) +--- + CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3550a1..4d5fa02 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,8 +41,6 @@ INSTALL(FILES ${headers} ${CMAKE_CURRENT_BINARY_DIR}/include/musicbrainz5/mb5_c. + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz5.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + + ADD_SUBDIRECTORY(src) +-ADD_SUBDIRECTORY(tests) +-ADD_SUBDIRECTORY(examples) + + ADD_CUSTOM_TARGET(docs + doxygen +-- +1.8.3.4 + +From f980c76455c341b6f97f728709a4e726447f0355 Mon Sep 17 00:00:00 2001 +From: Theodore Kokkoris +Date: Sat, 17 Jan 2015 17:25:56 +0200 +Subject: [PATCH 4/4] Remove -Wextra (doesn't exist on gcc2) + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c91a565..160d5c0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -65,7 +65,7 @@ IF(WIN32) + ENDIF(WIN32) + + IF(CMAKE_COMPILER_IS_GNUCXX) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic-errors") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic-errors") + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git) +-- +1.8.3.4 + From 71a8cf57bc45331009ec2925249be75ccc9153cf Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 17 Jan 2015 20:05:31 -0800 Subject: [PATCH 18/42] Fix SOURCE_DIR for musicbrainz --- media-libs/musicbrainz/musicbrainz-5.1.0.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-libs/musicbrainz/musicbrainz-5.1.0.recipe b/media-libs/musicbrainz/musicbrainz-5.1.0.recipe index 316f48d9e..96f46aed5 100644 --- a/media-libs/musicbrainz/musicbrainz-5.1.0.recipe +++ b/media-libs/musicbrainz/musicbrainz-5.1.0.recipe @@ -37,6 +37,8 @@ BUILD_PREREQUIRES=" PATCHES="musicbrainz-5.1.0.patchset" +SOURCE_DIR="libmusicbrainz-$portVersion" + BUILD() { cmake . -DCMAKE_INSTALL_PREFIX=$prefix make From 7dd53d845c0893db4dfcf539b91a959e98bc839a Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Sun, 18 Jan 2015 04:53:38 +0000 Subject: [PATCH 19/42] Mini XML Library --- dev-cpp/mxml/mxml-2.9.patchset | 28 ++++++++++++++ dev-cpp/mxml/mxml-2.9.recipe | 68 ++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 dev-cpp/mxml/mxml-2.9.patchset create mode 100644 dev-cpp/mxml/mxml-2.9.recipe diff --git a/dev-cpp/mxml/mxml-2.9.patchset b/dev-cpp/mxml/mxml-2.9.patchset new file mode 100644 index 000000000..dda6daa16 --- /dev/null +++ b/dev-cpp/mxml/mxml-2.9.patchset @@ -0,0 +1,28 @@ +From e15adf9b52db905f16349ecefa2785443d16fdfd Mon Sep 17 00:00:00 2001 +From: Derek Tse +Date: Sun, 18 Jan 2015 04:09:22 +0000 +Subject: Fixed configure + + +diff --git a/configure.in b/configure.in +index de1bf8b..7d3494d 100644 +--- a/configure.in ++++ b/configure.in +@@ -207,6 +207,14 @@ if test x$enable_shared != xno; then + DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)" + LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" + ;; ++ ++ Haiku*) ++ AC_MSG_RESULT(yes) ++ LIBMXML="libmxml.so.1.5" ++ DSO="\$(CC)" ++ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)" ++ LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" ++ ;; + + Darwin*) + AC_MSG_RESULT(yes) +-- +1.8.3.4 + diff --git a/dev-cpp/mxml/mxml-2.9.recipe b/dev-cpp/mxml/mxml-2.9.recipe new file mode 100644 index 000000000..a5d9dab9b --- /dev/null +++ b/dev-cpp/mxml/mxml-2.9.recipe @@ -0,0 +1,68 @@ +SUMMARY="Minimum XML Library" +DESCRIPTION=" Mini-XML is a small XML parsing library that you can \ +use to read XML and XML-like data files in your application without \ +requiring large non-standard libraries." +HOMEPAGE="http://www.minixml.org/index.php" +SRC_URI="http://www.msweet.org/files/project3/mxml-2.9.tar.gz" +CHECKSUM_SHA256="cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92" +SOURCE_DIR="mxml-2.9" +REVISION="2" +LICENSE="GNU LGPL v2" +COPYRIGHT="2003-2014 Michael R Sweet" + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + mxml$secondaryArchSuffix = $portVersion + lib:mxml$secondaryArchSuffix = $portVersion + " +#PROVIDES_devel=" +# mxml${secondaryArchSuffix}_devel >= $portVersion +# devel:mxml$secondaryArchSuffix >= $portVersion +# " + +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +#REQUIRES_devel=" +# haiku${secondaryArchSuffix}_devel +# " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " + +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:make +# cmd:aclocal +# cmd:automake + cmd:autoconf + cmd:mkdepend + cmd:gcc${secondaryArchSuffix} + cmd:ld${secondaryArchSuffix} +" + +PATCHES="mxml-2.9.patchset +" + +BUILD() +{ + libtoolize -fci + autoconf + runConfigure ./configure --enable-shared + sed -i "s|LIBS = -pthread|LIBS=|" $sourceDir/Makefile + make $jobArgs +} + +INSTALL() +{ + make install +# prepareInstalledDevelLibs \ +# libmxml +# packageEntries devel \ +# $developDir +} \ No newline at end of file From 8718c000bf56248a199c4f865bf4ceac908ad9b0 Mon Sep 17 00:00:00 2001 From: Derek Tse Date: Sun, 18 Jan 2015 05:06:36 +0000 Subject: [PATCH 20/42] Marked as broken --- dev-cpp/mxml/mxml-2.9.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/mxml/mxml-2.9.recipe b/dev-cpp/mxml/mxml-2.9.recipe index a5d9dab9b..83ab4e278 100644 --- a/dev-cpp/mxml/mxml-2.9.recipe +++ b/dev-cpp/mxml/mxml-2.9.recipe @@ -10,8 +10,8 @@ REVISION="2" LICENSE="GNU LGPL v2" COPYRIGHT="2003-2014 Michael R Sweet" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" PROVIDES=" mxml$secondaryArchSuffix = $portVersion From 7c31d203af7e7bf93e342c1e5801bb299d1ea86b Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 17 Jan 2015 22:27:02 -0800 Subject: [PATCH 21/42] Moved mxml-2.9.patchset into patches directory --- dev-cpp/mxml/{ => patches}/mxml-2.9.patchset | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dev-cpp/mxml/{ => patches}/mxml-2.9.patchset (100%) diff --git a/dev-cpp/mxml/mxml-2.9.patchset b/dev-cpp/mxml/patches/mxml-2.9.patchset similarity index 100% rename from dev-cpp/mxml/mxml-2.9.patchset rename to dev-cpp/mxml/patches/mxml-2.9.patchset From fb991a5ca491edb1087731afc1ca019d77d460e8 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 18 Jan 2015 14:22:00 +0100 Subject: [PATCH 22/42] Add autotrace recipe --- media-gfx/autotrace/autotrace-0.31.1.recipe | 65 + .../patches/autotrace-0.31.1.patchset | 3243 +++++++++++++++++ 2 files changed, 3308 insertions(+) create mode 100644 media-gfx/autotrace/autotrace-0.31.1.recipe create mode 100644 media-gfx/autotrace/patches/autotrace-0.31.1.patchset diff --git a/media-gfx/autotrace/autotrace-0.31.1.recipe b/media-gfx/autotrace/autotrace-0.31.1.recipe new file mode 100644 index 000000000..6301abeb9 --- /dev/null +++ b/media-gfx/autotrace/autotrace-0.31.1.recipe @@ -0,0 +1,65 @@ +SUMMARY="A program to turn bitmaps into vectors" +DESCRIPTION="AutoTrace is a program that can convert bitmaps into \ +close vectors. It tries to replicate the image as close as possible while \ +still being usable to edit manually. It is made to compete with other \ +commercial products that do the same." +HOMEPAGE="http://autotrace.sourceforge.net" +SRC_URI="http://sourceforge.net/projects/autotrace/files/AutoTrace/0.31.1/autotrace-0.31.1.tar.gz/download" +SOURCE_DIR="autotrace-0.31.1" +CHECKSUM_SHA256="5a1a923c3335dfd7cbcccb2bbd4cc3d68cafe7713686a2f46a1591ed8a92aff6" +REVISION="1" +LICENSE="GNU GPL v2" +COPYRIGHT="2000-2002 AutoTrace contributors" +PATCHES="autotrace-0.31.1.patchset" + +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + autotrace$secondaryArchSuffix = $portVersion + lib:libautotrace$secondaryArchSuffix = $portVersion + cmd:autotrace$secondaryArchSuffix = $portVersion + cmd:autotrace_config$secondaryArchSuffix = $portVersion + " +PROVIDES_devel=" + autotrace${secondaryArchSuffix}_devel = $portVersion + devel:libautotrace$secondaryArchSuffix = $portVersion + " + +REQUIRES=" + haiku$secondaryArchSuffix + " +REQUIRES_devel=" + haiku${secondaryArchSuffix}_devel + autotrace$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + cmd:autoconf + " + +BUILD() +{ + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + mkdir -p $developLibDir + + fixPkgconfig + + prepareInstalledDevelLibs \ + libautotrace + packageEntries devel \ + $developDir +} diff --git a/media-gfx/autotrace/patches/autotrace-0.31.1.patchset b/media-gfx/autotrace/patches/autotrace-0.31.1.patchset new file mode 100644 index 000000000..a41533300 --- /dev/null +++ b/media-gfx/autotrace/patches/autotrace-0.31.1.patchset @@ -0,0 +1,3243 @@ +From 2389b1b9a11cb6c24580e1ce40e814e108ddbc67 Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sun, 18 Jan 2015 12:10:14 +0100 +Subject: Update config.guess and config.sub + + +diff --git a/config.guess b/config.guess +index fd30ab0..dbfb978 100755 +--- a/config.guess ++++ b/config.guess +@@ -1,13 +1,12 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002 Free Software Foundation, Inc. ++# Copyright 1992-2015 Free Software Foundation, Inc. + +-timestamp='2002-07-23' ++timestamp='2015-01-01' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 2 of the License, or ++# the Free Software Foundation; either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, but +@@ -16,24 +15,22 @@ timestamp='2002-07-23' + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). ++# ++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. + # +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# Please send patches to . ++ + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -53,8 +50,7 @@ version="\ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright 1992-2015 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -66,11 +62,11 @@ Try \`$me --help' for more information." + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -98,30 +94,32 @@ trap 'exit 1' 1 2 15 + # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still + # use `HOST_CC' if defined, but it is deprecated. + +-# This shell variable is my proudest work .. or something. --bje ++# Portable tmp directory creation inspired by the Autoconf team. + +-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; +-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) +- || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; +-dummy=$tmpdir/dummy ; +-files="$dummy.c $dummy.o $dummy.rel $dummy" ; +-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; + case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do +- if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; +- rm -f $files ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +-esac ; +-unset files' ++esac ; set_cc_for_build= ;' + + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. + # (ghazi@noc.rutgers.edu 1994-08-24) +@@ -134,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + ++case "${UNAME_SYSTEM}" in ++Linux|GNU|GNU/*) ++ # If the system lacks a compiler, then just pick glibc. ++ # We could probably try harder. ++ LIBC=gnu ++ ++ eval $set_cc_for_build ++ cat <<-EOF > $dummy.c ++ #include ++ #if defined(__UCLIBC__) ++ LIBC=uclibc ++ #elif defined(__dietlibc__) ++ LIBC=dietlibc ++ #else ++ LIBC=gnu ++ #endif ++ EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ++ ;; ++esac ++ + # Note: order is significant - the case branches are not exclusive. + + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -156,6 +175,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -164,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -174,148 +194,139 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- macppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvmeppc:OpenBSD:*:*) +- echo powerpc-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mipseb-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; + alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then ++ case $UNAME_RELEASE in ++ *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. +- eval $set_cc_for_build +- cat <$dummy.s +- .data +-\$Lformat: +- .byte 37,100,45,37,120,10,0 # "%d-%x\n" +- +- .text +- .globl main +- .align 4 +- .ent main +-main: +- .frame \$30,16,\$26,0 +- ldgp \$29,0(\$27) +- .prologue 1 +- .long 0x47e03d80 # implver \$0 +- lda \$2,-1 +- .long 0x47e20c21 # amask \$2,\$1 +- lda \$16,\$Lformat +- mov \$0,\$17 +- not \$1,\$18 +- jsr \$26,printf +- ldgp \$29,0(\$26) +- mov 0,\$16 +- jsr \$26,exit +- .end main +-EOF +- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- case `$dummy` in +- 0-0) +- UNAME_MACHINE="alpha" +- ;; +- 1-0) +- UNAME_MACHINE="alphaev5" +- ;; +- 1-1) +- UNAME_MACHINE="alphaev56" +- ;; +- 1-101) +- UNAME_MACHINE="alphapca56" +- ;; +- 2-303) +- UNAME_MACHINE="alphaev6" +- ;; +- 2-307) +- UNAME_MACHINE="alphaev67" +- ;; +- 2-1307) +- UNAME_MACHINE="alphaev68" +- ;; +- 3-1307) +- UNAME_MACHINE="alphaev7" +- ;; +- esac +- fi +- rm -f $dummy.s $dummy && rmdir $tmpdir +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix +- exit 0 ;; ++ exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 +- exit 0 ;; ++ exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 +- exit 0;; ++ exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; ++ exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos +- exit 0 ;; ++ exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition +- exit 0 ;; ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; ++ exit ;; ++ arm*:riscos:*:*|arm*:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp +- exit 0;; ++ exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then +@@ -323,29 +334,51 @@ EOF + else + echo pyramid-pyramid-bsd + fi +- exit 0 ;; ++ exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 +- exit 0 ;; +- DRS?6000:UNIX_SV:4.2*:7*) ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in +- sparc) echo sparc-icl-nx7 && exit 0 ;; ++ sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) +@@ -354,10 +387,10 @@ EOF + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; ++ exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +@@ -369,10 +402,10 @@ EOF + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac +- exit 0 ;; ++ exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor +@@ -382,38 +415,41 @@ EOF + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 +- exit 0 ;; ++ exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -437,33 +473,36 @@ EOF + exit (-1); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy \ +- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 +- rm -f $dummy.c $dummy && rmdir $tmpdir ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax +- exit 0 ;; +- Night_Hawk:*:*:PowerMAX_OS) ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax +- exit 0 ;; ++ exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix +- exit 0 ;; ++ exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 +- exit 0 ;; ++ exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 +- exit 0 ;; ++ exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -476,29 +515,29 @@ EOF + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 +- exit 0 ;; ++ exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 +- exit 0 ;; ++ exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 +- exit 0 ;; ++ exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd +- exit 0 ;; ++ exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; ++ exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix +- exit 0 ;; ++ exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` +@@ -506,7 +545,7 @@ EOF + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build +@@ -521,50 +560,54 @@ EOF + exit(0); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 +- rm -f $dummy.c $dummy && rmdir $tmpdir +- echo rs6000-ibm-aix3.2.5 ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi +- exit 0 ;; +- *:AIX:*:[45]) ++ exit ;; ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` ++ if [ -x /usr/bin/lslpp ] ; then ++ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | ++ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; ++ exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix +- exit 0 ;; ++ exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 +- exit 0 ;; ++ exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 ++ exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx +- exit 0 ;; ++ exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 +- exit 0 ;; ++ exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd +- exit 0 ;; ++ exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 +- exit 0 ;; ++ exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in +@@ -573,64 +616,84 @@ EOF + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include ++ #define _HPUX_SOURCE ++ #include ++ #include + +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF +- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` +- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi +- rm -f $dummy.c $dummy && rmdir $tmpdir ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} +- exit 0 ;; ++ exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +@@ -658,277 +721,345 @@ EOF + exit (0); + } + EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 +- rm -f $dummy.c $dummy && rmdir $tmpdir ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 +- exit 0 ;; ++ exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd +- exit 0 ;; ++ exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd +- exit 0 ;; ++ exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix +- exit 0 ;; ++ exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf +- exit 0 ;; ++ exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf +- exit 0 ;; ++ exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi +- exit 0 ;; ++ exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites +- exit 0 ;; ++ exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit 0 ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit 0 ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit 0 ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit 0 ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit 0 ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; +- CRAY*T3D:*:*:*) +- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' +- exit 0 ;; ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:FreeBSD:*:*) +- # Determine whether the default compiler uses glibc. +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #if __GLIBC__ >= 2 +- LIBC=gnu +- #else +- LIBC= +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- rm -f $dummy.c && rmdir $tmpdir +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} +- exit 0 ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) ++ exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; ++ exit ;; ++ *:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 +- exit 0 ;; +- x86:Interix*:3*) +- echo i386-pc-interix3 +- exit 0 ;; ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; ++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ++ echo i${UNAME_MACHINE}-pc-mks ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? +- echo i386-pc-interix +- exit 0 ;; ++ echo i586-pc-interix ++ exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin +- exit 0 ;; ++ exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; ++ exit ;; + *:GNU:*:*) +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; ++ # the GNU system ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} ++ exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix +- exit 0 ;; ++ exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ arc:Linux:*:* | arceb:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + arm*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ cris:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} ++ exit ;; ++ crisv32:Linux:*:*) ++ echo ${UNAME_MACHINE}-axis-linux-${LIBC} ++ exit ;; ++ frv:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ i*86:Linux:*:*) ++ echo ${UNAME_MACHINE}-pc-linux-${LIBC} ++ exit ;; + ia64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + m68*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; +- mips:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips +- #undef mipsel ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` +- rm -f $dummy.c && rmdir $tmpdir +- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit 0 ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit 0 ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +- exit 0 ;; ++ openrisc*:Linux:*:*) ++ echo or1k-unknown-linux-${LIBC} ++ exit ;; ++ or32:Linux:*:* | or1k*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-${LIBC} ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-${LIBC} ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +- PA7*) echo hppa1.1-unknown-linux-gnu ;; +- PA8*) echo hppa2.0-unknown-linux-gnu ;; +- *) echo hppa-unknown-linux-gnu ;; ++ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; ++ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; ++ *) echo hppa-unknown-linux-${LIBC} ;; + esac +- exit 0 ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu +- exit 0 ;; ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-${LIBC} ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-${LIBC} ++ exit ;; ++ ppc64le:Linux:*:*) ++ echo powerpc64le-unknown-linux-${LIBC} ++ exit ;; ++ ppcle:Linux:*:*) ++ echo powerpcle-unknown-linux-${LIBC} ++ exit ;; + s390:Linux:*:* | s390x:Linux:*:*) +- echo ${UNAME_MACHINE}-ibm-linux +- exit 0 ;; ++ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + sh*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu +- exit 0 ;; ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-${LIBC} ++ exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu +- exit 0 ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit 0 ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit 0 ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit 0 ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #ifdef __INTEL_COMPILER +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +-EOF +- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` +- rm -f $dummy.c && rmdir $tmpdir +- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 +- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 +- ;; ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 +- exit 0 ;; ++ exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +@@ -936,15 +1067,16 @@ EOF + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi +- exit 0 ;; +- i*86:*:5:[78]*) ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} +- exit 0 ;; ++ exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi +- exit 0 ;; ++ exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 +- exit 0 ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 +- exit 0 ;; ++ exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` +@@ -1036,61 +1181,109 @@ EOF + else + echo ns32k-sni-sysv + fi +- exit 0 ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit 0 ;; ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 +- exit 0 ;; ++ exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 +- exit 0 ;; ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos +- exit 0 ;; ++ exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 +- exit 0 ;; ++ exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit 0 ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos +- exit 0 ;; ++ exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos +- exit 0 ;; ++ exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos +- exit 0 ;; ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; ++ SX-6:SUPER-UX:*:*) ++ echo sx6-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Darwin:*:*) +- echo `uname -p`-apple-darwin${UNAME_RELEASE} +- exit 0 ;; ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ eval $set_cc_for_build ++ if test "$UNAME_PROCESSOR" = unknown ; then ++ UNAME_PROCESSOR=powerpc ++ fi ++ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ case $UNAME_PROCESSOR in ++ i386) UNAME_PROCESSOR=x86_64 ;; ++ powerpc) UNAME_PROCESSOR=powerpc64 ;; ++ esac ++ fi ++ fi ++ elif test "$UNAME_PROCESSOR" = i386 ; then ++ # Avoid executing cc on OS X 10.9, as it ships with a stub ++ # that puts up a graphical alert prompting to install ++ # developer tools. Any system running Mac OS X 10.7 or ++ # later (Darwin 11 and later) is required to have a 64-bit ++ # processor. This is not true of the ARM version of Darwin ++ # that Apple uses in portable devices. ++ UNAME_PROCESSOR=x86_64 ++ fi ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then +@@ -1098,22 +1291,28 @@ EOF + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:QNX:*:4*) + echo i386-pc-qnx +- exit 0 ;; +- NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux +- exit 0 ;; ++ exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv +- exit 0 ;; ++ exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} +- exit 0 ;; ++ exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 +@@ -1124,189 +1323,55 @@ EOF + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 +- exit 0 ;; +- i*86:OS/2:*:*) +- # If we were able to find `uname', then EMX Unix compatibility +- # is probably installed. +- echo ${UNAME_MACHINE}-pc-os2-emx +- exit 0 ;; ++ exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 +- exit 0 ;; ++ exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex +- exit 0 ;; ++ exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 +- exit 0 ;; ++ exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 +- exit 0 ;; ++ exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 +- exit 0 ;; ++ exit ;; + *:ITS:*:*) + echo pdp10-unknown-its +- exit 0 ;; +- i*86:XTS-300:*:STOP) +- echo ${UNAME_MACHINE}-unknown-stop +- exit 0 ;; +- i*86:atheos:*:*) +- echo ${UNAME_MACHINE}-unknown-atheos +- exit 0 ;; ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-eval $set_cc_for_build +-cat >$dummy.c < +-# include +-#endif +-main () +-{ +-#if defined (sony) +-#if defined (MIPSEB) +- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +- I don't know.... */ +- printf ("mips-sony-bsd\n"); exit (0); +-#else +-#include +- printf ("m68k-sony-newsos%s\n", +-#ifdef NEWSOS4 +- "4" +-#else +- "" +-#endif +- ); exit (0); +-#endif +-#endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); +-#endif +- +-#if defined (NeXT) +-#if !defined (__ARCHITECTURE__) +-#define __ARCHITECTURE__ "m68k" +-#endif +- int version; +- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- if (version < 4) +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); +- else +- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); +- exit (0); +-#endif +- +-#if defined (MULTIMAX) || defined (n16) +-#if defined (UMAXV) +- printf ("ns32k-encore-sysv\n"); exit (0); +-#else +-#if defined (CMU) +- printf ("ns32k-encore-mach\n"); exit (0); +-#else +- printf ("ns32k-encore-bsd\n"); exit (0); +-#endif +-#endif +-#endif +- +-#if defined (__386BSD__) +- printf ("i386-pc-bsd\n"); exit (0); +-#endif +- +-#if defined (sequent) +-#if defined (i386) +- printf ("i386-sequent-dynix\n"); exit (0); +-#endif +-#if defined (ns32000) +- printf ("ns32k-sequent-dynix\n"); exit (0); +-#endif +-#endif +- +-#if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); +- +-#endif +- +-#if defined (vax) +-# if !defined (ultrix) +-# include +-# if defined (BSD) +-# if BSD == 43 +- printf ("vax-dec-bsd4.3\n"); exit (0); +-# else +-# if BSD == 199006 +- printf ("vax-dec-bsd4.3reno\n"); exit (0); +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# endif +-# else +- printf ("vax-dec-bsd\n"); exit (0); +-# endif +-# else +- printf ("vax-dec-ultrix\n"); exit (0); +-# endif +-#endif +- +-#if defined (alliant) && defined (i860) +- printf ("i860-alliant-bsd\n"); exit (0); +-#endif +- +- exit (1); +-} +-EOF +- +-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 +-rm -f $dummy.c $dummy && rmdir $tmpdir +- +-# Apollos put the system type in the environment. +- +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +- +-# Convex versions that predate uname can use getsysinfo(1) +- +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit 0 ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit 0 ;; +- c34*) +- echo c34-convex-bsd +- exit 0 ;; +- c38*) +- echo c38-convex-bsd +- exit 0 ;; +- c4*) +- echo c4-convex-bsd +- exit 0 ;; +- esac +-fi +- + cat >&2 <. ++# + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. ++# the same distribution terms that you use for the rest of that ++# program. This Exception is an additional permission under section 7 ++# of the GNU General Public License, version 3 ("GPLv3"). ++ + + # Please send patches to . + # +@@ -36,6 +32,9 @@ timestamp='2001-09-07' + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -69,8 +68,7 @@ Report bugs and patches to ." + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-Free Software Foundation, Inc. ++Copyright 1992-2015 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -82,11 +80,11 @@ Try \`$me --help' for more information." + while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) +- echo "$timestamp" ; exit 0 ;; ++ echo "$timestamp" ; exit ;; + --version | -v ) +- echo "$version" ; exit 0 ;; ++ echo "$version" ; exit ;; + --help | --h* | -h ) +- echo "$usage"; exit 0 ;; ++ echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. +@@ -98,7 +96,7 @@ while test $# -gt 0 ; do + *local*) + # First pass through any local machine types. + echo $1 +- exit 0;; ++ exit ;; + + * ) + break ;; +@@ -117,10 +115,18 @@ esac + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -143,10 +149,13 @@ case $os in + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -161,13 +170,17 @@ case $os in + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -184,6 +197,10 @@ case $os in + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +@@ -201,6 +218,12 @@ case $os in + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -225,43 +248,113 @@ case $basic_machine in + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ +- | c4x | clipper \ +- | d10v | d30v | dsp16xx \ +- | fr30 \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arceb \ ++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ ++ | avr | avr32 \ ++ | be32 | be64 \ ++ | bfin \ ++ | c4x | c8051 | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ ++ | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ +- | m32r | m68000 | m68k | m88k | mcore \ +- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ +- | mips64vr4100 | mips64vr4100el | mips64vr4300 \ +- | mips64vr4300el | mips64vr5000 | mips64vr5000el \ +- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ +- | mipsisa32 \ ++ | ip2k | iq2000 \ ++ | k1om \ ++ | le32 | le64 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa32r6 | mipsisa32r6el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64r6 | mipsisa64r6el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipsr5900 | mipsr5900el \ ++ | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nds32 | nds32le | nds32be \ ++ | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ +- | openrisc \ ++ | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | s390 | s390x \ +- | sh | sh[34] | sh[34]eb | shbe | shle \ +- | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ +- | stormy16 | strongarm \ +- | tahoe | thumb | tic80 | tron \ +- | v850 \ ++ | riscv32 | riscv64 \ ++ | rl78 | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ ++ | visium \ + | we32k \ +- | x86 | xscale \ +- | z8k) ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ leon|leon[3-9]) ++ basic_machine=sparc-$basic_machine ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and +@@ -277,41 +370,87 @@ case $basic_machine in + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ +- | alphapca5[67]-* | arc-* \ +- | arm-* | armbe-* | armle-* | armv*-* \ +- | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c54x-* \ +- | clipper-* | cray2-* | cydra-* \ +- | d10v-* | d30v-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | be32-* | be64-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ ++ | c8051-* | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ +- | m32r-* \ +- | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | mcore-* \ +- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ +- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ +- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ +- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ ++ | ip2k-* | iq2000-* \ ++ | k1om-* \ ++ | le32-* | le64-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa32r6-* | mipsisa32r6el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64r6-* | mipsisa64r6el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipsr5900-* | mipsr5900el-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ ++ | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ ++ | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* \ +- | s390-* | s390x-* \ +- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ +- | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ +- | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ +- | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ +- | v850-* | vax-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ ++ | visium-* \ + | we32k-* \ +- | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -329,6 +468,9 @@ case $basic_machine in + basic_machine=a29k-amd + os=-udi + ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout +@@ -343,6 +485,12 @@ case $basic_machine in + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv +@@ -366,6 +514,10 @@ case $basic_machine in + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -374,6 +526,35 @@ case $basic_machine in + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -394,30 +575,45 @@ case $basic_machine in + basic_machine=c38-convex + os=-bsd + ;; +- cray | ymp) +- basic_machine=ymp-cray ++ cray | j90) ++ basic_machine=j90-cray + os=-unicos + ;; +- cray2) +- basic_machine=cray2-cray +- os=-unicos ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp + ;; +- [cjt]90) +- basic_machine=${basic_machine}-cray +- os=-unicos ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown ++ os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola +@@ -426,6 +622,14 @@ case $basic_machine in + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx +@@ -537,7 +741,6 @@ case $basic_machine in + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -576,6 +779,17 @@ case $basic_machine in + basic_machine=m68k-isi + os=-sysv + ;; ++ leon-*|leon[3-9]-*) ++ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -587,10 +801,21 @@ case $basic_machine in + basic_machine=ns32k-utek + os=-sysv + ;; ++ microblaze*) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) +- basic_machine=i386-pc ++ basic_machine=i686-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -598,36 +823,43 @@ case $basic_machine in + basic_machine=m68k-atari + os=-mint + ;; +- mipsel*-linux*) +- basic_machine=mipsel-unknown +- os=-linux-gnu +- ;; +- mips*-linux*) +- basic_machine=mips-unknown +- os=-linux-gnu +- ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; +- mmix*) +- basic_machine=mmix-knuth +- os=-mmixware +- ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; ++ moxiebox) ++ basic_machine=moxie-unknown ++ os=-moxiebox ++ ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ msys) ++ basic_machine=i686-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -692,6 +924,12 @@ case $basic_machine in + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -699,6 +937,13 @@ case $basic_machine in + basic_machine=hppa1.1-oki + os=-proelf + ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose +@@ -715,55 +960,76 @@ case $basic_machine in + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; +- pc532 | pc532-*) ++ pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; +- pentium | p5 | k5 | k6 | nexgen) ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +- pentiumpro | p6 | 6x86 | athlon) ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; +- pentiumii | pentium2) ++ pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; +- pentium-* | p5-* | k5-* | k6-* | nexgen-*) ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +- pentiumii-* | pentium2-*) ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown +- ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc | ppcbe) basic_machine=powerpc-unknown ++ ;; ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +- ;; ++ ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown +- ;; ++ ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown +- ;; ++ ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; +@@ -774,6 +1040,14 @@ case $basic_machine in + basic_machine=i586-unknown + os=-pw32 + ;; ++ rdos | rdos64) ++ basic_machine=x86_64-pc ++ os=-rdos ++ ;; ++ rdos32) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff +@@ -784,10 +1058,30 @@ case $basic_machine in + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; + sequent) + basic_machine=i386-sequent + ;; +@@ -795,7 +1089,13 @@ case $basic_machine in + basic_machine=sh-hitachi + os=-hms + ;; +- sparclite-wrs) ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; +@@ -813,6 +1113,9 @@ case $basic_machine in + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -862,12 +1165,16 @@ case $basic_machine in + os=-dynix + ;; + t3e) +- basic_machine=t3e-cray ++ basic_machine=alphaev5-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ tile*) ++ basic_machine=$basic_machine-unknown ++ os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown +@@ -875,9 +1182,17 @@ case $basic_machine in + tx39el) + basic_machine=mipstx39el-unknown + ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; + udi29k) + basic_machine=a29k-amd + os=-udi +@@ -899,8 +1214,8 @@ case $basic_machine in + os=-vms + ;; + vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; ++ basic_machine=f301-fujitsu ++ ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks +@@ -921,21 +1236,28 @@ case $basic_machine in + basic_machine=hppa1.1-winbond + os=-proelf + ;; +- windows32) +- basic_machine=i386-pc +- os=-windows32-msvcrt +- ;; +- xmp) +- basic_machine=xmp-cray +- os=-unicos ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 + ;; +- xps | xps100) ++ xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -952,16 +1274,12 @@ case $basic_machine in + op60c) + basic_machine=hppa1.1-oki + ;; +- mips) +- if [ x$os = x-linux-gnu ]; then +- basic_machine=mips-unknown +- else +- basic_machine=mips-mips +- fi +- ;; + romp) + basic_machine=romp-ibm + ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; + rs6000) + basic_machine=rs6000-ibm + ;; +@@ -978,13 +1296,13 @@ case $basic_machine in + we32k) + basic_machine=we32k-att + ;; +- sh3 | sh4 | sh3eb | sh4eb) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sparc | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; +- cydra) ++ cydra) + basic_machine=cydra-cydrome + ;; + orion) +@@ -999,10 +1317,6 @@ case $basic_machine in + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; +- c4x*) +- basic_machine=c4x-none +- os=-coff +- ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; +@@ -1029,9 +1343,12 @@ esac + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; +@@ -1052,23 +1369,31 @@ case $os in + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ +- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ +- | -os2* | -vos*) ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1080,16 +1405,21 @@ case $os in + ;; + esac + ;; ++ -nto-qnx*) ++ ;; + -nto*) +- os=-nto-qnx ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; +@@ -1102,6 +1432,9 @@ case $os in + -opened*) + os=-openedition + ;; ++ -os400*) ++ os=-os400 ++ ;; + -wince*) + os=-wince + ;; +@@ -1120,14 +1453,23 @@ case $os in + -acis*) + os=-aos + ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; + -ns2 ) +- os=-nextstep2 ++ os=-nextstep2 + ;; + -nsk*) + os=-nsk +@@ -1139,6 +1481,9 @@ case $os in + -sinix*) + os=-sysv4 + ;; ++ -tpf*) ++ os=-tpf ++ ;; + -triton*) + os=-sysv3 + ;; +@@ -1166,8 +1511,19 @@ case $os in + -xenix) + os=-xenix + ;; +- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) +- os=-mint ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) + ;; + -none) + ;; +@@ -1191,6 +1547,12 @@ else + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1200,10 +1562,29 @@ case $basic_machine in + arm*-semi) + os=-aout + ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ c8051-*) ++ os=-elf ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; +- pdp11-*) ++ pdp11-*) + os=-none + ;; + *-dec | vax-*) +@@ -1217,19 +1598,22 @@ case $basic_machine in + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; ++ or32-*) ++ os=-coff ++ ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; +@@ -1239,9 +1623,15 @@ case $basic_machine in + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1293,19 +1683,19 @@ case $basic_machine in + *-next) + os=-nextstep3 + ;; +- *-gould) ++ *-gould) + os=-sysv + ;; +- *-highlevel) ++ *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; +- *-sgi) ++ *-sgi) + os=-irix + ;; +- *-siemens) ++ *-siemens) + os=-sysv4 + ;; + *-masscomp) +@@ -1344,7 +1734,7 @@ case $basic_machine in + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +@@ -1374,10 +1764,16 @@ case $basic_machine in + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; +- -vxsim* | -vxworks*) ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) +@@ -1401,7 +1797,7 @@ case $basic_machine in + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +-- +1.8.3.4 + + +From f57f1e7cb4abb28d88bc7994b19f2e77cf0b334f Mon Sep 17 00:00:00 2001 +From: Puck Meerburg +Date: Sun, 18 Jan 2015 13:47:23 +0100 +Subject: ltmain: Check for haiku to discard -lm and -lc + + +diff --git a/ltmain.sh b/ltmain.sh +index c8c38c2..d7ad92f 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -1048,7 +1048,7 @@ compiler." + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in +- *-*-cygwin* | *-*-pw32* | *-*-beos*) ++ *-*-cygwin* | *-*-pw32* | *-*-beos* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; +-- +1.8.3.4 + From 3cf60fdc4a8008600262d16c0a856556821634a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Sun, 18 Jan 2015 18:44:14 +0000 Subject: [PATCH 23/42] libuv 1.2.0 style fixes --- dev-libs/libuv/libuv-1.2.0.recipe | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dev-libs/libuv/libuv-1.2.0.recipe b/dev-libs/libuv/libuv-1.2.0.recipe index 1a38420b4..e259db925 100644 --- a/dev-libs/libuv/libuv-1.2.0.recipe +++ b/dev-libs/libuv/libuv-1.2.0.recipe @@ -4,9 +4,8 @@ libuv is a multi-platform support library with a focus on asynchronous I/O. \ It was primarily developed for use by Node.js, but it's also used by Luvit, \ Julia, pyuv, and others." HOMEPAGE="http://github.com/libuv/libuv" -#SRC_URI="http://libuv.org/dist/v1.2.0/libuv-v1.2.0.tar.gz" -#CHECKSUM_SHA256="40e2d7b3ea9800d2a4fc6423c1cdcb4deaa6a834eaa02e22ad0de5dd4f3d8e10" SRC_URI="git://github.com/hamishm/libuv#d48e9ae4bd504aadc25e26f06e83e9c2c86921ac" +SOURCE_DIR="libuv-v1.2.0" REVISION="1" LICENSE="MIT" COPYRIGHT="2009-2015 Ryan Dahl and others" @@ -45,15 +44,17 @@ BUILD_PREREQUIRES=" cmd:gyp " -SOURCE_DIR="libuv-v1.2.0" +REQUIRES_devel=" + libuv$secondaryArchSuffix == $portVersion +" -#PATCHES="libuv-1.2.0.patchset" +PROVIDES_devel=" + libuv${secondaryArchSuffix}_devel = $portVersion + devel:libuv$secondaryArchSuffix = $portVersion +" BUILD() { - #./autogen.sh - #runConfigure ./configure - #make rm -rf out ./gyp_uv.py -f make -Dcomponent=shared_library -Duv_library=shared_library make -C out BUILDTYPE=Release @@ -79,12 +80,3 @@ TEST() # Test suite doesn't pass } -REQUIRES_devel=" - libuv$secondaryArchSuffix == $portVersion -" - -PROVIDES_devel=" - libuv${secondaryArchSuffix}_devel = $portVersion - devel:libuv$secondaryArchSuffix = $portVersion -" - From 1c7b79e0301f9ef4395f653289be378b5c3df0ca Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 18 Jan 2015 19:45:32 +0000 Subject: [PATCH 24/42] Update Moe recipe to use HaikuArchives repo --- haiku-apps/moe/moe-1.1.2.recipe | 39 +-- haiku-apps/moe/patches/moe-1.1.2.patchset | 372 ---------------------- 2 files changed, 12 insertions(+), 399 deletions(-) delete mode 100644 haiku-apps/moe/patches/moe-1.1.2.patchset diff --git a/haiku-apps/moe/moe-1.1.2.recipe b/haiku-apps/moe/moe-1.1.2.recipe index f1e21a762..7310f634a 100644 --- a/haiku-apps/moe/moe-1.1.2.recipe +++ b/haiku-apps/moe/moe-1.1.2.recipe @@ -2,13 +2,13 @@ SUMMARY="A cute mascot on the active window" DESCRIPTION="\ Moe is a program that displays a cute mascot on the active window. \ How about mind cooler for your desktop?" -HOMEPAGE="http://web.archive.org/web/20040205093746/http://www.be-in.org/~yun/index_e.html" +HOMEPAGE="https://github.com/HaikuArchives/moe" LICENSE="GNU GPL v2" COPYRIGHT="2001 Okada Jun" -SRC_URI="http://web.archive.org/web/20040205093746/http://www.be-in.org/~yun/Moe/Moe1.1.2-src.zip" -CHECKSUM_SHA256="4ccbe50ab845ffa5d4e04055f9db4ffa867860c38c58d2f5bd3404982b2c04dc" -SOURCE_DIR="Moe" -REVISION="1" +SRC_URI="https://github.com/HaikuArchives/Moe/archive/68e18f359d114fbce2b0f4247a43c951becc87bc.tar.gz" +CHECKSUM_SHA256="62aaefdd298e41d865d73ed092251469a0cc63b9ed5c2e1531d0a409513d5f46" +SOURCE_DIR="Moe-68e18f359d114fbce2b0f4247a43c951becc87bc" +REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" @@ -34,36 +34,21 @@ BUILD_PREREQUIRES=" cmd:make " -PATCHES="moe-1.1.2.patchset" - BUILD() { - # work around git limitations... - # must recreate the attributes on the sample - addattr -t mime BEOS:TYPE image/png sample/moe.png - addattr -t mime BEOS:PREF_APP application/x-vnd.Kamnagi.Moe sample/moe.png - addattr -t float MOE:Y_RATE 0.287425 sample/moe.png - addattr -t bool MOE:Y_LOCKED 1 sample/moe.png - addattr -t float MOE:X_RATE 0.993443 sample/moe.png - addattr -t bool MOE:X_LOCKED 0 sample/moe.png - addattr -t float MOE:SIZE 1.000000 sample/moe.png - addattr -t int MOE:SIDE 0 sample/moe.png - addattr -f wink1.bin -t "'MSGG'" MOE:ANIME:WINK1 sample/moe.png - addattr -f wink2.bin -t "'MSGG'" MOE:ANIME:WINK2 sample/moe.png + cd sample + ./add_attributes.sh - make + cd ../source + make OBJ_DIR=objects $jobArgs } INSTALL() { - mkdir -p $appsDir/Moe + mkdir -p $appsDir/Moe $binDir - cp -a objects.*-*/Moe $appsDir/Moe + cp -a source/objects/Moe $appsDir/Moe + cp -a sample/moe.png COPYING doc $appsDir/Moe - cp -a 1stReadMe.* sample/moe.png GPL doc $appsDir/Moe - - mkdir $binDir ln -sfn $appsDir/Moe/Moe $binDir/moe - - #addAppDeskbarSymlink $appsDir/Moe/Moe } diff --git a/haiku-apps/moe/patches/moe-1.1.2.patchset b/haiku-apps/moe/patches/moe-1.1.2.patchset deleted file mode 100644 index 289782b24..000000000 --- a/haiku-apps/moe/patches/moe-1.1.2.patchset +++ /dev/null @@ -1,372 +0,0 @@ -From febe68d2f67b820284dde9c2100086dbf2f68b46 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Fri, 8 Aug 2014 19:25:13 +0200 -Subject: [PATCH 1/5] Restore symlinks as from the sources zip - ---- - 1stReadMe.En | 2 +- - 1stReadMe.Ja | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - mode change 100644 => 120000 1stReadMe.En - mode change 100644 => 120000 1stReadMe.Ja - -diff --git a/1stReadMe.En b/1stReadMe.En -deleted file mode 100644 -index 3089786..0000000 ---- a/1stReadMe.En -+++ /dev/null -@@ -1 +0,0 @@ --./doc/en/index.html -\ No newline at end of file -diff --git a/1stReadMe.En b/1stReadMe.En -new file mode 120000 -index 0000000..7f2873c ---- /dev/null -+++ b/1stReadMe.En -@@ -0,0 +1 @@ -+doc/en/index.html -\ No newline at end of file -diff --git a/1stReadMe.Ja b/1stReadMe.Ja -deleted file mode 100644 -index 02451fb..0000000 ---- a/1stReadMe.Ja -+++ /dev/null -@@ -1 +0,0 @@ --./doc/ja/index.html -\ No newline at end of file -diff --git a/1stReadMe.Ja b/1stReadMe.Ja -new file mode 120000 -index 0000000..a0e38c1 ---- /dev/null -+++ b/1stReadMe.Ja -@@ -0,0 +1 @@ -+doc/ja/index.html -\ No newline at end of file --- -1.8.3.4 - - -From 7380810b93c752367c5f5d06934a1b5715580a66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Fri, 8 Aug 2014 19:26:05 +0200 -Subject: [PATCH 2/5] Add binary parts for the sample attributes - -Those are two flattened messages in attributes on sample/moe.png -in the original zip. ---- - wink1.bin | Bin 0 -> 4804 bytes - wink2.bin | Bin 0 -> 4828 bytes - 2 files changed, 0 insertions(+), 0 deletions(-) - create mode 100644 wink1.bin - create mode 100644 wink2.bin - -diff --git a/wink1.bin b/wink1.bin -new file mode 100644 -index 0000000000000000000000000000000000000000..5218a3956794bf486dfb066b8650dcd511e08ca7 -GIT binary patch -literal 4804 -zcmV;#5<{9O>bpEZfR|000000 -z3sO{5Ll6aDZeeX@1^@s6S4mDwF#rGn000004^%@%QV<1Za$#*{0078A001mP004wS -z004MG2S-j%OalxEb7gULWo~0-000000RR91000002S-j%OalxAcVTIC2mk;82mk;8 -z2mk;80aRB(QUU+~01y%Y00d)YY-}6}004N}jg|{si1!-Di`>@S7G_3drJImavXbsp -zDwWjGMXPDZR9iSUhcj%-%xn{O5!pDJSY$Y)dtxb5NJ^uadx@6Y_dM_0vd-q?ct4-# -z^MBvx{a?P%@BjRt_ceF)cGcAAnx5WOL%lS$ef|BMdUOb%9TpqgSsadzQE_v^-cet6 -z_jhvf?a?tLGA3+JgvOIg-%&#&$)UTOm$#=@r;za2cf!IWl%Xx2&LK1AM9vO-D^~M~ -zt4m1C-1r#_;v!qCF<@!L%^qy!{#8e-Os{MmP*IV4~qL -zd`w0#dCXXb=;<@EpDt6(t(oQSg|nR#hmO@ze7>2`@VSf|Fc?p>k=TrJV1({qf^Ej) -z>EK3I$yGl5WD}M$*4tz_zCJ+|lsAyPGnbJAU&G7DjQ9Kku^wWCUJo7I4NRGCV^4&G -zD`N)eVIkut8IQnPxcrBYBFfE!g#lA>9y$WQsc&IzXokDK30~4VnvNj;gH^mP9L~Z& -zO}L%yUC8|T3MJJKSiLa~hv8P(3g5i>E3mhc_k#`a^$z4`iDTL7WUM8Qv4iA&{4z=| -zJYv`3a;%MpF>#0~b3D9pvU9}E-W4ZZeM03vc#J)|-Fjd*&_Lz1dUcTW9g2s<5iD^8 -zjItpj>OJ0`y^v9T`Y}=bHpau)edG))K3d0X+FgZVh;X`+Em{?wY2;whMIyuB!TjZZ -zZ2ayZvGL0>?And68PS}&2&*^j#PZdF4A<2Y9dkHY^O!w3m5ed7z*jU5u(2gNZV5Aj -zqj2o6N0ie9CJZ&FU(a5+>KhB^a4cTY#j^jvYL`L!!fVFlVHWtgc(Xy)GZn4fL_fQc -zHe}>ibL?y*GlfTAyBoF^He?oGp|HGO)$IG-g$#RT06%7)Va@tfdUx)^%1<|Q_A0FT -zDvkaxyvQW)Aods5kdb?y&AalkHZ>OxBdko!Se2B@1V<0X3a5{`B~D{qaFk~|*?TY1 -z-JquqOFm9Y_i^>cvR7Yx#AhdZeYPQufWUApBqk@xxg(;Tvd1T??lX7ZVsu687Vz@O;XbG -zaC7(Ph~#hTPbG}^m`vETC~`}$OHN-__h4Oe2Cu%>cPIeYBD5e6urA?Xka4eJScQFrgDaQO5A}Vvn0<_`98f! -z)l7+NpX{H)m0Nm^!^dh_`}J;)p1wos{t{ATUlpAX+Hu|Sv$Pd5-WX*#3y3|KGxN*?`O`8yjVZWGbiR&+{}b2rXx1XIK25c7`&;ua;M -zFXz_XbF#|tld!nBcyXxc68WcYsy@Z?g;UX`<@tvCUg0h%Q+&5LdgczfC$Ed$AYb|@ -zEIAU-r*fuNt=oaA)EMUpegsFvuv-`=N=|&3_>DSW;UDY=3oc+NTE+`gp_~olzI};~ -zS**r?_R3=t)_#YVSDhmsHN0~>tS9Cv7^?)K-L*dw$S0y#&5`G?jEME47x(7Y3kWUB$ABe|sutt0~&%l(uO6S8MH)EwN^u -z_)U#j@n;^t%%1EDHcLI*zNh6pDD|-In9sjWSKGhN-8!G*e-@V#htfyM=l@}pwsmal -zd~N4HA}o6)pZ}dv%$A*bYOZ|t)h-Smy{N{}ma*-9Ti>&^c$(#u-ca{ljZOCWkh0e$ -zt?e~7NexTdvX6C}_pxG43cf*a;^;OB3u}9N>hz}b3)-~T(!yYf32y|?WagX&Y?U*r -z#G&e5dhIVdURUe0QWF$?lr_@+bLyFlPfT<@P*BZa0~0jcwL?Qw^SMmn^YHZKbj?k| -zrv&p#zX2E;8c8iO{hJLKpo^yFpL4gaqqO5a{m3t?e?C^R(>0AKS43o_)NtdcvT12) -zJyzF~+Gu2GNL5u8D?j_1U?(@+#<`#?-yr2(hYlUk*4D<>Zmi0wsW7S5GFCAion90b -z6;b}{?`jQt9!6zPN~@Zvy>f%Px;k#(zRjXVi(2P=EcWORd)&Ug7G1i$Kte(S6}7jS -z9vDoFk3ZAhCX%>z6Nw3l+_}>rc8BETWC8*Lp0KrA$BrFkd?M$oFRFDe_c^s}+5g*e -zUh8PSf1gujWf&M3(5_ue{E8Nx<)1)X`$b-QNr(CK7f^NS606szFx7cH3#Uxu4cl=n -zU6w%W_2rjI4^2%?pRg$!ck0wxon!myQo^RA&~&8Vyp6Xb|ZRouLSVAfPZ5rOePv -zD8on~qJj!UjGIVsEityJ-)>N%E274Nq9Rz4-a7(46 -zd+*)%mvhfO_x{h^N#r_AMlL5uPKLXN$@=>H2^2>~Es`WAjvq86%z-7qdw6N#d~AuCd~T -z#mVzNONvfBNIp6LAV*(K+JBVzV@Z-E-opng!z4%&`NLFI69zneIBM#^OV0$}hGqz` -zb%3rG57SiC5oB(Sh3-N)+Y69i(}VhJ&kz~47_-&1;mMx{8(T-1scR#`#sQv=ZYXNJ -zgVme&z>?;Q3{4>xFF<+AePkRf#Wann5bE=>%r6+$y86&koB($nBZS+`LbRhRY}K@2 -zLGyeJ%wSEp{7t7L*3APe0z=_!YzDv3PhhRbhda*@Lb^K{nIU=QCd?!p&V)aVa68X( -zK|$RuG{BA(EaWY-d4TUJ>>hIvh@`DVj9a7#g~T1pal`fJSiCd^>cn-%(Gt{Lc}(~p -zBd@p?i!905RShF&yrMGyLPF2##2Q8FtQ4l2d?+(j-KX -zZ(%|zw3R-Dwt^ybNVj36c?056b(}nmCo033c>QA4R+P2eLuB}T(t!ryorL)K&ylwO -z9CRj3!VJD8R<2KnI64vLmNQ{v?}Dj11~`&iiz4Eukg%O4zSC)Z*`;5wFS`tG?*1qw -z{brqM#2k+RNWx-K+SEsy?&WguZAKoZd@vDTuG@hteZX3}ThY6{o)OYBa?#cU#4P*_ -zeB#N9YH7u)?eKT?!0ECs4YT*mPWEi~^cl2f)Ig!EWJ -zm@6+oM2Jr~rfcb72jOQrs_T4;ofNkracoCCWmDbF=9?i@5{HC;Y(UcI8^NQxb@vS5 -zFq|PQE-pgkSKq)<+JF7_{gls3)LZUxys$B4m+o@k8SaW!=DWw$bZK)R*Gg}XX-K4aj-0L^z$nFevE~L!8h?Jn_djDj -zf%RFIgFzqTf6tL36gS-A-jC0~v>%4{O?_eCXlBT;{-rvMB)cSshPdZQPXZ?0-`Z4I}8dCq*ZVt{^VqOHT9jhs4$X>dpVb -zKR528THT4cq96#|gzyQHK%1wBv18xIh!G>`PUqUTU5F64!ELq+lvOoAe^T7Hkt0V! -zR#q1B@(P@9&=eFuApbb%8W_RA*c3K)j$99V7o1z^U&TKpiktUmrl2^U+sn|z61y{w -zprQRK!h<7_;O&oaH!sA-F9)B`hnJTZOifK8J5CP6hY!c7QKO+m=aZ_MCiOfXc)AAM -zdUL!2hSvT&SVil7Z2I?M#4Jd_6je27>*y1Ay5Q*oTW -z54bPw<8AjjE5Fo-a}`}wFTFTZ(uL}lew5dN!&qMb5@P?4kmwVLMM6Ks&hbP@s06+J -zz)yFcproOP(_abckJS`AlR3=~)M&|HU@UEx+R$1ejHD69X?@3YR5dajFHqO=D{3wQ -z)lE{XsDFk0l1Hd(1C}SIBGSaRYcwffO`?J=6J{};_&Ptbh*8Jap@ -zq5d*Z*#KND?MKd;m)M*63Yq&};&=|_IuF=)@HT>+g-G@f#-{-x5Kv!Q?CFiLU@?cY -z`yOzG{#A;q?;Ltv^1I-Z^`Uw(e(W -zzxfOuH=m=U=Q*zQzK~kaOLX=EE!U-a%{>boIs#;50(&xm-Fu{VC<|EjX%@U^%;30; -e_wt1v)rib*wv0Rh001!o0000y<{9O>bpEZfR|008UR# -z3sO{5Ll6aDZeeX@1^@s6S4mDwG5`PoR98V#4^%@%QV<1Za$#*{0078A001mP004wS -z004MG2S-j%Oa&AOb7gULWo~0-000000RR91000000RR91000002S-j%Oa&AKcVTIC -z2mk;82mk;82mk;82mk;82mk;80aRB(QUU+~02mSg00d)YY-}J2004N}jg|{si1!-D -zi`>@S7G_3drJImavXbspDwWjGMXPDZR9iSUhcj%-%xn{O5!pDJSY$Y)tHe^Kkd#I- -z_b#;DzUO)0mUT8C$NTv_pa1(l@Bi|Be*fqHysx>Vx2vW`*YxzR8tSE~?d$L7)T2ZA -z?6BC_&f;)%jEb8R_Kt>k`kJ%d{heHVdvpwmj0u|)q4DI>cht~Ga_H{nJkz&H-5%~xQN(o;_K=^#ld%wtluHz&9JzzXpc#J -zFfEKYZ-0jOAB3^K5e|b4m}oc*ACnPG9y699disp)r^^&`Yi7B7;cVx`q2sj_U1%mW -zd@kb#493%JBsOCl7@<3uV4JacI=GQle2ou3*@UHx^)?xfuTKz1%j!wqnajw5ui<56 -z#(RE&SPwBmuZIrq2Bu86u_wa8l`#YKu#j<+j7MNCT>isH5#{E=!hoqb4;_Ku)VHuU -zG{arr1TSeFO-B&_!75%C4rk$?Cfv^UE@b|EmEx)gtlpT0!*DBXg>T;c71&$J`@shI -zdI$2e#IbC3GS(8u*g^6>ei_9VAF=Cj8P-O_m^j3gIUe3P**W57?~0SIKB00SJjNc~ -zZauIYXrOXhy*fzx4#h*_2$nbkM%fS%^&W4}UdX6E{g^0z8{=W@K5~{7AFbmx?XJQw -zL^xf^7Oe`;Hgd4=5|QEWVE%GHHhy=I*!blbcI`&kjA%|@g4G*#V)^PohU@ByjyasF -ze$1Yn3dWdO;42yj*w_*sw}ctNQ8@P3Bg$z46NZ}8uV*h@^^JvdI2NzyV%dLSmCGP~ -z;WcCOFbn)#yxAb@nTpnKqMzMJ8#3~%IDW2?nZl#5-3?m{8#0ToQczZ>YWDr^0*1XZ -zfFCo@vSxiMy*qbd<)@oDcMaBjl}7&;USyJY5c>%oDY2NzF!2;!Znwimk%$JvoF< -z?c3oloYUW&M_};VjJ9>ASJ&?J>(z%~@y&`^!r)#nGq`&X3?y%-NzNOKj{RTk#?an< -z87jKIzjO_Gr*9KFeWv8WK;i8}bo3&UwjRJhrw^meEcxK$jf6zRVs805Hg+z&W?;;Y -zy(h>LO^*oMe$jiQ^w0a{7Aa|YxVigtMDjQFr((u?OeSnv6uBigB&V;ad$2A!gI8bb -z%|BPHr~C#im)1(2?F>!Xn7o&=T8Nyr05j3aO3u>4rEBqb^G@Vg;2CNr;C69it_?-|jgxf^FTf~jG1i1|kXaf=esmvigxIay`+NmyK5yf{>Nnf%kYRG(t`!l~%e@_bW$ -zuW%nNReZNOcD8}sQ#ZtJk}rJ}mK=%aQ#n(s*6qMlYK-#)KY}A-*ewhbB_}>i{6?Lx -z;1BkLM=xS1TE+`gft(HFzI};~S**r??&@O_)_#YVSDn%f96O -zhmsHN0~>tS9CvF`G7)M -zL*dw$S1C2+GJYO@EME47x(7Y3kWUB$AB -zetRlst0~&%l(cC4S8MH)EwN^u{7sEn@n@d6!k+AMHcLI*zNh6pDD|-In9sjWSKGhN -z-8!G*e-@V#htfyM=l@}pwsmald~N4HA}o6)pZ}dv#Fm|TYOZ|t)h-SmyQId@ma*-9 -zTi>&^c$(#u+*J2njZOCWkh0gst?hL-NexTdvX6C}_pxG43cf*a;^;OB3u}9N>hz}b -z3)-~T(!yYf32y|?WagX&Y?U*r#G&e5a{Vtl-cakaQWF$?lr_@+bNZQ#PfT<@aI}iS -z1}12>YlnuW=5v|C=i%wend)1FPYLFgegiNxG?H3m`ZpUeKo?ETKj&^;M`_1<`jKB+ -z_k65kXQ~@fu87D;so};?Wz*8qdaSM|wb97XkjlzRR(|$1!A@?tjdMX)zCp^n4jnq6 -zt*wo%-B^`VQ(;oAWvpU4I=v_?ETrt$-_;uQJdDbolvFlRbM+>*wYA*2bB9HX7PZd# -zSnSas_PBj}ExL4hfrNwv%4_a0JusLUAAhF1O(b#cCK3}8X=tbyYalr}nSg+RCv2_O -zv13OWpU8!(OKP3VeNHV~_WzEY*IJtI-{*8`DFy}xv}@NAzoJEF`6tlUevy}6(qaDm -z1yo+X%y3uMy(^2CCdwYA_-QC%`HAU6={Do@y7FG!3v-bGb-`~r(EMFLp -zmfoT0{5=j8Tx45XCJl}Ec=+%Ub@h#0uD#CsuTqJ5_alC(fcddY2z78~@zhYft;R6V -z%a_oQNaR>iQx7-pJ|J~Z9yK*JG&MC*S64@Mbv664$~Y+hWlF6rkoAt1-u{~@{=zeL -z@@=aZo(4`I9&;OGSA-q -zuwy4AZ-Gt8@Xe+c+nx&Vy_<^9=+UZ{(Gz_!lz%vl{{q#Y00;m8008I+004N}l~xB> -zRA&~&mS~V-M1x3o=nO>=1OcThWri}eP==8}LN%E274Nq9Rz4 -z-a7(46d+*)%mvhfO_x{h^N$56AMlL5uPKLXN$@+=> -zofSt#EtDiCjwXkbQ*2V4WU-8$f18+SO_!ycYz}5k}T0BfuQAd!uH5PaX;9~EL{F)xrUwekg -zs708irVTItRM^-$!c1Ko5jGC+a&$*g;~lKtya$#vS7>Mov3NepTka#{SShAzOo2e3 -zkEQ;>u-4Uwmg0DL=olf~W+tK?-C(Px1q+(zYhVUz!X+}DhFEt`tOyK+i?JE}LqCPJ -z9v>b&LkQ^ZWMqcqm76ewaJUfuFv9IJ(-j4Ex6s)20$b9v;b>|FJHoeQ**eU$qVL)| -z@Dm23j^bFeB?HzJhl3`4PhNwn_D48=u?^PxCh*oZLY$`%&h}1lpXml?bsi$=Il^`( -z)a4anuc5=?w3@6*V~ycSaYRrYfzxad9lI3s7p}mxi7N0Wzm0(jP87Cd-B;gYimV)A -z&?TI1C?>9|+xv08x*IW3i(&qe3epdpM`H3?=*h`LGB+MA-N2Te$6z^G1E%U)$UI(- -zs>_dXs-zRPd<*yy$ALC>h)+tz+=y5>scIqCc@E|nn?q%s65MzOgwqrjlhk3Us?p`D -z$s@dc1ejRB-&Kg6w4V`i?N0pJPqjf_c^7Ir`Z162@MPs-XJLba`dg@Md%$t_{fSDL -zOj5(if_7}(k%bAP$KdO4_M+nsu=TrasD3aOzQPa`(ww4(+t^EZt&PkHhd!(f`Ph_} -zg*i^1a3GvM=9X}FaD@}S+f(iZ#JkS8@km{tmgD0lgr$-)e8^`{d~MsAjlke2SWryP -zq`5-kj^()F`g1H=k^*(&I^$>wYOXvc{Ev}W+zBr?0San+keO8sEs8t)d^7eFeqn$Z -z?~fP`55gJ#$r1!d%*S*)7bwXoKt*XHBFMKOAr;z6A3<9|5jv#XFw(pM@u)gh9>x=t -zVNAS!v1%*ITJ9k-d>-jQgYZs7eEjD~+kXx^<0oP|-x4d=r$Zc_2y@FBu(5Z=6deN` -z$*n~Z@l#0H&Jy40G`{T8FW8q|26qn;3Q50NXBsivGXRpXSd=#Pk*0gO9DJLRhshsK -zz?bWG;7T8`mhM*cZm(yA^o(4z^#CyomV-|`Sy3&mShXD@H&2`{>p~uBhVd;gBLhRK -z^N`4eFrpe7M{x&>7m&`f@O@4-#~F+3bm=t?S83DFxL9)&+jpJdw3l_Z5&I~wjOTOZ -zKOl+pdVuQtWWi+|ztBSSt|B>Q3qnYb6@)tC -zQ+DYt_nqOcXl1^8TuqlY_mSO2IgR;h+kPxd{f66z#jin_EUfGi5uJb&gu$CMv3lcf -zZoSF@?B^?ffF5y~OqeREHVl-N5ucF4#oux3S8UjR00KcU4(HY&_3Q5tLR>P9`H^0~ -zSeu4Kis#7b`T>kmoEK|uprrBVH+=sy))QEtWjPr1G5+@)DME3>9q#>jek->Qd#=6u -zgzDf0s@ooNI8K*cr=D^H{+|9wS@SP02W;H#gBLMx(dSsXE)9DrUuS6?TaW2$(764Y -z?+(FJRDb&qaSj^ewxmhQ@!K{yrkG-7{a|ohL2WOGlj-QtDQP{hemFRXVPX8d#`Xtm -z{*^Ipu>F{xhhSuD55)R4`vUQ{ -zG-Wf)>1>=v{|PFS)e#jGfk`TANL;ZFdyf_)gL-r(^}kHgWiIup66!fD=GXN?Ib`}^ -zewKqbYva!>x9AGu629a#Pk%^U?XTYaAN+IUE~?d?m?I2=v%3JkK@w>5^e|@32N*G8 -z1l{Re+qMf4&hBuZFg+y`l{>&5<$8mcZnpk3Y#t}5MKSg+O1QL8i2zU2JZ2U6t`FwbLd&AV! -z6tZLGFnsuMj2iVGl<0g?Rnw%N#{*B-fLm|2cfiove+R2*y^l@*K8%?837D*^25lXE -z;!YPlJp*q2*J|T*S~~V^f3~B1F=xxkJ#B>2nm&-w;%ZF&J&b0^lQy8m~P@)Aj$Nx$6m3X@Ir9>GGhZQd-%A|NprYR~o}l%|C(=7-Ptn%>4DC0cq2uOrbo4yOmEIRp>v@UJUZCZ=G_Sd5 -zfkQ`tj7(rp2C#dN)DC30iJy -Date: Fri, 8 Aug 2014 19:28:11 +0200 -Subject: [PATCH 3/5] Fix makefile for Haiku - -makefile engine has moved... ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7035896..acef657 100644 ---- a/Makefile -+++ b/Makefile -@@ -124,7 +124,7 @@ LINKER_FLAGS = - - - ## include the makefile-engine --include /boot/develop/etc/makefile-engine -+include /system/develop/etc/makefile-engine - - ## make backup - cin: --- -1.8.3.4 - - -From 2071bafae26cff7c31825ba1269082b9c5d5de64 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Fri, 8 Aug 2014 19:29:18 +0200 -Subject: [PATCH 4/5] Work around "ambiguous override of operator" error - ---- - MoeUtils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/MoeUtils.h b/MoeUtils.h -index 34d64e6..e090620 100644 ---- a/MoeUtils.h -+++ b/MoeUtils.h -@@ -53,12 +53,14 @@ operator==(const rgb_color c1, const rgb_color c2) - } - - -+#ifndef __HAIKU__ - static inline bool - operator!=(const rgb_color c1, const rgb_color c2) - { - return *reinterpret_cast(&c1) != - *reinterpret_cast(&c2); - } -+#endif - - - static inline rgb_color * --- -1.8.3.4 - - -From 8a2bbd4dcf773601f135454f0eaf2d8fc204231d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Fri, 8 Aug 2014 19:29:52 +0200 -Subject: [PATCH 5/5] Fix Haiku build - -- _IMPEXP_BE is gone -- This BMessenger constructor is not available anymore. ---- - MoeActiveWindowWatcher.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/MoeActiveWindowWatcher.cpp b/MoeActiveWindowWatcher.cpp -index 10b057c..dc44805 100644 ---- a/MoeActiveWindowWatcher.cpp -+++ b/MoeActiveWindowWatcher.cpp -@@ -207,7 +207,9 @@ struct window_info { - char name[1]; - }; - -- -+#ifndef _IMPEXP_BE -+#define _IMPEXP_BE -+#endif - _IMPEXP_BE window_info *get_window_info(int32 a_token); - _IMPEXP_BE int32 *get_token_list(team_id app, int32 *count); - -@@ -257,7 +259,12 @@ get_active_window(void) - static status_t - get_window_state(window_info *winInfo, bool *active, BRect *frame) - { -+#ifdef __HAIKU__ -+ BMessenger win; -+ win._SetTo(winInfo->team, winInfo->client_port, winInfo->client_token); -+#else - BMessenger win(winInfo->team, winInfo->client_port, winInfo->client_token, false); -+#endif - BMessage msg(B_GET_PROPERTY), reply; - - msg.AddSpecifier("Active"); --- -1.8.3.4 - From 9d68906e47ec27eb3d1338c58dfe9bfc5b1f3f7d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 18 Jan 2015 18:34:49 -0500 Subject: [PATCH 25/42] Adding BePhotoMagic and LibImageManip. --- .../bephotomagic/bephotomagic-0.62_git.recipe | 49 ++++++++++++++ .../libimagemanip/libimagemanip-1.1.0.recipe | 67 +++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe create mode 100644 haiku-libs/libimagemanip/libimagemanip-1.1.0.recipe diff --git a/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe b/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe new file mode 100644 index 000000000..380726575 --- /dev/null +++ b/haiku-apps/bephotomagic/bephotomagic-0.62_git.recipe @@ -0,0 +1,49 @@ +SUMMARY="Paint & image manipuator for Haiku" +DESCRIPTION="BePhotoMagic is a resurrection of the abandoned Photon \ +project and is intended to be a Photoshop-quality paint and image \ +processor for BeOS." +HOMEPAGE="https://github.com/HaikuArchives/BePhotoMagic" +SRC_URI="https://github.com/HaikuArchives/BePhotoMagic/archive/3f4444736db5cc21856867b73c3bb1b6098caf88.tar.gz" +CHECKSUM_SHA256="4b1d566f00aef68edb728d73a5810ceb2efce1db257f4532a3b23951779c301c" +SOURCE_DIR="BePhotoMagic-3f4444736db5cc21856867b73c3bb1b6098caf88" +LICENSE="GNU GPL v2" +COPYRIGHT="2000 Santiago Lema + 2001 Jon Yoder (DarkWyrm)" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 ?x86_64" + +PROVIDES=" + bephotomagic = $portVersion + app:BePhotoMagic = $portVersion + " +REQUIRES=" + haiku + lib:libbz2 + lib:libimagemanip + " + +BUILD_REQUIRES=" + haiku_devel + devel:libbz2 + devel:libimagemanip + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:make + cmd:g++ + cmd:mkdepend + " + +BUILD() +{ + cd src + make $jobArgs +} + +INSTALL() +{ + mkdir -p $appsDir + cp -R bin $appsDir + mv $appsDir/bin $appsDir/BePhotoMagic + addAppDeskbarSymlink $appsDir/BePhotoMagic/BePhotoMagic +} diff --git a/haiku-libs/libimagemanip/libimagemanip-1.1.0.recipe b/haiku-libs/libimagemanip/libimagemanip-1.1.0.recipe new file mode 100644 index 000000000..c5b3d171a --- /dev/null +++ b/haiku-libs/libimagemanip/libimagemanip-1.1.0.recipe @@ -0,0 +1,67 @@ +SUMMARY="Shared library for image manipulation" +DESCRIPTION="LibImageManip provides an easy way to create add-ons that \ +transform images. Some basic add-ons are included." +HOMEPAGE="https://github.com/HaikuArchives/LibImageManip" +COPYRIGHT="2000 Edmund Vermeulen" +LICENSE="Public Domain" +SRC_URI="https://github.com/HaikuArchives/LibImageManip/archive/v$portVersion.tar.gz" +CHECKSUM_SHA256="f9aed23036fa2138c7902a9120fe01d96f6d97c02f0e67d6fa2e978a2437f9ec" +SOURCE_DIR="LibImageManip-$portVersion" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + libimagemanip$secondaryArchSuffix = $portVersion + lib:libimagemanip$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:mkdepend + " + +PROVIDES_devel=" + libimagemanip${secondaryArchSuffix}_devel = $portVersion + devel:libimagemanip$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libimagemanip$secondaryArchSuffix == $portVersion base + " + +BUILD() +{ + cd Source + make OBJ_DIR=objects $jobArgs + mkdir -p ../Addons + for i in DitherFloydSteinberg GammaCorrect MakeGray; do + cd $i + make $jobArgs + cd .. + done +} + +INSTALL() +{ + mkdir -p $developDocDir $includeDir $libDir $addOnsDir/ImageManip/ + + cp LibImageManip.html $developDocDir + cp -R Include/. $includeDir/ + cp -R Addons/. $addOnsDir/ImageManip/ + + cp Source/objects/libimagemanip.so $libDir + + prepareInstalledDevelLibs \ + libimagemanip + + packageEntries devel \ + $developDir +} From 8dd8acc035c080fe894b74923eb1af4c08640d58 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 19 Jan 2015 14:51:21 +0100 Subject: [PATCH 26/42] WIP recipe for OpenWatcom 2 --- sys-devel/openwatcom/openwatcom-1.9.0.recipe | 4 +- sys-devel/openwatcom/openwatcom-2.0.0.recipe | 49 + .../patches/openwatcom-2.0.0.patchset | 855 ++++++++++++++++++ 3 files changed, 906 insertions(+), 2 deletions(-) create mode 100644 sys-devel/openwatcom/openwatcom-2.0.0.recipe create mode 100644 sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset diff --git a/sys-devel/openwatcom/openwatcom-1.9.0.recipe b/sys-devel/openwatcom/openwatcom-1.9.0.recipe index 784ab4f95..f501bccd7 100644 --- a/sys-devel/openwatcom/openwatcom-1.9.0.recipe +++ b/sys-devel/openwatcom/openwatcom-1.9.0.recipe @@ -13,9 +13,9 @@ ARCHITECTURES="" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. - ARCHITECTURES="$ARCHITECTURES !x86_gcc2" + ARCHITECTURES="$ARCHITECTURES x86_gcc2" fi -SECONDARY_ARCHITECTURES="!x86" +SECONDARY_ARCHITECTURES="x86" SRC_URI="ftp://ftp.openwatcom.org/source/open_watcom_$portVersion-src.tar.bz2" CHECKSUM_SHA256="6d303327988ee2dda60cfabebf3f45a9758aee4da117d41cf3153fccb7e5e4bf" diff --git a/sys-devel/openwatcom/openwatcom-2.0.0.recipe b/sys-devel/openwatcom/openwatcom-2.0.0.recipe new file mode 100644 index 000000000..014681a49 --- /dev/null +++ b/sys-devel/openwatcom/openwatcom-2.0.0.recipe @@ -0,0 +1,49 @@ +SUMMARY="C/C++ compiler targetting DOS and Win16/32 machines" +DESCRIPTION=" +Open Watcom is a project of the open source community to maintain and enhance \ +the Watcom C, C++, and Fortran cross compilers and tools. An Open Source \ +license from Sybase allows free commercial and non-commercial use of Open\ +Watcom." +HOMEPAGE="https://github.com/open-watcom/open-watcom-v2" +LICENSE="Open Watcom Public Licence v1.0" +COPYRIGHT="Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved." +REVISION="1" + +ARCHITECTURES="" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" + +SRC_URI="git@github.com:open-watcom/open-watcom-v2.git#7d23ba88ff2a81660b2a48e4b73d2fcbcb36b837" +PATCHES="openwatcom-$portVersion.patchset" + +PROVIDES=" + openwatcom$secondaryArchSuffix = $portVersion +" + +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:awk + cmd:cc$secondaryArchSuffix + cmd:make + cmd:which +" + +BUILD() +{ + . ./setvars.sh + ./build.sh +} + +INSTALL() +{ + false +} + +TEST() +{ + false +} diff --git a/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset b/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset new file mode 100644 index 000000000..75452c70d --- /dev/null +++ b/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset @@ -0,0 +1,855 @@ +From d7a38595716dc02a6cc991acc3c1d4b700c15632 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 15 Jul 2014 12:57:37 +0200 +Subject: let wasm know about Haiku. + + +diff --git a/bld/wasm/c/main.c b/bld/wasm/c/main.c +index 6fbcd0b..424341b 100644 +--- a/bld/wasm/c/main.c ++++ b/bld/wasm/c/main.c +@@ -1065,6 +1065,8 @@ static bool set_build_target( void ) + SetTargName( "QNX", 3 ); + #elif defined(__LINUX__) + SetTargName( "LINUX", 5 ); ++#elif defined(__HAIKU__) ++ SetTargName( "HAIKU", 5 ); + #elif defined(__BSD__) + SetTargName( "BSD", 3 ); + #elif defined(__OSX__) || defined(__APPLE__) +-- +1.8.3.4 + + +From 48aeab747fe564d9ddc88f712707cc60650cdb67 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 15 Jul 2014 18:54:26 +0200 +Subject: Rename sched.h to avoid conflict with haiku headers. + + +diff --git a/bld/cg/c/dumpschd.c b/bld/cg/c/dumpschd.c +index 63d486c..9ec4504 100644 +--- a/bld/cg/c/dumpschd.c ++++ b/bld/cg/c/dumpschd.c +@@ -38,7 +38,7 @@ + #include "memout.h" + #include "procdef.h" + #include "freelist.h" +-#include "sched.h" ++#include "inssched.h" + #include "dumpio.h" + + extern void DumpIns(instruction *); +diff --git a/bld/cg/c/inssched.c b/bld/cg/c/inssched.c +index dce35bd..3cb288e 100644 +--- a/bld/cg/c/inssched.c ++++ b/bld/cg/c/inssched.c +@@ -36,7 +36,7 @@ + #include "spawn.h" + #include "memout.h" + #include "freelist.h" +-#include "sched.h" ++#include "inssched.h" + #include "zoiks.h" + #include "data.h" + #include "x87.h" +diff --git a/bld/cg/h/inssched.h b/bld/cg/h/inssched.h +new file mode 100644 +index 0000000..f44a87a +--- /dev/null ++++ b/bld/cg/h/inssched.h +@@ -0,0 +1,54 @@ ++/**************************************************************************** ++* ++* Open Watcom Project ++* ++* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved. ++* ++* ======================================================================== ++* ++* This file contains Original Code and/or Modifications of Original ++* Code as defined in and that are subject to the Sybase Open Watcom ++* Public License version 1.0 (the 'License'). You may not use this file ++* except in compliance with the License. BY USING THIS FILE YOU AGREE TO ++* ALL TERMS AND CONDITIONS OF THE LICENSE. A copy of the License is ++* provided with the Original Code and Modifications, and is also ++* available at www.sybase.com/developer/opensource. ++* ++* The Original Code and all software distributed under the License are ++* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER ++* EXPRESS OR IMPLIED, AND SYBASE AND ALL CONTRIBUTORS HEREBY DISCLAIM ++* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF ++* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR ++* NON-INFRINGEMENT. Please see the License for the specific language ++* governing rights and limitations under the License. ++* ++* ======================================================================== ++* ++* Description: WHEN YOU FIGURE OUT WHAT THIS FILE DOES, PLEASE ++* DESCRIBE IT HERE! ++* ++****************************************************************************/ ++ ++ ++typedef struct FU_entry { ++ unsigned short good_fu; ++ byte unit_stall; ++ byte opnd_stall; ++} FU_entry; ++ ++typedef struct data_dag { ++ struct data_dag *prev; ++ instruction *ins; ++ struct dep_list_entry *deps; ++ struct data_dag *ready; ++ unsigned stallable : 8; ++ unsigned visited : 1; ++ unsigned scheduled : 1; ++ instruction_id height; ++ instruction_id anc_count; ++} data_dag; ++ ++typedef struct dep_list_entry { ++ struct dep_list_entry *next; ++ data_dag *dep; ++} dep_list_entry; +diff --git a/bld/cg/h/sched.h b/bld/cg/h/sched.h +deleted file mode 100644 +index f44a87a..0000000 +--- a/bld/cg/h/sched.h ++++ /dev/null +@@ -1,54 +0,0 @@ +-/**************************************************************************** +-* +-* Open Watcom Project +-* +-* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved. +-* +-* ======================================================================== +-* +-* This file contains Original Code and/or Modifications of Original +-* Code as defined in and that are subject to the Sybase Open Watcom +-* Public License version 1.0 (the 'License'). You may not use this file +-* except in compliance with the License. BY USING THIS FILE YOU AGREE TO +-* ALL TERMS AND CONDITIONS OF THE LICENSE. A copy of the License is +-* provided with the Original Code and Modifications, and is also +-* available at www.sybase.com/developer/opensource. +-* +-* The Original Code and all software distributed under the License are +-* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER +-* EXPRESS OR IMPLIED, AND SYBASE AND ALL CONTRIBUTORS HEREBY DISCLAIM +-* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF +-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR +-* NON-INFRINGEMENT. Please see the License for the specific language +-* governing rights and limitations under the License. +-* +-* ======================================================================== +-* +-* Description: WHEN YOU FIGURE OUT WHAT THIS FILE DOES, PLEASE +-* DESCRIBE IT HERE! +-* +-****************************************************************************/ +- +- +-typedef struct FU_entry { +- unsigned short good_fu; +- byte unit_stall; +- byte opnd_stall; +-} FU_entry; +- +-typedef struct data_dag { +- struct data_dag *prev; +- instruction *ins; +- struct dep_list_entry *deps; +- struct data_dag *ready; +- unsigned stallable : 8; +- unsigned visited : 1; +- unsigned scheduled : 1; +- instruction_id height; +- instruction_id anc_count; +-} data_dag; +- +-typedef struct dep_list_entry { +- struct dep_list_entry *next; +- data_dag *dep; +-} dep_list_entry; +diff --git a/bld/cg/intel/c/386funit.c b/bld/cg/intel/c/386funit.c +index 3761e0f..e6b9bb5 100644 +--- a/bld/cg/intel/c/386funit.c ++++ b/bld/cg/intel/c/386funit.c +@@ -34,7 +34,7 @@ + #include "coderep.h" + #include "indvars.h" + #include "model.h" +-#include "sched.h" ++#include "inssched.h" + + enum { + F_NONE = 0x0000, +diff --git a/bld/cg/risc/axp/c/axpfunit.c b/bld/cg/risc/axp/c/axpfunit.c +index c4541f5..3f15bb4 100644 +--- a/bld/cg/risc/axp/c/axpfunit.c ++++ b/bld/cg/risc/axp/c/axpfunit.c +@@ -34,7 +34,7 @@ + #include "coderep.h" + #include "indvars.h" + #include "model.h" +-#include "sched.h" ++#include "inssched.h" + + enum { + F_NONE = 0x0000, +diff --git a/bld/cg/risc/mps/c/mpsfunit.c b/bld/cg/risc/mps/c/mpsfunit.c +index 6474dbd..d23f170 100644 +--- a/bld/cg/risc/mps/c/mpsfunit.c ++++ b/bld/cg/risc/mps/c/mpsfunit.c +@@ -33,7 +33,7 @@ + #include "coderep.h" + #include "indvars.h" + #include "model.h" +-#include "sched.h" ++#include "inssched.h" + + enum { + F_NONE = 0x0000, +diff --git a/bld/cg/risc/ppc/c/ppcfunit.c b/bld/cg/risc/ppc/c/ppcfunit.c +index 732f73b..1365b02 100644 +--- a/bld/cg/risc/ppc/c/ppcfunit.c ++++ b/bld/cg/risc/ppc/c/ppcfunit.c +@@ -34,7 +34,7 @@ + #include "coderep.h" + #include "indvars.h" + #include "model.h" +-#include "sched.h" ++#include "inssched.h" + + enum { + F_NONE = 0x0000, +diff --git a/bld/cg/s37/c/s37funit.c b/bld/cg/s37/c/s37funit.c +index 658ad95..15c7e6a 100644 +--- a/bld/cg/s37/c/s37funit.c ++++ b/bld/cg/s37/c/s37funit.c +@@ -35,7 +35,7 @@ + #include "indvars.h" + #include "opcodes.h" + #include "model.h" +-#include "sched.h" ++#include "inssched.h" + #include "funits.h" + #include "pattern.h" + +-- +1.8.3.4 + + +From 4e304b0ff86d62f71615cc5dc7d61f4ddd5ebc6c Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 15 Jul 2014 18:56:03 +0200 +Subject: Implement cmdname for haiku. + +The default implementation can't work when /proc is not available, +because it then fallbacks to _argv but is called before that is +initialised (eg in wlink). + +diff --git a/bld/watcom/c/clibext.c b/bld/watcom/c/clibext.c +index 9eec4d6..26d8f20 100644 +--- a/bld/watcom/c/clibext.c ++++ b/bld/watcom/c/clibext.c +@@ -1264,6 +1264,17 @@ char *_cmdname( char *name ) + return( name ); + } + ++#elif defined (__HAIKU__) ++ ++#include ++ ++char *_cmdname( char *name ) ++{ ++ image_info info; ++ get_image_info( 0, &info ); ++ return( strcpy( name, info.name ) ); ++} ++ + #elif defined( __UNIX__ ) + + char *_cmdname( char *name ) +-- +1.8.3.4 + + +From 31f32a11b8b69fe294a35c9a08fe880baabc4e56 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 15 Jul 2014 18:58:53 +0200 +Subject: Let cc know about Haiku. + + +diff --git a/bld/cc/c/coptions.c b/bld/cc/c/coptions.c +index f0e9f41..8fbe651 100644 +--- a/bld/cc/c/coptions.c ++++ b/bld/cc/c/coptions.c +@@ -282,6 +282,8 @@ local void SetTargSystem( void ) + _SetConstTarg( "qnx" ); + #elif defined( __LINUX__ ) + _SetConstTarg( "linux" ); ++ #elif defined( __HAIKU__ ) ++ _SetConstTarg( "haiku" ); + #elif defined( __SOLARIS__ ) || defined( __sun__ ) + _SetConstTarg( "solaris" ); + #elif defined( __OSX__ ) || defined( __APPLE__ ) +-- +1.8.3.4 + + +From 274e3144905cb02dbafa193b79bb596ba67c9fa4 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 15 Jul 2014 19:39:16 +0200 +Subject: Replace "local" with "static". + + +diff --git a/bld/cc/c/cexpr.c b/bld/cc/c/cexpr.c +index 9cbb2cf..2333caf 100644 +--- a/bld/cc/c/cexpr.c ++++ b/bld/cc/c/cexpr.c +@@ -50,26 +50,26 @@ struct mathfuncs { + { NULL, 0, 0 } + }; + +-local TREEPTR GenNextParm(TREEPTR,TYPEPTR **); +-local TREEPTR StartFunc(TREEPTR,TYPEPTR **); +-local TREEPTR GetExpr(void); +-local TREEPTR ExprId(void); +-local TREEPTR ExprOpnd(void); +-local TREEPTR SizeofOp(TYPEPTR); +-local TREEPTR ScalarExpr(TREEPTR); +-local TREEPTR UnaryPlus(TREEPTR); +-local TREEPTR TernOp(TREEPTR,TREEPTR,TREEPTR); +-local TREEPTR ColonOp(TREEPTR); +-local TREEPTR StartTernary(TREEPTR); +-local TREEPTR NotOp(TREEPTR); +-local TREEPTR AndAnd(TREEPTR); +-local TREEPTR OrOr(TREEPTR); +-local TREEPTR GenFuncCall(TREEPTR); +-local TREEPTR IndexOp(TREEPTR,TREEPTR); +-local TREEPTR SegOp(TREEPTR,TREEPTR); +-local void PopNestedParms( TYPEPTR **plistptr ); +-local void IncSymWeight( SYMPTR sym ); +-local void AddCallNode( TREEPTR tree ); ++static TREEPTR GenNextParm(TREEPTR,TYPEPTR **); ++static TREEPTR StartFunc(TREEPTR,TYPEPTR **); ++static TREEPTR GetExpr(void); ++static TREEPTR ExprId(void); ++static TREEPTR ExprOpnd(void); ++static TREEPTR SizeofOp(TYPEPTR); ++static TREEPTR ScalarExpr(TREEPTR); ++static TREEPTR UnaryPlus(TREEPTR); ++static TREEPTR TernOp(TREEPTR,TREEPTR,TREEPTR); ++static TREEPTR ColonOp(TREEPTR); ++static TREEPTR StartTernary(TREEPTR); ++static TREEPTR NotOp(TREEPTR); ++static TREEPTR AndAnd(TREEPTR); ++static TREEPTR OrOr(TREEPTR); ++static TREEPTR GenFuncCall(TREEPTR); ++static TREEPTR IndexOp(TREEPTR,TREEPTR); ++static TREEPTR SegOp(TREEPTR,TREEPTR); ++static void PopNestedParms( TYPEPTR **plistptr ); ++static void IncSymWeight( SYMPTR sym ); ++static void AddCallNode( TREEPTR tree ); + + extern int64 LongValue64( TREEPTR leaf ); + +@@ -298,7 +298,7 @@ TREEPTR LongLeaf( target_long value ) + return( leaf ); + } + +-local TREEPTR EnumLeaf( ENUMPTR ep ) ++static TREEPTR EnumLeaf( ENUMPTR ep ) + { + DATA_TYPE decl_type; + TREEPTR leaf; +@@ -439,7 +439,7 @@ TREEPTR SymLeaf( void ) + } + + +-local void IncSymWeight( SYMPTR sym ) ++static void IncSymWeight( SYMPTR sym ) + { + static int LoopWeights[] = { 1, 0x10, 0x100, 0x1000 }; + +@@ -499,7 +499,7 @@ static bool IsCallValue( TREEPTR tree ) + } + + // This RVALUE thing is backwards -mjc +-local TREEPTR TakeRValue( TREEPTR tree, int void_ok ) ++static TREEPTR TakeRValue( TREEPTR tree, int void_ok ) + { + TYPEPTR typ; + sym_flags symb_flags; +@@ -953,7 +953,7 @@ FIELDPTR SearchFields( TYPEPTR *class_typ, target_size *field_offset, const char + } + + +-local TYPEPTR Ptr2Struct( TYPEPTR typ ) ++static TYPEPTR Ptr2Struct( TYPEPTR typ ) + { + if( typ->decl_type != TYPE_POINTER ) { + return( NULL ); +@@ -1170,7 +1170,7 @@ TREEPTR SingleExpr( void ) + } + + +-local TREEPTR GetExpr( void ) ++static TREEPTR GetExpr( void ) + { + TREEPTR tree, op1; + TYPEPTR typ; +@@ -1454,7 +1454,7 @@ local TREEPTR GetExpr( void ) + } + + +-local TREEPTR ExprOpnd( void ) ++static TREEPTR ExprOpnd( void ) + { + TREEPTR tree; + TYPEPTR typ; +@@ -1617,7 +1617,7 @@ local TREEPTR ExprOpnd( void ) + } + + +-local bool IsMacroDefined( void ) ++static bool IsMacroDefined( void ) + { + MEPTR mentry; + +@@ -1634,7 +1634,7 @@ local bool IsMacroDefined( void ) + } + + +-local TREEPTR ExprId( void ) ++static TREEPTR ExprId( void ) + { + TREEPTR tree; + int value; +@@ -1691,7 +1691,7 @@ local TREEPTR ExprId( void ) + + + #if 0 +-local bool LValueArray( TREEPTR tree ) ++static bool LValueArray( TREEPTR tree ) + { + TYPEPTR typ; + +@@ -1710,7 +1710,7 @@ local bool LValueArray( TREEPTR tree ) + } + #endif + +-local TREEPTR GenIndex( TREEPTR tree, TREEPTR index_expr ) ++static TREEPTR GenIndex( TREEPTR tree, TREEPTR index_expr ) + { + TYPEPTR typ; + op_flags tree_flags; +@@ -1774,14 +1774,14 @@ local TREEPTR GenIndex( TREEPTR tree, TREEPTR index_expr ) + return( tree ); + } + +-local TREEPTR ArrayIndex( TREEPTR tree, TREEPTR index_expr ) ++static TREEPTR ArrayIndex( TREEPTR tree, TREEPTR index_expr ) + { + tree = GenIndex( tree, index_expr ); + return( tree ); + } + + +-local TREEPTR IndexOp( TREEPTR tree, TREEPTR index_expr ) ++static TREEPTR IndexOp( TREEPTR tree, TREEPTR index_expr ) + { + TYPEPTR typ; + +@@ -1810,7 +1810,7 @@ local TREEPTR IndexOp( TREEPTR tree, TREEPTR index_expr ) + return( tree ); + } + +-local void AddCallNode( TREEPTR tree ) ++static void AddCallNode( TREEPTR tree ) + // if a function call has no prototype wait till end + // to check it out + { +@@ -1852,7 +1852,7 @@ static int ParmNum( void ) + return( parm_count ); + } + +-local TREEPTR GenNextParm( TREEPTR tree, TYPEPTR **plistptr ) ++static TREEPTR GenNextParm( TREEPTR tree, TYPEPTR **plistptr ) + { + TYPEPTR *plist; + TYPEPTR typ; +@@ -1923,7 +1923,7 @@ local TREEPTR GenNextParm( TREEPTR tree, TYPEPTR **plistptr ) + } + + +-local bool IntrinsicMathFunc( SYM_NAMEPTR sym_name, int i, size_t len, SYMPTR sym ) ++static bool IntrinsicMathFunc( SYM_NAMEPTR sym_name, int i, size_t len, SYMPTR sym ) + { + size_t j; + +@@ -1946,7 +1946,7 @@ local bool IntrinsicMathFunc( SYM_NAMEPTR sym_name, int i, size_t len, SYMPTR sy + #else + #define REG_SIZE 4 + #endif +-local TREEPTR GenVaStartNode( TREEPTR last_parm ) ++static TREEPTR GenVaStartNode( TREEPTR last_parm ) + { + // there should be 3 parms __builtin_va_start( list, parm_name, stdarg ) + // - first parm should be name of va_list +@@ -1999,7 +1999,7 @@ local TREEPTR GenVaStartNode( TREEPTR last_parm ) + return( tree ); + } + +-local TREEPTR GenAllocaNode( TREEPTR size_parm ) ++static TREEPTR GenAllocaNode( TREEPTR size_parm ) + { + // there should be 1 parm __builtin_alloca( size ) + TREEPTR tree; +@@ -2016,7 +2016,7 @@ local TREEPTR GenAllocaNode( TREEPTR size_parm ) + #endif + + #if _CPU == _PPC +-local TREEPTR GenVaArgNode( TREEPTR last_parm ) ++static TREEPTR GenVaArgNode( TREEPTR last_parm ) + { + // there should be 2 parms __builtin_varg( list, type_arg ) + // - first parm should be name of va_list +@@ -2049,7 +2049,7 @@ local TREEPTR GenVaArgNode( TREEPTR last_parm ) + } + #endif + +-local TREEPTR GenFuncCall( TREEPTR last_parm ) ++static TREEPTR GenFuncCall( TREEPTR last_parm ) + { + expr_level_type i; + expr_level_type n; +@@ -2201,7 +2201,7 @@ done_call: + return( tree ); + } + +-local void PopNestedParms( TYPEPTR **plistptr ) ++static void PopNestedParms( TYPEPTR **plistptr ) + { + struct nested_parm_lists *npl; + +@@ -2231,7 +2231,7 @@ static TREEPTR DummyFuncName( void ) + return( tree ); + } + +-local TREEPTR StartFunc( TREEPTR tree, TYPEPTR **plistptr ) ++static TREEPTR StartFunc( TREEPTR tree, TYPEPTR **plistptr ) + { + TYPEPTR typ; + TYPEPTR orig_typ; +@@ -2378,7 +2378,7 @@ local TREEPTR StartFunc( TREEPTR tree, TYPEPTR **plistptr ) + } + + +-local TREEPTR OrOr( TREEPTR tree ) ++static TREEPTR OrOr( TREEPTR tree ) + { + // This routine is called when || token is found + if( tree->op.opr == OPR_PUSHINT ) { +@@ -2391,7 +2391,7 @@ local TREEPTR OrOr( TREEPTR tree ) + } + + +-local TREEPTR AndAnd( TREEPTR tree ) ++static TREEPTR AndAnd( TREEPTR tree ) + { + // This routine is called when && token is found + if( tree->op.opr == OPR_PUSHINT ) { +@@ -2439,7 +2439,7 @@ TREEPTR BoolExpr( TREEPTR tree ) + } + + +-local TREEPTR NotOp( TREEPTR tree ) ++static TREEPTR NotOp( TREEPTR tree ) + { + TREEPTR opnd; + FLOATVAL *flt; +@@ -2492,14 +2492,14 @@ local TREEPTR NotOp( TREEPTR tree ) + } + + +-local TREEPTR StartTernary( TREEPTR tree ) ++static TREEPTR StartTernary( TREEPTR tree ) + { + tree = BoolExpr( tree ); + return( tree ); + } + + +-local TREEPTR ColonOp( TREEPTR true_part ) ++static TREEPTR ColonOp( TREEPTR true_part ) + { + if( Class[ExprLevel] != TC_TERNARY ) { + CErr1( ERR_MISSING_QUESTION_OR_MISPLACED_COLON ); +@@ -2574,7 +2574,7 @@ static TREEPTR TernOp( TREEPTR expr1, TREEPTR true_part, TREEPTR false_part ) + } + + +-local TREEPTR UnaryPlus( TREEPTR tree ) ++static TREEPTR UnaryPlus( TREEPTR tree ) + { + TYPEPTR typ; + +@@ -2627,7 +2627,7 @@ TREEPTR ScalarExpr( TREEPTR tree ) + } + + +-local TREEPTR SizeofOp( TYPEPTR typ ) ++static TREEPTR SizeofOp( TYPEPTR typ ) + { + TREEPTR tree; + target_size size; +@@ -2658,7 +2658,7 @@ local TREEPTR SizeofOp( TYPEPTR typ ) + return( tree ); + } + +-local TREEPTR SegOp( TREEPTR seg, TREEPTR offset ) ++static TREEPTR SegOp( TREEPTR seg, TREEPTR offset ) + { + TREEPTR tree; + TYPEPTR typ; +diff --git a/bld/cc/c/cmac2.c b/bld/cc/c/cmac2.c +index 232b456..bea45a7 100644 +--- a/bld/cc/c/cmac2.c ++++ b/bld/cc/c/cmac2.c +@@ -51,8 +51,8 @@ static void CLine( void ); + static void CError( void ); + static void CIdent( void ); + +-local void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *src_loc ); +-local mac_parm_count FormalParm( MPPTR formal_parms ); ++static void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *src_loc ); ++static mac_parm_count FormalParm( MPPTR formal_parms ); + + struct preproc { + char *directive; +@@ -107,7 +107,7 @@ static void PPFlush2EOL( void ) + } + + +-local void ChkEOL( void ) ++static void ChkEOL( void ) + { + if( CurToken != T_EOF ) { + ExpectingToken( T_NULL ); +@@ -115,7 +115,7 @@ local void ChkEOL( void ) + } + + +-local void WantEOL( void ) ++static void WantEOL( void ) + { + if( CompFlags.extensions_enabled ) { + if( CurToken != T_NULL && CurToken != T_EOF ) { +@@ -129,7 +129,7 @@ local void WantEOL( void ) + } + + +-local void IncLevel( bool value ) ++static void IncLevel( bool value ) + { + struct cpp_info *cpp; + +@@ -150,7 +150,7 @@ local void IncLevel( bool value ) + } + + +-local void CUnknown( void ) ++static void CUnknown( void ) + { + if( NestLevel == SkipLevel ) { + CErr2p( ERR_UNKNOWN_DIRECTIVE, Buffer ); +@@ -244,18 +244,18 @@ TOKEN ChkControl( void ) + } + + +-local void CSkip( void ) ++static void CSkip( void ) + { + } + + +-local void CSkipIf( void ) ++static void CSkipIf( void ) + { + IncLevel( FALSE ); + } + + +-local void CIdent( void ) ++static void CIdent( void ) + { + if( !CompFlags.extensions_enabled ) { + CUnknown(); +@@ -319,7 +319,7 @@ void CInclude( void ) + } + + +-local void CDefine( void ) ++static void CDefine( void ) + { + MPPTR mp; + MPPTR prev_mp; +@@ -406,7 +406,7 @@ local void CDefine( void ) + } + + +-local void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *loc ) ++static void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *loc ) + { + MEPTR mentry; + size_t len; +@@ -524,7 +524,7 @@ local void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR form + } + + +-local mac_parm_count FormalParm( MPPTR formal_parms ) ++static mac_parm_count FormalParm( MPPTR formal_parms ) + { + mac_parm_count i; + +@@ -539,7 +539,7 @@ local mac_parm_count FormalParm( MPPTR formal_parms ) + } + + +-local void CIfDef( void ) ++static void CIfDef( void ) + { + MEPTR mentry; + +@@ -561,7 +561,7 @@ local void CIfDef( void ) + } + + +-local void CIfNDef( void ) ++static void CIfNDef( void ) + { + MEPTR mentry; + +@@ -582,7 +582,7 @@ local void CIfNDef( void ) + } + + +-local bool GetConstExpr( void ) ++static bool GetConstExpr( void ) + { + bool value; + bool useful_side_effect; +@@ -603,7 +603,7 @@ local bool GetConstExpr( void ) + return( value ); + } + +-local void CIf( void ) ++static void CIf( void ) + { + bool value; + +@@ -616,7 +616,7 @@ local void CIf( void ) + } + + +-local void CElif( void ) ++static void CElif( void ) + { + bool value; + +@@ -646,7 +646,7 @@ local void CElif( void ) + } + + +-local void CElse( void ) ++static void CElse( void ) + { + if( ( NestLevel == 0 ) || ( CppStack->cpp_type == PRE_ELSE ) ) { + CErr1( ERR_MISPLACED_ELSE ); +@@ -668,7 +668,7 @@ local void CElse( void ) + } + + +-local void CEndif( void ) ++static void CEndif( void ) + { + if( NestLevel == 0 ) { + CErr1( ERR_MISPLACED_ENDIF ); +@@ -733,7 +733,7 @@ bool MacroDel( const char *name ) + } + + +-local void CUndef( void ) ++static void CUndef( void ) + { + + PPNextToken(); +@@ -745,7 +745,7 @@ local void CUndef( void ) + } + + +-local void CLine( void ) ++static void CLine( void ) + { + FNAMEPTR flist; + unsigned src_line; +@@ -791,7 +791,7 @@ local void CLine( void ) + } + + +-local void CError( void ) ++static void CError( void ) + { + size_t len; + bool save; +diff --git a/bld/cc/master.mif b/bld/cc/master.mif +index 45a69b5..0ac6a97 100644 +--- a/bld/cc/master.mif ++++ b/bld/cc/master.mif +@@ -53,7 +53,7 @@ pre_obj_deps += code$(target_cpu).gh + # + # C compiler options + # +-extra_cpp_flags = -Dlocal=static ++extra_cpp_flags = -Dlocal="static" + !ifneq cc_dll 1 + extra_cpp_flags += -DIDE_PGM + !endif +-- +1.8.3.4 + + +From 6470c82af223c0c5e912e1ef0218155971e6bd8e Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 18 Jan 2015 15:35:30 +0100 +Subject: Adjust setvars.sh to Haiku build environment. + + +diff --git a/setvars.sh b/setvars.sh +index a64d135..30bce44 100755 +--- a/setvars.sh ++++ b/setvars.sh +@@ -6,14 +6,14 @@ + # modify it as necessary for your own use!! + + # Change this to point your Open Watcom source tree +-export OWROOT=/home/ow/ow ++export OWROOT=/sources/openwatcom-2.0.0 + + # Subdirectory to be used for building OW build tools + export OWOBJDIR=binbuild + + # Set this entry to identify your toolchain used by build process + # supported values are WATCOM GCC CLANG +-export OWTOOLS=WATCOM ++export OWTOOLS=GCC + + # Documentation related variables + +-- +1.8.3.4 + From ff1911f44b7865773bed3b64208b10dab5ceb55d Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 13:45:41 -0500 Subject: [PATCH 27/42] ruby: remove old versions. --- dev-lang/ruby/patches/ruby-1.9.1.patchset | 545 --------------------- dev-lang/ruby/patches/ruby-1.9.3-rc1.patch | 135 ----- dev-lang/ruby/patches/ruby-1.9.3.patchset | 545 --------------------- dev-lang/ruby/ruby-1.9.1.recipe | 96 ---- dev-lang/ruby/ruby-1.9.3.recipe | 123 ----- 5 files changed, 1444 deletions(-) delete mode 100644 dev-lang/ruby/patches/ruby-1.9.1.patchset delete mode 100644 dev-lang/ruby/patches/ruby-1.9.3-rc1.patch delete mode 100644 dev-lang/ruby/patches/ruby-1.9.3.patchset delete mode 100644 dev-lang/ruby/ruby-1.9.1.recipe delete mode 100644 dev-lang/ruby/ruby-1.9.3.recipe diff --git a/dev-lang/ruby/patches/ruby-1.9.1.patchset b/dev-lang/ruby/patches/ruby-1.9.1.patchset deleted file mode 100644 index d382648d4..000000000 --- a/dev-lang/ruby/patches/ruby-1.9.1.patchset +++ /dev/null @@ -1,545 +0,0 @@ -From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 11 Nov 2013 19:00:01 -0700 -Subject: applying patch ruby-1.9.1.patch - - -diff --git a/configure.in b/configure.in -index c98a024..113d4e5 100644 ---- a/configure.in -+++ b/configure.in -@@ -1462,11 +1462,11 @@ if test "$with_dln_a_out" != yes; then - haiku*) case "$target_cpu" in - powerpc*) - : ${LDSHARED="ld -xms"} -- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' -+ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ;; - i586*) - : ${LDSHARED="ld -shared"} -- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" -+ DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" - ;; - esac - : ${LIBPATHENV=LIBRARY_PATH} -diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h -index 0998837..814ceef 100644 ---- a/ext/nkf/nkf-utf8/nkf.h -+++ b/ext/nkf/nkf-utf8/nkf.h -@@ -164,6 +164,11 @@ void setbinmode(FILE *fp) - # ifndef HAVE_LOCALE_H - # define HAVE_LOCALE_H - # endif -+#elif defined(__HAIKU__) -+# undef HAVE_LANGINFO_H -+# ifndef HAVE_LOCALE_H -+# define HAVE_LOCALE_H -+# endif - #else - # ifndef HAVE_LANGINFO_H - # define HAVE_LANGINFO_H -diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c -index a3b612b..d900ef3 100644 ---- a/ext/openssl/ossl.c -+++ b/ext/openssl/ossl.c -@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) - - #define OSSL_IMPL_SK2ARY(name, type) \ - VALUE \ --ossl_##name##_sk2ary(STACK *sk) \ -+ossl_##name##_sk2ary(STACK_OF(type) *sk) \ - { \ - type *t; \ - int i, num; \ -@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \ - OSSL_Debug("empty sk!"); \ - return Qnil; \ - } \ -- num = sk_num(sk); \ -+ num = sk_##type##_num(sk); \ - if (num < 0) { \ - OSSL_Debug("items in sk < -1???"); \ - return rb_ary_new(); \ -@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \ - ary = rb_ary_new2(num); \ - \ - for (i=0; i= 0x10000000L -+#define STACK _STACK -+#endif -+ -+/* - * String to HEXString conversion - */ - int string2hex(const unsigned char *, int, char **, int *); -diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c -index bc5067f..5ec5b06 100644 ---- a/ext/openssl/ossl_config.c -+++ b/ext/openssl/ossl_config.c -@@ -1,5 +1,5 @@ - /* -- * $Id: ossl_config.c 18971 2008-08-31 03:36:09Z nobu $ -+ * $Id: ossl_config.c 27460 2010-04-23 14:28:56Z akr $ - * 'OpenSSL for Ruby' project - * Copyright (C) 2001-2002 Michal Rokos - * All rights reserved. -@@ -33,8 +33,8 @@ - VALUE cConfig; - VALUE eConfigError; - --/* -- * Public -+/* -+ * Public - */ - - static CONF *parse_config(VALUE, CONF*); -@@ -154,7 +154,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self) - _CONF_new_data(conf); - } - #endif -- -+ - return self; - } - -@@ -187,11 +187,30 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value) - OPENSSL_free(cv); - ossl_raise(eConfigError, "_CONF_add_string failure"); - } -- -+ - return value; - #endif - } - -+static void -+rb_ossl_config_modify_check(VALUE config) -+{ -+ if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config"); -+ if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4) -+ rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config"); -+} -+ -+#if !defined(OSSL_NO_CONF_API) -+static VALUE -+ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value) -+{ -+ rb_ossl_config_modify_check(self); -+ return ossl_config_add_value(self, section, name, value); -+} -+#else -+#define ossl_config_add_value_m rb_f_notimplement -+#endif -+ - static VALUE - ossl_config_get_value(VALUE self, VALUE section, VALUE name) - { -@@ -214,7 +233,7 @@ static VALUE - ossl_config_get_value_old(int argc, VALUE *argv, VALUE self) - { - VALUE section, name; -- -+ - rb_scan_args(argc, argv, "11", §ion, &name); - - /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */ -@@ -247,6 +266,7 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash) - { - VALUE arg[2]; - -+ rb_ossl_config_modify_check(self); - arg[0] = self; - arg[1] = section; - rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg); -@@ -278,7 +298,7 @@ ossl_config_get_section(VALUE self, VALUE section) - return hash; - } - for (i=0; iname), rb_str_new2(entry->value)); - } - -@@ -292,15 +312,16 @@ ossl_config_get_section_old(VALUE self, VALUE section) - return ossl_config_get_section(self, section); - } - --#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN -+#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF) - static void --get_conf_section(CONF_VALUE *cv, VALUE ary) -+get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp) - { -+ VALUE ary = (VALUE)tmp; - if(cv->name) return; - rb_ary_push(ary, rb_str_new2(cv->section)); - } - --static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE); -+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void) - - static VALUE - ossl_config_get_sections(VALUE self) -@@ -310,14 +331,16 @@ ossl_config_get_sections(VALUE self) - - GetConfig(self, conf); - ary = rb_ary_new(); -- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary); -+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section), -+ (void*)ary); - - return ary; - } - - static void --dump_conf_value(CONF_VALUE *cv, VALUE str) -+dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp) - { -+ VALUE str = (VALUE)tmp; - STACK_OF(CONF_VALUE) *sk; - CONF_VALUE *v; - int i, num; -@@ -338,7 +361,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str) - rb_str_cat2(str, "\n"); - } - --static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE); -+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void) - - static VALUE - dump_conf(CONF *conf) -@@ -346,7 +369,8 @@ dump_conf(CONF *conf) - VALUE str; - - str = rb_str_new(0, 0); -- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str); -+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), -+ (void*)str); - - return str; - } -@@ -362,7 +386,7 @@ ossl_config_to_s(VALUE self) - } - - static void --each_conf_value(CONF_VALUE *cv, void* dummy) -+each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy) - { - STACK_OF(CONF_VALUE) *sk; - CONF_VALUE *v; -@@ -382,7 +406,7 @@ each_conf_value(CONF_VALUE *cv, void* dummy) - } - } - --static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*); -+static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE, void *) - - static VALUE - ossl_config_each(VALUE self) -@@ -392,7 +416,8 @@ ossl_config_each(VALUE self) - RETURN_ENUMERATOR(self, 0, 0); - - GetConfig(self, conf); -- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL); -+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value), -+ (void*)NULL); - - return self; - } -@@ -456,7 +481,7 @@ Init_ossl_config() - rb_define_method(cConfig, "initialize", ossl_config_initialize, -1); - rb_define_method(cConfig, "get_value", ossl_config_get_value, 2); - rb_define_method(cConfig, "value", ossl_config_get_value_old, -1); -- rb_define_method(cConfig, "add_value", ossl_config_add_value, 3); -+ rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3); - rb_define_method(cConfig, "[]", ossl_config_get_section, 1); - rb_define_method(cConfig, "section", ossl_config_get_section_old, 1); - rb_define_method(cConfig, "[]=", ossl_config_set_section, 2); -diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c -index f7cd156..644e91a 100644 ---- a/ext/openssl/ossl_pkcs7.c -+++ b/ext/openssl/ossl_pkcs7.c -@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert) - return self; - } - --static STACK * --pkcs7_get_certs_or_crls(VALUE self, int want_certs) -+static STACK_OF(X509) * -+pkcs7_get_certs(VALUE self) - { - PKCS7 *pkcs7; - STACK_OF(X509) *certs; -- STACK_OF(X509_CRL) *crls; - int i; - - GetPKCS7(self, pkcs7); -@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs) - switch(i){ - case NID_pkcs7_signed: - certs = pkcs7->d.sign->cert; -- crls = pkcs7->d.sign->crl; - break; - case NID_pkcs7_signedAndEnveloped: - certs = pkcs7->d.signed_and_enveloped->cert; -+ break; -+ default: -+ certs = NULL; -+ } -+ -+ return certs; -+} -+ -+static STACK_OF(X509_CRL) * -+pkcs7_get_crls(VALUE self) -+{ -+ PKCS7 *pkcs7; -+ STACK_OF(X509_CRL) *crls; -+ int i; -+ -+ GetPKCS7(self, pkcs7); -+ i = OBJ_obj2nid(pkcs7->type); -+ switch(i){ -+ case NID_pkcs7_signed: -+ crls = pkcs7->d.sign->crl; -+ break; -+ case NID_pkcs7_signedAndEnveloped: - crls = pkcs7->d.signed_and_enveloped->crl; - break; - default: -- certs = crls = NULL; -+ crls = NULL; - } - -- return want_certs ? certs : crls; -+ return crls; - } - - static VALUE -@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) - STACK_OF(X509) *certs; - X509 *cert; - -- certs = pkcs7_get_certs_or_crls(self, 1); -+ certs = pkcs7_get_certs(self); - while((cert = sk_X509_pop(certs))) X509_free(cert); - rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); - -@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) - static VALUE - ossl_pkcs7_get_certificates(VALUE self) - { -- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); -+ return ossl_x509_sk2ary(pkcs7_get_certs(self)); - } - - static VALUE -@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) - STACK_OF(X509_CRL) *crls; - X509_CRL *crl; - -- crls = pkcs7_get_certs_or_crls(self, 0); -+ crls = pkcs7_get_crls(self); - while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); - rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); - -@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) - static VALUE - ossl_pkcs7_get_crls(VALUE self) - { -- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); -+ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); - } - - static VALUE -diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c -index c278edc..1167627 100644 ---- a/ext/openssl/ossl_ssl.c -+++ b/ext/openssl/ossl_ssl.c -@@ -1195,10 +1195,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self) - } - chain = SSL_get_peer_cert_chain(ssl); - if(!chain) return Qnil; -- num = sk_num(chain); -+ num = sk_X509_num(chain); - ary = rb_ary_new2(num); - for (i = 0; i < num; i++){ -- cert = (X509*)sk_value(chain, i); -+ cert = sk_X509_value(chain, i); - rb_ary_push(ary, ossl_x509_new(cert)); - } - -diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c -index b236e4d..4d0848f 100644 ---- a/ext/openssl/ossl_ssl_session.c -+++ b/ext/openssl/ossl_ssl_session.c -@@ -72,6 +72,16 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1) - return self; - } - -+#if HAVE_SSL_SESSION_CMP == 0 -+int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b) -+{ -+ if (a->ssl_version != b->ssl_version || -+ a->session_id_length != b->session_id_length) -+ return 1; -+ return memcmp(a->session_id,b-> session_id, a->session_id_length); -+} -+#endif -+ - /* - * call-seq: - * session1 == session2 -> boolean -diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c -index 248e02a..2634cd9 100644 ---- a/ext/openssl/ossl_x509attr.c -+++ b/ext/openssl/ossl_x509attr.c -@@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self) - ossl_str_adjust(str, p); - } - else{ -- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, -- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); -+ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, -+ (unsigned char **) NULL, i2d_ASN1_TYPE, -+ V_ASN1_SET, V_ASN1_UNIVERSAL, 0); - str = rb_str_new(0, length); - p = (unsigned char *)RSTRING_PTR(str); - i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, -diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c -index 3896b6e..c5123ae 100644 ---- a/ext/openssl/ossl_x509crl.c -+++ b/ext/openssl/ossl_x509crl.c -@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self) - VALUE ary, revoked; - - GetX509CRL(self, crl); -- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl)); -+ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl)); - if (num < 0) { - OSSL_Debug("num < 0???"); - return rb_ary_new(); -@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self) - ary = rb_ary_new2(num); - for(i=0; i -Date: Mon, 11 Nov 2013 20:00:13 -0700 -Subject: Use gcc for linking modules - - -diff --git a/configure.in b/configure.in -index 113d4e5..9bfbfb3 100644 ---- a/configure.in -+++ b/configure.in -@@ -1465,7 +1465,10 @@ if test "$with_dln_a_out" != yes; then - DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ;; - i586*) -- : ${LDSHARED="ld -shared"} -+ : ${LDSHARED="${CC} -shared"} -+ if test "$rb_cv_binary_elf" = yes; then -+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" -+ fi - DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" - ;; - esac --- -1.8.3.4 - - -From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 11 Nov 2013 23:13:59 -0700 -Subject: Add soname flags for libruby.so - - -diff --git a/configure.in b/configure.in -index 9bfbfb3..611b586 100644 ---- a/configure.in -+++ b/configure.in -@@ -1777,6 +1777,10 @@ if test "$enable_shared" = 'yes'; then - ;; - esac - ;; -+ haiku*) -+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' -+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' -+ ;; - darwin*) - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib' - LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace' --- -1.8.3.4 - - -From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 -From: Rene Gollent -Date: Wed, 18 Dec 2013 21:52:24 -0500 -Subject: Add case for x86_64. - - -diff --git a/configure.in b/configure.in -index 611b586..01f0bb0 100644 ---- a/configure.in -+++ b/configure.in -@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then - : ${LDSHARED="ld -xms"} - DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ;; -- i586*) -+ i586*|x86_64*) - : ${LDSHARED="${CC} -shared"} - if test "$rb_cv_binary_elf" = yes; then - LDFLAGS="$LDFLAGS -Wl,-export-dynamic" --- -1.8.3.4 - diff --git a/dev-lang/ruby/patches/ruby-1.9.3-rc1.patch b/dev-lang/ruby/patches/ruby-1.9.3-rc1.patch deleted file mode 100644 index eb0cdbb51..000000000 --- a/dev-lang/ruby/patches/ruby-1.9.3-rc1.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 4efb1f167e3f3f083f4f7ac92166f71ccf7a0b5b Mon Sep 17 00:00:00 2001 -From: Augustin Cavalier -Date: Wed, 2 Jul 2014 11:58:34 -0400 -Subject: [PATCH] Applying Chris's fixes and some of my own. - ---- - configure.in | 13 ++++++++++--- - elf.h | 42 ++++++++++++++++++++++++++++++++++++++++++ - ext/nkf/nkf-utf8/nkf.h | 5 +++++ - signal.c | 4 ++-- - 4 files changed, 59 insertions(+), 5 deletions(-) - create mode 100644 elf.h - -diff --git a/configure.in b/configure.in -index 73c87b7..f4f6a23 100644 ---- a/configure.in -+++ b/configure.in -@@ -2121,11 +2121,14 @@ if test "$with_dln_a_out" != yes; then - [haiku*], [ AS_CASE(["$target_cpu"], - [powerpc*], [ - : ${LDSHARED="ld -xms"} -- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' -+ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ], - [i586*], [ -- : ${LDSHARED="ld -shared"} -- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" -+ : ${LDSHARED="${CC} -shared"} -+ if test "$rb_cv_binary_elf" = yes; then -+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" -+ fi -+ DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" - ]) - : ${LIBPATHENV=LIBRARY_PATH} - rb_cv_dlopen=yes ], -@@ -2401,6 +2404,10 @@ AS_CASE("$enable_shared", [yes], [ - LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ]) - ], -+ [haiku*], [ -+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' -+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' -+ ], - [darwin*], [ - RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)' - LIBRUBY_LDSHARED='$(CC) -dynamiclib' -diff --git a/elf.h b/elf.h -new file mode 100644 -index 0000000..2300dde ---- /dev/null -+++ b/elf.h -@@ -0,0 +1,42 @@ -+/* -+ * -+ * /boot/common/include/elf.h -+ * -+ * -I/system/develop/headers/private/system -+ * -I/system/develop/headers/private/system/arch_x86 -+ * -+ * As found on other platforms, for benefit of GHC Haskell compiler, -+ * Donn -+ * */ -+ -+#ifdef __HAIKU__ -+ -+#include -+#include -+ -+typedef struct Elf32_Ehdr Elf32_Ehdr; -+typedef struct Elf32_Shdr Elf32_Shdr; -+typedef struct Elf32_Sym Elf32_Sym; -+typedef struct Elf32_Rel Elf32_Rel; -+typedef struct Elf32_Rela Elf32_Rela; -+ -+#define ELFMAG0 0x7F -+#define ELFMAG1 'E' -+#define ELFMAG2 'L' -+#define ELFMAG3 'F' -+ -+#define ET_NONE 0 -+#define ET_REL 1 -+#define ET_EXEC 2 -+#define ET_DYN 3 -+#define ET_CORE 4 -+ -+#define EM_386 3 -+#define EM_SPARC 2 -+#define EM_PPC 20 -+ -+#else -+ -+#include_next -+ -+#endif -\ No newline at end of file -diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h -index a23ec5c..8351578 100644 ---- a/ext/nkf/nkf-utf8/nkf.h -+++ b/ext/nkf/nkf-utf8/nkf.h -@@ -164,6 +164,11 @@ void setbinmode(FILE *fp) - # ifndef HAVE_LOCALE_H - # define HAVE_LOCALE_H - # endif -+#elif defined(__HAIKU__) -+# undef HAVE_LANGINFO_H -+# ifndef HAVE_LOCALE_H -+# define HAVE_LOCALE_H -+# endif - #else - # ifndef HAVE_LANGINFO_H - # define HAVE_LANGINFO_H -diff --git a/signal.c b/signal.c -index d4e56dc..92c54e9 100644 ---- a/signal.c -+++ b/signal.c -@@ -28,6 +28,6 @@ ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val) - } - #endif - --#if defined(__BEOS__) || defined(__HAIKU__) -+#if defined(__BEOS__) - #undef SIGBUS - #endif -@@ -590,7 +590,7 @@ static int segv_received = 0; - static RETSIGTYPE - sigsegv(int sig SIGINFO_ARG) - { --#ifdef USE_SIGALTSTACK -+#if defined USE_SIGALTSTACK && defined SA_SIGINFO - int ruby_stack_overflowed_p(const rb_thread_t *, const void *); - NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); - rb_thread_t *th = GET_THREAD(); ---- -1.8.3.4 - diff --git a/dev-lang/ruby/patches/ruby-1.9.3.patchset b/dev-lang/ruby/patches/ruby-1.9.3.patchset deleted file mode 100644 index d382648d4..000000000 --- a/dev-lang/ruby/patches/ruby-1.9.3.patchset +++ /dev/null @@ -1,545 +0,0 @@ -From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 11 Nov 2013 19:00:01 -0700 -Subject: applying patch ruby-1.9.1.patch - - -diff --git a/configure.in b/configure.in -index c98a024..113d4e5 100644 ---- a/configure.in -+++ b/configure.in -@@ -1462,11 +1462,11 @@ if test "$with_dln_a_out" != yes; then - haiku*) case "$target_cpu" in - powerpc*) - : ${LDSHARED="ld -xms"} -- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' -+ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ;; - i586*) - : ${LDSHARED="ld -shared"} -- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" -+ DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" - ;; - esac - : ${LIBPATHENV=LIBRARY_PATH} -diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h -index 0998837..814ceef 100644 ---- a/ext/nkf/nkf-utf8/nkf.h -+++ b/ext/nkf/nkf-utf8/nkf.h -@@ -164,6 +164,11 @@ void setbinmode(FILE *fp) - # ifndef HAVE_LOCALE_H - # define HAVE_LOCALE_H - # endif -+#elif defined(__HAIKU__) -+# undef HAVE_LANGINFO_H -+# ifndef HAVE_LOCALE_H -+# define HAVE_LOCALE_H -+# endif - #else - # ifndef HAVE_LANGINFO_H - # define HAVE_LANGINFO_H -diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c -index a3b612b..d900ef3 100644 ---- a/ext/openssl/ossl.c -+++ b/ext/openssl/ossl.c -@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) - - #define OSSL_IMPL_SK2ARY(name, type) \ - VALUE \ --ossl_##name##_sk2ary(STACK *sk) \ -+ossl_##name##_sk2ary(STACK_OF(type) *sk) \ - { \ - type *t; \ - int i, num; \ -@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \ - OSSL_Debug("empty sk!"); \ - return Qnil; \ - } \ -- num = sk_num(sk); \ -+ num = sk_##type##_num(sk); \ - if (num < 0) { \ - OSSL_Debug("items in sk < -1???"); \ - return rb_ary_new(); \ -@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \ - ary = rb_ary_new2(num); \ - \ - for (i=0; i= 0x10000000L -+#define STACK _STACK -+#endif -+ -+/* - * String to HEXString conversion - */ - int string2hex(const unsigned char *, int, char **, int *); -diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c -index bc5067f..5ec5b06 100644 ---- a/ext/openssl/ossl_config.c -+++ b/ext/openssl/ossl_config.c -@@ -1,5 +1,5 @@ - /* -- * $Id: ossl_config.c 18971 2008-08-31 03:36:09Z nobu $ -+ * $Id: ossl_config.c 27460 2010-04-23 14:28:56Z akr $ - * 'OpenSSL for Ruby' project - * Copyright (C) 2001-2002 Michal Rokos - * All rights reserved. -@@ -33,8 +33,8 @@ - VALUE cConfig; - VALUE eConfigError; - --/* -- * Public -+/* -+ * Public - */ - - static CONF *parse_config(VALUE, CONF*); -@@ -154,7 +154,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self) - _CONF_new_data(conf); - } - #endif -- -+ - return self; - } - -@@ -187,11 +187,30 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value) - OPENSSL_free(cv); - ossl_raise(eConfigError, "_CONF_add_string failure"); - } -- -+ - return value; - #endif - } - -+static void -+rb_ossl_config_modify_check(VALUE config) -+{ -+ if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config"); -+ if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4) -+ rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config"); -+} -+ -+#if !defined(OSSL_NO_CONF_API) -+static VALUE -+ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value) -+{ -+ rb_ossl_config_modify_check(self); -+ return ossl_config_add_value(self, section, name, value); -+} -+#else -+#define ossl_config_add_value_m rb_f_notimplement -+#endif -+ - static VALUE - ossl_config_get_value(VALUE self, VALUE section, VALUE name) - { -@@ -214,7 +233,7 @@ static VALUE - ossl_config_get_value_old(int argc, VALUE *argv, VALUE self) - { - VALUE section, name; -- -+ - rb_scan_args(argc, argv, "11", §ion, &name); - - /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */ -@@ -247,6 +266,7 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash) - { - VALUE arg[2]; - -+ rb_ossl_config_modify_check(self); - arg[0] = self; - arg[1] = section; - rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg); -@@ -278,7 +298,7 @@ ossl_config_get_section(VALUE self, VALUE section) - return hash; - } - for (i=0; iname), rb_str_new2(entry->value)); - } - -@@ -292,15 +312,16 @@ ossl_config_get_section_old(VALUE self, VALUE section) - return ossl_config_get_section(self, section); - } - --#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN -+#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF) - static void --get_conf_section(CONF_VALUE *cv, VALUE ary) -+get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp) - { -+ VALUE ary = (VALUE)tmp; - if(cv->name) return; - rb_ary_push(ary, rb_str_new2(cv->section)); - } - --static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE); -+static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void) - - static VALUE - ossl_config_get_sections(VALUE self) -@@ -310,14 +331,16 @@ ossl_config_get_sections(VALUE self) - - GetConfig(self, conf); - ary = rb_ary_new(); -- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary); -+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section), -+ (void*)ary); - - return ary; - } - - static void --dump_conf_value(CONF_VALUE *cv, VALUE str) -+dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp) - { -+ VALUE str = (VALUE)tmp; - STACK_OF(CONF_VALUE) *sk; - CONF_VALUE *v; - int i, num; -@@ -338,7 +361,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str) - rb_str_cat2(str, "\n"); - } - --static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE); -+static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void) - - static VALUE - dump_conf(CONF *conf) -@@ -346,7 +369,8 @@ dump_conf(CONF *conf) - VALUE str; - - str = rb_str_new(0, 0); -- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str); -+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), -+ (void*)str); - - return str; - } -@@ -362,7 +386,7 @@ ossl_config_to_s(VALUE self) - } - - static void --each_conf_value(CONF_VALUE *cv, void* dummy) -+each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy) - { - STACK_OF(CONF_VALUE) *sk; - CONF_VALUE *v; -@@ -382,7 +406,7 @@ each_conf_value(CONF_VALUE *cv, void* dummy) - } - } - --static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*); -+static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE, void *) - - static VALUE - ossl_config_each(VALUE self) -@@ -392,7 +416,8 @@ ossl_config_each(VALUE self) - RETURN_ENUMERATOR(self, 0, 0); - - GetConfig(self, conf); -- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL); -+ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value), -+ (void*)NULL); - - return self; - } -@@ -456,7 +481,7 @@ Init_ossl_config() - rb_define_method(cConfig, "initialize", ossl_config_initialize, -1); - rb_define_method(cConfig, "get_value", ossl_config_get_value, 2); - rb_define_method(cConfig, "value", ossl_config_get_value_old, -1); -- rb_define_method(cConfig, "add_value", ossl_config_add_value, 3); -+ rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3); - rb_define_method(cConfig, "[]", ossl_config_get_section, 1); - rb_define_method(cConfig, "section", ossl_config_get_section_old, 1); - rb_define_method(cConfig, "[]=", ossl_config_set_section, 2); -diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c -index f7cd156..644e91a 100644 ---- a/ext/openssl/ossl_pkcs7.c -+++ b/ext/openssl/ossl_pkcs7.c -@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert) - return self; - } - --static STACK * --pkcs7_get_certs_or_crls(VALUE self, int want_certs) -+static STACK_OF(X509) * -+pkcs7_get_certs(VALUE self) - { - PKCS7 *pkcs7; - STACK_OF(X509) *certs; -- STACK_OF(X509_CRL) *crls; - int i; - - GetPKCS7(self, pkcs7); -@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs) - switch(i){ - case NID_pkcs7_signed: - certs = pkcs7->d.sign->cert; -- crls = pkcs7->d.sign->crl; - break; - case NID_pkcs7_signedAndEnveloped: - certs = pkcs7->d.signed_and_enveloped->cert; -+ break; -+ default: -+ certs = NULL; -+ } -+ -+ return certs; -+} -+ -+static STACK_OF(X509_CRL) * -+pkcs7_get_crls(VALUE self) -+{ -+ PKCS7 *pkcs7; -+ STACK_OF(X509_CRL) *crls; -+ int i; -+ -+ GetPKCS7(self, pkcs7); -+ i = OBJ_obj2nid(pkcs7->type); -+ switch(i){ -+ case NID_pkcs7_signed: -+ crls = pkcs7->d.sign->crl; -+ break; -+ case NID_pkcs7_signedAndEnveloped: - crls = pkcs7->d.signed_and_enveloped->crl; - break; - default: -- certs = crls = NULL; -+ crls = NULL; - } - -- return want_certs ? certs : crls; -+ return crls; - } - - static VALUE -@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) - STACK_OF(X509) *certs; - X509 *cert; - -- certs = pkcs7_get_certs_or_crls(self, 1); -+ certs = pkcs7_get_certs(self); - while((cert = sk_X509_pop(certs))) X509_free(cert); - rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); - -@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) - static VALUE - ossl_pkcs7_get_certificates(VALUE self) - { -- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); -+ return ossl_x509_sk2ary(pkcs7_get_certs(self)); - } - - static VALUE -@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) - STACK_OF(X509_CRL) *crls; - X509_CRL *crl; - -- crls = pkcs7_get_certs_or_crls(self, 0); -+ crls = pkcs7_get_crls(self); - while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); - rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); - -@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) - static VALUE - ossl_pkcs7_get_crls(VALUE self) - { -- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); -+ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); - } - - static VALUE -diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c -index c278edc..1167627 100644 ---- a/ext/openssl/ossl_ssl.c -+++ b/ext/openssl/ossl_ssl.c -@@ -1195,10 +1195,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self) - } - chain = SSL_get_peer_cert_chain(ssl); - if(!chain) return Qnil; -- num = sk_num(chain); -+ num = sk_X509_num(chain); - ary = rb_ary_new2(num); - for (i = 0; i < num; i++){ -- cert = (X509*)sk_value(chain, i); -+ cert = sk_X509_value(chain, i); - rb_ary_push(ary, ossl_x509_new(cert)); - } - -diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c -index b236e4d..4d0848f 100644 ---- a/ext/openssl/ossl_ssl_session.c -+++ b/ext/openssl/ossl_ssl_session.c -@@ -72,6 +72,16 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1) - return self; - } - -+#if HAVE_SSL_SESSION_CMP == 0 -+int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b) -+{ -+ if (a->ssl_version != b->ssl_version || -+ a->session_id_length != b->session_id_length) -+ return 1; -+ return memcmp(a->session_id,b-> session_id, a->session_id_length); -+} -+#endif -+ - /* - * call-seq: - * session1 == session2 -> boolean -diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c -index 248e02a..2634cd9 100644 ---- a/ext/openssl/ossl_x509attr.c -+++ b/ext/openssl/ossl_x509attr.c -@@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self) - ossl_str_adjust(str, p); - } - else{ -- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, -- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); -+ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, -+ (unsigned char **) NULL, i2d_ASN1_TYPE, -+ V_ASN1_SET, V_ASN1_UNIVERSAL, 0); - str = rb_str_new(0, length); - p = (unsigned char *)RSTRING_PTR(str); - i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, -diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c -index 3896b6e..c5123ae 100644 ---- a/ext/openssl/ossl_x509crl.c -+++ b/ext/openssl/ossl_x509crl.c -@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self) - VALUE ary, revoked; - - GetX509CRL(self, crl); -- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl)); -+ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl)); - if (num < 0) { - OSSL_Debug("num < 0???"); - return rb_ary_new(); -@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self) - ary = rb_ary_new2(num); - for(i=0; i -Date: Mon, 11 Nov 2013 20:00:13 -0700 -Subject: Use gcc for linking modules - - -diff --git a/configure.in b/configure.in -index 113d4e5..9bfbfb3 100644 ---- a/configure.in -+++ b/configure.in -@@ -1465,7 +1465,10 @@ if test "$with_dln_a_out" != yes; then - DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ;; - i586*) -- : ${LDSHARED="ld -shared"} -+ : ${LDSHARED="${CC} -shared"} -+ if test "$rb_cv_binary_elf" = yes; then -+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" -+ fi - DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" - ;; - esac --- -1.8.3.4 - - -From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 11 Nov 2013 23:13:59 -0700 -Subject: Add soname flags for libruby.so - - -diff --git a/configure.in b/configure.in -index 9bfbfb3..611b586 100644 ---- a/configure.in -+++ b/configure.in -@@ -1777,6 +1777,10 @@ if test "$enable_shared" = 'yes'; then - ;; - esac - ;; -+ haiku*) -+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' -+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' -+ ;; - darwin*) - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib' - LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace' --- -1.8.3.4 - - -From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 -From: Rene Gollent -Date: Wed, 18 Dec 2013 21:52:24 -0500 -Subject: Add case for x86_64. - - -diff --git a/configure.in b/configure.in -index 611b586..01f0bb0 100644 ---- a/configure.in -+++ b/configure.in -@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then - : ${LDSHARED="ld -xms"} - DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' - ;; -- i586*) -+ i586*|x86_64*) - : ${LDSHARED="${CC} -shared"} - if test "$rb_cv_binary_elf" = yes; then - LDFLAGS="$LDFLAGS -Wl,-export-dynamic" --- -1.8.3.4 - diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe deleted file mode 100644 index 0d521a28f..000000000 --- a/dev-lang/ruby/ruby-1.9.1.recipe +++ /dev/null @@ -1,96 +0,0 @@ -SUMMARY="A programming language focused on simplicity and productivity" -DESCRIPTION=" -Ruby is a dynamic, reflective, object-oriented, general-purpose -programming language. It was designed and developed in the mid-1990s -by Yukihiro 'Matz' Matsumoto in Japan. - -Ruby embodies syntax inspired by Perl with Smalltalk-like features and -was also influenced by Eiffel and Lisp. It supports multiple -programming paradigms, including functional, object oriented, and -imperative. It also has a dynamic type system and automatic memory -management. Therefore, it is similar in varying degrees to, Smalltalk, -Python, Perl, Lisp, Dylan, and CLU." -HOMEPAGE="http://www.ruby-lang.org" -SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz" -CHECKSUM_SHA256="31598e37b3962643bec722921644957be6f8fb9a26f6c91fa627bd668ea68be4" -LICENSE="Ruby - GNU GPL v2 - GNU LGPL v2.1 - Artistic (Perl) - BSD (3-clause)" -COPYRIGHT="1993-2009 Yukihiro Matsumoto" - -REVISION="2" - -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" - -PROVIDES=" - ruby = $portVersion compat >= 1.9 - cmd:ruby = $portVersion compat >= 1.9 - cmd:erb = $portVersion compat >= 1.9 - cmd:gem = $portVersion compat >= 1.9 - cmd:irb = $portVersion compat >= 1.9 - cmd:rake = $portVersion compat >= 1.9 - cmd:rdoc = $portVersion compat >= 1.9 - cmd:ri = $portVersion compat >= 1.9 - cmd:testrb = $portVersion compat >= 1.9 - lib:libruby = $portVersion compat >= 1.9 - " - -REQUIRES=" - haiku - lib:libedit - lib:libz - lib:libcrypto - lib:libssl - lib:libiconv - lib:libncursesw - " - -BUILD_REQUIRES=" - devel:libedit - devel:libz - devel:libcrypto - devel:libssl - devel:libiconv - devel:libncursesw - " - -BUILD_PREREQUIRES=" - haiku_devel - cmd:gcc - cmd:g++ - cmd:autoconf - cmd:make - cmd:bison - " - -PROVIDES_devel=" - ruby_devel = $portVersion - devel:libruby_static = $portVersion compat >= 1.9 - lib:libruby_static = $portVersion compat >= 1.9 - devel:libruby = $portVersion compat >= 1.9 - " - -REQUIRES_devel=" - ruby == $portVersion - " - -SOURCE_DIR="ruby-1.9.1-p243" - -PATCHES="ruby-1.9.1.patchset" - -BUILD() -{ - autoconf - runConfigure ./configure \ - --enable-shared - make $jobArgs -} - -INSTALL() -{ - make install - prepareInstalledDevelLibs libruby-static libruby - packageEntries devel $developDir -} diff --git a/dev-lang/ruby/ruby-1.9.3.recipe b/dev-lang/ruby/ruby-1.9.3.recipe deleted file mode 100644 index 41550c622..000000000 --- a/dev-lang/ruby/ruby-1.9.3.recipe +++ /dev/null @@ -1,123 +0,0 @@ -SUMMARY="A programming language focused on simplicity and productivity." -DESCRIPTION="Ruby is a dynamic, reflective, object-oriented, general-purpose \ -programming language. It was designed and developed in the mid-1990s \ -by Yukihiro 'Matz' Matsumoto in Japan. - -Ruby embodies syntax inspired by Perl with Smalltalk-like features and \ -was also influenced by Eiffel and Lisp. It supports multiple \ -programming paradigms, including functional, object oriented, and \ -imperative. It also has a dynamic type system and automatic memory \ -management. Therefore, it is similar in varying degrees to, Smalltalk, \ -Python, Perl, Lisp, Dylan, and CLU." -HOMEPAGE="http://www.ruby-lang.org" -SRC_URI="http://cache.ruby-lang.org/pub/ruby/ruby-1.9.3-rc1.tar.bz2" -SOURCE_DIR="ruby-1.9.3-rc1" -CHECKSUM_SHA256="951a8810086abca0e200f81767a518ee2730d6dc9b0cc2c7e3587dcfc3bf5fc8" -LICENSE="Ruby - GNU GPL v2 - GNU LGPL v2.1 - Artistic (Perl) - BSD (3-clause)" -COPYRIGHT="1993-2009 Yukihiro Matsumoto" -REVISION="4" -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="ruby-1.9.3-rc1.patch" - -PROVIDES=" - ruby$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:ruby$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:erb$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:gem$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:irb$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:rake$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:rdoc$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:ri$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:testrb$secondaryArchSuffix = $portVersion compat >= 1.9 - lib:libruby$secondaryArchSuffix = $portVersion compat >= 1.9 - cmd:ruby = $portVersion compat >= 1.9 - cmd:erb = $portVersion compat >= 1.9 - cmd:gem = $portVersion compat >= 1.9 - cmd:irb = $portVersion compat >= 1.9 - cmd:rake = $portVersion compat >= 1.9 - cmd:rdoc = $portVersion compat >= 1.9 - cmd:ri = $portVersion compat >= 1.9 - cmd:testrb = $portVersion compat >= 1.9 - " - -REQUIRES=" - haiku$secondaryArchSuffix - lib:libedit$secondaryArchSuffix - lib:libz$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libssl$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libncursesw$secondaryArchSuffix - " - -BUILD_REQUIRES=" - devel:libedit$secondaryArchSuffix - devel:libz$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - devel:libiconv$secondaryArchSuffix - devel:libncursesw$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix - cmd:ruby >= 1.9 - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:g++$secondaryArchSuffix - cmd:autoconf - cmd:make - cmd:bison - " - -PROVIDES_devel=" - ruby${secondaryArchSuffix}_devel = $portVersion - devel:libruby_static$secondaryArchSuffix = $portVersion compat >= 1.9 - lib:libruby_static$secondaryArchSuffix = $portVersion compat >= 1.9 - devel:libruby$secondaryArchSuffix = $portVersion compat >= 1.9 - " - -REQUIRES_devel=" - ruby$secondaryArchSuffix == $portVersion base - " - -BUILD() -{ - autoconf - - # tell configure where to find the private header folders - # that have elf32.h, elf64.h, and arch_elf.h - extraFlags="-I/boot/system/develop/headers/private/system \ - -I/boot/system/develop/headers/private/system/arch/x86" - export CFLAGS="$extraFlags" - export CPPFLAGS="$extraFlags" - - runConfigure ./configure --enable-shared - make $jobArgs -} - -INSTALL() -{ - make install - prepareInstalledDevelLibs libruby-static libruby - fixPkgconfig - packageEntries devel $developDir -} - -TEST() -{ - make check -} From bf18b746f742f92beed87a6d2e4d6a3da8099294 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 14:36:50 -0500 Subject: [PATCH 28/42] ruby: recipe for 2.1.5. * Also, install to $prefix/bin and not $binDir * Still crashes on the second test... --- ...uby-2.1.2.patchset => ruby-2.1.5.patchset} | 0 .../{ruby-2.1.2.recipe => ruby-2.1.5.recipe} | 40 +++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) rename dev-lang/ruby/patches/{ruby-2.1.2.patchset => ruby-2.1.5.patchset} (100%) rename dev-lang/ruby/{ruby-2.1.2.recipe => ruby-2.1.5.recipe} (73%) diff --git a/dev-lang/ruby/patches/ruby-2.1.2.patchset b/dev-lang/ruby/patches/ruby-2.1.5.patchset similarity index 100% rename from dev-lang/ruby/patches/ruby-2.1.2.patchset rename to dev-lang/ruby/patches/ruby-2.1.5.patchset diff --git a/dev-lang/ruby/ruby-2.1.2.recipe b/dev-lang/ruby/ruby-2.1.5.recipe similarity index 73% rename from dev-lang/ruby/ruby-2.1.2.recipe rename to dev-lang/ruby/ruby-2.1.5.recipe index a64583a98..b9f74a191 100644 --- a/dev-lang/ruby/ruby-2.1.2.recipe +++ b/dev-lang/ruby/ruby-2.1.5.recipe @@ -1,6 +1,5 @@ SUMMARY="A programming language focused on simplicity and productivity" -DESCRIPTION=" -Ruby is a dynamic, reflective, object-oriented, general-purpose \ +DESCRIPTION="Ruby is a dynamic, reflective, object-oriented, general-purpose \ programming language. It was designed and developed in the mid-1990s \ by Yukihiro 'Matz' Matsumoto in Japan. @@ -9,16 +8,14 @@ was also influenced by Eiffel and Lisp. It supports multiple \ programming paradigms, including functional, object oriented, and \ imperative. It also has a dynamic type system and automatic memory \ management. Therefore, it is similar in varying degrees to, Smalltalk, \ -Python, Perl, Lisp, Dylan, and CLU. -" -HOMEPAGE="http://www.ruby-lang.org" -SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.gz" -CHECKSUM_SHA256="f22a6447811a81f3c808d1c2a5ce3b5f5f0955c68c9a749182feb425589e6635" -LICENSE=" - Ruby - BSD (3-clause) - " +Python, Perl, Lisp, Dylan, and CLU." +HOMEPAGE="http://www.ruby-lang.org" +SRC_URI="http://cache.ruby-lang.org/pub/ruby/2.1/ruby-$portVersion.tar.gz" +CHECKSUM_SHA256="4305cc6ceb094df55210d83548dcbeb5117d74eea25196a9b14fa268d354b100" +LICENSE="Ruby + BSD (3-clause)" COPYRIGHT="1993-2014 Yukihiro Matsumoto" +PATCHES="ruby-$portVersion.patchset" REVISION="1" @@ -32,14 +29,14 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" ruby$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:ruby$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:erb$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:gem$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:irb$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:rake$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:rdoc$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:ri$secondaryArchSuffix = $portVersion compat >= 2.1 - cmd:testrb$secondaryArchSuffix = $portVersion compat >= 2.1 + cmd:ruby = $portVersion compat >= 2.1 + cmd:erb = $portVersion compat >= 2.1 + cmd:gem = $portVersion compat >= 2.1 + cmd:irb = $portVersion compat >= 2.1 + cmd:rake = $portVersion compat >= 2.1 + cmd:rdoc = $portVersion compat >= 2.1 + cmd:ri = $portVersion compat >= 2.1 + cmd:testrb = $portVersion compat >= 2.1 lib:libruby$secondaryArchSuffix = $portVersion compat >= 2.1 " REQUIRES=" @@ -82,12 +79,13 @@ REQUIRES_devel=" ruby$secondaryArchSuffix == $portVersion base " -PATCHES="ruby-2.1.2.patchset" BUILD() { libtoolize --force --copy --install autoconf - runConfigure ./configure --enable-shared --disable-silent-rules + runConfigure --omit-dirs binDir ./configure --enable-shared \ + --disable-silent-rules \ + --bindir=$prefix/bin # The build process needs to run ruby, and without this it fails to find # libruby.so. export LIBRARY_PATH=$LIBRARY_PATH:%A From f30289933c2ed37f388d2979544651532d9bde9b Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 14:38:50 -0500 Subject: [PATCH 29/42] php: add missing bz2 provide. --- dev-lang/php/php-5.6.4.recipe | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-lang/php/php-5.6.4.recipe b/dev-lang/php/php-5.6.4.recipe index 630e3e2ea..b2b116b87 100644 --- a/dev-lang/php/php-5.6.4.recipe +++ b/dev-lang/php/php-5.6.4.recipe @@ -5,7 +5,7 @@ especially suited to web development. Fast, flexible and pragmatic, PHP powers everything from your blog to the most \ popular websites in the world." HOMEPAGE="https://php.net" -REVISION="2" +REVISION="3" COPYRIGHT="2001-2014 PHP Group" LICENSE="PHP License v3.01" ARCHITECTURES="x86_gcc2" @@ -37,6 +37,7 @@ REQUIRES=" icu lib:libxml2 lib:libz + lib:libbz2 lib:libssl lib:libcrypto lib:libcurl @@ -50,6 +51,7 @@ BUILD_REQUIRES=" icu_devel devel:libxml2 devel:libz + devel:libbz2 devel:libssl devel:libcrypto devel:libcurl From f9c9d55cb33a4d285baea05f665bdbf7536274a9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 15:05:34 -0500 Subject: [PATCH 30/42] ocaml: remove old versions. --- dev-lang/ocaml/ocaml-4.00.0.recipe | 90 -------------------- dev-lang/ocaml/patches/ocaml-4.00.0.patchset | 70 --------------- 2 files changed, 160 deletions(-) delete mode 100644 dev-lang/ocaml/ocaml-4.00.0.recipe delete mode 100644 dev-lang/ocaml/patches/ocaml-4.00.0.patchset diff --git a/dev-lang/ocaml/ocaml-4.00.0.recipe b/dev-lang/ocaml/ocaml-4.00.0.recipe deleted file mode 100644 index cf3f18c67..000000000 --- a/dev-lang/ocaml/ocaml-4.00.0.recipe +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY="Implementation of the Caml language" -DESCRIPTION=" -Caml is a general-purpose programming language, designed with program safety \ -and reliability in mind. It is very expressive, yet easy to learn and use. \ -Caml supports functional, imperative, and object-oriented programming styles. \ -It has been developed and distributed by INRIA, a French research institute in \ -computer science and applied mathematics, since 1985. -The OCaml system is the main implementation of the Caml language. It features \ -a powerful module system and a full-fledged object-oriented layer. It comes \ -with a native-code compiler that supports numerous architectures, for high \ -performance; a bytecode compiler, for increased portability; and an \ -interactive loop, for experimentation and rapid development. -" -LICENSE="GNU LGPL v2" -COPYRIGHT="1996-2012 Institut National de Recherche en Informatique et en Automatique (INRIA)." -HOMEPAGE="http://caml.inria.fr/index.en.html" -SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-4.00/ocaml-4.00.0.tar.gz" -CHECKSUM_SHA256="9ea5544538144811b5fd9c7172d63abc0d1c6ba6b64d2c60474807fc57ad4c6e" -REVISION="1" -ARCHITECTURES="?x86 ?x86_gcc2" - -SOURCE_DIR="ocaml-4.00.0" - -PROVIDES=" - ocaml = $portVersion compat >= 4 - cmd:camlp4 = $portVersion compat >= 4 - cmd:camlp4boot = $portVersion compat >= 4 - cmd:camlp4o = $portVersion compat >= 4 - cmd:camlp4o.opt = $portVersion compat >= 4 - cmd:camlp4of = $portVersion compat >= 4 - cmd:camlp4of.opt = $portVersion compat >= 4 - cmd:camlp4oof = $portVersion compat >= 4 - cmd:camlp4oof.opt = $portVersion compat >= 4 - cmd:camlp4orf = $portVersion compat >= 4 - cmd:camlp4orf.opt = $portVersion compat >= 4 - cmd:camlp4prof = $portVersion compat >= 4 - cmd:camlp4r = $portVersion compat >= 4 - cmd:camlp4r.opt = $portVersion compat >= 4 - cmd:camlp4rf = $portVersion compat >= 4 - cmd:camlp4rf.opt = $portVersion compat >= 4 - cmd:mkcamlp4 = $portVersion compat >= 4 - cmd:ocaml = $portVersion compat >= 4 - cmd:ocamlbuild = $portVersion compat >= 4 - cmd:ocamlbuild.byte = $portVersion compat >= 4 - cmd:ocamlbuild.native = $portVersion compat >= 4 - cmd:ocamlc = $portVersion compat >= 4 - cmd:ocamlc.opt = $portVersion compat >= 4 - cmd:ocamlcp = $portVersion compat >= 4 - cmd:ocamldebug = $portVersion compat >= 4 - cmd:ocamldep = $portVersion compat >= 4 - cmd:ocamldep.opt = $portVersion compat >= 4 - cmd:ocamldoc = $portVersion compat >= 4 - cmd:ocamldoc.opt = $portVersion compat >= 4 - cmd:ocamllex = $portVersion compat >= 4 - cmd:ocamllex.opt = $portVersion compat >= 4 - cmd:ocamlmklib = $portVersion compat >= 4 - cmd:ocamlmktop = $portVersion compat >= 4 - cmd:ocamlobjinfo = $portVersion compat >= 4 - cmd:ocamlopt = $portVersion compat >= 4 - cmd:ocamlopt.opt = $portVersion compat >= 4 - cmd:ocamloptp = $portVersion compat >= 4 - cmd:ocamlprof = $portVersion compat >= 4 - cmd:ocamlrun = $portVersion compat >= 4 - cmd:ocamlyacc = $portVersion compat >= 4 - " - -REQUIRES=" - haiku - cmd:gcc - " - -BUILD_PREREQUIRES=" - haiku_devel - cmd:make - cmd:gcc - " - -PATCHES="ocaml-4.00.0.patchset" - -BUILD() -{ - ./configure --prefix $prefix \ - --mandir $manDir - make world.opt -} - -INSTALL() -{ - make install -} diff --git a/dev-lang/ocaml/patches/ocaml-4.00.0.patchset b/dev-lang/ocaml/patches/ocaml-4.00.0.patchset deleted file mode 100644 index 785fb0f4c..000000000 --- a/dev-lang/ocaml/patches/ocaml-4.00.0.patchset +++ /dev/null @@ -1,70 +0,0 @@ -From 392fc2240718d68c1e0ce62cc11c1e894ba2cd95 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Wed, 30 Oct 2013 21:35:40 -0600 -Subject: import old patch - - -diff --git a/configure b/configure -index e08bbce..a39e9e4 100755 ---- a/configure -+++ b/configure -@@ -285,6 +285,10 @@ case "$bytecc,$host" in - bytecccompopts="-fno-defer-pop $gcc_warnings" - # No -lm library - mathlib="";; -+ *,*-*-haiku*) -+ bytecccompopts="-fno-defer-pop $gcc_warnings" -+ # No -lm library -+ mathlib="";; - gcc,alpha*-*-osf*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - if cc="$bytecc" sh ./hasgot -mieee; then -@@ -614,6 +618,9 @@ if test $withsharedlibs = "yes"; then - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - shared_libraries_supported=true;; -+ *-*haiku*) -+ mksharedlib="$bytecc -shared" -+ shared_libraries_supported=true;; - esac - fi - -@@ -679,6 +686,7 @@ case "$host" in - arch=i386; system=solaris - fi;; - i[3456]86-*-beos*) arch=i386; system=beos;; -+ i[3456]86-*-haiku*) arch=i386; system=beos;; - i[3456]86-*-cygwin*) arch=i386; system=cygwin;; - i[3456]86-*-darwin*) if $arch64; then - arch=amd64; system=macosx -@@ -901,6 +909,11 @@ elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; th - cclibs="$cclibs -lnsl -lsocket" - echo "#define HAS_SOCKETS" >> s.h - has_sockets=yes -+elif sh ./hasgot -lnetwork socket socketpair bind listen accept connect; then -+ echo "You have BSD sockets (with libraries '-lnetwork')" -+ cclibs="$cclibs -lnetwork" -+ echo "#define HAS_SOCKETS" >> s.h -+ has_sockets=yes - fi - - if sh ./hasgot -i sys/socket.h -t socklen_t; then -diff --git a/otherlibs/unix/nice.c b/otherlibs/unix/nice.c -index 400543c..94aa025 100644 ---- a/otherlibs/unix/nice.c -+++ b/otherlibs/unix/nice.c -@@ -24,7 +24,11 @@ CAMLprim value unix_nice(value incr) - { - int ret; - errno = 0; -+#ifdef __HAIKU__ -+ ret = 0; -+#else - ret = nice(Int_val(incr)); -+#endif - if (ret == -1 && errno != 0) uerror("nice", Nothing); - return Val_int(ret); - } --- -1.8.3.4 - From 58b497bb99d61fd6be8422c7a1d309963cb8ae1c Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 15:05:43 -0500 Subject: [PATCH 31/42] ocaml: enable x86_gcc2. Also some style fixes to the recipe. No functional change, so I didn't bump the REVISION. --- dev-lang/ocaml/ocaml-4.01.0.recipe | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dev-lang/ocaml/ocaml-4.01.0.recipe b/dev-lang/ocaml/ocaml-4.01.0.recipe index 089a50f3f..f9e564e15 100644 --- a/dev-lang/ocaml/ocaml-4.01.0.recipe +++ b/dev-lang/ocaml/ocaml-4.01.0.recipe @@ -13,13 +13,13 @@ interactive loop, for experimentation and rapid development. " LICENSE="GNU LGPL v2" COPYRIGHT="1996-2013 Institut National de Recherche en Informatique et en Automatique (INRIA)." -HOMEPAGE="http://caml.inria.fr/index.en.html" -SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-4.01.0.tar.gz" +HOMEPAGE="http://caml.inria.fr/index.en.html" +SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-4.01/ocaml-$portVersion.tar.gz" CHECKSUM_SHA256="ea1751deff454f5c738d10d8a0ad135afee0852d391cf95766b726c0faf7cfdb" REVISION="1" -ARCHITECTURES="x86 ?x86_gcc2 x86_64" +ARCHITECTURES="x86 x86_gcc2 x86_64" -SOURCE_DIR="ocaml-4.01.0" +PATCHES="ocaml-$portVersion.patchset" PROVIDES=" ocaml = $portVersion compat >= 4 @@ -78,13 +78,11 @@ BUILD_PREREQUIRES=" cmd:xargs " -PATCHES="ocaml-4.01.0.patchset" - BUILD() { ./configure --prefix $prefix \ --mandir $manDir - make world.opt + make world.opt } INSTALL() From c4ae1bc27fea6828abfd2a9560d7d0f0a058e051 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 15:14:46 -0500 Subject: [PATCH 32/42] ruby: re-add 1.9.1. --- dev-lang/ruby/patches/ruby-1.9.1.patchset | 545 ++++++++++++++++++++++ dev-lang/ruby/ruby-1.9.1.recipe | 96 ++++ 2 files changed, 641 insertions(+) create mode 100644 dev-lang/ruby/patches/ruby-1.9.1.patchset create mode 100644 dev-lang/ruby/ruby-1.9.1.recipe diff --git a/dev-lang/ruby/patches/ruby-1.9.1.patchset b/dev-lang/ruby/patches/ruby-1.9.1.patchset new file mode 100644 index 000000000..d382648d4 --- /dev/null +++ b/dev-lang/ruby/patches/ruby-1.9.1.patchset @@ -0,0 +1,545 @@ +From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 11 Nov 2013 19:00:01 -0700 +Subject: applying patch ruby-1.9.1.patch + + +diff --git a/configure.in b/configure.in +index c98a024..113d4e5 100644 +--- a/configure.in ++++ b/configure.in +@@ -1462,11 +1462,11 @@ if test "$with_dln_a_out" != yes; then + haiku*) case "$target_cpu" in + powerpc*) + : ${LDSHARED="ld -xms"} +- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' ++ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; + i586*) + : ${LDSHARED="ld -shared"} +- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" ++ DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" + ;; + esac + : ${LIBPATHENV=LIBRARY_PATH} +diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h +index 0998837..814ceef 100644 +--- a/ext/nkf/nkf-utf8/nkf.h ++++ b/ext/nkf/nkf-utf8/nkf.h +@@ -164,6 +164,11 @@ void setbinmode(FILE *fp) + # ifndef HAVE_LOCALE_H + # define HAVE_LOCALE_H + # endif ++#elif defined(__HAIKU__) ++# undef HAVE_LANGINFO_H ++# ifndef HAVE_LOCALE_H ++# define HAVE_LOCALE_H ++# endif + #else + # ifndef HAVE_LANGINFO_H + # define HAVE_LANGINFO_H +diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c +index a3b612b..d900ef3 100644 +--- a/ext/openssl/ossl.c ++++ b/ext/openssl/ossl.c +@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) + + #define OSSL_IMPL_SK2ARY(name, type) \ + VALUE \ +-ossl_##name##_sk2ary(STACK *sk) \ ++ossl_##name##_sk2ary(STACK_OF(type) *sk) \ + { \ + type *t; \ + int i, num; \ +@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \ + OSSL_Debug("empty sk!"); \ + return Qnil; \ + } \ +- num = sk_num(sk); \ ++ num = sk_##type##_num(sk); \ + if (num < 0) { \ + OSSL_Debug("items in sk < -1???"); \ + return rb_ary_new(); \ +@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \ + ary = rb_ary_new2(num); \ + \ + for (i=0; i= 0x10000000L ++#define STACK _STACK ++#endif ++ ++/* + * String to HEXString conversion + */ + int string2hex(const unsigned char *, int, char **, int *); +diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c +index bc5067f..5ec5b06 100644 +--- a/ext/openssl/ossl_config.c ++++ b/ext/openssl/ossl_config.c +@@ -1,5 +1,5 @@ + /* +- * $Id: ossl_config.c 18971 2008-08-31 03:36:09Z nobu $ ++ * $Id: ossl_config.c 27460 2010-04-23 14:28:56Z akr $ + * 'OpenSSL for Ruby' project + * Copyright (C) 2001-2002 Michal Rokos + * All rights reserved. +@@ -33,8 +33,8 @@ + VALUE cConfig; + VALUE eConfigError; + +-/* +- * Public ++/* ++ * Public + */ + + static CONF *parse_config(VALUE, CONF*); +@@ -154,7 +154,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self) + _CONF_new_data(conf); + } + #endif +- ++ + return self; + } + +@@ -187,11 +187,30 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value) + OPENSSL_free(cv); + ossl_raise(eConfigError, "_CONF_add_string failure"); + } +- ++ + return value; + #endif + } + ++static void ++rb_ossl_config_modify_check(VALUE config) ++{ ++ if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config"); ++ if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4) ++ rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config"); ++} ++ ++#if !defined(OSSL_NO_CONF_API) ++static VALUE ++ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value) ++{ ++ rb_ossl_config_modify_check(self); ++ return ossl_config_add_value(self, section, name, value); ++} ++#else ++#define ossl_config_add_value_m rb_f_notimplement ++#endif ++ + static VALUE + ossl_config_get_value(VALUE self, VALUE section, VALUE name) + { +@@ -214,7 +233,7 @@ static VALUE + ossl_config_get_value_old(int argc, VALUE *argv, VALUE self) + { + VALUE section, name; +- ++ + rb_scan_args(argc, argv, "11", §ion, &name); + + /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */ +@@ -247,6 +266,7 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash) + { + VALUE arg[2]; + ++ rb_ossl_config_modify_check(self); + arg[0] = self; + arg[1] = section; + rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg); +@@ -278,7 +298,7 @@ ossl_config_get_section(VALUE self, VALUE section) + return hash; + } + for (i=0; iname), rb_str_new2(entry->value)); + } + +@@ -292,15 +312,16 @@ ossl_config_get_section_old(VALUE self, VALUE section) + return ossl_config_get_section(self, section); + } + +-#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN ++#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF) + static void +-get_conf_section(CONF_VALUE *cv, VALUE ary) ++get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp) + { ++ VALUE ary = (VALUE)tmp; + if(cv->name) return; + rb_ary_push(ary, rb_str_new2(cv->section)); + } + +-static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE); ++static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void) + + static VALUE + ossl_config_get_sections(VALUE self) +@@ -310,14 +331,16 @@ ossl_config_get_sections(VALUE self) + + GetConfig(self, conf); + ary = rb_ary_new(); +- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary); ++ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section), ++ (void*)ary); + + return ary; + } + + static void +-dump_conf_value(CONF_VALUE *cv, VALUE str) ++dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp) + { ++ VALUE str = (VALUE)tmp; + STACK_OF(CONF_VALUE) *sk; + CONF_VALUE *v; + int i, num; +@@ -338,7 +361,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str) + rb_str_cat2(str, "\n"); + } + +-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE); ++static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void) + + static VALUE + dump_conf(CONF *conf) +@@ -346,7 +369,8 @@ dump_conf(CONF *conf) + VALUE str; + + str = rb_str_new(0, 0); +- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str); ++ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), ++ (void*)str); + + return str; + } +@@ -362,7 +386,7 @@ ossl_config_to_s(VALUE self) + } + + static void +-each_conf_value(CONF_VALUE *cv, void* dummy) ++each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy) + { + STACK_OF(CONF_VALUE) *sk; + CONF_VALUE *v; +@@ -382,7 +406,7 @@ each_conf_value(CONF_VALUE *cv, void* dummy) + } + } + +-static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*); ++static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE, void *) + + static VALUE + ossl_config_each(VALUE self) +@@ -392,7 +416,8 @@ ossl_config_each(VALUE self) + RETURN_ENUMERATOR(self, 0, 0); + + GetConfig(self, conf); +- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL); ++ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value), ++ (void*)NULL); + + return self; + } +@@ -456,7 +481,7 @@ Init_ossl_config() + rb_define_method(cConfig, "initialize", ossl_config_initialize, -1); + rb_define_method(cConfig, "get_value", ossl_config_get_value, 2); + rb_define_method(cConfig, "value", ossl_config_get_value_old, -1); +- rb_define_method(cConfig, "add_value", ossl_config_add_value, 3); ++ rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3); + rb_define_method(cConfig, "[]", ossl_config_get_section, 1); + rb_define_method(cConfig, "section", ossl_config_get_section_old, 1); + rb_define_method(cConfig, "[]=", ossl_config_set_section, 2); +diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c +index f7cd156..644e91a 100644 +--- a/ext/openssl/ossl_pkcs7.c ++++ b/ext/openssl/ossl_pkcs7.c +@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert) + return self; + } + +-static STACK * +-pkcs7_get_certs_or_crls(VALUE self, int want_certs) ++static STACK_OF(X509) * ++pkcs7_get_certs(VALUE self) + { + PKCS7 *pkcs7; + STACK_OF(X509) *certs; +- STACK_OF(X509_CRL) *crls; + int i; + + GetPKCS7(self, pkcs7); +@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs) + switch(i){ + case NID_pkcs7_signed: + certs = pkcs7->d.sign->cert; +- crls = pkcs7->d.sign->crl; + break; + case NID_pkcs7_signedAndEnveloped: + certs = pkcs7->d.signed_and_enveloped->cert; ++ break; ++ default: ++ certs = NULL; ++ } ++ ++ return certs; ++} ++ ++static STACK_OF(X509_CRL) * ++pkcs7_get_crls(VALUE self) ++{ ++ PKCS7 *pkcs7; ++ STACK_OF(X509_CRL) *crls; ++ int i; ++ ++ GetPKCS7(self, pkcs7); ++ i = OBJ_obj2nid(pkcs7->type); ++ switch(i){ ++ case NID_pkcs7_signed: ++ crls = pkcs7->d.sign->crl; ++ break; ++ case NID_pkcs7_signedAndEnveloped: + crls = pkcs7->d.signed_and_enveloped->crl; + break; + default: +- certs = crls = NULL; ++ crls = NULL; + } + +- return want_certs ? certs : crls; ++ return crls; + } + + static VALUE +@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) + STACK_OF(X509) *certs; + X509 *cert; + +- certs = pkcs7_get_certs_or_crls(self, 1); ++ certs = pkcs7_get_certs(self); + while((cert = sk_X509_pop(certs))) X509_free(cert); + rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); + +@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) + static VALUE + ossl_pkcs7_get_certificates(VALUE self) + { +- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); ++ return ossl_x509_sk2ary(pkcs7_get_certs(self)); + } + + static VALUE +@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) + STACK_OF(X509_CRL) *crls; + X509_CRL *crl; + +- crls = pkcs7_get_certs_or_crls(self, 0); ++ crls = pkcs7_get_crls(self); + while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); + rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); + +@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) + static VALUE + ossl_pkcs7_get_crls(VALUE self) + { +- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); ++ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); + } + + static VALUE +diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c +index c278edc..1167627 100644 +--- a/ext/openssl/ossl_ssl.c ++++ b/ext/openssl/ossl_ssl.c +@@ -1195,10 +1195,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self) + } + chain = SSL_get_peer_cert_chain(ssl); + if(!chain) return Qnil; +- num = sk_num(chain); ++ num = sk_X509_num(chain); + ary = rb_ary_new2(num); + for (i = 0; i < num; i++){ +- cert = (X509*)sk_value(chain, i); ++ cert = sk_X509_value(chain, i); + rb_ary_push(ary, ossl_x509_new(cert)); + } + +diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c +index b236e4d..4d0848f 100644 +--- a/ext/openssl/ossl_ssl_session.c ++++ b/ext/openssl/ossl_ssl_session.c +@@ -72,6 +72,16 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1) + return self; + } + ++#if HAVE_SSL_SESSION_CMP == 0 ++int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b) ++{ ++ if (a->ssl_version != b->ssl_version || ++ a->session_id_length != b->session_id_length) ++ return 1; ++ return memcmp(a->session_id,b-> session_id, a->session_id_length); ++} ++#endif ++ + /* + * call-seq: + * session1 == session2 -> boolean +diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c +index 248e02a..2634cd9 100644 +--- a/ext/openssl/ossl_x509attr.c ++++ b/ext/openssl/ossl_x509attr.c +@@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self) + ossl_str_adjust(str, p); + } + else{ +- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, +- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); ++ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, ++ (unsigned char **) NULL, i2d_ASN1_TYPE, ++ V_ASN1_SET, V_ASN1_UNIVERSAL, 0); + str = rb_str_new(0, length); + p = (unsigned char *)RSTRING_PTR(str); + i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, +diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c +index 3896b6e..c5123ae 100644 +--- a/ext/openssl/ossl_x509crl.c ++++ b/ext/openssl/ossl_x509crl.c +@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self) + VALUE ary, revoked; + + GetX509CRL(self, crl); +- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl)); ++ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl)); + if (num < 0) { + OSSL_Debug("num < 0???"); + return rb_ary_new(); +@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self) + ary = rb_ary_new2(num); + for(i=0; i +Date: Mon, 11 Nov 2013 20:00:13 -0700 +Subject: Use gcc for linking modules + + +diff --git a/configure.in b/configure.in +index 113d4e5..9bfbfb3 100644 +--- a/configure.in ++++ b/configure.in +@@ -1465,7 +1465,10 @@ if test "$with_dln_a_out" != yes; then + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; + i586*) +- : ${LDSHARED="ld -shared"} ++ : ${LDSHARED="${CC} -shared"} ++ if test "$rb_cv_binary_elf" = yes; then ++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" ++ fi + DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" + ;; + esac +-- +1.8.3.4 + + +From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 11 Nov 2013 23:13:59 -0700 +Subject: Add soname flags for libruby.so + + +diff --git a/configure.in b/configure.in +index 9bfbfb3..611b586 100644 +--- a/configure.in ++++ b/configure.in +@@ -1777,6 +1777,10 @@ if test "$enable_shared" = 'yes'; then + ;; + esac + ;; ++ haiku*) ++ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' ++ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ++ ;; + darwin*) + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib' + LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace' +-- +1.8.3.4 + + +From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 +From: Rene Gollent +Date: Wed, 18 Dec 2013 21:52:24 -0500 +Subject: Add case for x86_64. + + +diff --git a/configure.in b/configure.in +index 611b586..01f0bb0 100644 +--- a/configure.in ++++ b/configure.in +@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then + : ${LDSHARED="ld -xms"} + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; +- i586*) ++ i586*|x86_64*) + : ${LDSHARED="${CC} -shared"} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" +-- +1.8.3.4 + diff --git a/dev-lang/ruby/ruby-1.9.1.recipe b/dev-lang/ruby/ruby-1.9.1.recipe new file mode 100644 index 000000000..0d521a28f --- /dev/null +++ b/dev-lang/ruby/ruby-1.9.1.recipe @@ -0,0 +1,96 @@ +SUMMARY="A programming language focused on simplicity and productivity" +DESCRIPTION=" +Ruby is a dynamic, reflective, object-oriented, general-purpose +programming language. It was designed and developed in the mid-1990s +by Yukihiro 'Matz' Matsumoto in Japan. + +Ruby embodies syntax inspired by Perl with Smalltalk-like features and +was also influenced by Eiffel and Lisp. It supports multiple +programming paradigms, including functional, object oriented, and +imperative. It also has a dynamic type system and automatic memory +management. Therefore, it is similar in varying degrees to, Smalltalk, +Python, Perl, Lisp, Dylan, and CLU." +HOMEPAGE="http://www.ruby-lang.org" +SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-1.9.1-p243.tar.gz" +CHECKSUM_SHA256="31598e37b3962643bec722921644957be6f8fb9a26f6c91fa627bd668ea68be4" +LICENSE="Ruby + GNU GPL v2 + GNU LGPL v2.1 + Artistic (Perl) + BSD (3-clause)" +COPYRIGHT="1993-2009 Yukihiro Matsumoto" + +REVISION="2" + +ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + ruby = $portVersion compat >= 1.9 + cmd:ruby = $portVersion compat >= 1.9 + cmd:erb = $portVersion compat >= 1.9 + cmd:gem = $portVersion compat >= 1.9 + cmd:irb = $portVersion compat >= 1.9 + cmd:rake = $portVersion compat >= 1.9 + cmd:rdoc = $portVersion compat >= 1.9 + cmd:ri = $portVersion compat >= 1.9 + cmd:testrb = $portVersion compat >= 1.9 + lib:libruby = $portVersion compat >= 1.9 + " + +REQUIRES=" + haiku + lib:libedit + lib:libz + lib:libcrypto + lib:libssl + lib:libiconv + lib:libncursesw + " + +BUILD_REQUIRES=" + devel:libedit + devel:libz + devel:libcrypto + devel:libssl + devel:libiconv + devel:libncursesw + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:g++ + cmd:autoconf + cmd:make + cmd:bison + " + +PROVIDES_devel=" + ruby_devel = $portVersion + devel:libruby_static = $portVersion compat >= 1.9 + lib:libruby_static = $portVersion compat >= 1.9 + devel:libruby = $portVersion compat >= 1.9 + " + +REQUIRES_devel=" + ruby == $portVersion + " + +SOURCE_DIR="ruby-1.9.1-p243" + +PATCHES="ruby-1.9.1.patchset" + +BUILD() +{ + autoconf + runConfigure ./configure \ + --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLibs libruby-static libruby + packageEntries devel $developDir +} From af1b8eba0b946dab45f0d2941e2da9e2d00b8f51 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 18 Dec 2014 10:23:43 +0000 Subject: [PATCH 33/42] libsolv: missing libgcc_s, libstdc++ requires. --- dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe index 8806eadcc..b94244811 100644 --- a/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe +++ b/dev-libs/libsolv/libsolv-0.3.0_haiku_2013_10_01.recipe @@ -20,6 +20,8 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libexpat$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix " BUILD_REQUIRES=" devel:libexpat$secondaryArchSuffix From 871cecde3edf8c6fe0d820053ba8337f995fa9f5 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 19 Jan 2015 23:06:08 +0100 Subject: [PATCH 34/42] openwatcom: some patches were upstreamed. --- sys-devel/openwatcom/openwatcom-2.0.0.recipe | 2 +- .../patches/openwatcom-2.0.0.patchset | 490 +++++++----------- 2 files changed, 187 insertions(+), 305 deletions(-) diff --git a/sys-devel/openwatcom/openwatcom-2.0.0.recipe b/sys-devel/openwatcom/openwatcom-2.0.0.recipe index 014681a49..02601abfb 100644 --- a/sys-devel/openwatcom/openwatcom-2.0.0.recipe +++ b/sys-devel/openwatcom/openwatcom-2.0.0.recipe @@ -17,7 +17,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" -SRC_URI="git@github.com:open-watcom/open-watcom-v2.git#7d23ba88ff2a81660b2a48e4b73d2fcbcb36b837" +SRC_URI="git@github.com:open-watcom/open-watcom-v2.git#a3b3e22c3a0266a93da5f7d67bc368ff34813449" PATCHES="openwatcom-$portVersion.patchset" PROVIDES=" diff --git a/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset b/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset index 75452c70d..0df4298d4 100644 --- a/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset +++ b/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset @@ -1,306 +1,4 @@ -From d7a38595716dc02a6cc991acc3c1d4b700c15632 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 15 Jul 2014 12:57:37 +0200 -Subject: let wasm know about Haiku. - - -diff --git a/bld/wasm/c/main.c b/bld/wasm/c/main.c -index 6fbcd0b..424341b 100644 ---- a/bld/wasm/c/main.c -+++ b/bld/wasm/c/main.c -@@ -1065,6 +1065,8 @@ static bool set_build_target( void ) - SetTargName( "QNX", 3 ); - #elif defined(__LINUX__) - SetTargName( "LINUX", 5 ); -+#elif defined(__HAIKU__) -+ SetTargName( "HAIKU", 5 ); - #elif defined(__BSD__) - SetTargName( "BSD", 3 ); - #elif defined(__OSX__) || defined(__APPLE__) --- -1.8.3.4 - - -From 48aeab747fe564d9ddc88f712707cc60650cdb67 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 15 Jul 2014 18:54:26 +0200 -Subject: Rename sched.h to avoid conflict with haiku headers. - - -diff --git a/bld/cg/c/dumpschd.c b/bld/cg/c/dumpschd.c -index 63d486c..9ec4504 100644 ---- a/bld/cg/c/dumpschd.c -+++ b/bld/cg/c/dumpschd.c -@@ -38,7 +38,7 @@ - #include "memout.h" - #include "procdef.h" - #include "freelist.h" --#include "sched.h" -+#include "inssched.h" - #include "dumpio.h" - - extern void DumpIns(instruction *); -diff --git a/bld/cg/c/inssched.c b/bld/cg/c/inssched.c -index dce35bd..3cb288e 100644 ---- a/bld/cg/c/inssched.c -+++ b/bld/cg/c/inssched.c -@@ -36,7 +36,7 @@ - #include "spawn.h" - #include "memout.h" - #include "freelist.h" --#include "sched.h" -+#include "inssched.h" - #include "zoiks.h" - #include "data.h" - #include "x87.h" -diff --git a/bld/cg/h/inssched.h b/bld/cg/h/inssched.h -new file mode 100644 -index 0000000..f44a87a ---- /dev/null -+++ b/bld/cg/h/inssched.h -@@ -0,0 +1,54 @@ -+/**************************************************************************** -+* -+* Open Watcom Project -+* -+* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved. -+* -+* ======================================================================== -+* -+* This file contains Original Code and/or Modifications of Original -+* Code as defined in and that are subject to the Sybase Open Watcom -+* Public License version 1.0 (the 'License'). You may not use this file -+* except in compliance with the License. BY USING THIS FILE YOU AGREE TO -+* ALL TERMS AND CONDITIONS OF THE LICENSE. A copy of the License is -+* provided with the Original Code and Modifications, and is also -+* available at www.sybase.com/developer/opensource. -+* -+* The Original Code and all software distributed under the License are -+* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER -+* EXPRESS OR IMPLIED, AND SYBASE AND ALL CONTRIBUTORS HEREBY DISCLAIM -+* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF -+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR -+* NON-INFRINGEMENT. Please see the License for the specific language -+* governing rights and limitations under the License. -+* -+* ======================================================================== -+* -+* Description: WHEN YOU FIGURE OUT WHAT THIS FILE DOES, PLEASE -+* DESCRIBE IT HERE! -+* -+****************************************************************************/ -+ -+ -+typedef struct FU_entry { -+ unsigned short good_fu; -+ byte unit_stall; -+ byte opnd_stall; -+} FU_entry; -+ -+typedef struct data_dag { -+ struct data_dag *prev; -+ instruction *ins; -+ struct dep_list_entry *deps; -+ struct data_dag *ready; -+ unsigned stallable : 8; -+ unsigned visited : 1; -+ unsigned scheduled : 1; -+ instruction_id height; -+ instruction_id anc_count; -+} data_dag; -+ -+typedef struct dep_list_entry { -+ struct dep_list_entry *next; -+ data_dag *dep; -+} dep_list_entry; -diff --git a/bld/cg/h/sched.h b/bld/cg/h/sched.h -deleted file mode 100644 -index f44a87a..0000000 ---- a/bld/cg/h/sched.h -+++ /dev/null -@@ -1,54 +0,0 @@ --/**************************************************************************** --* --* Open Watcom Project --* --* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved. --* --* ======================================================================== --* --* This file contains Original Code and/or Modifications of Original --* Code as defined in and that are subject to the Sybase Open Watcom --* Public License version 1.0 (the 'License'). You may not use this file --* except in compliance with the License. BY USING THIS FILE YOU AGREE TO --* ALL TERMS AND CONDITIONS OF THE LICENSE. A copy of the License is --* provided with the Original Code and Modifications, and is also --* available at www.sybase.com/developer/opensource. --* --* The Original Code and all software distributed under the License are --* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER --* EXPRESS OR IMPLIED, AND SYBASE AND ALL CONTRIBUTORS HEREBY DISCLAIM --* ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF --* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR --* NON-INFRINGEMENT. Please see the License for the specific language --* governing rights and limitations under the License. --* --* ======================================================================== --* --* Description: WHEN YOU FIGURE OUT WHAT THIS FILE DOES, PLEASE --* DESCRIBE IT HERE! --* --****************************************************************************/ -- -- --typedef struct FU_entry { -- unsigned short good_fu; -- byte unit_stall; -- byte opnd_stall; --} FU_entry; -- --typedef struct data_dag { -- struct data_dag *prev; -- instruction *ins; -- struct dep_list_entry *deps; -- struct data_dag *ready; -- unsigned stallable : 8; -- unsigned visited : 1; -- unsigned scheduled : 1; -- instruction_id height; -- instruction_id anc_count; --} data_dag; -- --typedef struct dep_list_entry { -- struct dep_list_entry *next; -- data_dag *dep; --} dep_list_entry; -diff --git a/bld/cg/intel/c/386funit.c b/bld/cg/intel/c/386funit.c -index 3761e0f..e6b9bb5 100644 ---- a/bld/cg/intel/c/386funit.c -+++ b/bld/cg/intel/c/386funit.c -@@ -34,7 +34,7 @@ - #include "coderep.h" - #include "indvars.h" - #include "model.h" --#include "sched.h" -+#include "inssched.h" - - enum { - F_NONE = 0x0000, -diff --git a/bld/cg/risc/axp/c/axpfunit.c b/bld/cg/risc/axp/c/axpfunit.c -index c4541f5..3f15bb4 100644 ---- a/bld/cg/risc/axp/c/axpfunit.c -+++ b/bld/cg/risc/axp/c/axpfunit.c -@@ -34,7 +34,7 @@ - #include "coderep.h" - #include "indvars.h" - #include "model.h" --#include "sched.h" -+#include "inssched.h" - - enum { - F_NONE = 0x0000, -diff --git a/bld/cg/risc/mps/c/mpsfunit.c b/bld/cg/risc/mps/c/mpsfunit.c -index 6474dbd..d23f170 100644 ---- a/bld/cg/risc/mps/c/mpsfunit.c -+++ b/bld/cg/risc/mps/c/mpsfunit.c -@@ -33,7 +33,7 @@ - #include "coderep.h" - #include "indvars.h" - #include "model.h" --#include "sched.h" -+#include "inssched.h" - - enum { - F_NONE = 0x0000, -diff --git a/bld/cg/risc/ppc/c/ppcfunit.c b/bld/cg/risc/ppc/c/ppcfunit.c -index 732f73b..1365b02 100644 ---- a/bld/cg/risc/ppc/c/ppcfunit.c -+++ b/bld/cg/risc/ppc/c/ppcfunit.c -@@ -34,7 +34,7 @@ - #include "coderep.h" - #include "indvars.h" - #include "model.h" --#include "sched.h" -+#include "inssched.h" - - enum { - F_NONE = 0x0000, -diff --git a/bld/cg/s37/c/s37funit.c b/bld/cg/s37/c/s37funit.c -index 658ad95..15c7e6a 100644 ---- a/bld/cg/s37/c/s37funit.c -+++ b/bld/cg/s37/c/s37funit.c -@@ -35,7 +35,7 @@ - #include "indvars.h" - #include "opcodes.h" - #include "model.h" --#include "sched.h" -+#include "inssched.h" - #include "funits.h" - #include "pattern.h" - --- -1.8.3.4 - - -From 4e304b0ff86d62f71615cc5dc7d61f4ddd5ebc6c Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 15 Jul 2014 18:56:03 +0200 -Subject: Implement cmdname for haiku. - -The default implementation can't work when /proc is not available, -because it then fallbacks to _argv but is called before that is -initialised (eg in wlink). - -diff --git a/bld/watcom/c/clibext.c b/bld/watcom/c/clibext.c -index 9eec4d6..26d8f20 100644 ---- a/bld/watcom/c/clibext.c -+++ b/bld/watcom/c/clibext.c -@@ -1264,6 +1264,17 @@ char *_cmdname( char *name ) - return( name ); - } - -+#elif defined (__HAIKU__) -+ -+#include -+ -+char *_cmdname( char *name ) -+{ -+ image_info info; -+ get_image_info( 0, &info ); -+ return( strcpy( name, info.name ) ); -+} -+ - #elif defined( __UNIX__ ) - - char *_cmdname( char *name ) --- -1.8.3.4 - - -From 31f32a11b8b69fe294a35c9a08fe880baabc4e56 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 15 Jul 2014 18:58:53 +0200 -Subject: Let cc know about Haiku. - - -diff --git a/bld/cc/c/coptions.c b/bld/cc/c/coptions.c -index f0e9f41..8fbe651 100644 ---- a/bld/cc/c/coptions.c -+++ b/bld/cc/c/coptions.c -@@ -282,6 +282,8 @@ local void SetTargSystem( void ) - _SetConstTarg( "qnx" ); - #elif defined( __LINUX__ ) - _SetConstTarg( "linux" ); -+ #elif defined( __HAIKU__ ) -+ _SetConstTarg( "haiku" ); - #elif defined( __SOLARIS__ ) || defined( __sun__ ) - _SetConstTarg( "solaris" ); - #elif defined( __OSX__ ) || defined( __APPLE__ ) --- -1.8.3.4 - - -From 274e3144905cb02dbafa193b79bb596ba67c9fa4 Mon Sep 17 00:00:00 2001 +From 1b692403e242c2383cb1055e5fac6d3014920993 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 15 Jul 2014 19:39:16 +0200 Subject: Replace "local" with "static". @@ -823,7 +521,7 @@ index 45a69b5..0ac6a97 100644 1.8.3.4 -From 6470c82af223c0c5e912e1ef0218155971e6bd8e Mon Sep 17 00:00:00 2001 +From eda63ead29387368ea13473af964ada010826c8e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 18 Jan 2015 15:35:30 +0100 Subject: Adjust setvars.sh to Haiku build environment. @@ -853,3 +551,187 @@ index a64d135..30bce44 100755 -- 1.8.3.4 + +From a720938fa74b28394287eb1c4f13804520089948 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 19 Jan 2015 19:36:32 +0100 +Subject: loadfind: long is 32-bit, off_t might be 64bit + +Use the proper type to get the correct sign expansion effect. + +diff --git a/bld/wres/c/loadfind.c b/bld/wres/c/loadfind.c +index 28b9529..c94ae26 100644 +--- a/bld/wres/c/loadfind.c ++++ b/bld/wres/c/loadfind.c +@@ -61,7 +61,7 @@ unsigned char FindResources( PHANDLE_INFO hInstance ) + /* look for the resource information in a debugger record at the end of file */ + { + long currpos; +- long offset; ++ off_t offset; + dbgheader header; + bool notfound; + char buffer[sizeof( PATCH_LEVEL )]; +@@ -69,7 +69,7 @@ unsigned char FindResources( PHANDLE_INFO hInstance ) + notfound = true; + FileShift = 0; + offset = sizeof( dbgheader ); +- if( WRESSEEK( hInstance->handle, -(long)sizeof( PATCH_LEVEL ), SEEK_END ) != -1 ) { ++ if( WRESSEEK( hInstance->handle, -(off_t)sizeof( PATCH_LEVEL ), SEEK_END ) != -1 ) { + if( WRESREAD( hInstance->handle, buffer, sizeof( PATCH_LEVEL ) ) == sizeof( PATCH_LEVEL ) ) { + if( memcmp( buffer, PATCH_LEVEL, PATCH_LEVEL_HEAD_SIZE ) == 0 ) { + offset += sizeof( PATCH_LEVEL ); +-- +1.8.3.4 + + +From 48aea848589760809e793b3f38af51fc4c0dd313 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 19 Jan 2015 22:44:26 +0100 +Subject: Fix local.mif for Haiku. + +* It was still referencing BSD from which it was copied, resulting in +broken build. + +diff --git a/build/mif/local.mif b/build/mif/local.mif +index 1990b94..4537b76 100644 +--- a/build/mif/local.mif ++++ b/build/mif/local.mif +@@ -453,7 +453,7 @@ bld_cl_sys = + + bld_incs = $(bld_extra_incs) -I"$(watcom_dir)/h" + +-bld_cppflags = $(common_cppflags_bsd) $(common_cppflags_$(bld_cpu)) ++bld_cppflags = $(common_cppflags_haiku) $(common_cppflags_$(bld_cpu)) + + bld_cflags = $(common_cflags) $(common_flags) -o $@ + +@@ -485,8 +485,8 @@ cl = gcc -pipe + + librarian = ar + +-cppflags_bsd = $(common_cppflags_bsd) +-cppflags_osi = $(common_cppflags_bsd) ++cppflags_haiku = $(common_cppflags_haiku) ++cppflags_osi = $(common_cppflags_haiku) + cppflags_386 = $(common_cppflags_386) + cppflags_ppc = $(common_cppflags_ppc) + cppflags_x64 = $(common_cppflags_x64) +-- +1.8.3.4 + + +From 4b0ebc440cc9f2b217c39f00f89cf2e280fc4bc1 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 19 Jan 2015 22:45:36 +0100 +Subject: makeinit, variety.h: Haiku support. + +Not sure if this is needed, for symmetry with other systems only. + +diff --git a/bld/lib_misc/h/variety.h b/bld/lib_misc/h/variety.h +index 241183e..7323caa 100644 +--- a/bld/lib_misc/h/variety.h ++++ b/bld/lib_misc/h/variety.h +@@ -164,6 +164,16 @@ + #else + #error unrecognized processor for Linux + #endif ++#elif defined(__HAIKU__) ++ #define __PROTECT_MODE__ ++ #define __UNIX__ ++ #if defined(__386__) ++ #define __HAIKU_386__ ++ #elif defined(__PPC__) ++ #define __HAIKU_PPC__ ++ #else ++ #error unrecognized processor for Haiku ++ #endif + #elif defined(__NETWARE__) + #define __PROTECT_MODE__ + #if defined(__386__) +diff --git a/build/makeinit b/build/makeinit +index f9bc945..692675a 100644 +--- a/build/makeinit ++++ b/build/makeinit +@@ -82,6 +82,17 @@ bld64host_osi = 1 + !else ifdef __BSDPPC__ + bld_cpu = ppc + bld_os = bsd ++!else ifdef __HAIKU386__ ++bld_cpu = 386 ++bld_os = haiku ++!else ifdef __HAIKUX64__ ++bld_cpu = x64 ++bld_os = haiku ++bld64host_bsd = 1 ++bld64host_osi = 1 ++!else ifdef __HAIKUPPC__ ++bld_cpu = ppc ++bld_os = haiku + !endif + + !ifdef nulldevice_$(bld_os) +-- +1.8.3.4 + + +From 61579736f40c305f7e33642c17e36c4daad73094 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 19 Jan 2015 22:46:14 +0100 +Subject: walloca: silcene warning on Haiku + +We already define __alloca in Haiku system headers, and this triggers a +warning during build. + +diff --git a/bld/watcom/h/walloca.h b/bld/watcom/h/walloca.h +index 66a7ac8..6f70d1c 100644 +--- a/bld/watcom/h/walloca.h ++++ b/bld/watcom/h/walloca.h +@@ -41,7 +41,7 @@ + #if !defined( __WATCOMC__ ) + #if defined( _MSC_VER ) + #define __alloca _alloca +-#else ++#elif !defined(__HAIKU__) + #define __alloca alloca + #endif + #endif +-- +1.8.3.4 + + +From bfc9f3a6eab0dbc28d4eb91698842faa8fb94ac8 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 19 Jan 2015 22:47:04 +0100 +Subject: wl, builder: let makefiles know about Haiku + +* We want the POSIX stuff used, otherwise there are undefined +references. + +diff --git a/bld/builder/master.mif b/bld/builder/master.mif +index 6ce7918..2d7f651 100644 +--- a/bld/builder/master.mif ++++ b/bld/builder/master.mif +@@ -36,6 +36,7 @@ inc_dirs = -I"../h" -I"$(pmake_dir)" -I"$(posix_dir)/h" + sys_bsd = sys.obj sysposix.obj + sys_dos = sys.obj sysdos.obj sysdoscd.obj + sys_linux = sys.obj sysposix.obj ++sys_haiku = sys.obj sysposix.obj + sys_nt = sysnt.obj sysdoscd.obj + sys_os2 = sys.obj sysos2.obj sysdoscd.obj + +diff --git a/bld/wl/wlobjs.mif b/bld/wl/wlobjs.mif +index 7b50b4f..e1efd0b 100644 +--- a/bld/wl/wlobjs.mif ++++ b/bld/wl/wlobjs.mif +@@ -125,6 +125,7 @@ wlink_ide_objs = $(_subdir_)idedrv.obj + wlink_objs_dos = $(_subdir_)linkio.obj + wlink_objs_qnx = $(_subdir_)posixio.obj + wlink_objs_linux = $(_subdir_)posixio.obj ++wlink_objs_haiku = $(_subdir_)posixio.obj + wlink_objs_osx = $(_subdir_)posixio.obj + wlink_objs_bsd = $(_subdir_)posixio.obj + wlink_objs_nt = $(_subdir_)ntio.obj +-- +1.8.3.4 + From 916c79b85cfc419c7aaaf7ab78413d05b2f28fbe Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 15:17:03 -0500 Subject: [PATCH 35/42] git: remove all but current version. --- dev-vcs/git/git-1.7.10.2.recipe | 186 ------------------------- dev-vcs/git/git-1.7.11.3.recipe | 29 ---- dev-vcs/git/git-1.8.0.recipe | 29 ---- dev-vcs/git/git-1.8.1.3.recipe | 29 ---- dev-vcs/git/patches/git-1.7.10.2.patch | 43 ------ dev-vcs/git/patches/git-1.7.11.3.patch | 47 ------- dev-vcs/git/patches/git-1.8.0.patch | 47 ------- dev-vcs/git/patches/git-1.8.1.3.patch | 47 ------- 8 files changed, 457 deletions(-) delete mode 100644 dev-vcs/git/git-1.7.10.2.recipe delete mode 100644 dev-vcs/git/git-1.7.11.3.recipe delete mode 100644 dev-vcs/git/git-1.8.0.recipe delete mode 100644 dev-vcs/git/git-1.8.1.3.recipe delete mode 100644 dev-vcs/git/patches/git-1.7.10.2.patch delete mode 100644 dev-vcs/git/patches/git-1.7.11.3.patch delete mode 100644 dev-vcs/git/patches/git-1.8.0.patch delete mode 100644 dev-vcs/git/patches/git-1.8.1.3.patch diff --git a/dev-vcs/git/git-1.7.10.2.recipe b/dev-vcs/git/git-1.7.10.2.recipe deleted file mode 100644 index 9f0f51fca..000000000 --- a/dev-vcs/git/git-1.7.10.2.recipe +++ /dev/null @@ -1,186 +0,0 @@ -SUMMARY="Fast, scalable, distributed revision control system" -DESCRIPTION=" -Git is a free and open source distributed version control system designed to \ -handle everything from small to very large projects with speed and efficiency. -Git is easy to learn and has a tiny footprint with lightning fast performance. \ -It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \ -features like cheap local branching, convenient staging areas, and multiple \ -workflows. -" -HOMEPAGE="http://git-scm.com/" -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Git Authors (see git web site for list)" - -SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.2.tar.gz" -CHECKSUM_SHA256="335e978814659f328e377715b13a33336859275ae6f215bf28bbbb2ae711bb43" -PATCHES="git-1.7.10.2.patch" - -SRC_URI_2="http://git-core.googlecode.com/files/git-manpages-1.7.10.2.tar.gz" -CHECKSUM_SHA256_2="bc57810ec8d87f7a10f320e31ceeb1f9eaf254e62e0f6414af67f17d0cf7d522" - -SRC_URI_3="http://git-core.googlecode.com/files/git-htmldocs-1.7.10.2.tar.gz" -CHECKSUM_SHA256_3="4cb17519eb621060d657c71ba8b10d755a6ea71123642ed6cc73d24ce8f0b734" - -REVISION="2" - -ARCHITECTURES="x86_gcc2 ?x86" - -PROVIDES=" - git = $portVersion compat >= 1.7 - cmd:git = $portVersion compat >= 1.7 - cmd:git_receive_pack = $portVersion compat >= 1.7 - cmd:git_shell = $portVersion compat >= 1.7 - cmd:git_upload_archive = $portVersion compat >= 1.7 - cmd:git_upload_pack = $portVersion compat >= 1.7 - " -PROVIDES_arch=" - git_arch = $portVersion compat >= 1.7 - cmd:git_archimport = $portVersion compat >= 1.7 - " -PROVIDES_cvs=" - git_cvs = $portVersion compat >= 1.7 - cmd:git_cvsserver = $portVersion compat >= 1.7 - " -PROVIDES_daemon=" - git_daemon = $portVersion compat >= 1.7 - cmd:git_daemon = $portVersion compat >= 1.7 - " -PROVIDES_email=" - git_email = $portVersion compat >= 1.7 - cmd:git_send_email = $portVersion compat >= 1.7 - " -PROVIDES_source=" - git_source = $portVersion compat >= 1.7 - " -PROVIDES_svn=" - git_svn = $portVersion compat >= 1.7 - cmd:git_svn = $portVersion compat >= 1.7 - " - -REQUIRES=" - haiku - cmd:man - cmd:nano - cmd:perl - cmd:python - lib:libcurl - lib:libexpat - lib:libssl - lib:libz - " -REQUIRES_arch=" - haiku - git == $portVersion base - " -REQUIRES_cvs=" - haiku - git == $portVersion base - " -REQUIRES_daemon=" - haiku - git == $portVersion base - " -REQUIRES_email=" - haiku - git == $portVersion base - " -REQUIRES_svn=" - haiku - git == $portVersion base - " - -BUILD_REQUIRES=" - cmd:man - cmd:nano - cmd:perl - cmd:python - devel:libcurl - devel:libexpat - devel:libssl - devel:libz - " - -BUILD_PREREQUIRES=" - haiku_devel - cmd:gcc - cmd:ld - cmd:make - cmd:sed - cmd:tar - " - -BUILD() -{ - make -} - -INSTALL() -{ - make strip - make install - - # replace copies of git binaries with symlinks - cd $prefix/bin - for program in git*; do - ln -sfn "../lib/git-core/$program" "$program" - done - - # copy manpages - mkdir -p $manDir - cp -rd $sourceDir2/* $manDir/ - - # copy html documentation - htmlDir=$docDir/html - mkdir -p $htmlDir - cp -rd $sourceDir3/*.html $htmlDir/ - rm $htmlDir/git-gui.html - - # copy asciidoc documentation for which there isn't any corresponding html - asciidocDir=$docDir/asciidoc - mkdir -p $asciidocDir - for f in $sourceDir3/*.txt; do - html=$sourceDir3/$(basename $f .txt).html - if ! [ -e $html ]; then - cp -d $f $asciidocDir/ - fi - done - - packageEntries arch \ - documentation/packages/git/html/git-archimport.html \ - documentation/man/man1/git-archimport.1 \ - lib/git-core/git-archimport - - packageEntries cvs \ - bin/git-cvsserver \ - documentation/packages/git/html/git-cvsexportcommit.html \ - documentation/packages/git/html/git-cvsimport.html \ - documentation/packages/git/html/git-cvsserver.html \ - documentation/man/man1/git-cvsexportcommit.1 \ - documentation/man/man1/git-cvsimport.1 \ - documentation/man/man1/git-cvsserver.1 \ - documentation/man/man7/gitcvs-migration.7 \ - lib/git-core/git-cvsexportcommit \ - lib/git-core/git-cvsimport \ - lib/git-core/git-cvsserver - - packageEntries daemon \ - documentation/packages/git/html/git-credential-cache--daemon.html \ - documentation/packages/git/html/git-credential-cache.html \ - documentation/packages/git/html/git-daemon.html \ - documentation/man/man1/git-credential-cache--daemon.1 \ - documentation/man/man1/git-credential-cache.1 \ - documentation/man/man1/git-daemon.1 \ - lib/git-core/git-credential-cache--daemon \ - lib/git-core/git-credential-cache \ - lib/git-core/git-daemon - - packageEntries email \ - documentation/packages/git/html/git-send-email.html \ - documentation/man/man1/git-send-email.1 \ - lib/git-core/git-send-email - - packageEntries svn \ - documentation/packages/git/html/git-svn.html \ - documentation/man/man1/git-svn.1 \ - lib/git-core/git-svn -} diff --git a/dev-vcs/git/git-1.7.11.3.recipe b/dev-vcs/git/git-1.7.11.3.recipe deleted file mode 100644 index e79806686..000000000 --- a/dev-vcs/git/git-1.7.11.3.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://git-core.googlecode.com/files/git-1.7.11.3.tar.gz" -CHECKSUM_MD5="23caacd9f3f421b6c05b40796df3505d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1 - dev-vcs/gitdoc == 1.7.11.3" -BUILD() -{ - cd git-1.7.11.3 - make strip -} - -INSTALL() -{ - cd git-1.7.11.3 - make install -} - -TEST() -{ - cd git-1.7.11.3 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.8.0.recipe b/dev-vcs/git/git-1.8.0.recipe deleted file mode 100644 index b96e28c7b..000000000 --- a/dev-vcs/git/git-1.8.0.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://git-core.googlecode.com/files/git-1.8.0.tar.gz" -CHECKSUM_MD5="12f4d20f34ae37086d86dd3b9d037bba" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1 - dev-vcs/gitdoc == 1.8.0" -BUILD() -{ - cd git-1.8.0 - make strip -} - -INSTALL() -{ - cd git-1.8.0 - make install -} - -TEST() -{ - cd git-1.8.0 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2012 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/git-1.8.1.3.recipe b/dev-vcs/git/git-1.8.1.3.recipe deleted file mode 100644 index 094ba2ef8..000000000 --- a/dev-vcs/git/git-1.8.1.3.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="git a fast version control system" -HOMEPAGE="http://git-scm.com/" -SRC_URI="http://git-core.googlecode.com/files/git-1.8.1.3.tar.gz" -CHECKSUM_MD5="05fb5ea3792a51cef2becc8d06ea9b87" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="net-misc/curl >= 7.20.0 - dev-lang/perl >= 5.10.1 - dev-vcs/gitdoc == 1.8.0" -BUILD() -{ - cd git-1.8.1.3 - make strip -} - -INSTALL() -{ - cd git-1.8.1.3 - make install -} - -TEST() -{ - cd git-1.8.1.3 - make check -} - -LICENSE="GNU GPL v2" -COPYRIGHT="2005-2013 Git Authors (see git web site for list)" diff --git a/dev-vcs/git/patches/git-1.7.10.2.patch b/dev-vcs/git/patches/git-1.7.10.2.patch deleted file mode 100644 index 29dfa45df..000000000 --- a/dev-vcs/git/patches/git-1.7.10.2.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up git-1.7.10.2/Makefile.orig git-1.7.10.2/Makefile ---- git-1.7.10.2/Makefile.orig 2012-05-11 14:25:45.066322432 -0600 -+++ git-1.7.10.2/Makefile 2012-05-19 12:53:42.392429568 -0600 -@@ -1242,6 +1242,27 @@ ifeq ($(uname_S),Minix) - NO_CURL = - NO_EXPAT = - endif -+ifeq ($(uname_S),Haiku) -+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease -+ NO_GETTEXT = YesPlease -+ NO_ICONV = YesPlease -+ NO_LIBGEN_H = YesPlease -+ NO_MEMMEM = YesPlease -+ NO_MKSTEMPS = YesPlease -+ NO_TCLTK = YesPlease -+ PTHREAD_LIBS = -+ BASIC_LDFLAGS += -lnetwork -lbsd -+ DEFAULT_EDITOR = nano -+ PERL_PATH = $(portPackageLinksDir)/perl/bin/perl -+ PYTHON_PATH = $(portPackageLinksDir)/python/bin/python -+ prefix = $(portPackageLinksDir)/.self -+ mandir = $(manDir) -+ infodir = $(infoDir) -+ htmldir = $(docDir) -+ gitexecdir = $(libDir)/git-core -+ gitwebdir = $(dataDir)/gitweb -+ template_dir = $(dataDir)/git-core/templates -+endif - ifneq (,$(findstring MINGW,$(uname_S))) - pathsep = ; - NO_PREAD = YesPlease -diff -up git-1.7.10.2/git-web--browse.sh.orig git-1.7.10.2/git-web--browse.sh ---- git-1.7.10.2/git-web--browse.sh.orig 2012-05-11 14:25:45.053477376 -0600 -+++ git-1.7.10.2/git-web--browse.sh 2012-05-19 12:53:42.405536768 -0600 -@@ -116,7 +116,7 @@ if test -z "$browser" ; then - browser_candidates="konqueror $browser_candidates" - fi - else -- browser_candidates="w3m elinks links lynx" -+ browser_candidates="w3m elinks links lynx open" - fi - # SECURITYSESSIONID indicates an OS X GUI login session - if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/git/patches/git-1.7.11.3.patch b/dev-vcs/git/patches/git-1.7.11.3.patch deleted file mode 100644 index 5ffff15ee..000000000 --- a/dev-vcs/git/patches/git-1.7.11.3.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up git-1.7.11.3/Makefile.orig git-1.7.11.3/Makefile ---- git-1.7.11.3/Makefile.orig 2012-07-22 14:44:07.027525120 -0600 -+++ git-1.7.11.3/Makefile 2012-07-28 22:12:40.271056896 -0600 -@@ -1297,6 +1297,31 @@ ifeq ($(uname_S),Minix) - NO_CURL = - NO_EXPAT = - endif -+ifeq ($(uname_S),Haiku) -+ NO_LIBGEN_H = YesPlease -+ NO_MEMMEM = YesPlease -+ NO_MKSTEMPS = YesPlease -+ NEEDS_LIBICONV = YesPlease -+ PERL_PATH = perl -+ PYTHON_PATH = python -+# TCL_PATH = tclsh -+ mandir = /boot/common/documentation/man -+ infodir = /boot/common/documentation/info -+ htmldir = /boot/common/documentation/doc/git-1.7.11.3 -+ gitexecdir = /boot/common/bin/git-core -+ gitwebdir = /boot/common/data/gitweb -+ template_dir = /boot/common/data/git-core/templates -+ NO_TCLTK = YesPlease -+ DEFAULT_EDITOR = nano -+ CURL_DIR = /boot/common -+ EXPAT_DIR = /boot/common -+ BASIC_CFLAGS += -I/boot/common/include -+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib -+ PTHREAD_LIBS = -+ prefix = /boot/common -+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease -+ NO_GETTEXT = YesPlease -+endif - ifneq (,$(findstring MINGW,$(uname_S))) - pathsep = ; - NO_PREAD = YesPlease -diff -up git-1.7.11.3/git-web--browse.sh.orig git-1.7.11.3/git-web--browse.sh ---- git-1.7.11.3/git-web--browse.sh.orig 2012-07-22 14:44:07.017039360 -0600 -+++ git-1.7.11.3/git-web--browse.sh 2012-07-28 22:12:40.283115520 -0600 -@@ -116,7 +116,7 @@ if test -z "$browser" ; then - browser_candidates="konqueror $browser_candidates" - fi - else -- browser_candidates="w3m elinks links lynx" -+ browser_candidates="w3m elinks links lynx open" - fi - # SECURITYSESSIONID indicates an OS X GUI login session - if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/git/patches/git-1.8.0.patch b/dev-vcs/git/patches/git-1.8.0.patch deleted file mode 100644 index 20f31f3de..000000000 --- a/dev-vcs/git/patches/git-1.8.0.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up git-1.8.0/Makefile.orig git-1.8.0/Makefile ---- git-1.8.0/Makefile.orig 2012-10-21 15:32:15.034078720 -0600 -+++ git-1.8.0/Makefile 2012-11-04 15:47:49.335020032 -0700 -@@ -1382,6 +1382,31 @@ ifeq ($(uname_S),NONSTOP_KERNEL) - # RFE 10-120912-4693 submitted to HP NonStop development. - NO_SETITIMER = UnfortunatelyYes - endif -+ifeq ($(uname_S),Haiku) -+ NO_LIBGEN_H = YesPlease -+ NO_MEMMEM = YesPlease -+ NO_MKSTEMPS = YesPlease -+ NEEDS_LIBICONV = YesPlease -+ PERL_PATH = perl -+ PYTHON_PATH = python -+# TCL_PATH = tclsh -+ mandir = /boot/common/documentation/man -+ infodir = /boot/common/documentation/info -+ htmldir = /boot/common/documentation/doc/git-1.8.0 -+ gitexecdir = /boot/common/bin/git-core -+ gitwebdir = /boot/common/data/gitweb -+ template_dir = /boot/common/data/git-core/templates -+ NO_TCLTK = YesPlease -+ DEFAULT_EDITOR = nano -+ CURL_DIR = /boot/common -+ EXPAT_DIR = /boot/common -+ BASIC_CFLAGS += -I/boot/common/include -+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib -+ PTHREAD_LIBS = -+ prefix = /boot/common -+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease -+ NO_GETTEXT = YesPlease -+endif - ifneq (,$(findstring MINGW,$(uname_S))) - pathsep = ; - NO_PREAD = YesPlease -diff -up git-1.8.0/git-web--browse.sh.orig git-1.8.0/git-web--browse.sh ---- git-1.8.0/git-web--browse.sh.orig 2012-10-21 15:32:15.028311552 -0600 -+++ git-1.8.0/git-web--browse.sh 2012-11-04 15:47:49.345505792 -0700 -@@ -116,7 +116,7 @@ if test -z "$browser" ; then - browser_candidates="konqueror $browser_candidates" - fi - else -- browser_candidates="w3m elinks links lynx" -+ browser_candidates="w3m elinks links lynx open" - fi - # SECURITYSESSIONID indicates an OS X GUI login session - if test -n "$SECURITYSESSIONID" \ diff --git a/dev-vcs/git/patches/git-1.8.1.3.patch b/dev-vcs/git/patches/git-1.8.1.3.patch deleted file mode 100644 index ce6762401..000000000 --- a/dev-vcs/git/patches/git-1.8.1.3.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up git-1.8.1.3/Makefile.orig git-1.8.0/Makefile ---- git-1.8.1.3/Makefile.orig -+++ git-1.8.1.3/Makefile -@@ -1382,6 +1382,31 @@ ifeq ($(uname_S),NONSTOP_KERNEL) - # RFE 10-120912-4693 submitted to HP NonStop development. - NO_SETITIMER = UnfortunatelyYes - endif -+ifeq ($(uname_S),Haiku) -+ NO_LIBGEN_H = YesPlease -+ NO_MEMMEM = YesPlease -+ NO_MKSTEMPS = YesPlease -+ NEEDS_LIBICONV = YesPlease -+ PERL_PATH = perl -+ PYTHON_PATH = python -+# TCL_PATH = tclsh -+ mandir = /boot/common/documentation/man -+ infodir = /boot/common/documentation/info -+ htmldir = /boot/common/documentation/doc/git-1.8.0 -+ gitexecdir = /boot/common/bin/git-core -+ gitwebdir = /boot/common/data/gitweb -+ template_dir = /boot/common/data/git-core/templates -+ NO_TCLTK = YesPlease -+ DEFAULT_EDITOR = nano -+ CURL_DIR = /boot/common -+ EXPAT_DIR = /boot/common -+ BASIC_CFLAGS += -I/boot/common/include -+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib -+ PTHREAD_LIBS = -+ prefix = /boot/common -+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease -+ NO_GETTEXT = YesPlease -+endif - ifneq (,$(findstring MINGW,$(uname_S))) - pathsep = ; - NO_PREAD = YesPlease -diff -up git-1.8.1.3/git-web--browse.sh.orig git-1.8.0/git-web--browse.sh ---- git-1.8.1.3/git-web--browse.sh.orig -+++ git-1.8.1.3/git-web--browse.sh -@@ -116,7 +116,7 @@ if test -z "$browser" ; then - browser_candidates="konqueror $browser_candidates" - fi - else -- browser_candidates="w3m elinks links lynx" -+ browser_candidates="w3m elinks links lynx open" - fi - # SECURITYSESSIONID indicates an OS X GUI login session - if test -n "$SECURITYSESSIONID" \ From 0c8cc24df36735339d1091e7c57ac9435213e618 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 17:53:41 -0500 Subject: [PATCH 36/42] Create recipe for xmlto. --- app-text/xmlto/patches/xmlto-0.0.26.patch | 62 +++++++++++++++++++++++ app-text/xmlto/xmlto-0.0.26.recipe | 52 +++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 app-text/xmlto/patches/xmlto-0.0.26.patch create mode 100644 app-text/xmlto/xmlto-0.0.26.recipe diff --git a/app-text/xmlto/patches/xmlto-0.0.26.patch b/app-text/xmlto/patches/xmlto-0.0.26.patch new file mode 100644 index 000000000..6747e0d1f --- /dev/null +++ b/app-text/xmlto/patches/xmlto-0.0.26.patch @@ -0,0 +1,62 @@ +From c1c5b8d4e142a48abb28f2c9bb81f2e170e3f564 Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Mon, 19 Jan 2015 17:49:37 -0500 +Subject: [PATCH] Make xmlif compatible with POSIX. + +--- + xmlif/xmlif.l | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/xmlif/xmlif.l b/xmlif/xmlif.l +index 0a11cdf..a6efe97 100644 +--- a/xmlif/xmlif.l ++++ b/xmlif/xmlif.l +@@ -46,22 +46,22 @@ static int nselections; /* number of selections */ + static ifsense; /* sense of last `if' or unless seen */ + static char *attribute; /* last attribute scanned */ + +-struct stack_t { ++struct stack_type { + int matched; /* matched at current level */ + int suppressed; /* suppressed branch? */ +- struct stack_t *up; ++ struct stack_type *up; + }; +-static struct stack_t head, *end = &head; ++static struct stack_type head, *end = &head; + + static void push_level(void) + /* create activation record for the current level */ + { +- struct stack_t *newelt; ++ struct stack_type *newelt; + + #ifdef DEBUG + fprintf(stderr, "{push_level()}"); + #endif /* DEBUG */ +- newelt = (struct stack_t *)malloc(sizeof(struct stack_t)); ++ newelt = (struct stack_type *)malloc(sizeof(struct stack_type)); + newelt->up = end; + end = newelt; + +@@ -72,7 +72,7 @@ static void push_level(void) + static void pop_level(void) + /* delete activation record for the current level */ + { +- struct stack_t *up = end->up; ++ struct stack_type *up = end->up; + + #ifdef DEBUG + fprintf(stderr, "{pop_level()}"); +@@ -96,7 +96,7 @@ static void stash_attribute(char *attr) + static void end_attribute(void) + /* we've seen all the attributes of a conditional, process them now */ + { +- struct stack_t *up; ++ struct stack_type *up; + + if (attribute) + free(attribute); +-- +1.8.3.4 + diff --git a/app-text/xmlto/xmlto-0.0.26.recipe b/app-text/xmlto/xmlto-0.0.26.recipe new file mode 100644 index 000000000..05f270f4b --- /dev/null +++ b/app-text/xmlto/xmlto-0.0.26.recipe @@ -0,0 +1,52 @@ +SUMMARY="Shell-script tool for converting XML files to various formats" +DESCRIPTION="xmlto is a shell-script tool for converting XML files to \ +various formats. At the moment it supports conversion from docbook, \ +xhtml1 and fo format to various output formats (awt, fo, htmlhelp, \ +javahelp, mif, pdf, svg, xhtml, dvi, html, html-nochunks, man, \ +pcl, ps, txt, xhtml-nochunks, epub). It uses \ +passivetex(default)/fop/dblatex for processing, just provides easy \ +to use command line frontend to make fine output without remembering \ +many long options and searching for syntax. " +HOMEPAGE="https://fedorahosted.org/xmlto/" +SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$portVersion.tar.gz" +CHECKSUM_SHA256="cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977" +PATCHES="xmlto-$portVersion.patch" +REVISION="1" +COPYRIGHT="2009 Tim Waugh + 2013 Ondrej Vasik" +LICENSE="GNU GPL v2" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +PROVIDES=" + xmlto = $portVersion compat >= 0 + cmd:xmlto + cmd:xmlif + " + +REQUIRES=" + haiku + cmd:getopt + cmd:xmllint + cmd:xsltproc + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:gcc + cmd:awk + cmd:getopt + cmd:flex + cmd:make + " + +BUILD() +{ + runConfigure --omit-dirs binDir ./configure --bindir=$prefix/bin + make $jobArgs +} + +INSTALL() +{ + make install +} From c609cbd63a1a815684f6909647a275c37bfccc38 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 19 Jan 2015 20:17:28 -0500 Subject: [PATCH 37/42] git: version 2.2.2. * Tested with HaikuPorter, works * No longer needs Python * Has fancy colorized terminal output --- dev-vcs/git/git-2.2.2.recipe | 222 +++++++++++++++++++++++++ dev-vcs/git/patches/git-2.2.2.patchset | 147 ++++++++++++++++ 2 files changed, 369 insertions(+) create mode 100644 dev-vcs/git/git-2.2.2.recipe create mode 100644 dev-vcs/git/patches/git-2.2.2.patchset diff --git a/dev-vcs/git/git-2.2.2.recipe b/dev-vcs/git/git-2.2.2.recipe new file mode 100644 index 000000000..bc3b7ef6c --- /dev/null +++ b/dev-vcs/git/git-2.2.2.recipe @@ -0,0 +1,222 @@ +SUMMARY="Fast, scalable, distributed revision control system" +DESCRIPTION="Git is a free and open source distributed version control system \ +designed to handle everything from small to very large projects with speed \ +and efficiency. + +Git is easy to learn and has a tiny footprint with lightning fast performance. \ +It outclasses SCM tools like Subversion, CVS, Perforce, and ClearCase with \ +features like cheap local branching, convenient staging areas, and multiple \ +workflows." +HOMEPAGE="http://git-scm.com/" +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2015 Git Authors (see git web site for list)" + +SRC_URI="https://www.kernel.org/pub/software/scm/git/git-$portVersion.tar.gz" +CHECKSUM_SHA256="e9e50d0d382183a9327d39334eb65db92852208e1438aab2a9bf8d06ef17b653" +PATCHES="git-$portVersion.patchset" + +SRC_URI_2="https://www.kernel.org/pub/software/scm/git/git-manpages-$portVersion.tar.gz" +CHECKSUM_SHA256_2="c9340fad1f521f3782abca4839d66bfee237f3e931856413561cf1b55fc9d550" + +SRC_URI_3="https://www.kernel.org/pub/software/scm/git/git-htmldocs-$portVersion.tar.gz" +CHECKSUM_SHA256_3="7f5eb11cf3dd5abb4705fb91f52c78ff4265b2e2eb15948cef311b3e04896d1c" + +REVISION="1" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + git = $portVersion compat >= 2.2 + cmd:git = $portVersion compat >= 2.2 + cmd:git_receive_pack = $portVersion compat >= 2.2 + cmd:git_shell = $portVersion compat >= 2.2 + cmd:git_upload_archive = $portVersion compat >= 2.2 + cmd:git_upload_pack = $portVersion compat >= 2.2 + " +PROVIDES_arch=" + git_arch = $portVersion compat >= 2.2 + cmd:git_archimport = $portVersion compat >= 2.2 + " +PROVIDES_cvs=" + git_cvs = $portVersion compat >= 2.2 + cmd:git_cvsimport = $portVersion compat >= 2.2 + cmd:git_cvsserver = $portVersion compat >= 2.2 + " +PROVIDES_daemon=" + git_daemon = $portVersion compat >= 2.2 + cmd:git_daemon = $portVersion compat >= 2.2 + " +PROVIDES_email=" + git_email = $portVersion compat >= 2.2 + cmd:git_send_email = $portVersion compat >= 2.2 + " +PROVIDES_source=" + git_source = $portVersion compat >= 2.2 + " +PROVIDES_svn=" + git_svn = $portVersion compat >= 2.2 + cmd:git_svn = $portVersion compat >= 2.2 + " + +REQUIRES=" + haiku + cmd:man + cmd:nano + cmd:perl >= 5 + cmd:python + lib:libcurl + lib:libexpat + lib:libiconv + lib:libintl + lib:libpcre + lib:libssl + lib:libz + vendor_perl + " +REQUIRES_arch=" + haiku + git == $portVersion base + " +REQUIRES_cvs=" + haiku + git == $portVersion base + cmd:cvsps + " +REQUIRES_daemon=" + haiku + git == $portVersion base + " +REQUIRES_email=" + haiku + git == $portVersion base + " +REQUIRES_svn=" + haiku + git == $portVersion base + " + +BUILD_REQUIRES=" + cmd:man + cmd:nano + cmd:perl + devel:libcurl + devel:libexpat + devel:libiconv + devel:libintl + devel:libpcre + devel:libssl + devel:libz + " + +BUILD_PREREQUIRES=" + haiku_devel + cmd:find + cmd:gcc + cmd:gettext + cmd:ld + cmd:make + cmd:msgfmt + cmd:sed + cmd:tar + " + +USER_SETTINGS_FILES=" + settings/git directory + " + +makeGit() +{ + make prefix=$prefix \ + bindir_relative=$relativeBinDir \ + mandir=$manDir \ + infodir=$infoDir \ + gitexecdir=$libDir/git-core \ + sharedir=$dataDir \ + template_dir=$dataDir/git-core/templates \ + htmldir=$docDir \ + sysconfdir=$sysconfDir \ + PTHREAD_LIBS= \ + USE_LIBPCRE=YesPlease \ + NO_D_TYPE_IN_DIRENT=YesPlease \ + NO_MEMMEM=YesPlease \ + NO_MKSTEMPS=YesPlease \ + NEEDS_LIBICONV=YesPlease \ + NO_R_TO_GCC_LINKER=YesPlease \ + GNU_ROFF=YesPlease \ + PERL_PATH=$portPackageLinksDir/cmd~perl/bin/perl \ + NO_PYTHON=YesPlease \ + NO_TCLTK=YesPlease \ + OBJECT_CREATION_USES_RENAMES=YesPlease \ + NO_CROSS_DIRECTORY_HARDLINKS=YesPlease \ + NO_INSTALL_HARDLINKS=YesPlease \ + HAVE_DEV_TTY=YesPlease \ + DEFAULT_EDITOR=nano \ + BASIC_LDFLAGS="-lnetwork -lbsd" \ + "$@" +} + +BUILD() +{ + makeGit $jobArgs + makeGit strip +} + +INSTALL() +{ + makeGit install + + # copy manpages + mkdir -p $manDir + cp -rd $sourceDir2/* $manDir/ + + # copy html documentation + htmlDir=$docDir/html + mkdir -p $htmlDir + cp -rd $sourceDir3/*.html $htmlDir/ + rm $htmlDir/git-gui.html + + # replace copies of git binaries with symlinks + cd $binDir + for program in git*; do + ln -sfn "../lib/git-core/$program" "$program" + done + + packageEntries arch \ + documentation/packages/git/html/git-archimport.html \ + documentation/man/man1/git-archimport.1 \ + lib/git-core/git-archimport + + packageEntries cvs \ + bin/git-cvsserver \ + documentation/packages/git/html/git-cvsexportcommit.html \ + documentation/packages/git/html/git-cvsimport.html \ + documentation/packages/git/html/git-cvsserver.html \ + documentation/man/man1/git-cvsexportcommit.1 \ + documentation/man/man1/git-cvsimport.1 \ + documentation/man/man1/git-cvsserver.1 \ + documentation/man/man7/gitcvs-migration.7 \ + lib/git-core/git-cvsexportcommit \ + lib/git-core/git-cvsimport \ + lib/git-core/git-cvsserver + + packageEntries daemon \ + documentation/packages/git/html/git-credential-cache--daemon.html \ + documentation/packages/git/html/git-credential-cache.html \ + documentation/packages/git/html/git-daemon.html \ + documentation/man/man1/git-credential-cache--daemon.1 \ + documentation/man/man1/git-credential-cache.1 \ + documentation/man/man1/git-daemon.1 \ + lib/git-core/git-credential-cache--daemon \ + lib/git-core/git-credential-cache \ + lib/git-core/git-daemon + + packageEntries email \ + documentation/packages/git/html/git-send-email.html \ + documentation/man/man1/git-send-email.1 \ + lib/git-core/git-send-email + + packageEntries svn \ + documentation/packages/git/html/git-svn.html \ + documentation/man/man1/git-svn.1 \ + lib/git-core/git-svn +} diff --git a/dev-vcs/git/patches/git-2.2.2.patchset b/dev-vcs/git/patches/git-2.2.2.patchset new file mode 100644 index 000000000..820f58492 --- /dev/null +++ b/dev-vcs/git/patches/git-2.2.2.patchset @@ -0,0 +1,147 @@ +From ee8b7c8ecc7ea2cd35a3e1c298c7afaf8823e048 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Tue, 13 Aug 2013 08:07:25 +0200 +Subject: [PATCH 1/5] git-web--browse.sh: use "open" on Haiku + +--- + git-web--browse.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/git-web--browse.sh b/git-web--browse.sh +index ae15253..1f6e306 100755 +--- a/git-web--browse.sh ++++ b/git-web--browse.sh +@@ -132,6 +132,10 @@ if test -z "$browser" ; then + if test -x /usr/bin/cygstart; then + browser_candidates="cygstart $browser_candidates" + fi ++ # /boot/system/haiku_loader indicates Haiku ++ if test -f /boot/system/haiku_loader; then ++ browser_candidates="open $browser_candidates" ++ fi + + for i in $browser_candidates; do + init_browser_path $i +-- +1.8.3.4 + + +From a7f24c225e8b75abf52d07f73625ea404503b475 Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Mon, 19 Jan 2015 15:37:16 -0500 +Subject: [PATCH 2/5] On Haiku use the user settings directory instead of HOME + +--- + path.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/path.c b/path.c +index e608993..ee5831c 100644 +--- a/path.c ++++ b/path.c +@@ -5,6 +5,11 @@ + #include "strbuf.h" + #include "string-list.h" + ++#ifdef __HAIKU__ ++# include ++# include ++#endif ++ + static int get_st_mode_bits(const char *path, int *mode) + { + struct stat st; +@@ -132,6 +137,19 @@ char *git_path(const char *fmt, ...) + + void home_config_paths(char **global, char **xdg, char *file) + { ++#ifdef __HAIKU__ ++ char settingsPath[B_PATH_NAME_LENGTH]; ++ ++ *xdg = NULL; ++ ++ if (global) { ++ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, true, settingsPath, ++ sizeof(settingsPath)) == B_OK) { ++ *global = mkpathdup("%s/git/%s", settingsPath, file); ++ } else ++ *global = NULL; ++ } ++#else + char *xdg_home = getenv("XDG_CONFIG_HOME"); + char *home = getenv("HOME"); + char *to_free = NULL; +@@ -156,6 +174,7 @@ void home_config_paths(char **global, char **xdg, char *file) + } + + free(to_free); ++#endif + } + + char *git_path_submodule(const char *path, const char *fmt, ...) +-- +1.8.3.4 + + +From b2890c33ea7dff56b4060394673d36746ad4e448 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Mon, 19 Jan 2015 15:50:09 -0500 +Subject: [PATCH 3/5] Ensure config-directory exists before using it. + +--- + config.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/config.c b/config.c +index 752e2e2..1e07f5c 100644 +--- a/config.c ++++ b/config.c +@@ -1934,6 +1934,7 @@ int git_config_set_multivar_in_file(const char *config_filename, + int ret; + struct lock_file *lock = NULL; + char *filename_buf = NULL; ++ char *config_dir = NULL; + + /* parse-key returns negative; flip the sign to feed exit(3) */ + ret = 0 - git_config_parse_key(key, &store.key, &store.baselen); +@@ -1945,6 +1946,12 @@ int git_config_set_multivar_in_file(const char *config_filename, + if (!config_filename) + config_filename = filename_buf = git_pathdup("config"); + ++ config_dir = xstrdup(config_filename); ++ * find_last_dir_sep(config_dir) = '\0'; ++ if (access(config_dir, F_OK) != 0) ++ mkdir(config_dir, 0755); ++ free(config_dir); ++ + /* + * The lock serves a purpose in addition to locking: the new + * contents of .git/config will be written into it. +-- +1.8.3.4 + + +From 089d55aa7d52ac66b9639b47b0be062851bfbda2 Mon Sep 17 00:00:00 2001 +From: Augustin Cavalier +Date: Mon, 19 Jan 2015 16:40:30 -0500 +Subject: [PATCH 4/5] Don't use __builtin_ctzll on GCC2. + +--- + ewah/ewok.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ewah/ewok.h b/ewah/ewok.h +index f6ad190..ca059c9 100644 +--- a/ewah/ewok.h ++++ b/ewah/ewok.h +@@ -47,7 +47,7 @@ static inline uint32_t ewah_bit_popcount64(uint64_t x) + return (x * 0x0101010101010101ULL) >> 56; + } + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && __GNUC__ >= 3 + #define ewah_bit_ctz64(x) __builtin_ctzll(x) + #else + static inline int ewah_bit_ctz64(uint64_t x) +-- +1.8.3.4 From d32932915cfbbd5d523f8df75e74dd65e2cf7024 Mon Sep 17 00:00:00 2001 From: Josef Gajdusek Date: Mon, 19 Jan 2015 22:13:20 +0100 Subject: [PATCH 38/42] hdialog: Update --- ...dialog-0.1_git.recipe => hdialog-0.2.recipe} | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) rename haiku-apps/hdialog/{hdialog-0.1_git.recipe => hdialog-0.2.recipe} (52%) diff --git a/haiku-apps/hdialog/hdialog-0.1_git.recipe b/haiku-apps/hdialog/hdialog-0.2.recipe similarity index 52% rename from haiku-apps/hdialog/hdialog-0.1_git.recipe rename to haiku-apps/hdialog/hdialog-0.2.recipe index e4374286c..3d9590c84 100644 --- a/haiku-apps/hdialog/hdialog-0.1_git.recipe +++ b/haiku-apps/hdialog/hdialog-0.2.recipe @@ -1,13 +1,12 @@ SUMMARY="Create GUI dialogs from shell scripts." -DESCRIPTION=" - This tools is able to create various GUI dialogs. This allows for shell \ - scripts to easily integrate to the system and interact with the user. - " +DESCRIPTION="This tools is able to create various GUI dialogs. This allows \ +for shell scripts to easily integrate to the system and interact with the user." HOMEPAGE="https://github.com/atalax/hdialog" -SRC_URI="git+https://github.com/atalax/hdialog#4d64128" +SRC_URI="https://github.com/atalax/hdialog/archive/v0.2.tar.gz" +CHECKSUM_SHA256="77deae4e51f522eb6735d184372222e482edec83f93c8b3ace5d5d2c100e165d" REVISION="1" LICENSE="MIT" -COPYRIGHT="2014 Josef Gajdusek" +COPYRIGHT="2014-2015 Josef Gajdusek" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -22,10 +21,10 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel + " + +BUILD_PREREQUIRES=" makefile_engine - cmd:gcc - cmd:make - cmd:mkdepend " BUILD() From 4c2614bf6599740ef7b4cba8953148cc1562efac Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 20 Jan 2015 14:35:01 +0100 Subject: [PATCH 39/42] openwatcom: more things got upstreamed, more needs to be fixed. --- sys-devel/openwatcom/openwatcom-2.0.0.recipe | 2 +- .../patches/openwatcom-2.0.0.patchset | 783 +++++++++--------- 2 files changed, 377 insertions(+), 408 deletions(-) diff --git a/sys-devel/openwatcom/openwatcom-2.0.0.recipe b/sys-devel/openwatcom/openwatcom-2.0.0.recipe index 02601abfb..a993a237e 100644 --- a/sys-devel/openwatcom/openwatcom-2.0.0.recipe +++ b/sys-devel/openwatcom/openwatcom-2.0.0.recipe @@ -17,7 +17,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then fi SECONDARY_ARCHITECTURES="x86" -SRC_URI="git@github.com:open-watcom/open-watcom-v2.git#a3b3e22c3a0266a93da5f7d67bc368ff34813449" +SRC_URI="git@github.com:open-watcom/open-watcom-v2.git#da9bd7daad78cfae6219ab29ffadb60797481d6d" PATCHES="openwatcom-$portVersion.patchset" PROVIDES=" diff --git a/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset b/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset index 0df4298d4..ebb1b1a89 100644 --- a/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset +++ b/sys-devel/openwatcom/patches/openwatcom-2.0.0.patchset @@ -1,9 +1,251 @@ -From 1b692403e242c2383cb1055e5fac6d3014920993 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 15 Jul 2014 19:39:16 +0200 -Subject: Replace "local" with "static". +From 23162357097c5f295ee9143311b1f8dc058eb06d Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 18 Jan 2015 15:35:30 +0100 +Subject: Adjust setvars.sh to Haiku build environment. +diff --git a/setvars.sh b/setvars.sh +index a64d135..30bce44 100755 +--- a/setvars.sh ++++ b/setvars.sh +@@ -6,14 +6,14 @@ + # modify it as necessary for your own use!! + + # Change this to point your Open Watcom source tree +-export OWROOT=/home/ow/ow ++export OWROOT=/sources/openwatcom-2.0.0 + + # Subdirectory to be used for building OW build tools + export OWOBJDIR=binbuild + + # Set this entry to identify your toolchain used by build process + # supported values are WATCOM GCC CLANG +-export OWTOOLS=WATCOM ++export OWTOOLS=GCC + + # Documentation related variables + +-- +1.8.3.4 + + +From 8eb0dea26f4e2d7e0d7924fa980660da52dc77f3 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 19 Jan 2015 22:44:26 +0100 +Subject: Fix local.mif for Haiku. + +* It was still referencing BSD from which it was copied, resulting in +broken build. + +diff --git a/build/mif/local.mif b/build/mif/local.mif +index 7a21e56..3f3b863 100644 +--- a/build/mif/local.mif ++++ b/build/mif/local.mif +@@ -296,7 +296,7 @@ bld_cl_sys = + + bld_incs = $(bld_extra_incs) -I"$(watcom_dir)/h" + +-bld_cppflags = $(common_cppflags_bsd) $(common_cppflags_$(bld_cpu)) ++bld_cppflags = $(common_cppflags_haiku) $(common_cppflags_$(bld_cpu)) + + bld_cflags = $(common_cflags) $(common_flags) -o $@ + +@@ -328,8 +328,8 @@ cl = clang -pipe + + librarian = ar + +-cppflags_bsd = $(common_cppflags_bsd) +-cppflags_osi = $(common_cppflags_bsd) ++cppflags_haiku = $(common_cppflags_haiku) ++cppflags_osi = $(common_cppflags_haiku) + cppflags_386 = $(common_cppflags_386) + cppflags_ppc = $(common_cppflags_ppc) + cppflags_x64 = $(common_cppflags_x64) +-- +1.8.3.4 + + +From fb3e476980b1832ac3faff2a0c1f8501bff68890 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 20 Jan 2015 12:36:48 +0100 +Subject: trmem: fix build with non-watcom compiler + +* i86.h is not available in this case, use the stubs. + +diff --git a/bld/trmem/trmem.c b/bld/trmem/trmem.c +index f2c6eb9..a7ea28f 100644 +--- a/bld/trmem/trmem.c ++++ b/bld/trmem/trmem.c +@@ -33,7 +33,7 @@ + #include + #include + +-#if defined( _M_IX86 ) ++#if defined( _M_IX86 ) && defined( __WATCOMC__ ) + #include + #endif + +@@ -782,7 +782,7 @@ memsize _trmem_get_peak_usage( _trmem_hdl hdl ) { + return( hdl->max_mem ); + } + +-#ifndef _M_IX86 ++#if !defined( _M_IX86 ) || !defined( __WATCOMC__) + _trmem_who _trmem_guess_who( void ) + /**********************************/ + /* NYI: stubbed for now */ +-- +1.8.3.4 + + +From d08d3eac330bd61aaff31170eaa67de964874cd5 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 20 Jan 2015 12:37:36 +0100 +Subject: clibext: better implementation of _cmdname for haiku + +We need to look for the app image and not take whatever is listed first. + +diff --git a/bld/watcom/c/clibext.c b/bld/watcom/c/clibext.c +index d7fc1e0..f857228 100644 +--- a/bld/watcom/c/clibext.c ++++ b/bld/watcom/c/clibext.c +@@ -1270,9 +1270,13 @@ char *_cmdname( char *name ) + + char *_cmdname( char *name ) + { +- image_info info; +- get_image_info( 0, &info ); +- return( strcpy( name, info.name ) ); ++ image_info info; ++ int32 cookie; ++ while ( get_next_image_info( 0, &cookie, &info ) == B_OK) { ++ if ( info.type != B_APP_IMAGE ) ++ continue; ++ return( strcpy( name, info.name ) ); ++ } + } + + #elif defined( __UNIX__ ) +-- +1.8.3.4 + + +From 2b23463882316209eecbaa20416eee963710ae87 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 20 Jan 2015 12:38:16 +0100 +Subject: Fix more WResFileOffset type mismatches + +* Needed for things to build on Haiku. + +diff --git a/bld/as/c/asmsg.c b/bld/as/c/asmsg.c +index 00f29c3..f7df3d5 100644 +--- a/bld/as/c/asmsg.c ++++ b/bld/as/c/asmsg.c +@@ -70,7 +70,7 @@ static unsigned msgShift; + #define NO_RES_MESSAGE "Error: could not open message resource file\r\n" + #define NO_RES_SIZE (sizeof(NO_RES_MESSAGE)-1) + +-extern long FileShift; ++extern WResFileOffset FileShift; + + static HANDLE_INFO hInstance = {0}; + +diff --git a/bld/wasm/c/wasmmsg.c b/bld/wasm/c/wasmmsg.c +index 51a406f..302bb9d 100644 +--- a/bld/wasm/c/wasmmsg.c ++++ b/bld/wasm/c/wasmmsg.c +@@ -60,7 +60,7 @@ static const char *txtmsgs[] = { + #define NO_RES_MESSAGE "Error: could not open message resource file.\r\n" + #define NO_RES_SIZE (sizeof( NO_RES_MESSAGE ) - 1) + +-extern long FileShift; ++extern WResFileOffset FileShift; + + static HANDLE_INFO hInstance = { 0 }; + static unsigned MsgShift; +diff --git a/bld/wl/c/loadpe.c b/bld/wl/c/loadpe.c +index 41b7457..e0e674f 100644 +--- a/bld/wl/c/loadpe.c ++++ b/bld/wl/c/loadpe.c +@@ -773,7 +773,7 @@ WResFileSSize RcWrite( WResFileID hdl, const void *buf, WResFileSize len ) + return( len ); + } + +-long RcSeek( int hdl, long off, int pos ) ++WResFileOffset RcSeek( WResFileID hdl, WResFileOffset off, int pos ) + { + DbgAssert( pos != SEEK_END ); + DbgAssert( !(pos == SEEK_CUR && off < 0) ); +@@ -794,7 +794,7 @@ long RcSeek( int hdl, long off, int pos ) + } + } + +-long RcTell( int hdl ) ++WResFileOffset RcTell( WResFileID hdl ) + { + DbgAssert( hdl == Root->outfile->handle ); + +diff --git a/bld/wres/c/loadfind.c b/bld/wres/c/loadfind.c +index 1449fa6..e8aa881 100644 +--- a/bld/wres/c/loadfind.c ++++ b/bld/wres/c/loadfind.c +@@ -55,7 +55,7 @@ typedef struct dbgheader { + } dbgheader; + #include "poppck.h" + +-long FileShift = 0; ++WResFileOffset FileShift = 0; + + unsigned char FindResources( PHANDLE_INFO hInstance ) + /* look for the resource information in a debugger record at the end of file */ +-- +1.8.3.4 + + +From 85d972cda11f12d57fa958551805f02113193855 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 20 Jan 2015 14:25:55 +0100 +Subject: Another missing haiku define. + + +diff --git a/bld/watcom/h/wstd.h b/bld/watcom/h/wstd.h +index 01e8745..f892d58 100644 +--- a/bld/watcom/h/wstd.h ++++ b/bld/watcom/h/wstd.h +@@ -82,6 +82,9 @@ typedef unsigned_8 sbit; + #elif defined( __LINUX__ ) + #undef OS_LINUX + #define OS_LINUX 1 ++#elif defined( __HAIKU__ ) ++ #undef OS_HAIKU ++ #define OS_HAIKU 1 + #elif defined( __BSD__ ) + #undef OS_BSD + #define OS_BSD 1 +-- +1.8.3.4 + + +From 62d47ba56c04a1b6dddd343a96ddbb59bc83a97f Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 20 Jan 2015 14:26:59 +0100 +Subject: Some missing local > static conversions. + +* Not doing this really confuses gcc on Haiku. + +diff --git a/bld/cc/c/ccmain.c b/bld/cc/c/ccmain.c +index 547fc50..a75b4db 100644 +--- a/bld/cc/c/ccmain.c ++++ b/bld/cc/c/ccmain.c +@@ -81,7 +81,7 @@ static bool TryOpen( const char *path, const char *filename ); + static void ParseInit( void ); + static void CPP_Parse( void ); + static bool FCB_Alloc( FILE *fp, const char *filename ); +-local void Parse( void ); ++static void Parse( void ); + static bool OpenPgmFile( void ); + static void DelDepFile( void ); + static const char *IncludeAlias( const char *filename, bool is_lib ); diff --git a/bld/cc/c/cexpr.c b/bld/cc/c/cexpr.c index 9cbb2cf..2333caf 100644 --- a/bld/cc/c/cexpr.c @@ -314,424 +556,151 @@ index 9cbb2cf..2333caf 100644 { TREEPTR tree; TYPEPTR typ; -diff --git a/bld/cc/c/cmac2.c b/bld/cc/c/cmac2.c -index 232b456..bea45a7 100644 ---- a/bld/cc/c/cmac2.c -+++ b/bld/cc/c/cmac2.c -@@ -51,8 +51,8 @@ static void CLine( void ); - static void CError( void ); - static void CIdent( void ); +diff --git a/bld/cc/c/ctype.c b/bld/cc/c/ctype.c +index 12d8062..7561b22 100644 +--- a/bld/cc/c/ctype.c ++++ b/bld/cc/c/ctype.c +@@ -33,10 +33,10 @@ --local void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *src_loc ); --local mac_parm_count FormalParm( MPPTR formal_parms ); -+static void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *src_loc ); -+static mac_parm_count FormalParm( MPPTR formal_parms ); + extern unsigned SymTypedef; - struct preproc { - char *directive; -@@ -107,7 +107,7 @@ static void PPFlush2EOL( void ) +-local TYPEPTR StructDecl(DATA_TYPE,bool); +-//local TYPEPTR ComplexDecl(int,bool); +-local void SetPlainCharType( DATA_TYPE char_type ); +-local void CheckBitfieldType( TYPEPTR typ ); ++static TYPEPTR StructDecl(DATA_TYPE,bool); ++//static TYPEPTR ComplexDecl(int,bool); ++static void SetPlainCharType( DATA_TYPE char_type ); ++static void CheckBitfieldType( TYPEPTR typ ); + + #if _CPU == 386 + #define _CHECK_SIZE( s ) +@@ -325,7 +325,7 @@ type_modifiers TypeQualifier( void ) + return( flags ); + } + +-local TYPEPTR GetScalarType( bool *plain_int, int bmask, type_modifiers flags ) ++static TYPEPTR GetScalarType( bool *plain_int, int bmask, type_modifiers flags ) + { + DATA_TYPE data_type; + TYPEPTR typ; +@@ -400,7 +400,7 @@ local TYPEPTR GetScalarType( bool *plain_int, int bmask, type_modifiers flags ) } --local void ChkEOL( void ) -+static void ChkEOL( void ) +-local void AdvanceToken( void ) ++static void AdvanceToken( void ) { - if( CurToken != T_EOF ) { - ExpectingToken( T_NULL ); -@@ -115,7 +115,7 @@ local void ChkEOL( void ) + if( CurToken == T_SAVED_ID ) { + CMemFree( SavedId ); +@@ -763,7 +763,7 @@ TAGPTR VfyNewTag( TAGPTR tag, DATA_TYPE tag_type ) } --local void WantEOL( void ) -+static void WantEOL( void ) +-local FIELDPTR NewField( FIELDPTR new_field, TYPEPTR decl ) ++static FIELDPTR NewField( FIELDPTR new_field, TYPEPTR decl ) { + FIELDPTR field; + FIELDPTR prev_field; +@@ -823,7 +823,7 @@ local FIELDPTR NewField( FIELDPTR new_field, TYPEPTR decl ) + } + + +-local TYPEPTR EnumFieldType( TYPEPTR ftyp, bool plain_int, ++static TYPEPTR EnumFieldType( TYPEPTR ftyp, bool plain_int, + bitfield_width start, bitfield_width width ) + { + TYPEPTR typ; +@@ -877,7 +877,7 @@ align_type GetTypeAlignment( TYPEPTR typ ) + } + + +-local target_size FieldAlign( target_size next_offset, FIELDPTR field, align_type *worst_alignment ) ++static target_size FieldAlign( target_size next_offset, FIELDPTR field, align_type *worst_alignment ) + { + align_type pack_adjustment; + align_type align; +@@ -902,7 +902,7 @@ local target_size FieldAlign( target_size next_offset, FIELDPTR field, align_typ + return( next_offset ); + } + +-local DATA_TYPE UnQualifiedType( TYPEPTR typ ) ++static DATA_TYPE UnQualifiedType( TYPEPTR typ ) + { + SKIP_TYPEDEFS( typ ); + SKIP_ENUM( typ ); +@@ -932,7 +932,7 @@ local DATA_TYPE UnQualifiedType( TYPEPTR typ ) + + /* clear the hash table of all fields that were just defined + in the struct with tag tag */ +-local void ClearFieldHashTable( TAGPTR tag ) ++static void ClearFieldHashTable( TAGPTR tag ) + { + FIELDPTR field; + FIELDPTR hash_field; +@@ -984,7 +984,7 @@ static void AdjFieldTypeNode( FIELDPTR field, type_modifiers decl_mod ) + } + } + +-local target_size GetFields( TYPEPTR decl ) ++static target_size GetFields( TYPEPTR decl ) + { + target_size start; + TYPEPTR typ; +@@ -1129,7 +1129,7 @@ local target_size GetFields( TYPEPTR decl ) + } + + +-local TYPEPTR StructDecl( DATA_TYPE decl_typ, bool packed ) ++static TYPEPTR StructDecl( DATA_TYPE decl_typ, bool packed ) + { + TYPEPTR typ; + TAGPTR tag; +@@ -1202,7 +1202,7 @@ struct { + */ + + /* +-local void GetComplexFieldTypeSpecifier( decl_info *info, DATA_TYPE data_type ) ++static void GetComplexFieldTypeSpecifier( decl_info *info, DATA_TYPE data_type ) + { + info->stg = SC_NONE; // indicate don't want any storage class specifiers + info->mod = FLAG_NONE; +@@ -1214,7 +1214,7 @@ local void GetComplexFieldTypeSpecifier( decl_info *info, DATA_TYPE data_type ) + } + + +-local target_size GetComplexFields( TYPEPTR decl ) ++static target_size GetComplexFields( TYPEPTR decl ) + { + target_size start; + TYPEPTR typ; +@@ -1270,7 +1270,7 @@ local target_size GetComplexFields( TYPEPTR decl ) + } + + +-local TYPEPTR ComplexDecl( DATA_TYPE decl_typ, bool packed ) ++static TYPEPTR ComplexDecl( DATA_TYPE decl_typ, bool packed ) + { + TYPEPTR typ; + TAGPTR tag; +@@ -1297,7 +1297,7 @@ local TYPEPTR ComplexDecl( DATA_TYPE decl_typ, bool packed ) + } + */ + +-local void CheckBitfieldType( TYPEPTR typ ) ++static void CheckBitfieldType( TYPEPTR typ ) + { + SKIP_TYPEDEFS( typ ); if( CompFlags.extensions_enabled ) { - if( CurToken != T_NULL && CurToken != T_EOF ) { -@@ -129,7 +129,7 @@ local void WantEOL( void ) +@@ -1437,7 +1437,7 @@ TYPEPTR ArrayNode( TYPEPTR the_object ) } --local void IncLevel( bool value ) -+static void IncLevel( bool value ) +-local TYPEPTR MkPtrNode( TYPEPTR typ, type_modifiers flags, ++static TYPEPTR MkPtrNode( TYPEPTR typ, type_modifiers flags, + segment_id segid, SYM_HANDLE base, BASED_KIND based_kind ) { - struct cpp_info *cpp; - -@@ -150,7 +150,7 @@ local void IncLevel( bool value ) - } - - --local void CUnknown( void ) -+static void CUnknown( void ) - { - if( NestLevel == SkipLevel ) { - CErr2p( ERR_UNKNOWN_DIRECTIVE, Buffer ); -@@ -244,18 +244,18 @@ TOKEN ChkControl( void ) - } - - --local void CSkip( void ) -+static void CSkip( void ) - { - } - - --local void CSkipIf( void ) -+static void CSkipIf( void ) - { - IncLevel( FALSE ); - } - - --local void CIdent( void ) -+static void CIdent( void ) - { - if( !CompFlags.extensions_enabled ) { - CUnknown(); -@@ -319,7 +319,7 @@ void CInclude( void ) - } - - --local void CDefine( void ) -+static void CDefine( void ) - { - MPPTR mp; - MPPTR prev_mp; -@@ -406,7 +406,7 @@ local void CDefine( void ) - } - - --local void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *loc ) -+static void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR formal_parms, const char *mac_name, source_loc *loc ) - { - MEPTR mentry; - size_t len; -@@ -524,7 +524,7 @@ local void GrabTokens( mac_parm_count parm_count, macro_flags mflags, MPPTR form - } - - --local mac_parm_count FormalParm( MPPTR formal_parms ) -+static mac_parm_count FormalParm( MPPTR formal_parms ) - { - mac_parm_count i; - -@@ -539,7 +539,7 @@ local mac_parm_count FormalParm( MPPTR formal_parms ) - } - - --local void CIfDef( void ) -+static void CIfDef( void ) - { - MEPTR mentry; - -@@ -561,7 +561,7 @@ local void CIfDef( void ) - } - - --local void CIfNDef( void ) -+static void CIfNDef( void ) - { - MEPTR mentry; - -@@ -582,7 +582,7 @@ local void CIfNDef( void ) - } - - --local bool GetConstExpr( void ) -+static bool GetConstExpr( void ) - { - bool value; - bool useful_side_effect; -@@ -603,7 +603,7 @@ local bool GetConstExpr( void ) - return( value ); - } - --local void CIf( void ) -+static void CIf( void ) - { - bool value; - -@@ -616,7 +616,7 @@ local void CIf( void ) - } - - --local void CElif( void ) -+static void CElif( void ) - { - bool value; - -@@ -646,7 +646,7 @@ local void CElif( void ) - } - - --local void CElse( void ) -+static void CElse( void ) - { - if( ( NestLevel == 0 ) || ( CppStack->cpp_type == PRE_ELSE ) ) { - CErr1( ERR_MISPLACED_ELSE ); -@@ -668,7 +668,7 @@ local void CElse( void ) - } - - --local void CEndif( void ) -+static void CEndif( void ) - { - if( NestLevel == 0 ) { - CErr1( ERR_MISPLACED_ENDIF ); -@@ -733,7 +733,7 @@ bool MacroDel( const char *name ) - } - - --local void CUndef( void ) -+static void CUndef( void ) - { - - PPNextToken(); -@@ -745,7 +745,7 @@ local void CUndef( void ) - } - - --local void CLine( void ) -+static void CLine( void ) - { - FNAMEPTR flist; - unsigned src_line; -@@ -791,7 +791,7 @@ local void CLine( void ) - } - - --local void CError( void ) -+static void CError( void ) - { - size_t len; - bool save; -diff --git a/bld/cc/master.mif b/bld/cc/master.mif -index 45a69b5..0ac6a97 100644 ---- a/bld/cc/master.mif -+++ b/bld/cc/master.mif -@@ -53,7 +53,7 @@ pre_obj_deps += code$(target_cpu).gh - # - # C compiler options - # --extra_cpp_flags = -Dlocal=static -+extra_cpp_flags = -Dlocal="static" - !ifneq cc_dll 1 - extra_cpp_flags += -DIDE_PGM - !endif --- -1.8.3.4 - - -From eda63ead29387368ea13473af964ada010826c8e Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Sun, 18 Jan 2015 15:35:30 +0100 -Subject: Adjust setvars.sh to Haiku build environment. - - -diff --git a/setvars.sh b/setvars.sh -index a64d135..30bce44 100755 ---- a/setvars.sh -+++ b/setvars.sh -@@ -6,14 +6,14 @@ - # modify it as necessary for your own use!! - - # Change this to point your Open Watcom source tree --export OWROOT=/home/ow/ow -+export OWROOT=/sources/openwatcom-2.0.0 - - # Subdirectory to be used for building OW build tools - export OWOBJDIR=binbuild - - # Set this entry to identify your toolchain used by build process - # supported values are WATCOM GCC CLANG --export OWTOOLS=WATCOM -+export OWTOOLS=GCC - - # Documentation related variables - --- -1.8.3.4 - - -From a720938fa74b28394287eb1c4f13804520089948 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 19 Jan 2015 19:36:32 +0100 -Subject: loadfind: long is 32-bit, off_t might be 64bit - -Use the proper type to get the correct sign expansion effect. - -diff --git a/bld/wres/c/loadfind.c b/bld/wres/c/loadfind.c -index 28b9529..c94ae26 100644 ---- a/bld/wres/c/loadfind.c -+++ b/bld/wres/c/loadfind.c -@@ -61,7 +61,7 @@ unsigned char FindResources( PHANDLE_INFO hInstance ) - /* look for the resource information in a debugger record at the end of file */ - { - long currpos; -- long offset; -+ off_t offset; - dbgheader header; - bool notfound; - char buffer[sizeof( PATCH_LEVEL )]; -@@ -69,7 +69,7 @@ unsigned char FindResources( PHANDLE_INFO hInstance ) - notfound = true; - FileShift = 0; - offset = sizeof( dbgheader ); -- if( WRESSEEK( hInstance->handle, -(long)sizeof( PATCH_LEVEL ), SEEK_END ) != -1 ) { -+ if( WRESSEEK( hInstance->handle, -(off_t)sizeof( PATCH_LEVEL ), SEEK_END ) != -1 ) { - if( WRESREAD( hInstance->handle, buffer, sizeof( PATCH_LEVEL ) ) == sizeof( PATCH_LEVEL ) ) { - if( memcmp( buffer, PATCH_LEVEL, PATCH_LEVEL_HEAD_SIZE ) == 0 ) { - offset += sizeof( PATCH_LEVEL ); --- -1.8.3.4 - - -From 48aea848589760809e793b3f38af51fc4c0dd313 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 19 Jan 2015 22:44:26 +0100 -Subject: Fix local.mif for Haiku. - -* It was still referencing BSD from which it was copied, resulting in -broken build. - -diff --git a/build/mif/local.mif b/build/mif/local.mif -index 1990b94..4537b76 100644 ---- a/build/mif/local.mif -+++ b/build/mif/local.mif -@@ -453,7 +453,7 @@ bld_cl_sys = - - bld_incs = $(bld_extra_incs) -I"$(watcom_dir)/h" - --bld_cppflags = $(common_cppflags_bsd) $(common_cppflags_$(bld_cpu)) -+bld_cppflags = $(common_cppflags_haiku) $(common_cppflags_$(bld_cpu)) - - bld_cflags = $(common_cflags) $(common_flags) -o $@ - -@@ -485,8 +485,8 @@ cl = gcc -pipe - - librarian = ar - --cppflags_bsd = $(common_cppflags_bsd) --cppflags_osi = $(common_cppflags_bsd) -+cppflags_haiku = $(common_cppflags_haiku) -+cppflags_osi = $(common_cppflags_haiku) - cppflags_386 = $(common_cppflags_386) - cppflags_ppc = $(common_cppflags_ppc) - cppflags_x64 = $(common_cppflags_x64) --- -1.8.3.4 - - -From 4b0ebc440cc9f2b217c39f00f89cf2e280fc4bc1 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 19 Jan 2015 22:45:36 +0100 -Subject: makeinit, variety.h: Haiku support. - -Not sure if this is needed, for symmetry with other systems only. - -diff --git a/bld/lib_misc/h/variety.h b/bld/lib_misc/h/variety.h -index 241183e..7323caa 100644 ---- a/bld/lib_misc/h/variety.h -+++ b/bld/lib_misc/h/variety.h -@@ -164,6 +164,16 @@ - #else - #error unrecognized processor for Linux - #endif -+#elif defined(__HAIKU__) -+ #define __PROTECT_MODE__ -+ #define __UNIX__ -+ #if defined(__386__) -+ #define __HAIKU_386__ -+ #elif defined(__PPC__) -+ #define __HAIKU_PPC__ -+ #else -+ #error unrecognized processor for Haiku -+ #endif - #elif defined(__NETWARE__) - #define __PROTECT_MODE__ - #if defined(__386__) -diff --git a/build/makeinit b/build/makeinit -index f9bc945..692675a 100644 ---- a/build/makeinit -+++ b/build/makeinit -@@ -82,6 +82,17 @@ bld64host_osi = 1 - !else ifdef __BSDPPC__ - bld_cpu = ppc - bld_os = bsd -+!else ifdef __HAIKU386__ -+bld_cpu = 386 -+bld_os = haiku -+!else ifdef __HAIKUX64__ -+bld_cpu = x64 -+bld_os = haiku -+bld64host_bsd = 1 -+bld64host_osi = 1 -+!else ifdef __HAIKUPPC__ -+bld_cpu = ppc -+bld_os = haiku - !endif - - !ifdef nulldevice_$(bld_os) --- -1.8.3.4 - - -From 61579736f40c305f7e33642c17e36c4daad73094 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 19 Jan 2015 22:46:14 +0100 -Subject: walloca: silcene warning on Haiku - -We already define __alloca in Haiku system headers, and this triggers a -warning during build. - -diff --git a/bld/watcom/h/walloca.h b/bld/watcom/h/walloca.h -index 66a7ac8..6f70d1c 100644 ---- a/bld/watcom/h/walloca.h -+++ b/bld/watcom/h/walloca.h -@@ -41,7 +41,7 @@ - #if !defined( __WATCOMC__ ) - #if defined( _MSC_VER ) - #define __alloca _alloca --#else -+#elif !defined(__HAIKU__) - #define __alloca alloca - #endif - #endif --- -1.8.3.4 - - -From bfc9f3a6eab0dbc28d4eb91698842faa8fb94ac8 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Mon, 19 Jan 2015 22:47:04 +0100 -Subject: wl, builder: let makefiles know about Haiku - -* We want the POSIX stuff used, otherwise there are undefined -references. - -diff --git a/bld/builder/master.mif b/bld/builder/master.mif -index 6ce7918..2d7f651 100644 ---- a/bld/builder/master.mif -+++ b/bld/builder/master.mif -@@ -36,6 +36,7 @@ inc_dirs = -I"../h" -I"$(pmake_dir)" -I"$(posix_dir)/h" - sys_bsd = sys.obj sysposix.obj - sys_dos = sys.obj sysdos.obj sysdoscd.obj - sys_linux = sys.obj sysposix.obj -+sys_haiku = sys.obj sysposix.obj - sys_nt = sysnt.obj sysdoscd.obj - sys_os2 = sys.obj sysos2.obj sysdoscd.obj - -diff --git a/bld/wl/wlobjs.mif b/bld/wl/wlobjs.mif -index 7b50b4f..e1efd0b 100644 ---- a/bld/wl/wlobjs.mif -+++ b/bld/wl/wlobjs.mif -@@ -125,6 +125,7 @@ wlink_ide_objs = $(_subdir_)idedrv.obj - wlink_objs_dos = $(_subdir_)linkio.obj - wlink_objs_qnx = $(_subdir_)posixio.obj - wlink_objs_linux = $(_subdir_)posixio.obj -+wlink_objs_haiku = $(_subdir_)posixio.obj - wlink_objs_osx = $(_subdir_)posixio.obj - wlink_objs_bsd = $(_subdir_)posixio.obj - wlink_objs_nt = $(_subdir_)ntio.obj + TYPEPTR ptrtyp; -- 1.8.3.4 From c37f3132beac6bf3aac33a79d16206b19282cc8b Mon Sep 17 00:00:00 2001 From: Nav Date: Thu, 15 Jan 2015 18:18:09 +0200 Subject: [PATCH 40/42] Updated libunistring recipe --- .../libunistring/libunistring-0.9.1.1.recipe | 26 -------- .../libunistring/libunistring-0.9.4.recipe | 61 +++++++++++++++++++ 2 files changed, 61 insertions(+), 26 deletions(-) delete mode 100644 dev-libs/libunistring/libunistring-0.9.1.1.recipe create mode 100644 dev-libs/libunistring/libunistring-0.9.4.recipe diff --git a/dev-libs/libunistring/libunistring-0.9.1.1.recipe b/dev-libs/libunistring/libunistring-0.9.1.1.recipe deleted file mode 100644 index e99f21559..000000000 --- a/dev-libs/libunistring/libunistring-0.9.1.1.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION=" -libunistring provides functions for manipulating Unicode strings and for \ -manipulating C strings according to the Unicode standard. -" -HOMEPAGE="http://www.gnu.org/software/libunistring/" -SRC_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.1.1.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/git >= 1.6.5.3 - dev-util/gperf >= 3.0.4" -BUILD() -{ - cd libunistring-0.9.1.1 - libtoolize --copy --force --install - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libunistring-0.9.1.1 - make install -} -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1998-2009 Free Software Fundation, Inc." diff --git a/dev-libs/libunistring/libunistring-0.9.4.recipe b/dev-libs/libunistring/libunistring-0.9.4.recipe new file mode 100644 index 000000000..e1459bfe4 --- /dev/null +++ b/dev-libs/libunistring/libunistring-0.9.4.recipe @@ -0,0 +1,61 @@ +SUMMARY="A library for manipulating Unicode strings" +DESCRIPTION="libunistring provides functions for manipulating Unicode strings and for \ +manipulating C strings according to the Unicode standard." +HOMEPAGE="http://www.gnu.org/software/libunistring/" +SRC_URI="http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.4.tar.gz" +LICENSE="GNU LGPL v2.1" +COPYRIGHT="1998-2014 Free Software Fundation, Inc." +CHECKSUM_SHA256="f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6" +REVISION="1" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" + +PROVIDES=" + libunistring + lib:libunistring + " + +REQUIRES=" + haiku + cmd:gperf + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel + cmd:make + cmd:libtoolize + cmd:git + cmd:autoconf + cmd:gcc + cmd:gperf + " + +PATCH() +{ + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac +} + +BUILD() +{ + libtoolize --copy --force --install + ./autogen.sh + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + prepareInstalledDevelLib libunistring + packageEntries devel \ + $developDir +} + +# ----- Development package ----- + +PROVIDES_devel=" + libunistring_devel + devel:libunistring + " +REQUIRES_devel="" From 8c99a0c8d4bcee510e25511394c28594bf04cd70 Mon Sep 17 00:00:00 2001 From: "Joseph R. Prostko" Date: Tue, 20 Jan 2015 19:31:29 -0500 Subject: [PATCH 41/42] Add recipe for Fossil 1.30 * No patch is needed for this version, as all Haiku fixes were upstreamed --- dev-vcs/fossil/fossil-1.30.recipe | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 dev-vcs/fossil/fossil-1.30.recipe diff --git a/dev-vcs/fossil/fossil-1.30.recipe b/dev-vcs/fossil/fossil-1.30.recipe new file mode 100644 index 000000000..e0250e32a --- /dev/null +++ b/dev-vcs/fossil/fossil-1.30.recipe @@ -0,0 +1,55 @@ +SUMMARY="Simple, high-reliability, distributed software configuration management" +DESCRIPTION="Fossil is a distributed version control system like Git and \ +Mercurial, but Fossil also supports distributed bug tracking, \ +distributed wiki, and a distributed blog mechanism all in a single \ +integrated package. + +Additionally, Fossil also has a built-in and easy-to-use web \ +interface that simplifies project tracking and promotes situational \ +awareness." +HOMEPAGE="http://www.fossil-scm.org/" +SRC_URI="http://www.fossil-scm.org/download/fossil-src-20150119112900.tar.gz" +CHECKSUM_SHA256="37969e5a09c1611199921e3518a4ed736fd637a02f2d5810cd45897a4ceb92dc" +REVISION="1" +LICENSE="BSD (2-clause)" +COPYRIGHT="2007 D. Richard Hipp" + +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + fossil = $portVersion + cmd:fossil = $portVersion + " +REQUIRES=" + haiku + lib:libz + openssl >= 1.0.0 + " +BUILD_REQUIRES=" + haiku_devel + devel:libz >= 1.2.3 + openssl_devel >= 1.0.0 + " +# tests require cmd:tclsh +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc + " + +SOURCE_DIR="fossil-src-20150119112900" + +BUILD() +{ + ./configure --prefix=$prefix + make +} + +INSTALL() +{ + make install +} + +TEST() +{ + make test +} From 5a93f5abd574e45811fb59ee8d46e373f545b9f0 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 20 Jan 2015 22:36:33 -0800 Subject: [PATCH 42/42] Cleaned up white-space in almp3 recipe, no functional changes. --- media-libs/almp3/almp3-2.0.4.recipe | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/media-libs/almp3/almp3-2.0.4.recipe b/media-libs/almp3/almp3-2.0.4.recipe index b3347967a..f795a00e1 100644 --- a/media-libs/almp3/almp3-2.0.4.recipe +++ b/media-libs/almp3/almp3-2.0.4.recipe @@ -23,25 +23,26 @@ PROVIDES_devel=" " REQUIRES=" - haiku${secondaryArchSuffix} + haiku${secondaryArchSuffix} lib:liballeg${secondaryArchSuffix} >= 4.4 - " +" BUILD_PREREQUIRES=" - cmd:gcc${secondaryArchSuffix} + cmd:gcc${secondaryArchSuffix} cmd:install - cmd:ld${secondaryArchSuffix} - cmd:make - " + cmd:ld${secondaryArchSuffix} + cmd:make +" BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel + haiku${secondaryArchSuffix}_devel devel:liballeg${secondaryArchSuffix} >= 4.4 - " +" SOURCE_DIR='almp3' PATCHES="almp3-$portVersion.patchset" + BUILD() { make $jobArgs TARGET=HAIKU_STATIC