From 30fd75c0d885388c76fe2b2450325987669170bb Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 8 Dec 2014 12:39:39 +0000 Subject: [PATCH 1/9] Mark libidl as working on x86_gcc2 --- dev-libs/libidl/libidl-0.6.8.recipe | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dev-libs/libidl/libidl-0.6.8.recipe b/dev-libs/libidl/libidl-0.6.8.recipe index e5c3ed859..aa7268aa0 100644 --- a/dev-libs/libidl/libidl-0.6.8.recipe +++ b/dev-libs/libidl/libidl-0.6.8.recipe @@ -12,13 +12,8 @@ CHECKSUM_SHA256="50e8f7674815e42a6e8be32610838d9b7da91b3043784d2b69d17b79c7203e7 COPYRIGHT="1998-1999 Andrew T. Veliath" LICENSE="GNU LGPL v2" REVISION="1" -ARCHITECTURES="x86" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="x86_gcc2 $ARCHITECTURES" -else - ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" -fi -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" libidl$secondaryArchSuffix = $portVersion From d3b61d4ee024c481effcf2135599841baa2289b8 Mon Sep 17 00:00:00 2001 From: Theodore Kokkoris Date: Mon, 8 Dec 2014 12:43:12 +0000 Subject: [PATCH 2/9] Mark glib as working on x86_gcc2 --- dev-libs/glib/glib-1.2.10.recipe | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dev-libs/glib/glib-1.2.10.recipe b/dev-libs/glib/glib-1.2.10.recipe index d63a721d4..92be8b050 100644 --- a/dev-libs/glib/glib-1.2.10.recipe +++ b/dev-libs/glib/glib-1.2.10.recipe @@ -22,13 +22,8 @@ COPYRIGHT="1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald REVISION="1" -ARCHITECTURES="x86" -if [ $effectiveTargetArchitecture != x86_gcc2 ]; then - ARCHITECTURES="x86_gcc2 $ARCHITECTURES" -else - ARCHITECTURES="!x86_gcc2 $ARCHITECTURES" -fi -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" glib$secondaryArchSuffix = $portVersion compat >= 1 From f8f1eaf9d4ddf1f5fd26e2519b80b5b4f8b64e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 8 Dec 2014 21:42:51 +0100 Subject: [PATCH 3/9] watchdog: rename recipe from python_watchdog --- .../{python_watchdog-0.8.2.recipe => watchdog-0.8.2.recipe} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename dev-python/watchdog/{python_watchdog-0.8.2.recipe => watchdog-0.8.2.recipe} (97%) diff --git a/dev-python/watchdog/python_watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe similarity index 97% rename from dev-python/watchdog/python_watchdog-0.8.2.recipe rename to dev-python/watchdog/watchdog-0.8.2.recipe index 3b9e47d3f..71bf25565 100644 --- a/dev-python/watchdog/python_watchdog-0.8.2.recipe +++ b/dev-python/watchdog/watchdog-0.8.2.recipe @@ -16,7 +16,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64" SOURCE_DIR="watchdog-$portVersion" PROVIDES=" - python_watchdog = $portVersion + watchdog = $portVersion cmd:watchmedo " From c776a6713b5430f8c8c1af419e23f887c416c343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 8 Dec 2014 21:45:23 +0100 Subject: [PATCH 4/9] pathtools: rename recipe from python_pathtools --- .../{python_pathtools-0.1.2.recipe => pathtools-0.1.2.recipe} | 2 +- dev-python/watchdog/watchdog-0.8.2.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dev-python/pathtools/{python_pathtools-0.1.2.recipe => pathtools-0.1.2.recipe} (97%) diff --git a/dev-python/pathtools/python_pathtools-0.1.2.recipe b/dev-python/pathtools/pathtools-0.1.2.recipe similarity index 97% rename from dev-python/pathtools/python_pathtools-0.1.2.recipe rename to dev-python/pathtools/pathtools-0.1.2.recipe index 744a02110..0cda667d2 100644 --- a/dev-python/pathtools/python_pathtools-0.1.2.recipe +++ b/dev-python/pathtools/pathtools-0.1.2.recipe @@ -18,7 +18,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64" SOURCE_DIR="pathtools-$portVersion" PROVIDES=" - python_pathtools = $portVersion + pathtools = $portVersion " REQUIRES=" diff --git a/dev-python/watchdog/watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe index 71bf25565..67170ceb5 100644 --- a/dev-python/watchdog/watchdog-0.8.2.recipe +++ b/dev-python/watchdog/watchdog-0.8.2.recipe @@ -24,7 +24,7 @@ REQUIRES=" haiku >= $haikuVersion cmd:python python_argh - python_pathtools + pathtools python_pyyaml " From 6e7d2bfcb8902da5626f889fe059cb99e5f6fcd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 8 Dec 2014 21:47:08 +0100 Subject: [PATCH 5/9] argh: rename recipe from python_argh --- .../argh/{python_argh-0.26.1.recipe => argh-0.26.1.recipe} | 2 +- dev-python/watchdog/watchdog-0.8.2.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dev-python/argh/{python_argh-0.26.1.recipe => argh-0.26.1.recipe} (98%) diff --git a/dev-python/argh/python_argh-0.26.1.recipe b/dev-python/argh/argh-0.26.1.recipe similarity index 98% rename from dev-python/argh/python_argh-0.26.1.recipe rename to dev-python/argh/argh-0.26.1.recipe index 7bde69c3b..954eabb67 100644 --- a/dev-python/argh/python_argh-0.26.1.recipe +++ b/dev-python/argh/argh-0.26.1.recipe @@ -17,7 +17,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64" SOURCE_DIR="argh-$portVersion" PROVIDES=" - python_argh = $portVersion + argh = $portVersion " REQUIRES=" diff --git a/dev-python/watchdog/watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe index 67170ceb5..bfb07b90c 100644 --- a/dev-python/watchdog/watchdog-0.8.2.recipe +++ b/dev-python/watchdog/watchdog-0.8.2.recipe @@ -23,7 +23,7 @@ PROVIDES=" REQUIRES=" haiku >= $haikuVersion cmd:python - python_argh + argh pathtools python_pyyaml " From f3f31d07db79595459cf33dc46144e0a1eee9b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 8 Dec 2014 21:48:51 +0100 Subject: [PATCH 6/9] pyyaml: rename recipe from python_pyyaml --- .../pyyaml/{python_pyyaml-3.11.recipe => pyyaml-3.11.recipe} | 2 +- dev-python/watchdog/watchdog-0.8.2.recipe | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dev-python/pyyaml/{python_pyyaml-3.11.recipe => pyyaml-3.11.recipe} (98%) diff --git a/dev-python/pyyaml/python_pyyaml-3.11.recipe b/dev-python/pyyaml/pyyaml-3.11.recipe similarity index 98% rename from dev-python/pyyaml/python_pyyaml-3.11.recipe rename to dev-python/pyyaml/pyyaml-3.11.recipe index 484baa4ee..19ad24e4c 100644 --- a/dev-python/pyyaml/python_pyyaml-3.11.recipe +++ b/dev-python/pyyaml/pyyaml-3.11.recipe @@ -27,7 +27,7 @@ ARCHITECTURES="x86 x86_gcc2 x86_64" SOURCE_DIR="PyYAML-$portVersion" PROVIDES=" - python_pyyaml = $portVersion + pyyaml = $portVersion " REQUIRES=" diff --git a/dev-python/watchdog/watchdog-0.8.2.recipe b/dev-python/watchdog/watchdog-0.8.2.recipe index bfb07b90c..bf2ef3f52 100644 --- a/dev-python/watchdog/watchdog-0.8.2.recipe +++ b/dev-python/watchdog/watchdog-0.8.2.recipe @@ -25,7 +25,7 @@ REQUIRES=" cmd:python argh pathtools - python_pyyaml + pyyaml " BUILD_REQUIRES=" From db95a2e4d0b4bf12068d4c4a978d6c6df8660337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 8 Dec 2014 23:06:11 +0100 Subject: [PATCH 7/9] antiword: fix data search path --- app-text/antiword/patches/antiword-0.37.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch index 117c4e06a..52efc88a0 100644 --- a/app-text/antiword/patches/antiword-0.37.patch +++ b/app-text/antiword/patches/antiword-0.37.patch @@ -6,7 +6,7 @@ diff -Naur antiword-0.37/antiword.h antiword-0.37-haiku/antiword.h #define ANTIWORD_DIR "antiword" #define FONTNAMES_FILE "fontnames" +#elif defined(__haiku) -+#define GLOBAL_ANTIWORD_DIR "/boot/common/data/antiword" ++#define GLOBAL_ANTIWORD_DIR "/boot/system/data/antiword" +#define ANTIWORD_DIR "antiword" +#define FONTNAMES_FILE "fontnames" #elif defined(__CYGMING__) From 10e8693868b5e7c6680479ff9fda9759fdfbc412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 8 Dec 2014 23:11:57 +0100 Subject: [PATCH 8/9] antiword: disable DEBUG build This should prevent the verbose output --- app-text/antiword/patches/antiword-0.37.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch index 52efc88a0..2873294b8 100644 --- a/app-text/antiword/patches/antiword-0.37.patch +++ b/app-text/antiword/patches/antiword-0.37.patch @@ -28,7 +28,7 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku +INSTALL_DATA = $(INSTALL) + +# must be equal to DEBUG or NDEBUG -+DB = DEBUG ++DB = NDEBUG +# Optimization: -O or debugging: -g +OPT = -O2 + From 3e1aefa06d8fe638bc9eed6531a0f8a8bfd4003f Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 9 Dec 2014 00:56:58 +0000 Subject: [PATCH 9/9] astyle: Port version 2.05 --- .../{astyle-2.03.recipe => astyle-2.05.recipe} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) rename dev-util/astyle/{astyle-2.03.recipe => astyle-2.05.recipe} (85%) diff --git a/dev-util/astyle/astyle-2.03.recipe b/dev-util/astyle/astyle-2.05.recipe similarity index 85% rename from dev-util/astyle/astyle-2.03.recipe rename to dev-util/astyle/astyle-2.05.recipe index c9e945f34..4d3794786 100644 --- a/dev-util/astyle/astyle-2.03.recipe +++ b/dev-util/astyle/astyle-2.05.recipe @@ -5,13 +5,18 @@ re-formats C / C++ / C# / Java source files. It can be used from a command \ line, or it can be incorporated as classes in another C++ program. " HOMEPAGE="http://astyle.sourceforge.net" -SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%202.03/astyle_2.03_linux.tar.gz" -CHECKSUM_SHA256="22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389" +SRC_URI="http://sourceforge.net/projects/astyle/files/astyle/astyle%20${portVersion}/astyle_${portVersion}_linux.tar.gz" +CHECKSUM_SHA256="da34eb1f8f12e6f50f1cf674944c0db70c91b203008e11be0f57aa8267823a39" LICENSE="GNU LGPL v3" -COPYRIGHT="1998-2002 by Tal Davidson - 2006-2013 Jim Pattee" + +COPYRIGHT=" +1998-2002 by Tal Davidson \ +2006-2013 Jim Pattee +" + REVISION="1" -ARCHITECTURES="x86" +ARCHITECTURES="x86 x86_64 arm ppc" + if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture.